amazon-album-art 0.1.1 → 0.3.0

data/Gemfile

@@ -3,10 +3,6 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-# gem 'nokogiri', '>= 1.4.4'
-# gem 'sucker', '>= 1.1.4'
-
-
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
@@ -14,4 +10,6 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
   gem "rcov", ">= 0"
+  gem 'nokogiri', '>= 1.4.4'
+  gem 'sucker', '>= 1.1.4'
 end

data/Gemfile.lock

@@ -1,14 +1,21 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.0.3)
+    curb (0.7.9)
     git (1.2.5)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    nokogiri (1.4.4)
     rake (0.8.7)
     rcov (0.9.9)
     shoulda (2.11.3)
+    sucker (1.1.4)
+      activesupport (>= 2.3.2)
+      curb (~> 0.7.0)
+      nokogiri (~> 1.4.0)
 
 PLATFORMS
   ruby
@@ -16,5 +23,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.5.2)
+  nokogiri (>= 1.4.4)
   rcov
   shoulda
+  sucker (>= 1.1.4)

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.3.0

data/amazon-album-art.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amazon-album-art}
-  s.version = "0.1.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Allen"]
-  s.date = %q{2011-01-13}
+  s.date = %q{2011-01-17}
   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 = [
@@ -49,6 +49,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       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_runtime_dependency(%q<nokogiri>, [">= 1.4.4"])
       s.add_runtime_dependency(%q<sucker>, [">= 1.1.4"])
     else
@@ -58,6 +60,8 @@ 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<nokogiri>, [">= 1.4.4"])
+      s.add_dependency(%q<sucker>, [">= 1.1.4"])
     end
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
@@ -66,6 +70,8 @@ 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<nokogiri>, [">= 1.4.4"])
+    s.add_dependency(%q<sucker>, [">= 1.1.4"])
   end
 end
 

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

@@ -34,15 +34,18 @@ module AmazonAlbumArt
       results = @worker.get
 
       # Make sure nothing went awry.
-      raise AmazonAlbumArtError.new("Error finding album") unless results.valid?
+      check_response(results, "Error finding album")
 
       # Now parse it.
       results.map("Item") do |match|
-        attribs = match['ItemAttributes']
-
-        # grab values that were returned
-        found_artist, found_album = (attribs['Artist'] ||= attribs['Author'] ||= attribs["Creator"]["__content__"]), match['ItemAttributes']['Title']
-
+        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']
+        rescue StandardError => bang
+          # getting unhandled 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)
 
@@ -61,22 +64,16 @@ module AmazonAlbumArt
         images = @worker.get
 
         # Make sure nothing went awry.
-        raise AmazonAlbumArtError.new("Error finding images") unless images.valid?
+        check_response(results, "Error finding images")
 
         # parse response
         doc = Nokogiri::XML.parse(images.body)
 
-        urls = {}
-
-        # build the hash with requested values
-        sizes.each do |size|
-          urls.merge!({ size => doc.css("Item > ImageSets > ImageSet[@Category=\"primary\"] > #{size.to_s.capitalize}Image > URL").text })
-        end
-
-        return { :artist => found_artist, :album => found_album, :images => urls }
+        return { :artist => found_artist, :album => found_album, :images => load_images(doc, sizes) }
       end
     end
 
+  private
     def matches?(s1, s2, tolerance = 2)
       s1 == s2 ||
       s1 =~ /#{Regexp.escape s2}/i ||
@@ -103,6 +100,19 @@ module AmazonAlbumArt
       end
       return x
     end
+    
+    def load_images(doc, sizes)
+      # build the hash with requested values
+      {}.tap do |urls|
+        sizes.each do |size|
+          urls.merge!({ size => doc.css("Item > ImageSets > ImageSet[@Category=\"primary\"] > #{size.to_s.capitalize}Image > URL").text })
+        end
+      end
+    end
+
+    def check_response(results, msg)
+      raise AmazonAlbumArtError.new(msg) unless results.valid? || results.find("Error").size > 0
+    end
   end
   
   class AmazonAlbumArtError < StandardError

data/test/helper.rb

@@ -16,10 +16,9 @@ require 'amazon-album-art'
 
 class Test::Unit::TestCase
   def api_key
-    'test_key'
+    'api-key'
   end
-
   def secret_key
-    'secret_key'
+    "secret-key"
   end
 end

data/test/test_amazon-album-art.rb

@@ -2,65 +2,75 @@ require 'helper'
 
 class TestAmazonAlbumArt < Test::Unit::TestCase
   context "amazon-album-art module" do
-      should "create a new client" do
-        c = AmazonAlbumArt.new(api_key, secret_key)
-        assert_equal AmazonAlbumArt::Client, c.class
-      end
+    should "create a new client" do
+      c = AmazonAlbumArt.new(api_key, secret_key)
+      assert_equal AmazonAlbumArt::Client, c.class
     end
-    context "using the amazon-amazon-art client" do
-      setup do
-        @client = AmazonAlbumArt.new(api_key, secret_key)
-      end
-      context "search for known items" do
-        context "and for all images sizes" do
-          setup do
-            @result = @client.search("phish", "rift")
-          end
-          should "return a hash" do
-            assert_kind_of Hash, @result
-          end
-          should "include the found artists name" do
-            assert_equal "Phish", @result[:artist]
-          end
-          should "include the found artists name" do
-            assert_equal "Rift", @result[:album]
-          end
-          should "include an images key" do
-            assert @result.has_key?(:images)
-          end
-          setup do
-            @images = @result[:images]
-          end
-          should "include include all image sizes" do
-            [:swatch, :small, :thumbnail, :tiny, :medium, :large].each do |key|
-              assert @images.has_key?(key)
-            end
-          end
+  end
+  context "using the amazon-amazon-art client" do
+    setup do
+      @client = AmazonAlbumArt.new(api_key, secret_key)
+    end
+    context "search for known items" do
+      context "and for all images sizes" do
+        setup do
+          @result = @client.search("phish", "rift")
         end
-        context "and just a medium search" do
-          setup do
-            @result = @client.search("phish", "rift", [:medium])
-          end
-          context "just a medium image" do
-            should "include a medium image url" do
-              assert_equal "http://ecx.images-amazon.com/images/I/511RmbQV7dL._SL160_.jpg", @result[:images][:medium]
-            end
+        should "return a hash" do
+          assert_kind_of Hash, @result
+        end
+        should "include the found artists name" do
+          assert_equal "Phish", @result[:artist]
+        end
+        should "include the found artists name" do
+          assert_equal "Rift", @result[:album]
+        end
+        should "include an images key" do
+          assert @result.has_key?(:images)
+        end
+        setup do
+          @images = @result[:images]
+        end
+        should "include include all image sizes" do
+          [:swatch, :small, :thumbnail, :tiny, :medium, :large].each do |key|
+            assert @images.has_key?(key)
           end
         end
-        context "no search values" do
-          should "raise an ArgumentError" do
-            assert_raise ArgumentError do
-              @client.search
-            end
+      end
+      context "and just a medium search" do
+        setup do
+          @result = @client.search("phish", "rift", [:medium])
+        end
+        context "just a medium image" do
+          should "include a medium image url" do
+            assert_equal "http://ecx.images-amazon.com/images/I/511RmbQV7dL._SL160_.jpg", @result[:images][:medium]
           end
         end
       end
     end
-    context "no keys" do
-      should "raise an ArgumentError" do
-        assert_raise ArgumentError do
-          AmazonAlbumArt.new
+    context "search for problematic items" do
+      setup do
+        @result = @client.search("Mya", "A Cinderella Story")
+      end
+      context "found something for mya" do
+        should "not be nil" do
+          assert_not_nil @result
+        end
+      end
+      context "no search values" do
+        should "raise an ArgumentError" do
+          assert_raise ArgumentError do
+            @client.search
+          end
         end
       end
     end
+  end
+  context "no keys" do
+    should "raise an ArgumentError" do
+      assert_raise ArgumentError do
+        AmazonAlbumArt.new
+      end
+    end
+  end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - John Allen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 -05:00
+date: 2011-01-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,7 +85,7 @@ dependencies:
         - 4
         - 4
         version: 1.4.4
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -100,9 +100,39 @@ dependencies:
         - 1
         - 4
         version: 1.1.4
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 4
+        version: 1.4.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: sucker
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 4
+        version: 1.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *id008
 description: A specialized Amazon AWS gem for finding Album Art running on top of the 'sucker' gem
 email: john@threedogconsulting.com
 executables: []
@@ -139,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4281510954553603032
+      hash: -2297918951107509842
       segments: 
       - 0
       version: "0"