amazon-album-art 0.3.0 → 0.3.1

data/Gemfile

@@ -12,4 +12,5 @@ group :development do
   gem "rcov", ">= 0"
   gem 'nokogiri', '>= 1.4.4'
   gem 'sucker', '>= 1.1.4'
+  gem 'json'
 end

data/Gemfile.lock

@@ -8,6 +8,7 @@ GEM
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    json (1.4.6)
     nokogiri (1.4.4)
     rake (0.8.7)
     rcov (0.9.9)
@@ -23,6 +24,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.5.2)
+  json
   nokogiri (>= 1.4.4)
   rcov
   shoulda

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/amazon-album-art.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amazon-album-art}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Allen"]
-  s.date = %q{2011-01-17}
+  s.date = %q{2011-01-20}
   s.description = %q{A specialized Amazon AWS gem for finding Album Art running on top of the 'sucker' gem}
   s.email = %q{john@threedogconsulting.com}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "amazon-album-art.gemspec",
     "lib/amazon-album-art.rb",
     "lib/amazon-album-art/client.rb",
+    "test/fixtures/albums.json",
     "test/helper.rb",
     "test/test_amazon-album-art.rb"
   ]
@@ -51,6 +52,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<nokogiri>, [">= 1.4.4"])
       s.add_development_dependency(%q<sucker>, [">= 1.1.4"])
+      s.add_development_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.4"])
       s.add_runtime_dependency(%q<sucker>, [">= 1.1.4"])
     else
@@ -60,6 +62,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
       s.add_dependency(%q<sucker>, [">= 1.1.4"])
+      s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
       s.add_dependency(%q<sucker>, [">= 1.1.4"])
     end
@@ -70,6 +73,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
     s.add_dependency(%q<sucker>, [">= 1.1.4"])
+    s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
     s.add_dependency(%q<sucker>, [">= 1.1.4"])
   end

data/lib/amazon-album-art/client.rb

@@ -22,6 +22,9 @@ module AmazonAlbumArt
     def search(artist, album, sizes = [:swatch, :small, :thumbnail, :tiny, :medium, :large])
       raise ArgumentError.new("An artist and album are required to search") if artist.blank? || album.blank?
 
+      # clean up params, this client may be used repeatedly
+      clean_params(%w{IdType ResponseGroup ItemId})
+
       # Prepare a request.
       @worker << {
         "Operation"     => "ItemSearch",
@@ -34,23 +37,24 @@ module AmazonAlbumArt
       results = @worker.get
 
       # Make sure nothing went awry.
-      check_response(results, "Error finding album")
+      return nil if !check_response?(results, "Error finding album")
 
       # Now parse it.
       results.map("Item") do |match|
         begin
           attribs = match['ItemAttributes']
           # grab values that were returned
-          found_artist, found_album = (attribs['Artist'] ||= attribs['Author'] ||= (attribs.has_key?("Creator") ? attribs["Creator"]["__content__"] : "")), match['ItemAttributes']['Title']
+          found_artist, found_album = load_artist(attribs), load_album(attribs)
         rescue StandardError => bang
-          # getting unhandled error from Sucker in some cases
+          # handled error from Sucker in some cases
           next
         end
         # check to see if we have a reasonable match
         next unless !found_album.blank? && !found_artist.blank? && matches?(album, found_album) && matches?(artist, found_artist)
 
         # remove params not used for image search
-        @worker.parameters.delete_if { |k,v| %w{SearchIndex Title Artist}.include? k }
+        # @worker.parameters.delete_if { |k,v| %w{SearchIndex Title Artist}.include? k }
+        clean_params(%w{SearchIndex Title Artist})
 
         # fetch images
         @worker << {
@@ -64,13 +68,15 @@ module AmazonAlbumArt
         images = @worker.get
 
         # Make sure nothing went awry.
-        check_response(results, "Error finding images")
+        return nil if !check_response?(results, "Error finding images")
 
         # parse response
         doc = Nokogiri::XML.parse(images.body)
 
         return { :artist => found_artist, :album => found_album, :images => load_images(doc, sizes) }
       end
+      
+      return nil # nothing found
     end
 
   private
@@ -101,6 +107,24 @@ module AmazonAlbumArt
       return x
     end
     
+    def clean_params(params)
+      # remove given params so worker can be reused
+      @worker.parameters.delete_if { |k,v| params.include? k }
+    end
+    
+    def load_artist(attribs)
+      # found artists are returned in many different permutations  
+      return attribs['Artist'] if attribs.has_key?('Artist')
+      return attribs['Author'] if attribs.has_key?('Author')
+      return attribs['Creator'].map { |item| item["__content__"] if item.has_key?("__content__") }.join(" and ") if attribs.has_key?("Creator") && attribs['Creator'].is_a?(Array)
+      return attribs["Creator"]["__content__"] if attribs.has_key?("Creator") && attribs["Creator"].has_key?('__content__')
+      return nil
+    end
+    
+    def load_album(attribs)
+      attribs.has_key?('Title') ? attribs['Title'] : ""
+    end
+    
     def load_images(doc, sizes)
       # build the hash with requested values
       {}.tap do |urls|
@@ -110,8 +134,9 @@ module AmazonAlbumArt
       end
     end
 
-    def check_response(results, msg)
-      raise AmazonAlbumArtError.new(msg) unless results.valid? || results.find("Error").size > 0
+    def check_response?(results, msg)
+      # raise AmazonAlbumArtError.new(msg) unless results.valid? || results.find("Error").size > 0
+      results.valid? || results.find("Error").size == 0
     end
   end
   

data/test/fixtures/albums.json

@@ -0,0 +1,101 @@
+[{"artist":"Rihanna", "album":"A Girl Like Me"},
+  {"artist":"Swing Out Sister", "album":"20th Century Masters - The Millennium Collection: The Best Of Swing Out Sister"},
+  {"artist":"Eddie Kendricks", "album":"20th Century Masters: The Millenium Collection"},
+  {"artist":"Brainstorm", "album":"54: Music From The Miramax Motion Picture, Vol. 2"},
+  {"artist":"Edgar Winter Group", "album":"70's Pop Hits"},
+  {"artist":"Collective Soul", "album":"7even Year Itch: Greatest Hits, 1994-2001"},
+  {"artist":"Breakfast Club", "album":"'80s Hits Back Vol. 3"},
+  {"artist":"Billy Squier", "album":"80's Rock, Vol. 1"},
+  {"artist":"Hilary Duff And Haylie Duff", "album":"A Cinderella Story"},
+  {"artist":"Mya", "album":"A Cinderella Story"},
+  {"artist":"Snow Patrol", "album":"A Hundred Million Suns"},
+  {"artist":"Jonas Brothers", "album":"A Little Bit Longer"},
+  {"artist":"Don Henley", "album":"Actual Miles: Henley's Greatest Hits"},
+  {"artist":"Lisa Stansfield", "album":"Affection"},
+  {"artist":"Tower Of Power", "album":"Ain't Nothin' Stoppin' Us Now"},
+  {"artist":"Al Green", "album":"Al Green's Greatest Hits"},
+  {"artist":"Sum 41", "album":"All Killer No Filler"},
+  {"artist":"Smash Mouth", "album":"All Star Smash Hits"},
+  {"artist":"Santana feat. Michelle Branch And The Wreckers", "album":"All That I Am"},
+  {"artist":"Killers", "album":"All These Things That I've Done"},
+  {"artist":"Crystal Waters", "album":"All Ultimate Dance"},
+  {"artist":"Josh Kelley", "album":"Almost Honest"},
+  {"artist":"Al Stewart", "album":"American Woman And Other Hits Of The '70s"},
+  {"artist":"Real McCoy", "album":"Another Night"},
+  {"artist":"Guns N' Roses", "album":"Appetite For Destruction"},
+  {"artist":"Bodyrockers", "album":"Aquamarine: Music From The Motion Picture"},
+  {"artist":"Barenaked Ladies", "album":"Are Me"},
+  {"artist":"Aretha Franklin", "album":"Aretha's Best"},
+  {"artist":"Aretha Franklin and George Michael", "album":"Aretha's Best"},
+  {"artist":"Stevie Wonder", "album":"At The Close Of A Century"},
+  {"artist":"Average White Band", "album":"AWB"},
+  {"artist":"Lenny Kravitz", "album":"Baptism"},
+  {"artist":"Nick Lowe", "album":"Basher: The Best of Nick Lowe"},
+  {"artist":"English Beat", "album":"Beat This!: The Best Of The English Beat"},
+  {"artist":"Jesse McCartney", "album":"Beautiful Soul"},
+  {"artist":"Big Mountain", "album":"Best of Big Mountain"},
+  {"artist":"Blur", "album":"Best of Blur"},
+  {"artist":"David Bowie", "album":"Best Of Bowie"},
+  {"artist":"David Bowie and Mick Jagger", "album":"Best Of Bowie"},
+  {"artist":"Brothers Johnson", "album":"Best Of Brothers Johnson"},
+  {"artist":"En Vogue", "album":"Best Of En Vogue"},
+  {"artist":"Pablo Cruise", "album":"Best Of Pablo Cruise"},
+  {"artist":"Ziggy Marley And The Melody Makers", "album":"Best of Ziggy Marley and the Melody Makers (1988-1993)"},
+  {"artist":"Van Halen", "album":"Best Of, Vol. 1"},
+  {"artist":"Outfield", "album":"Big Innings: Best Of The Outfield"},
+  {"artist":"Atlantic Starr", "album":"Billboard Hot R&B Hits: 1982"},
+  {"artist":"Brothers Johnson", "album":"Billboard Top Dance Hits - 1980"},
+  {"artist":"Heatwave", "album":"Billboard Top Hits: 1977"},
+  {"artist":"Jackson 5", "album":"Billboard Top Rock 'n' Roll Hits: 1974"},
+  {"artist":"Billy Idol", "album":"Billy Idol's Greatest Hits"},
+  {"artist":"Alana Davis", "album":"Blame It On Me"},
+  {"artist":"Jimmy Eat World", "album":"Bleed American"},
+  {"artist":"Blink-182", "album":"Blink-182 Greatest Hits"},
+  {"artist":"Boney M", "album":"Boney M - The Greatest Hits"},
+  {"artist":"Rick Springfield", "album":"Boogie Nights No. 2: More Music From The Original Motion Picture"},
+  {"artist":"Shaggy", "album":"Boombastic"},
+  {"artist":"Bonnie Raitt", "album":"Boys On The Side"},
+  {"artist":"Sting", "album":"Brand New Day - The Remixes"},
+  {"artist":"Kelly Clarkson", "album":"Breakaway"},
+  {"artist":"Miley Cyrus", "album":"Breakout"},
+  {"artist":"Wallflowers", "album":"Bringing Down The Horse"},
+  {"artist":"Raconteurs", "album":"Broken Boy Soldiers"},
+  {"artist":"Bachman-Turner Overdrive", "album":"BTO's Greatest"},
+  {"artist":"Red Hot Chili Peppers", "album":"By The Way"},
+  {"artist":"Marc Broussard", "album":"Carencro"},
+  {"artist":"C And C Music Factory", "album":"Casey Kasem Presents America's Top Ten Through The Years: 90s"},
+  {"artist":"Gavin DeGraw", "album":"Chariot"},
+  {"artist":"Andy Gibb", "album":"Charlie's Angels: Full Throttle"},
+  {"artist":"Blackbyrds", "album":"Chart Toppers: Dance Hits of the 70's"},
+  {"artist":"Cheap Trick", "album":"Cheap Trick's Greatest Hits"},
+  {"artist":"Elton John", "album":"Chicken Soup for the Soul: The Triumph of the Spirit"},
+  {"artist":"Christina Aguilera", "album":"Christina Aguilera"},
+  {"artist":"James Taylor", "album":"Classic Songs"},
+  {"artist":"George Harrison", "album":"Cloud Nine"},
+  {"artist":"Heatwave", "album":"Club Epic: A Collection Of Classic Dance Mixes, Vol.1"},
+  {"artist":"Jack Johnson", "album":"Curious George: Sing-A-Longs And Lullabies For The Film"},
+  {"artist":"Barry White", "album":"Dance Fever : Hits of the 70's"},
+  {"artist":"Vicki Sue Robinson", "album":"Dance Floor Divas: The 70's"},
+  {"artist":"Phil Collins", "album":"Dance Into The Light"},
+  {"artist":"Dan Hartman", "album":"Dancin' 'N' Disco"},
+  {"artist":"Daughtry", "album":"Daughtry"},
+  {"artist":"Janet Jackson", "album":"Design Of A Decade"},
+  {"artist":"Eagle-Eye Cherry", "album":"Desireless"},
+  {"artist":"Barenaked Ladies", "album":"Disc One: All Their Greatest Hits"},
+  {"artist":"Van Halen", "album":"Diver Down"},
+  {"artist":"Donavon Frankenreiter feat. Jack Johnson", "album":"Donavon Frankenreiter"},
+  {"artist":"Bobby Brown", "album":"Don't Be Cruel"},
+  {"artist":"Replacements", "album":"Don't You Know Who I Think I Was?: The Best Of The Replacements"},
+  {"artist":"Doobie Brothers", "album":"Doobie Brothers' Greatest Hits"},
+  {"artist":"Green Day", "album":"Dookie"},
+  {"artist":"KT Tunstall", "album":"Drastic Fantastic"},
+  {"artist":"Corrs", "album":"Dreams: The Ultimate Corrs Collection"},
+  {"artist":"Whispers", "album":"Drivin' Soul"},
+  {"artist":"Duran Duran", "album":"Duran Duran: Greatest"},
+  {"artist":"Eagles", "album":"Eagles Greatest Hits, Vol. 2"},
+  {"artist":"Culture Club", "album":"Eighties Complete Vol. #2"},
+  {"artist":"R.E.M.", "album":"Eponymous"},
+  {"artist":"Clash", "album":"Essential Clash"},
+  {"artist":"Eiffel 65", "album":"Europop"},
+  {"artist":"Vertical Horizon", "album":"Everything You Want"}
+]

data/test/helper.rb

@@ -14,11 +14,14 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'amazon-album-art'
 
-class Test::Unit::TestCase
-  def api_key
-    'api-key'
-  end
-  def secret_key
-    "secret-key"
-  end
+def api_key
+  'api-key'
+end
+def secret_key
+  "secret-key"
+end
+def fixture_file(filename)
+  return '' if filename == ''
+  file_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/' + filename)
+  File.read(file_path)
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - John Allen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 -05:00
+date: 2011-01-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,8 +104,21 @@ dependencies:
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: json
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -117,10 +130,10 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: sucker
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -132,7 +145,7 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 description: A specialized Amazon AWS gem for finding Album Art running on top of the 'sucker' gem
 email: john@threedogconsulting.com
 executables: []
@@ -153,6 +166,7 @@ files:
 - amazon-album-art.gemspec
 - lib/amazon-album-art.rb
 - lib/amazon-album-art/client.rb
+- test/fixtures/albums.json
 - test/helper.rb
 - test/test_amazon-album-art.rb
 has_rdoc: true
@@ -169,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2297918951107509842
+      hash: 3587697543368286211
       segments: 
       - 0
       version: "0"