itunes_api 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 977e293cb1119a93c8307fa6777c4fc56a2c2070
-  data.tar.gz: 7dbe4950ee63e43462c06d2549ef5a01cc94cc0a
+  metadata.gz: 0cefe7c03674f77de95c0ad26c37f7bcf1846228
+  data.tar.gz: d0ae1fa1c14205710238e2c49ec8d61f6c4fb332
 SHA512:
-  metadata.gz: b526669ffe54690bc851552129c8a3c7507298b66e883617981732221ed07740c04d7f0fd9715bf69104f8bb03be05ce9d472273b051d8986efb059c78f47229
-  data.tar.gz: c8db2f679fb319d0aa1f503f4cf8f7aaa5a3f192eda61295f8e9aa5410fd4a8fa1010e6a63362f40c3f4f6dbdf498ab6fb96f5cd4a64cc2a70447a794058b663
+  metadata.gz: 602db34f182e67fae632a47a5e3a955c964ed5c27c36e36ea6a910ffbaef40d04f2969250f613e0f4f9f184ab42813be6aa96d076e186b84375d93cb14a5d556
+  data.tar.gz: ae5429fdef3d026b6c881d275d296781323d769db55b9f49d1474f736c2422b6835fbf2f5582b084423a1fef1b4cbec71fb481fdd1422d024207c91c4913d1e3

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.4

data/README.md

@@ -30,7 +30,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/mariodarco/itunes_api. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/mariodarco/itunes-api. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/itunes_api.gemspec

@@ -35,5 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.45'
+  spec.add_development_dependency 'rubocop'
 end

data/lib/itunes_api/music/album.rb

@@ -2,36 +2,34 @@ module ItunesApi
   module Music
     # Retrieves album tracks info.
     class Album
-      attr_accessor :name
+      attr_accessor :name, :artwork, :track_count, :release_date
       include Request
 
-      def initialize(name, filtering_options = {})
-        @name = name
-        @filtering_options = filtering_options
-      end
-
-      def tracks
-        @tracks ||= filtered_results.sort_by { |track| track['trackNumber'] }
+      def initialize(info)
+        @name = info['collectionName']
+        @album_id = info['collectionId']
+        @artwork = info['artworkUrl100']
+        @track_count = info['trackCount']
+        @release_date = Date.parse(info['releaseDate'])
       end
 
       def apple_music?
-        tracks.any? { |track| track['isStreamable'] }
+        streamable_tracks.any?
       end
 
-      private
-
-      def album_id
-        @album_id ||= @filtering_options[:album_id]
+      def streamable_tracks
+        tracks.select { |track| track['isStreamable'] }
       end
 
-      def artist_id
-        @artist_id ||= @filtering_options[:artist_id]
+      def tracks
+        @tracks ||= filtered_results.sort_by { |track| track['trackNumber'] }
       end
 
+      private
+
       def filtered_results
         @filtered_results ||= results.find_all do |result|
-          (!album_id || result['collectionId'] == album_id) &&
-            (!artist_id || result['artistId'] == artist_id)
+          result['collectionId'] == @album_id
         end
       end
 

data/lib/itunes_api/music/artist.rb

@@ -8,7 +8,7 @@ module ItunesApi
 
       def initialize(artist_name, apple_id = nil)
         @artist_name = artist_name
-        @apple_id = apple_id
+        @apple_id = normalize(apple_id.to_i)
       end
 
       def albums(limit = 3)
@@ -16,32 +16,31 @@ module ItunesApi
                     .sort_by { |result| result['releaseDate'] }
                     .reverse
                     .first(limit)
-                    .map { |result| album(result) }
+                    .map { |info| Album.new(info) }
+      end
+
+      def normalize(apple_id)
+        apple_id.zero? ? nil : apple_id
       end
 
       def apple_ids
-        @apple_ids ||= filtered_results.collect do |album|
+        return [@apple_id] if @apple_id
+
+        @apple_ids ||= filtered_albums.collect do |album|
           album['artistId']
         end.compact.uniq.sort
       end
 
       private
 
-      def filtered_results
-        results.find_all do |result|
-          result['collectionType'] == 'Album' &&
-            (!@apple_id || result['artistId'] == @apple_id)
-        end
+      def filtered_albums
+        results.find_all { |result| result['collectionType'] == 'Album' }
       end
 
-      def album(result)
-        Album.new(
-          result['collectionName'],
-          {
-            artist_id: @apple_id,
-            album_id: result['collectionId']
-          }
-        )
+      def filtered_results
+        filtered_albums.find_all do |album|
+          (!@apple_id || album['artistId'] == @apple_id)
+        end
       end
 
       def query_values

data/lib/itunes_api/version.rb

@@ -1,3 +1,3 @@
 module ItunesApi
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itunes_api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Mario D’Arco
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-26 00:00:00.000000000 Z
+date: 2017-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -70,16 +70,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.45'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.45'
+        version: '0'
 description: An interface to the iTunes Api
 email:
 - mariodarco78@icloud.com
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -126,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: iTunes Api