meta-spotify 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5bc48dbd8347ca6e7231f8e8d54937e5e2719eb
-  data.tar.gz: d739fa8e68aa0f307566ad54cb986b63b0a27d4c
+  metadata.gz: 960fbabcafa79a3c832fdd7367bc2de387b0ce3b
+  data.tar.gz: d6a08c80e9d1f62a3559efeff72cb12f6d5286a5
 SHA512:
-  metadata.gz: f54795b5f072778d91732935abded787b990859a8ba955c33e869faf4f0ba49929f9b5d0218e9297749d512b653d424a666a20c00ed9d213ee8086e2766225ac
-  data.tar.gz: a74543459db1b0389f454af8483004208fb525f6c20f1170e7ef6ba271ac206e8191d84bcd46946b6e77b08894782020fbf9a265755d644c82b56b80923e15d4
+  metadata.gz: 704098dd7cef7f6428f533426b94bb6b7077968eb0b87207ac1ee45d7050288ec5aaabcb4bec43a5c5408993bdb022c2db54061fe379d55fc83832650e3c16d6
+  data.tar.gz: 60b8ff55290ab4b61ac001bb770a64c0800e8ef8fc6619a13c16562b7b9812dde8912656591170571587b6dfcb01cd623c1f7237fe4f92d6ee8a87581a4ff3de

data/lib/meta-spotify/album.rb

@@ -1,13 +1,13 @@
 module MetaSpotify
   class Album < MetaSpotify::Base
-    
+
     def self.uri_regex
       /^spotify:album:([A-Za-z0-9]+)$/
     end
-    
-    attr_reader :released, :artists, :available_territories, :tracks, :upc, 
+
+    attr_reader :released, :artists, :available_territories, :tracks, :upc,
                 :musicbrainz_id, :musicbrainz_uri, :allmusic_id, :allmusic_uri
-    
+
     def initialize(hash)
       @name = hash['name']
       @popularity = hash['popularity'].to_f if hash.has_key? 'popularity'
@@ -29,34 +29,36 @@ module MetaSpotify
       end
       @released = hash['released'] if hash.has_key? 'released'
       @uri = hash['href'] if hash.has_key? 'href'
-      
+
       if hash['id'].is_a? Array
-        
+
         hash['id'].each do |id|
           case id['type']
-            when 'upc' then 
+            when 'upc' then
               @upc = id['__content__']
             when 'mbid' then
               @musicbrainz_id = id['__content__']
               @musicbrainz_uri = id['href']
-            when 'amgid' then 
+            when 'amgid' then
               @allmusic_id = id['__content__']
               @allmusic_uri = id['href']
           end
         end
+      else
+        @upc = hash['id']['__content__'] if hash.has_key? 'id'
       end
-      
+
       @available_territories = if hash.has_key?('availability') && !hash['availability']['territories'].nil?
         hash['availability']['territories'].split(/\s+/).map {|t| t.downcase } || []
       else
         []
       end
     end
-    
+
     def is_available_in?(territory)
       (@available_territories.include?('worldwide') || @available_territories.include?(territory.downcase))
     end
-    
+
     def is_not_available_in?(territory)
       !is_available_in?(territory)
     end

data/lib/meta-spotify/version.rb

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

data/test/fixtures/album_one_upc.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<album xmlns="http://www.spotify.com/ns/music/1">
+  <name>Aleph</name>
+  <artist href="spotify:artist:3hteYQFiMFbJY7wS0xDymP">
+    <name>Gesaffelstein</name>
+  </artist>
+  <released>2013</released>
+  <id type="upc">825646397471</id>
+  <availability>
+    <territories>AD AR AT AU BE BG BO BR CH CL CO CR CY CZ DE DK DO EC EE ES FI FR GB GR GT HK HN HR HU IE IS IT LT LU LV MC MT MX MY NI NL NO NZ PA PE PH PL PT PY RO SE SG SI SK SV TR TW UY</territories>
+  </availability>
+</album>

data/test/helper.rb

@@ -19,6 +19,7 @@ end
 TRACK_URI  = "spotify:track:3zBhJBEbDD4a4SO1EaEiBP"
 ARTIST_URI = "spotify:artist:4YrKBkKSVeqDamzBPWVnSJ"
 ALBUM_URI  = "spotify:album:6G9fHYDCoyEErUkHrFYfs4"
+ALBUM_ONE_UPC_URI = "spotify:album:3MiiF9utmtGnLVITgl0JP7"
 
 class Test::Unit::TestCase
 end

data/test/test_album.rb

@@ -16,7 +16,7 @@ class TestAlbum < Test::Unit::TestCase
       assert @worldwide_album.is_available_in?('UK')
     end
   end
-  
+
   context "searching for an album name" do
     setup do
       FakeWeb.register_uri(:get,
@@ -44,7 +44,7 @@ class TestAlbum < Test::Unit::TestCase
       assert_equal 6, @results[:total_results]
     end
   end
-  
+
   context "looking up a album" do
     setup do
       FakeWeb.register_uri(:get,
@@ -75,6 +75,25 @@ class TestAlbum < Test::Unit::TestCase
       end
     end
   end
+
+  context "looking up an album with just an upc code" do
+    setup do
+      FakeWeb.register_uri(:get,
+                           "http://ws.spotify.com/lookup/1/?uri=#{CGI.escape ALBUM_ONE_UPC_URI}",
+                           :body => fixture_file("album_one_upc.xml"))
+      @result = MetaSpotify::Album.lookup(ALBUM_ONE_UPC_URI)
+    end
+    should "fetch an album and return an album object" do
+      assert_kind_of MetaSpotify::Album, @result
+      assert_equal "Aleph", @result.name
+      assert_equal ALBUM_ONE_UPC_URI, @result.uri
+      assert_equal "2013", @result.released
+      assert_equal "825646397471", @result.upc
+      assert_equal '3MiiF9utmtGnLVITgl0JP7', @result.spotify_id
+      assert_equal 'http://open.spotify.com/album/3MiiF9utmtGnLVITgl0JP7', @result.http_uri
+    end
+  end
+
   context "looking up an album with extra details" do
     setup do
       FakeWeb.register_uri(:get,
@@ -82,7 +101,7 @@ class TestAlbum < Test::Unit::TestCase
                            :body => fixture_file('album_with_trackdetail.xml'))
       @result = MetaSpotify::Album.lookup(ALBUM_URI, :extras => 'trackdetail')
     end
-    
+
     should "fetch an album and return an object with more detailed track information" do
       assert_kind_of MetaSpotify::Album, @result
       assert_kind_of MetaSpotify::Track, @result.tracks.first

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meta-spotify
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Phil Nash
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-25 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -75,6 +75,7 @@ files:
 - lib/meta-spotify/version.rb
 - meta-spotify.gemspec
 - test/fixtures/album.xml
+- test/fixtures/album_one_upc.xml
 - test/fixtures/album_search.xml
 - test/fixtures/album_with_trackdetail.xml
 - test/fixtures/artist.xml
@@ -113,6 +114,7 @@ specification_version: 4
 summary: A ruby wrapper for the Spotify Metadata API
 test_files:
 - test/fixtures/album.xml
+- test/fixtures/album_one_upc.xml
 - test/fixtures/album_search.xml
 - test/fixtures/album_with_trackdetail.xml
 - test/fixtures/artist.xml
@@ -126,3 +128,4 @@ test_files:
 - test/test_album.rb
 - test/test_artist.rb
 - test/test_track.rb
+has_rdoc: