meta-spotify 0.3.1 → 0.3.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a5bc48dbd8347ca6e7231f8e8d54937e5e2719eb
+  data.tar.gz: d739fa8e68aa0f307566ad54cb986b63b0a27d4c
+SHA512:
+  metadata.gz: f54795b5f072778d91732935abded787b990859a8ba955c33e869faf4f0ba49929f9b5d0218e9297749d512b653d424a666a20c00ed9d213ee8086e2766225ac
+  data.tar.gz: a74543459db1b0389f454af8483004208fb525f6c20f1170e7ef6ba271ac206e8191d84bcd46946b6e77b08894782020fbf9a265755d644c82b56b80923e15d4

data/HISTORY

@@ -1,3 +1,15 @@
+=== 0.3.2 / 2014-01-25
+
+* 1 minor update
+
+  * Exposes track ISRC
+
+=== 0.3.1 / 2013-03-16
+
+* 1 minor update
+
+  * Proper query string submission
+
 === 0.3.0 / 2012-10-9
 
 * 1 minor update
@@ -59,4 +71,4 @@ Also removed Jeweler and dependency on Crack.
 
 * 1 major enhancement
 
-  * First release
+  * First release

data/lib/meta-spotify/track.rb

@@ -1,17 +1,19 @@
 module MetaSpotify
   class Track < MetaSpotify::Base
-    
+
     def self.uri_regex
       /^spotify:track:([A-Za-z0-9]+)$/
     end
-  
+
     attr_reader :album, :artists, :track_number, :length,
-                :musicbrainz_id, :musicbrainz_uri, :allmusic_id, :allmusic_uri
-    
+                :musicbrainz_id, :musicbrainz_uri, :allmusic_id, :allmusic_uri,
+                :isrc_id
+
     def initialize(hash)
       @name = hash['name']
       @uri = hash['href'] if hash.has_key? 'href'
       @popularity = hash['popularity'].to_f if hash.has_key? 'popularity'
+
       if hash.has_key? 'artist'
         @artists = []
         if hash['artist'].is_a? Array
@@ -20,21 +22,17 @@ module MetaSpotify
           @artists << Artist.new(hash['artist'])
         end
       end
+
       @album = Album.new(hash['album']) if hash.has_key? 'album'
       @track_number = hash['track_number'].to_i if hash.has_key? 'track_number'
       @length = hash['length'].to_f if hash.has_key? 'length'
-      
-      if hash['id'].is_a? Array
-        
+
+      case hash['id']
+      when Hash
+        node_to_id hash['id']
+      when Array
         hash['id'].each do |id|
-          case id['type']
-            when 'mbid' then
-              @musicbrainz_id = id['__content__']
-              @musicbrainz_uri = id['href']
-            when 'amgid' then 
-              @allmusic_id = id
-              @allmusic_uri = id['href']
-          end
+          node_to_id id
         end
       end
     end
@@ -43,5 +41,18 @@ module MetaSpotify
       "http://open.spotify.com/track/#{spotify_id}"
     end
 
+    private
+    def node_to_id(node)
+      case node['type']
+        when 'mbid' then
+          @musicbrainz_id = node['__content__']
+          @musicbrainz_uri = node['href']
+        when 'amgid' then
+          @allmusic_id = node
+          @allmusic_uri = node['href']
+        when 'isrc' then
+          @isrc_id = node['__content__']
+      end
+    end
   end
 end

data/lib/meta-spotify/version.rb

@@ -1,3 +1,3 @@
 module MetaSpotify
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/test/test_track.rb

@@ -55,6 +55,7 @@ class TestTrack < Test::Unit::TestCase
       assert_equal "e230c541-78fb-4d08-99c9-ebcb111d7058", @result.musicbrainz_id
       assert_equal "http://www.allmusic.com/cg/amg.dll?p=amg&sql=33:jifqxvlhldde", @result.allmusic_uri
       assert_equal '3zBhJBEbDD4a4SO1EaEiBP', @result.spotify_id
+      assert_equal 'GBBKS9900090', @result.isrc_id
       assert_equal 'http://open.spotify.com/track/3zBhJBEbDD4a4SO1EaEiBP', @result.http_uri
     end
     should "create an album object for that track" do

metadata

@@ -1,52 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: meta-spotify
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  version: 0.3.2
 platform: ruby
 authors:
 - Phil Nash
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2014-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70318309136740 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70318309136740
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>'
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70318309132920 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.10.2
   type: :development
   prerelease: false
-  version_requirements: *70318309132920
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.10.2
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70318309142920 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.4
   type: :development
   prerelease: false
-  version_requirements: *70318309142920
-description: ! "A ruby wrapper for the Spotify Metadata API.\n                         See
-  https://developer.spotify.com/technologies/web-api/\n                         for
-  API documentation."
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.4
+description: |-
+  A ruby wrapper for the Spotify Metadata API.
+                           See https://developer.spotify.com/technologies/web-api/
+                           for API documentation.
 email:
 - philnash@gmail.com
 executables: []
@@ -81,27 +90,26 @@ files:
 - test/test_track.rb
 homepage: http://github.com/philnash/meta-spotify
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A ruby wrapper for the Spotify Metadata API
 test_files:
 - test/fixtures/album.xml