itunes_api 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d99e396f4049e8c7bd11bc060e06c3ff70aad41
-  data.tar.gz: e4447f6837f2feb4025f414d5de2d23958944830
+  metadata.gz: '086360de32ce5889a48b42076307dad1053d3246'
+  data.tar.gz: 23a2bd2b8077266ba0e7f80b4675f3e21648341a
 SHA512:
-  metadata.gz: 9a713e9774c704803155dcddbc1da773bd5c9c8180144cb5995e9d2d131a4a8916ab97c50b1f9e0fa6946e7d7a1710935ed057edb8c7f8c4ce59a5e06c43f733
-  data.tar.gz: 99dd861be1948e382b33696a7027aceb3e00d8847a3b1016c6906c34368df668b4e4eb97f94c97df675b97ffb9c0a05b8fe7fc64891f025e668c249afa23702b
+  metadata.gz: 5254e87655037e9627c841f531977aae91d3cff571dfe717784f1c75e451e77890960b25207cfae7ce392f754604024b53daa7a72570d69522a9585a3a32cf14
+  data.tar.gz: aa4d762126de0bdf0087d2dd56ceba1690eed644ceca577247a269258ddd0afeb19c3ba32774ce08cc154b3699c7e08c9b72583d17e8a3d9905bd5e34fed3864

data/lib/itunes_api/music/artist.rb

@@ -10,8 +10,8 @@ module ItunesApi
         @albums ||= Album.build(data[:albums])
       end
 
-      def amg_id
-        @amg_id ||= data[:amgArtistId]
+      def apple_id
+        @apple_id ||= data[:artistId]
       end
 
       def name

data/lib/itunes_api/music/artist_lookup.rb

@@ -11,17 +11,21 @@ module ItunesApi
       end
 
       def artist
-        @artist ||= build_artist(artist_id)
+        build_artist
       end
 
       private
 
       attr_reader :artist_id
 
-      def build_artist(id)
-        Artist.new(
-          Requests::Lookup.artist_with_albums(id)
-        )
+      def build_artist
+        return lookup unless lookup
+
+        Artist.new(lookup)
+      end
+
+      def lookup
+        @lookup ||= Requests::Lookup.artist_with_albums(artist_id)
       end
     end
   end

data/lib/itunes_api/music/artist_search.rb

@@ -11,7 +11,7 @@ module ItunesApi
       end
 
       def artists
-        @artists ||= artist_ids.map { |id| build_artist(id) }
+        @artists ||= artist_ids.map { |id| build_artist(id) }.compact
       end
 
       private
@@ -23,9 +23,15 @@ module ItunesApi
       end
 
       def build_artist(id)
-        Artist.new(
-          Requests::Lookup.artist_with_albums(id)
-        )
+        if (lookup = lookup(id))
+          Artist.new(lookup)
+        end
+      end
+
+      def lookup(id)
+        Requests::Lookup.artist_with_albums(id)
+      rescue
+        nil
       end
     end
   end

data/lib/itunes_api/requests/lookup.rb

@@ -13,6 +13,8 @@ module ItunesApi
       end
 
       def artist_with_albums
+        return artist unless artist
+
         artist.merge(albums: albums)
       end
 
@@ -33,11 +35,13 @@ module ItunesApi
       end
 
       def artist
+        return artist_data unless artist_data
+
         symbolize_keys(unwrapped(artist_data))
       end
 
       def artist_data
-        results.find do |wrappers|
+        @artist_data ||= results.find do |wrappers|
           wrappers['wrapperType'] == 'artist'
         end
       end
@@ -45,16 +49,15 @@ module ItunesApi
       def query
         {
           entity: 'album',
-          amgArtistId: @artist_id,
+          id: @artist_id,
           country: country_code,
           limit: LIMIT,
           sort: 'recent'
         }
       end
 
-      def unwrapped(hash)
-        hash.delete('wrapperType')
-        hash
+      def unwrapped(data_hash)
+        data_hash.tap { |hash| hash.delete('wrapperType') }
       end
     end
   end

data/lib/itunes_api/requests/search.rb

@@ -14,7 +14,7 @@ module ItunesApi
 
       def artist_ids
         results.collect do |result|
-          result['amgArtistId']
+          result['artistId']
         end.compact.uniq.sort
       end
 

data/lib/itunes_api/version.rb

@@ -1,3 +1,3 @@
 module ItunesApi
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itunes_api
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Mario D’Arco
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday