Merge origin/develop

Author: sandlbn

.gitignore

@@ -0,0 +1,32 @@
+*.rbc
+capybara-*.html
+.rspec
+/log
+/tmp
+/db/*.sqlite3
+/public/system
+/coverage/
+/spec/tmp
+/branches
+/hooks
+/refs
+/info
+/branches
+**.orig
+rerun.txt
+pickle-email-*.html
+
+## Environment normalisation:
+/.bundle
+/vendor/bundle
+
+# these should all be checked in to normalise the environment:
+# Gemfile.lock, .ruby-version, .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
+
+# if using bower-rails ignore default bower_components path bower.json files
+/vendor/assets/bower_components
+*.bowerrc
+bower.json

Gemfile

@@ -0,0 +1,63 @@
+source 'https://rubygems.org'
+ruby '2.1.2'
+
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '4.1.4'
+# Use sqlite3 as the database for Active Record
+gem 'sqlite3'
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 4.0.3'
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+# Use CoffeeScript for .js.coffee assets and views
+gem 'coffee-rails', '~> 4.0.0'
+# See https://github.com/sstephenson/execjs#readme for more supported runtimes
+# gem 'therubyracer',  platforms: :ruby
+
+# Use jquery as the JavaScript library
+gem 'jquery-rails'
+# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
+gem 'turbolinks'
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'jbuilder', '~> 2.0'
+# bundle exec rake doc:rails generates the API under doc/api.
+gem 'sdoc', '~> 0.4.0',          group: :doc
+
+# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+gem 'spring',        group: :development
+
+# Use ActiveModel has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+
+# Use unicorn as the app server
+# gem 'unicorn'
+
+# Use Capistrano for deployment
+# gem 'capistrano-rails', group: :development
+
+# Use debugger
+# gem 'debugger', group: [:development, :test]
+
+gem 'hashie', '~> 3.3.1'
+gem 'bootstrap-sass', '~> 3.2.0'
+gem 'autoprefixer-rails'
+gem 'angularjs-rails'
+gem 'font-awesome-sass'
+gem 'execjs'
+gem 'therubyracer', :platforms => :ruby
+
+# support for twitter, facebook, google, soundcloud, live and yahoo login  
+gem 'devise'
+gem 'omniauth'
+gem 'omniauth-twitter'
+gem 'omniauth-facebook'
+gem "omniauth-google-oauth2"
+gem 'omniauth-soundcloud', '~> 1.0.0'
+gem 'omniauth-live_connect'
+gem 'omniauth-yahoo', '~> 0.0.5'
+gem "pundit"
+
+# support for pg
+gem 'pg'
+

Gemfile.lock

@@ -0,0 +1,204 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.1.4)
+      actionpack (= 4.1.4)
+      actionview (= 4.1.4)
+      mail (~> 2.5.4)
+    actionpack (4.1.4)
+      actionview (= 4.1.4)
+      activesupport (= 4.1.4)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.4)
+      activesupport (= 4.1.4)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.4)
+      activesupport (= 4.1.4)
+      builder (~> 3.1)
+    activerecord (4.1.4)
+      activemodel (= 4.1.4)
+      activesupport (= 4.1.4)
+      arel (~> 5.0.0)
+    activesupport (4.1.4)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    angularjs-rails (1.2.22)
+    arel (5.0.1.20140414130214)
+    autoprefixer-rails (2.2.0.20140804)
+      execjs
+    bcrypt (3.1.7)
+    bootstrap-sass (3.2.0.1)
+      sass (~> 3.2)
+    builder (3.2.2)
+    coffee-rails (4.0.1)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0, < 5.0)
+    coffee-script (2.3.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.7.1)
+    devise (3.3.0)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 3.2.6, < 5)
+      thread_safe (~> 0.1)
+      warden (~> 1.2.3)
+    erubis (2.7.0)
+    execjs (2.2.1)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    font-awesome-sass (4.1.0)
+      sass (~> 3.2)
+    hashie (3.3.1)
+    hike (1.2.3)
+    i18n (0.6.11)
+    jbuilder (2.1.3)
+      activesupport (>= 3.0.0, < 5)
+      multi_json (~> 1.2)
+    jquery-rails (3.1.1)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.1)
+    jwt (1.0.0)
+    libv8 (3.16.14.3)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    minitest (5.4.0)
+    multi_json (1.10.1)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    oauth (0.4.7)
+    oauth2 (0.9.4)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    omniauth (1.2.2)
+      hashie (>= 1.2, < 4)
+      rack (~> 1.0)
+    omniauth-facebook (1.6.0)
+      omniauth-oauth2 (~> 1.1)
+    omniauth-google-oauth2 (0.2.5)
+      omniauth (> 1.0)
+      omniauth-oauth2 (~> 1.1)
+    omniauth-live_connect (0.0.1)
+    omniauth-oauth (1.0.1)
+      oauth
+      omniauth (~> 1.0)
+    omniauth-oauth2 (1.1.2)
+      faraday (>= 0.8, < 0.10)
+      multi_json (~> 1.3)
+      oauth2 (~> 0.9.3)
+      omniauth (~> 1.2)
+    omniauth-soundcloud (1.0.1)
+      omniauth-oauth2 (~> 1.1.0)
+    omniauth-twitter (1.0.1)
+      multi_json (~> 1.3)
+      omniauth-oauth (~> 1.0)
+    omniauth-yahoo (0.0.5)
+      omniauth-oauth (~> 1.0)
+    orm_adapter (0.5.0)
+    pg (0.17.1)
+    polyglot (0.3.5)
+    pundit (0.3.0)
+      activesupport (>= 3.0.0)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.1.4)
+      actionmailer (= 4.1.4)
+      actionpack (= 4.1.4)
+      actionview (= 4.1.4)
+      activemodel (= 4.1.4)
+      activerecord (= 4.1.4)
+      activesupport (= 4.1.4)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.4)
+      sprockets-rails (~> 2.0)
+    railties (4.1.4)
+      actionpack (= 4.1.4)
+      activesupport (= 4.1.4)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.3.2)
+    rdoc (4.1.1)
+      json (~> 1.4)
+    ref (1.0.5)
+    sass (3.2.19)
+    sass-rails (4.0.3)
+      railties (>= 4.0.0, < 5.0)
+      sass (~> 3.2.0)
+      sprockets (~> 2.8, <= 2.11.0)
+      sprockets-rails (~> 2.0)
+    sdoc (0.4.1)
+      json (~> 1.7, >= 1.7.7)
+      rdoc (~> 4.0)
+    spring (1.1.3)
+    sprockets (2.11.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.1.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.9)
+    therubyracer (0.12.1)
+      libv8 (~> 3.16.14.0)
+      ref
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    turbolinks (2.3.0)
+      coffee-rails
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uglifier (2.5.3)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
+    warden (1.2.3)
+      rack (>= 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  angularjs-rails
+  autoprefixer-rails
+  bootstrap-sass (~> 3.2.0)
+  coffee-rails (~> 4.0.0)
+  devise
+  execjs
+  font-awesome-sass
+  hashie (~> 3.3.1)
+  jbuilder (~> 2.0)
+  jquery-rails
+  omniauth
+  omniauth-facebook
+  omniauth-google-oauth2
+  omniauth-live_connect
+  omniauth-soundcloud (~> 1.0.0)
+  omniauth-twitter
+  omniauth-yahoo (~> 0.0.5)
+  pg
+  pundit
+  rails (= 4.1.4)
+  sass-rails (~> 4.0.3)
+  sdoc (~> 0.4.0)
+  spring
+  sqlite3
+  therubyracer
+  turbolinks
+  uglifier (>= 1.3.0)

README.md

@@ -0,0 +1,79 @@
+Marid Backend
+=============
+
+![](https://raw.githubusercontent.com/maridco/marid/master/app/assets/images/header-logo.png?token=5732914__eyJzY29wZSI6IlJhd0Jsb2I6bWFyaWRjby9tYXJpZC9tYXN0ZXIvYXBwL2Fzc2V0cy9pbWFnZXMvaGVhZGVyLWxvZ28ucG5nIiwiZXhwaXJlcyI6MTQwOTgwODYwMH0%3D--bfc78a84eeefba95185fb2b6cb2b92848bc68bd3)
+
+## Independent Music Platform
+
+Marid is a music platform that beautifully showcases the works of independent artists.
+
+For more information, please see http://marid.co
+
+## Authors
+
+[![Nathan Bernard](https://s.gravatar.com/avatar/764276fb0de2fba228d1a906efdcae45?s=117)](https://github.com/nb333) | [![Juan Pavlo](https://avatars0.githubusercontent.com/u/471024?v=2&s=117)](https://github.com/jpavlo) | [![John McConnell](https://avatars1.githubusercontent.com/u/1870400?v=2&s=117)](https://github.com/johnmcconnell) | [![Mario Mjertan](https://avatars1.githubusercontent.com/u/1742806?v=2&s=117)](https://github.com/iwebhub) | [![Marek Fajkus](https://avatars0.githubusercontent.com/u/2130305?v=2&s=117)](https://github.com/turboMaCk)
+:---:|:---:|:---:|:---:|:---:
+[Nathan Bernard](https://github.com/nb333) | [Juan Pavlo](https://github.com/jpavlo) | [John McConnell](https://github.com/johnmcconnell) | [Mario Mjertan](https://github.com/iwebhub) | [Marek Fajkus](https://github.com/turboMaCk)
+
+[![Marcin Spoczynski](https://avatars0.githubusercontent.com/u/2578718?v=2&s=117)](https://github.com/sandlbn) |
+:---:|:---:|:---:|:---:|:---:|
+[Marcin Spoczynski](https://github.com/sandlbn) |
+
+A full list of [contributors](https://github.com/maridco/backend/graphs/contributors) can be found on GitHub.
+
+## Contributing
+
+1. [Fork it](https://help.github.com/articles/fork-a-repo)
+2. Create your feature branch (`git checkout -b develop/my-new-feature`)
+3. Commit your changes (`git commit -am "Added some feature"`)
+4. Push to the branch (`git push origin develop/my-new-feature`)
+5. Create new [Pull Request](https://help.github.com/articles/using-pull-requests)
+
+**You can use [git-flow](https://github.com/nvie/gitflow) for branch management.**
+
+**Please make sure your fork is private, not public.**
+
+## Bug Tracker
+
+Found a bug? Report it [here](https://github.com/maridco/backend/issues/)!
+
+## Feature Request
+
+Have an idea? Add it [here](https://github.com/maridco/backend/issues/)!
+
+
+## Dependencies
+1. Ruby version 2.1.2
+2. Rails version 4.1.4
+3. SQLite3
+4. Postgresql
+5. Node.js
+
+## Installation 
+
+
+### Mac OS X, Linux, Windows
+
+1. Go to (https://github.com/maridco/marid-vagrant/) and follow instructions
+2. Contribute 
+
+### Setup Rails app (every platform)
+1. Configure Postgresql database
+2. Install dependencies vie Boundler: `bundle install`
+3. Setup Postgresql `rake db:setup`
+
+## Run
+Start the server `bundle exec rails s`
+
+## Check out the site
+In your browser go to localhost:3000
+
+## Contact
+
+Twitter: `@maridco`
+
+IRC: `#marid` on irc.freenode.net
+
+## License
+
+Copyright 2014 Marid. All Rights Reserved. Proprietary and Confidential.