meta-spotify 0.2.0 → 0.3.0

data/HISTORY

@@ -1,3 +1,9 @@
+=== 0.3.0 / 2012-10-9
+
+* 1 minor update
+
+  * Adds http_uri method to artist, album and track
+
 === 0.2.0 / 2012-08-31
 
 * 1 major update

data/lib/meta-spotify.rb

@@ -12,6 +12,10 @@ module MetaSpotify
 
     attr_reader :name, :uri, :popularity
 
+    def self.uri_regex
+      nil
+    end
+
     def self.search(string, opts={})
       item_name = self.name.downcase.gsub(/^.*::/,'')
       query = {:q => string}
@@ -43,7 +47,7 @@ module MetaSpotify
 
     def self.lookup(uri, opts={})
       uri = uri.strip
-      raise URIError.new("Spotify URI not in the correct syntax") unless self::URI_REGEX.match(uri)
+      raise URIError.new("Spotify URI not in the correct syntax") unless uri_regex.match(uri)
       query = {:uri => uri}
       query[:extras] = opts[:extras] if opts.has_key? :extras
       result = get("/lookup/#{API_VERSION}/",:query => query, :format => :xml)
@@ -61,6 +65,14 @@ module MetaSpotify
       end
     end
 
+    def spotify_id
+      if uri
+        uri[self.class.uri_regex, 1]
+      else
+        nil
+      end
+    end
+
     private
 
     def self.raise_errors(response)

data/lib/meta-spotify/album.rb

@@ -1,7 +1,9 @@
 module MetaSpotify
   class Album < MetaSpotify::Base
     
-    URI_REGEX = /^spotify:album:[A-Za-z0-9]+$/
+    def self.uri_regex
+      /^spotify:album:([A-Za-z0-9]+)$/
+    end
     
     attr_reader :released, :artists, :available_territories, :tracks, :upc, 
                 :musicbrainz_id, :musicbrainz_uri, :allmusic_id, :allmusic_uri
@@ -58,5 +60,10 @@ module MetaSpotify
     def is_not_available_in?(territory)
       !is_available_in?(territory)
     end
+
+    def http_uri
+      "http://open.spotify.com/album/#{spotify_id}"
+    end
+
   end
 end

data/lib/meta-spotify/artist.rb

@@ -1,7 +1,9 @@
 module MetaSpotify
   class Artist < MetaSpotify::Base
     
-    URI_REGEX = /^spotify:artist:[A-Za-z0-9]+$/
+    def self.uri_regex
+      /^spotify:artist:([A-Za-z0-9]+)$/
+    end
     
     attr_reader :albums
     
@@ -18,5 +20,10 @@ module MetaSpotify
         end
       end
     end
+
+    def http_uri
+      "http://open.spotify.com/artist/#{spotify_id}"
+    end
+
   end
 end

data/lib/meta-spotify/track.rb

@@ -1,7 +1,9 @@
 module MetaSpotify
   class Track < MetaSpotify::Base
     
-    URI_REGEX = /^spotify:track:[A-Za-z0-9]+$/
+    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
@@ -36,5 +38,10 @@ module MetaSpotify
         end
       end
     end
+
+    def http_uri
+      "http://open.spotify.com/track/#{spotify_id}"
+    end
+
   end
 end

data/lib/meta-spotify/version.rb

@@ -1,3 +1,3 @@
 module MetaSpotify
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/test/test_album.rb

@@ -26,12 +26,19 @@ class TestAlbum < Test::Unit::TestCase
     end
     should "return a list of results and search meta" do
       assert_kind_of Array, @results[:albums]
-      assert_kind_of MetaSpotify::Album, @results[:albums].first
-      assert_equal "Foo Foo", @results[:albums].first.name
-      assert_equal 0.29921, @results[:albums].first.popularity
-      assert_equal 1, @results[:query][:start_page]
-      assert_equal 'request', @results[:query][:role]
-      assert_equal "foo", @results[:query][:search_terms]
+
+      album = @results[:albums].first
+      assert_kind_of MetaSpotify::Album, album
+      assert_equal "Foo Foo", album.name
+      assert_equal 0.29921, album.popularity
+      assert_equal '7KXRgAg4K6eXjlYIIXzt3T', album.spotify_id
+      assert_equal 'http://open.spotify.com/album/7KXRgAg4K6eXjlYIIXzt3T', album.http_uri
+
+      query = @results[:query]
+      assert_equal 1, query[:start_page]
+      assert_equal 'request', query[:role]
+      assert_equal "foo", query[:search_terms]
+
       assert_equal 100, @results[:items_per_page]
       assert_equal 0, @results[:start_index]
       assert_equal 6, @results[:total_results]
@@ -53,6 +60,8 @@ class TestAlbum < Test::Unit::TestCase
       assert_equal "634904012922", @result.upc
       assert_equal "3a3685aa-9c4d-42f8-a401-e34a89494041", @result.musicbrainz_id
       assert_equal "http://www.allmusic.com/cg/amg.dll?p=amg&sql=10:dpfixqtkld0e", @result.allmusic_uri
+      assert_equal '6G9fHYDCoyEErUkHrFYfs4', @result.spotify_id
+      assert_equal 'http://open.spotify.com/album/6G9fHYDCoyEErUkHrFYfs4', @result.http_uri
     end
     should "create an artist object for that album" do
       assert_kind_of Array, @result.artists

data/test/test_artist.rb

@@ -11,12 +11,18 @@ class TestArtist < Test::Unit::TestCase
       end
       should "return a list of results and search meta" do
         assert_kind_of Array, @results[:artists]
-        assert_kind_of MetaSpotify::Artist, @results[:artists].first
-        assert_equal "Foo Fighters", @results[:artists].first.name
-        assert_equal 0.89217, @results[:artists].first.popularity
-        assert_equal 1, @results[:query][:start_page]
-        assert_equal 'request', @results[:query][:role]
-        assert_equal "foo", @results[:query][:search_terms]
+
+        artist = @results[:artists].first
+        assert_kind_of MetaSpotify::Artist, artist
+        assert_equal "Foo Fighters", artist.name
+        assert_equal 0.89217, artist.popularity
+        assert_equal '7jy3rLJdDQY21OgRLCZ9sD', artist.spotify_id
+        assert_equal 'http://open.spotify.com/artist/7jy3rLJdDQY21OgRLCZ9sD', artist.http_uri
+
+        query = @results[:query]
+        assert_equal 1, query[:start_page]
+        assert_equal 'request', query[:role]
+        assert_equal "foo", query[:search_terms]
         assert_equal 100, @results[:items_per_page]
         assert_equal 0, @results[:start_index]
         assert_equal 9, @results[:total_results]
@@ -32,12 +38,18 @@ class TestArtist < Test::Unit::TestCase
       should "still return a list of results, for consistency" do
         assert_kind_of Array, @results[:artists]
         assert_equal 1, @results[:artists].length
-        assert_kind_of MetaSpotify::Artist, @results[:artists].first
-        assert_equal "1200 Micrograms", @results[:artists].first.name
-        assert_equal 0.48196, @results[:artists].first.popularity
-        assert_equal 1, @results[:query][:start_page]
-        assert_equal 'request', @results[:query][:role]
-        assert_equal "1200 Micrograms", @results[:query][:search_terms]
+
+        artist = @results[:artists].first
+        assert_kind_of MetaSpotify::Artist, artist
+        assert_equal "1200 Micrograms", artist.name
+        assert_equal 0.48196, artist.popularity
+        assert_equal '3AUNfvctGVnEOGZiAh0JIK', artist.spotify_id
+        assert_equal 'http://open.spotify.com/artist/3AUNfvctGVnEOGZiAh0JIK', artist.http_uri
+
+        query = @results[:query]
+        assert_equal 1, query[:start_page]
+        assert_equal 'request', query[:role]
+        assert_equal "1200 Micrograms", query[:search_terms]
         assert_equal 100, @results[:items_per_page]
         assert_equal 0, @results[:start_index]
         assert_equal 1, @results[:total_results]

data/test/test_track.rb

@@ -10,11 +10,17 @@ class TestTrack < Test::Unit::TestCase
     end
     should "return a list of results and search meta" do
       assert_kind_of Array, @results[:tracks]
-      assert_kind_of MetaSpotify::Track, @results[:tracks].first
-      assert_equal "Big Me", @results[:tracks].first.name
-      assert_equal 1, @results[:query][:start_page]
-      assert_equal 'request', @results[:query][:role]
-      assert_equal "foo", @results[:query][:search_terms]
+
+      track = @results[:tracks].first
+      assert_kind_of MetaSpotify::Track, track
+      assert_equal "Big Me", track.name
+      assert_equal '6pb5BBnIM5IM7R1cqag6rE', track.spotify_id
+      assert_equal 'http://open.spotify.com/track/6pb5BBnIM5IM7R1cqag6rE', track.http_uri
+
+      query = @results[:query]
+      assert_equal 1, query[:start_page]
+      assert_equal 'request', query[:role]
+      assert_equal "foo", query[:search_terms]
       assert_equal 100, @results[:items_per_page]
       assert_equal 0, @results[:start_index]
       assert_equal 486, @results[:total_results]
@@ -48,6 +54,8 @@ class TestTrack < Test::Unit::TestCase
       assert_equal TRACK_URI, @result.uri
       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 'http://open.spotify.com/track/3zBhJBEbDD4a4SO1EaEiBP', @result.http_uri
     end
     should "create an album object for that track" do
       assert_kind_of MetaSpotify::Album, @result.album

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meta-spotify
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70293660427780 !ruby/object:Gem::Requirement
+  requirement: &70213547995960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -21,10 +21,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70293660427780
+  version_requirements: *70213547995960
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70293660427280 !ruby/object:Gem::Requirement
+  requirement: &70213547995140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.10.2
   type: :development
   prerelease: false
-  version_requirements: *70293660427280
+  version_requirements: *70213547995140
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70293660426760 !ruby/object:Gem::Requirement
+  requirement: &70213547994460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 1.2.4
   type: :development
   prerelease: false
-  version_requirements: *70293660426760
+  version_requirements: *70213547994460
 description: ! "A ruby wrapper for the Spotify Metadata API.\n                         See
   https://developer.spotify.com/technologies/web-api/\n                         for
   API documentation."