itunes_api 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dac75a6735f947bd3e7095a6a7fe04294c16275
-  data.tar.gz: 6e9322d0cd82782f5b2aa0955cef84b7ff7d953e
+  metadata.gz: f093140def0544a9f01d175bfbc950e63626f6b0
+  data.tar.gz: f11e580bc9922f4bce4b5ffdf7446c374e87872d
 SHA512:
-  metadata.gz: 70666914a1dd3a6ec81971dcfdac23df3ad78691fdfa0649be88f34f7f6263ff3460664d64375e277cb37db5eec7ce8d174623e9c75d0d7fcb5b5cdbbf55172e
-  data.tar.gz: accc175ac2b6d76d35751a2cbc0dcecca2516b2f1f069576741126d1ddc6443300c5e54b74070a1960147633f05b35c7fae65ec132be8b322c3bd3e864f07041
+  metadata.gz: 616de967cf9baf0707117f9c617204e917dd7c4aa59bed13bef8d15d965e70ad79ccacc96eeaa926e516b76a1fe25a37d6bed82d62da7339d205fb7b35a4763b
+  data.tar.gz: 0f903eb6650fb2eac0509d4eaebfaff58b62fb291cb325d696f9f74d3da7e531ce92b4cdd7083e2982718f6ef74531343066200d0d126f0d8cd74561ffa70d4b

data/lib/itunes_api/music/album.rb

@@ -1,39 +1,46 @@
 module ItunesApi
   module Music
-    # Use to retrieve available albums from artist's ids.
+    # Retrieves album tracks info.
     class Album
+      attr_accessor :name
       include Request
 
-      TYPE = 'Album'.freeze
-
-      def initialize(artists_id)
-        @artists_id = artists_id
+      def initialize(name, filtering_options = {})
+        @name = name
+        @filtering_options = filtering_options
       end
 
-      def self.info(artists_id)
-        new(artists_id).info
+      def tracks
+        @tracks ||= filtered_results.sort_by { |track| track['trackNumber'] }
       end
 
-      def info
-        @info ||= results
-                  .find_all { |r| r['collectionType'] == TYPE }
-                  .sort_by { |a| a['releaseDate'] }
-                  .reverse
+      def apple_music?
+        tracks.any? { |track| track['isStreamable'] }
       end
 
       private
 
-      def url
-        "#{BASE_URL}/lookup?id=#{all_artists_id}&" \
-        "entity=#{entity}&country=#{COUNTRY_CODE}"
+      def album_id
+        @album_id ||= @filtering_options[:album_id]
+      end
+
+      def artist_id
+        @artist_id ||= @filtering_options[:artist_id]
       end
 
-      def all_artists_id
-        @artists_id.join(',')
+      def filtered_results
+        @filtered_results ||= results.find_all do |result|
+          (!album_id || result['collectionId'] == album_id) &&
+            (!artist_id || result['artistId'] == artist_id)
+        end
       end
 
-      def entity
-        TYPE.downcase
+      def query_values
+        {
+          attribute: 'albumTerm',
+          entity: 'musicTrack',
+          term: name
+        }.merge(super)
       end
     end
   end

data/lib/itunes_api/music/all.rb

@@ -1,2 +1,2 @@
 require_relative 'album'
-require_relative 'artist'
+require_relative 'artist'

data/lib/itunes_api/music/artist.rb

@@ -2,32 +2,54 @@ require 'addressable/uri'
 
 module ItunesApi
   module Music
-    # Use to retrieve artist ids from their names.
+    # Retrieve apple ids and albums of artists.
     class Artist
       include Request
 
-      def initialize(artist_name)
+      def initialize(artist_name, apple_id = nil)
         @artist_name = artist_name
+        @apple_id = apple_id
       end
 
-      def self.apple_ids(artist_name)
-        new(artist_name).apple_ids
+      def albums(limit = 3)
+        @albums ||= filtered_results
+                    .sort_by { |result| result['releaseDate'] }
+                    .reverse
+                    .first(limit)
+                    .map { |result| album(result) }
       end
 
       def apple_ids
-        results.collect{ |r| r['artistId'] }.compact.uniq.sort
+        @apple_ids ||= filtered_results.collect do |album|
+          album['artistId']
+        end.compact.uniq.sort
       end
 
       private
 
-      def url
-        "#{BASE_URL}/search?#{query}"
+      def filtered_results
+        results.find_all do |result|
+          result['collectionType'] == 'Album' &&
+            (!@apple_id || result['artistId'] == @apple_id)
+        end
       end
 
-      def query
-        Addressable::URI.new(
-          query_values: { term: @artist_name }
-        ).query
+      def album(result)
+        Album.new(
+          result['collectionName'],
+          {
+            artist_id: @apple_id,
+            album_id: result['collectionId']
+          }
+        )
+      end
+
+      def query_values
+        {
+          attribute: 'artistTerm',
+          entity: 'album',
+          term: @artist_name
+        }.merge(super)
       end
     end
   end

data/lib/itunes_api/request.rb

@@ -4,16 +4,37 @@ require 'json'
 module ItunesApi
   # Allow requests to the iTunes API.
   module Request
+
+    def response
+      JSON.parse(request)
+    end
+
+    private
+
     def request
       @request ||= open(url).read
     end
 
-    def response
-      JSON.parse(request)
+    def query
+      Addressable::URI.new(
+        query_values: query_values
+      ).query
+    end
+
+    def query_values
+      {
+        country: COUNTRY_CODE,
+        limit: LIMIT,
+        media: 'music'
+      }
     end
 
     def results
       response.fetch('results', [])
     end
+
+    def url
+      "#{BASE_URL}/search?#{query}"
+    end
   end
 end

data/lib/itunes_api/version.rb

@@ -1,3 +1,3 @@
 module ItunesApi
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.0.4'.freeze
 end

data/lib/itunes_api.rb

@@ -2,6 +2,7 @@ require 'itunes_api/all'
 
 # Interface to the Itunes Api
 module ItunesApi
-  COUNTRY_CODE = 'GB'.freeze
   BASE_URL = 'https://itunes.apple.com'.freeze
+  COUNTRY_CODE = 'GB'.freeze
+  LIMIT = 200
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itunes_api
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Mario D’Arco
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable