voluntary_music_metadata_enrichment 0.1.1 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZGNjMWFkMjhkNzMyNWQ0ZTYzZjA0NGZjYTZlOGZmODAzMmY2YmNkNw==
-  data.tar.gz: !binary |-
-    ODlmMjQ3YjYzNjcwYjQzMWNmNzE5ZTE3MmI2NDkxZmE1OTc0ZTM5Ng==
+SHA1:
+  metadata.gz: 87672c5c80c85f0d27af153e16b910685a89c003
+  data.tar.gz: 0c36cc13b3dc311815c753ac5259d4816bae3e97
 SHA512:
-  metadata.gz: !binary |-
-    YjhlZDRhN2IwZThiZDRiNmU0M2YzMGUxNzU3ZGYwZTliMWVmOWIyZDJiMDg1
-    NGFiMTM1NTc5YWJkZTkzZjUyZmY4MTg0NmMwNDBmNjZhYjQwZjc0OWY2NDAx
-    NzNmNGJlZTI1ZWE5OGZkNjM2YmQ0NTA0MmExZjE2Njc4NzQ4NzM=
-  data.tar.gz: !binary |-
-    YzgwMmY2NDdlMTEwNjI5MGIxZGVjNmRiNmYwN2FkNDViNDYyYjgwMWVmN2Qz
-    ZDJjMjk2ZGU1OWNkMWNlMTYyN2E1Zjk0MDNkZjVhYzdhNDQwYTkyOGI3YWM1
-    ODMyMGEwMjBmNTczNWYwZGY0NzJiZDQ4ZmFhMmVlOTg2ZjZmMmM=
+  metadata.gz: 639cb58ebf3281b608db03b0d8b995fdd1fb59006bf7065b8e87ca5dfb172e7b96751a6057414d7488c16880d85ced22d08f9ed5b1bdbcb0031ed0b7691789fd
+  data.tar.gz: 08483590bb0275299f84f0817d340e38198c2f5d94776606c97fb5d7bc7a5a5538032fa805cd7dead62287937bb79d2170cae716b3412392d8404d207b04ec2f

data/CHANGELOG.md

@@ -0,0 +1,30 @@
+## 0.2.0 (April 12, 2015) ##
+
+*   #121 Rails 4.2.1 upgrade and Travis setup.
+*   #118 API actions for artists, artists/:id, artists/:artist_id/releases, releases/:id, releases/:release_id/tracks, tracks/:id, tracks/:track_id/videos and videos/:id
+*   #116 Import all artists with the same name through MusicMetadataEnrichment::Group#import_artist_connections.
+
+## 0.1.1 (March 23, 2015) ##
+
+*   Changes home page in gemspec.
+
+## 0.1.0 (March 23, 2015) ##
+
+*   #113 #114 Implements bulk releases and tracks route for API.
+*   #110 Implements API route for videos liked by user.
+*   #107 #109 Initializes API with first resource year in reviews including top releases and tracks.
+*   #70 Option to sort year in review releases and tracks by round-robin tournament.
+*   #64 Create year in review music releases and tracks for groups by average of lists by members.
+*   refs #65 Implements group membership.
+*   refs #1 Also import soundtrack releases.
+*   #60 Initializes year in review music releases and tracks by user's overall top releases and tracks.
+*   #61 Implements music_artists.is_ambiguous and import all artist with the same name at last.fm library artists import.
+*   #56 Implements option to hide releases and tracks from add multiple tracks / releases to year in review modal window.
+*   Shows top tracks of release on year in review entry for release including "Top Track Positions Sum".
+*   #48 Sets music_releases.is_lp and music release is now also uniq by artist_id, name plus is_lp.
+*   #49 don't import releases of classical artists. Tracks will be added to release "[Bonus Tracks]".
+*   refs #1 Never ending story: metadata importer improvements.
+
+## 0.0.1 (February 5, 2015) ##
+
+*   Initial version.

data/LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Volontari.at
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

data/README.md

@@ -0,0 +1,33 @@
+# voluntary_music_metadata_enrichment [![Build Status](https://travis-ci.org/volontariat/voluntary_music_metadata_enrichment.svg?branch=master)](https://travis-ci.org/volontariat/voluntary_music_metadata_enrichment) [![Code Climate](https://codeclimate.com/github/volontariat/voluntary_music_metadata_enrichment/badges/gpa.svg)](https://codeclimate.com/github/volontariat/voluntary_music_metadata_enrichment) [![Test Coverage](https://codeclimate.com/github/volontariat/voluntary_music_metadata_enrichment/badges/coverage.svg)](https://codeclimate.com/github/volontariat/voluntary_music_metadata_enrichment) [![Dependency Status](https://gemnasium.com/volontariat/voluntary_music_metadata_enrichment.png)](https://gemnasium.com/volontariat/voluntary_music_metadata_enrichment)
+
+A plugin for crowdsourcing management system http://Voluntary.Software which adds a music model with discography sync through http://MusicBrainz.org, http://last.fm plus http://Spotify.com to every Ruby on Rails application. But it does not import everything: see [Which data will be imported?](https://github.com/volontariat/voluntary_music_metadata_enrichment/wiki/Which-data-will-be-imported%3F).
+
+You can create year in reviews for music albums and songs, read more about it in my blog post @ http://last.fm: [Top Songs 2014 created with Open Source Website Volontari.at](http://www.last.fm/user/Volontarian/journal/2015/03/12/6grdr2_top_songs_2014_created_with_open_source_website_volontari.at)
+
+Furthermore you can manage last.fm groups with artist connections voting, release announcements and music video indexing.
+
+## Installation
+
+Preconditions: install the voluntary gem in your rails application https://GitHub.com/volontariat/voluntary
+
+Add this to your Gemfile:
+ 
+```ruby 
+  gem 'voluntary_music_metadata_enrichment'
+```
+  
+Run this in your console:
+
+```bash
+  bundle install  
+```
+  
+Run this in your console:
+
+```bash
+  rake railties:install:migrations
+```
+  
+## License 
+
+This project uses MIT-LICENSE.

data/app/controllers/library/music/year_in_review_releases_controller.rb

@@ -6,7 +6,7 @@ class Library::Music::YearInReviewReleasesController < ::MusicMetadataEnrichment
   authorize_resource class: 'YearInReviewMusicRelease'
   
   def index
-    @user = User.find(params[:user_id])
+    @user = User.by_slug_or_id(params[:user_id])
     find_year_in_review
     get_year_in_review_releases
     

data/app/controllers/library/music/year_in_review_tracks_controller.rb

@@ -6,7 +6,7 @@ class Library::Music::YearInReviewTracksController < ::MusicMetadataEnrichment::
   authorize_resource class: 'YearInReviewMusicTrack'
   
   def index
-    @user = User.find(params[:user_id])
+    @user = User.by_slug_or_id(params[:user_id])
     find_year_in_review
     get_year_in_review_tracks
     

data/app/controllers/library/music/years_in_review_controller.rb

@@ -19,7 +19,7 @@ class Library::Music::YearsInReviewController < ::MusicMetadataEnrichment::Appli
   end
   
   def show
-    @user = User.find(params[:user_id])
+    @user = User.by_slug_or_id(params[:user_id])
     @year_in_review = @user.years_in_review_music
     @year_in_review = @year_in_review.published unless current_user.try(:id) == @user.id
     @year_in_review = @year_in_review.where(year: params[:year]).first
@@ -55,7 +55,7 @@ class Library::Music::YearsInReviewController < ::MusicMetadataEnrichment::Appli
   end
   
   def get_years_in_review
-    @user ||= User.find(params[:user_id])
+    @user ||= User.by_slug_or_id(params[:user_id])
     @years_in_review = @user.years_in_review_music
     @years_in_review = @years_in_review.published unless current_user.try(:id) == @user.id
     @years_in_review = @years_in_review.order('year DESC').paginate(per_page: 10, page: params[:page] || 1)

data/app/controllers/library/music_controller.rb

@@ -4,7 +4,7 @@ class Library::MusicController < ::MusicMetadataEnrichment::ApplicationControlle
 
   def index
     @year = Time.now.strftime('%Y')
-    @user = User.find(params[:user_id])
+    @user = User.by_slug_or_id(params[:user_id])
     @releases = @user.music_releases.released_in_year(@year).order('released_at DESC')
   end
   

data/app/controllers/music_metadata_enrichment/artists_controller.rb

@@ -14,7 +14,7 @@ class MusicMetadataEnrichment::ArtistsController < ::MusicMetadataEnrichment::Ap
         @artists = @group.artists
         @pagination_params = { group_id: (params[:group_id] || params[:id]) }
       elsif params[:user_id].present?
-        @artists = User.find(params[:user_id]).music_artists
+        @artists = User.by_slug_or_id(params[:user_id]).music_artists
       end
       
       @artists = @artists.order('name ASC').paginate(per_page: 10, page: params[:page] || 1)

data/app/controllers/music_metadata_enrichment/releases_controller.rb

@@ -14,7 +14,7 @@ class MusicMetadataEnrichment::ReleasesController < ::MusicMetadataEnrichment::A
         @group = MusicMetadataEnrichment::Group.find(params[:id])
         @releases = @group.releases
       elsif params[:user_id].present?
-        @user = User.find(params[:user_id])
+        @user = User.by_slug_or_id(params[:user_id])
         @releases = @user.music_releases
       end
       

data/app/controllers/music_metadata_enrichment/videos_controller.rb

@@ -17,7 +17,7 @@ class MusicMetadataEnrichment::VideosController < ::MusicMetadataEnrichment::App
       elsif params[:uploaded_by_the_user] == 'true'
         @videos = MusicVideo.where(user_id: params[:user_id])
       elsif params[:user_id].present?
-        @videos = User.find(params[:user_id]).music_videos
+        @videos = User.by_slug_or_id(params[:user_id]).music_videos
       end
       
       @videos = @videos.order('created_at DESC').paginate(per_page: 5, page: params[:page] || 1)

data/app/controllers/voluntary/api/v1/music/artists_controller.rb

@@ -0,0 +1,34 @@
+module Voluntary
+  module Api
+    module V1
+      module Music
+        class ArtistsController < Voluntary::Api::V1::BaseController
+          respond_to :json
+          
+          def index
+            params[:page] = nil if params[:page] == ''
+            params[:per_page] = nil if params[:per_page] == ''
+            artists = MusicArtist
+            artists = artists.where(state: params[:state]) if params[:state].present?
+            artists = artists.order('name ASC').paginate(per_page: params[:per_page] || 10, page: params[:page] || 1)
+            
+            respond_to do |format|
+              format.json {
+                render json: {
+                  current_page: artists.current_page, per_page: artists.per_page, total_entries: artists.total_entries, total_pages: artists.total_pages,
+                  entries: artists.map(&:to_json),
+                }.to_json
+              }
+            end
+          end
+          
+          def show
+            respond_to do |format|
+              format.json { render json: MusicArtist.find(params[:id]).to_json }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/voluntary/api/v1/music/releases_controller.rb

@@ -5,11 +5,25 @@ module Voluntary
         class ReleasesController < Voluntary::Api::V1::BaseController
           respond_to :json
           
+          def index
+            respond_to do |format|
+              format.json {
+                render json: MusicRelease.where(artist_id: params[:artist_id]).order('released_at DESC').map(&:to_json).to_json
+              }
+            end
+          end
+          
           def bulk
             respond_to do |format|
               format.json { render json: MusicRelease.enrich_metadata(params[:releases]).to_json }
             end
           end
+          
+          def show
+            respond_to do |format|
+              format.json { render json: MusicRelease.find(params[:id]).to_json }
+            end
+          end
         end
       end
     end

data/app/controllers/voluntary/api/v1/music/tracks_controller.rb

@@ -5,11 +5,25 @@ module Voluntary
         class TracksController < Voluntary::Api::V1::BaseController
           respond_to :json
           
+          def index
+            respond_to do |format|
+              format.json {
+                render json: MusicTrack.where(release_id: params[:release_id]).order('nr ASC').map(&:to_json).to_json
+              }
+            end
+          end
+          
           def bulk
             respond_to do |format|
               format.json { render json: MusicTrack.enrich_metadata(params[:tracks]).to_json }
             end
           end
+          
+          def show
+            respond_to do |format|
+              format.json { render json: MusicTrack.find(params[:id]).to_json }
+            end
+          end
         end
       end
     end

data/app/controllers/voluntary/api/v1/music/videos_controller.rb

@@ -6,23 +6,30 @@ module Voluntary
           respond_to :json
           
           def index
-            params[:page] = nil if params[:page] == ''
-            params[:per_page] = nil if params[:per_page] == ''
-            videos = MusicVideo.liked_by(params[:user_id]).order('likes.created_at DESC').paginate(per_page: params[:per_page] || 10, page: params[:page] || 1)
+            primitive_videos = if params[:track_id].present?
+              MusicVideo.where(track_id: params[:track_id]).order_by_status.map(&:to_json)
+            else
+              params[:page] = nil if params[:page] == ''
+              params[:per_page] = nil if params[:per_page] == ''
+              videos = MusicVideo.liked_by(params[:user_id]).order('likes.created_at DESC').paginate(per_page: params[:per_page] || 10, page: params[:page] || 1)
             
-            respond_to do |f|
-              f.json {
-                render json: {
-                  current_page: videos.current_page, per_page: videos.per_page, total_entries: videos.total_entries, total_pages: videos.total_pages,
-                  entries: videos.map do |v| 
-                    { 
-                      id: v.id, status: v.status, artist_id: v.artist_id, artist_name: v.artist_name, 
-                      track_id: v.track_id, track_name: v.track_name, url: v.url, liked_at: v.liked_at.iso8601
-                    } 
-                  end,
-                }.to_json
+              {
+                current_page: videos.current_page, per_page: videos.per_page, total_entries: videos.total_entries, total_pages: videos.total_pages,
+                entries: videos.map do |video| 
+                  video.to_json.merge(liked_at: video.liked_at.iso8601)
+                end,
               }
             end
+             
+            respond_to do |format|
+              format.json { render json: primitive_videos.to_json }
+            end
+          end
+          
+          def show
+            respond_to do |format|
+              format.json { render json: MusicVideo.find(params[:id]).to_json }
+            end
           end
         end
       end

data/app/controllers/voluntary/api/v1/music/year_in_reviews_controller.rb

@@ -77,7 +77,7 @@ module Voluntary
           private
           
           def find_user
-            @user = User.find(params[:user_id])
+            @user = User.by_slug_or_id(params[:user_id])
           end
           
           def year_in_review

data/app/models/music_artist.rb

@@ -19,6 +19,8 @@ class MusicArtist < ActiveRecord::Base
   
   attr_accessible :name, :is_ambiguous, :mbid, :disambiguation, :founded_at, :dissolved_at, :listeners, :plays
   
+  after_initialize :set_initial_state
+  
   state_machine :state, initial: :without_metadata do
     event :import_metadata do transition :without_metadata => :active; end
     
@@ -39,8 +41,9 @@ class MusicArtist < ActiveRecord::Base
         is_ambiguous: is_ambiguous
       )
       
+      lastfm = Lastfm.new(LastfmApiKey, LastfmApiSecret)
+      
       unless artist.listeners.present? && artist.plays.present?
-        lastfm = Lastfm.new(LastfmApiKey, LastfmApiSecret)
         lastfm_artist = artist.lastfm_request(lastfm, :artist, :get_info, 'The artist you supplied could not be found', artist: artist.name)
         artist.update_attributes(listeners: lastfm_artist['stats']['listeners'], plays: lastfm_artist['stats']['playcount']) unless lastfm_artist.nil?
       end
@@ -53,6 +56,20 @@ class MusicArtist < ActiveRecord::Base
     end
   end
   
+  def self.create_by_name(name)
+    music_brainz_artists = MusicBrainz::Artist.search(name).select{|a| a[:name].downcase == name.downcase }
+    artist_mbids = music_brainz_artists.map{|a| a[:mbid] }
+    existing_artists = where(mbid: artist_mbids).map{|a| [a.id, a.mbid] }
+    ids = existing_artists.map(&:first); mbids = existing_artists.map(&:last)
+    
+    artist_mbids.select{|m| !mbids.include?(m) }.each do |mbid|
+      artist = create(name: name, mbid: mbid, is_ambiguous: music_brainz_artists.length > 1)
+      ids << artist.id if artist.persisted?
+    end 
+    
+    ids
+  end
+  
   def is_classical?(lastfm = nil)
     lastfm ||= Lastfm.new(LastfmApiKey, LastfmApiSecret)
     
@@ -217,8 +234,21 @@ class MusicArtist < ActiveRecord::Base
     end
   end
   
+  def to_json
+    { 
+      id: id, mbid: mbid, name: name, is_ambiguous: is_ambiguous, 
+      disambiguation: disambiguation, listeners: listeners, plays: plays,
+      founded_at: founded_at.try(:iso8601), dissolved_at: dissolved_at.try(:iso8601), 
+      state: state
+    } 
+  end
+  
   private
   
+  def set_initial_state
+    self.state ||= :without_metadata
+  end
+  
   def create_bonustracks_release
     release = releases.create(name: '[Bonus Tracks]', is_lp: true)
     release.update_attribute(:state, 'active')

data/app/models/music_metadata_enrichment/group.rb

@@ -34,22 +34,18 @@ module MusicMetadataEnrichment
           next
         end
         
-        artist = MusicArtist.where(mbid: lastfm_artist['mbid']).first
+        artist_ids = MusicArtist.create_by_name(artist_name)
         
-        unless artist
-          musicbrainz_artist = MusicBrainz::Artist.find(lastfm_artist['mbid'])
-          
-          if musicbrainz_artist
-            artist = MusicArtist.where(mbid: musicbrainz_artist.id).first
-            artist = MusicArtist.create(name: lastfm_artist['name'], mbid: musicbrainz_artist.id) unless artist
+        next if artist_ids.none?
+            
+        artist_connection_artist_ids = artist_connections.where(artist_id: artist_ids).map(&:artist_id)
+        artist_ids = artist_ids.select{|id| !artist_connection_artist_ids.include?(id) }
+                
+        if artist_ids.any?
+          artist_ids.each do |artist_id|
+            MusicMetadataEnrichment::GroupArtistConnection.create(group_id: id, artist_id: artist_id)
           end
         end
-        
-        next unless artist
-        
-        if artist_connections.where(artist_id: artist.id).none?
-          MusicMetadataEnrichment::GroupArtistConnection.create(group_id: id, artist_id: artist.id)
-        end
       end
       
       artist_names_without_mbid

data/app/models/music_release.rb

@@ -126,6 +126,8 @@ class MusicRelease < ActiveRecord::Base
   
   attr_accessor :releases
   
+  after_initialize :set_initial_state
+  
   state_machine :state, initial: :without_metadata do
     event :import_metadata do transition :without_metadata => :active; end
     
@@ -287,7 +289,7 @@ class MusicRelease < ActiveRecord::Base
     
     musicbrainz_release_groups = musicbrainz_release_groups.select do |rg| 
       ['Album', 'Soundtrack', 'EP'].include?(rg[:type]) &&
-      rg[:releases].select{|r| r[:status] == 'Official'}.any? && 
+      !rg[:releases].nil? && rg[:releases].select{|r| r[:status] == 'Official'}.any? && 
       (rg[:secondary_types].nil? || rg[:secondary_types].select{|st| SECONDARY_TYPES_BLACKLIST.include?(st)}.none?) && 
       rg[:artists].length == 1
     end
@@ -393,8 +395,22 @@ class MusicRelease < ActiveRecord::Base
     first_track_nr_of_disc
   end 
    
+  def to_json
+    {
+      id: id, mbid: mbid, spotify_id: spotify_album_id, is_lp: is_lp, 
+      artist_id: artist_id, artist_name: artist_name, name: name,
+      future_release_date: future_release_date, 
+      released_at: released_at.try(:iso8601), listeners: listeners, 
+      plays: plays, state: state
+    }
+  end  
+   
   private
   
+  def set_initial_state
+    self.state ||= :without_metadata
+  end
+  
   def future_release_date_format
     return unless future_release_date.present?
     

data/app/models/music_track.rb

@@ -6,7 +6,7 @@ class MusicTrack < ActiveRecord::Base
   
   # cached associations
   belongs_to :artist, class_name: 'MusicArtist'
-  belongs_to :release, class_name: 'MusicRelease', counter_cache: true, counter_cache: 'tracks_count'
+  belongs_to :release, class_name: 'MusicRelease', counter_cache: 'tracks_count'
   
   has_many :videos, foreign_key: 'track_id', class_name: 'MusicVideo', dependent: :destroy
   has_many :group_year_in_review_tops, foreign_key: 'track_id', class_name: 'MusicMetadataEnrichment::GroupYearInReviewTrack', dependent: :destroy
@@ -66,6 +66,8 @@ class MusicTrack < ActiveRecord::Base
   after_update :sync_year_in_review_music_tracks
   after_destroy :destroy_slaves
   
+  after_initialize :set_initial_state
+  
   state_machine :state, initial: :without_metadata do
     event :import_metadata do transition :without_metadata => :active; end
     
@@ -294,8 +296,24 @@ class MusicTrack < ActiveRecord::Base
     Time.at(duration / 1000).strftime('%M:%S') if duration.present?
   end
   
+  def to_json
+    {
+      id: id, mbid: mbid, spotify_id: spotify_track_id, nr: nr,
+      master_track_id: master_track_id, artist_id: artist_id, 
+      artist_name: artist_name, name: name, 
+      release_id: release_id, release_name: release_name,
+      duration: formatted_duration,
+      released_at: released_at.try(:iso8601), listeners: listeners, 
+      plays: plays, state: state
+    }
+  end
+  
   private
   
+  def set_initial_state
+    self.state ||= :without_metadata
+  end
+  
   def name_not_included_in_blacklist
     if ::MusicTrack.name_included_in_blacklist?(name) 
       errors[:name] << I18n.t('activerecord.errors.models.music_metadata_enrichment_group.attributes.name.included_in_blacklist')

data/app/models/music_video.rb

@@ -60,6 +60,13 @@ class MusicVideo < ActiveRecord::Base
     "#{track.artist_name } – #{track_name} (#{status})"
   end
   
+  def to_json
+    { 
+      id: id, status: status, artist_id: artist_id, artist_name: artist_name, 
+      track_id: track_id, track_name: track_name, url: url
+    } 
+  end
+  
   private
   
   def url_format

data/app/models/year_in_review_music.rb

@@ -20,6 +20,8 @@ class YearInReviewMusic < ActiveRecord::Base
   serialize :top_release_matches, Array
   serialize :top_track_matches, Array
   
+  after_initialize :set_initial_state
+  
   state_machine :state, initial: :draft do
     event :publish do
       transition draft: :published
@@ -322,4 +324,10 @@ class YearInReviewMusic < ActiveRecord::Base
       end
     end
   end
+  
+  private
+  
+  def set_initial_state
+    self.state ||= :draft
+  end
 end

data/config/routes/api.rb

@@ -1,19 +1,29 @@
 namespace :voluntary, path: 'api', module: 'voluntary/api', defaults: {format: 'json'} do
   namespace :v1 do
     namespace :music do
-      resources :releases, only: [] do
+      resources :artists, only: [:index, :show] do
+        resources :releases, only: [:index]
+      end
+      
+      resources :releases, only: [:show] do
         collection do
           get :bulk
           post :bulk
         end
+        
+        resources :tracks, only: [:index]
       end  
       
-      resources :tracks, only: [] do
+      resources :tracks, only: [:show] do
         collection do
           get :bulk
           post :bulk
         end
+        
+        resources :videos, only: [:index]
       end  
+      
+      resources :videos, only: [:show]
     end
     
     resources :users, only: [:show] do

data/lib/voluntary_music_metadata_enrichment/version.rb

@@ -1,3 +1,3 @@
 module VoluntaryMusicMetadataEnrichment
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,316 +1,305 @@
 --- !ruby/object:Gem::Specification
 name: voluntary_music_metadata_enrichment
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Mathias Gawlista
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: voluntary
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: musicbrainz
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: lastfm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.26.0
 - !ruby/object:Gem::Dependency
   name: letter_opener
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: oink
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.0
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: cucumber-rails-training-wheels
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: fixture_builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.22.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.22.1
 - !ruby/object:Gem::Dependency
   name: spork
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0rc2
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: guard-spork
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
-description: ! 'Importer, year in reviews, videos, etc. - changes: bit.ly/vmme-0-1-0'
+description: 'Importer, year in reviews, videos, etc. - changes: bit.ly/vmme-0-2-0'
 email:
 - gawlista@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- LICENSE
+- README.md
 - Rakefile
 - app/assets/javascripts/voluntary_music_metadata_enrichment/application.js
 - app/assets/javascripts/voluntary_music_metadata_enrichment/groups/show.js.coffee
@@ -345,6 +334,7 @@ files:
 - app/controllers/music_metadata_enrichment/tracks_controller.rb
 - app/controllers/music_metadata_enrichment/videos_controller.rb
 - app/controllers/product/music_metadata_enrichment_controller.rb
+- app/controllers/voluntary/api/v1/music/artists_controller.rb
 - app/controllers/voluntary/api/v1/music/releases_controller.rb
 - app/controllers/voluntary/api/v1/music/tracks_controller.rb
 - app/controllers/voluntary/api/v1/music/videos_controller.rb
@@ -506,19 +496,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Music metadata enrichment plugin for crowdsourcing engine voluntary.
+summary: Music metadata enrichment plugin for crowdsourcing management system Voluntary.Software.
 test_files: []
 has_rdoc: