sucker 0.8.0 → 0.9.0

data/README.md

@@ -1,7 +1,7 @@
 Sucker
 ======
 
-Sucker is a paper-thin Ruby wrapper to the [Amazon Product Advertising API](https://affiliate-program.amazon.co.uk/gp/advertising/api/detail/main.html). It runs on cURL and Nokogiri and supports __everything in the API__.
+Sucker is a paper-thin Ruby wrapper to the [Amazon Product Advertising API](https://affiliate-program.amazon.co.uk/gp/advertising/api/detail/main.html). It runs on cURL and Nokogiri and supports __the entire API__.
 
 ![Sucker](http://upload.wikimedia.org/wikipedia/commons/thumb/f/f8/FEMA_-_32011_-_FEMA_Joint_Field_Office_%28JFO%29_preparation_in_Ohio.jpg/540px-FEMA_-_32011_-_FEMA_Joint_Field_Office_%28JFO%29_preparation_in_Ohio.jpg)
 
@@ -15,7 +15,7 @@ Set up a worker.
       :key            => "API KEY",
       :secret         => "API SECRET")
 
-Optionally, fiddle with curl. Say you want to use multiple network interfaces to query Amazon:
+Optionally, fiddle with curl. Say you want to query Amazon through a different network interface:
 
     worker.curl { |c| c.interface = "eth1" }
 
@@ -75,18 +75,12 @@ In your spec, you can now stub the worker:
 
 The first time you run the spec, Sucker will perform the actual request. Following requests will use a cached response.
 
-Active Support
---------------
-Sucker::Response relies on the Nokogiri implementation of the XmlMini parser in Active Support (~> 3.0).
-
-In a non-Rails environment, that merely means requiring twenty-something lines of code from Active Support.
-
 Compatibility
 -------------
 
-Specs pass against Ruby 1.8.7, 1.9.2, and REE.
+Specs pass against Ruby 1.8.7 and 1.9.2.
 
 Todo
 ----
 
-* See if I can do away with the stub class and use something like VCR in its place.
+* Rip out the Stub class and use VCR instead once Webmock gets a cURL adapter.

data/lib/sucker.rb

@@ -1,14 +1,22 @@
-require "active_support/xml_mini/nokogiri"
 require "cgi"
 require "curb"
 require "digest/md5"
+require "nokogiri"
 require "sucker/request"
 require "sucker/response"
+require "uri"
+
+if Gem.available?("activesupport", ">= 2.3.2")
+  require "active_support/xml_mini/nokogiri"
+else
+  require "sucker/active_support/core_ext/object/blank"
+  require "sucker/active_support/xml_mini/nokogiri"
+end
 
 # = Sucker
 # Sucker is a paper-thin Ruby wrapper to the Amazon Product Advertising API.
 module Sucker
-  AMAZON_API_VERSION = "2010-06-01".freeze
+  AMAZON_API_VERSION = "2010-06-01"
 
   # Instantiates a new Sucker::Request
   def self.new(args={})

data/lib/sucker/active_support/core_ext/object/blank.rb

@@ -0,0 +1,77 @@
+# http://github.com/rails/rails/blob/v3.0.0/activesupport/core_ext/object/blank.rb
+class Object
+  # An object is blank if it's false, empty, or a whitespace string.
+  # For example, "", "   ", +nil+, [], and {} are blank.
+  #
+  # This simplifies:
+  #
+  #   if !address.nil? && !address.empty?
+  #
+  # ...to:
+  #
+  #   if !address.blank?
+  def blank?
+    respond_to?(:empty?) ? empty? : !self
+  end
+
+  # An object is present if it's not blank.
+  def present?
+    !blank?
+  end
+
+  # Returns object if it's #present? otherwise returns nil.
+  # object.presence is equivalent to object.present? ? object : nil.
+  #
+  # This is handy for any representation of objects where blank is the same
+  # as not present at all.  For example, this simplifies a common check for
+  # HTTP POST/query parameters:
+  #
+  #   state   = params[:state]   if params[:state].present?
+  #   country = params[:country] if params[:country].present?
+  #   region  = state || country || 'US'
+  #
+  # ...becomes:
+  #
+  #   region = params[:state].presence || params[:country].presence || 'US'
+  def presence
+    self if present?
+  end
+end
+
+class NilClass #:nodoc:
+  def blank?
+    true
+  end
+end
+
+class FalseClass #:nodoc:
+  def blank?
+    true
+  end
+end
+
+class TrueClass #:nodoc:
+  def blank?
+    false
+  end
+end
+
+class Array #:nodoc:
+  alias_method :blank?, :empty?
+end
+
+class Hash #:nodoc:
+  alias_method :blank?, :empty?
+end
+
+class String #:nodoc:
+  def blank?
+    self !~ /\S/
+  end
+end
+
+class Numeric #:nodoc:
+  def blank?
+    false
+  end
+end

data/lib/sucker/active_support/xml_mini/nokogiri.rb

@@ -0,0 +1,77 @@
+# http://github.com/rails/rails/blob/v3.0.0/activesupport/lib/active_support/xml_mini/nokogiri.rb
+module Sucker
+  module ActiveSupport
+    module XmlMini_Nokogiri #:nodoc:
+      extend self
+
+      # Parse an XML Document string or IO into a simple hash using libxml / nokogiri.
+      # data::
+      #   XML Document string or IO to parse
+      def parse(data)
+        if !data.respond_to?(:read)
+          data = StringIO.new(data || '')
+        end
+
+        char = data.getc
+        if char.nil?
+          {}
+        else
+          data.ungetc(char)
+          doc = Nokogiri::XML(data)
+          raise doc.errors.first if doc.errors.length > 0
+          doc.to_hash
+        end
+      end
+
+      module Conversions #:nodoc:
+        module Document #:nodoc:
+          def to_hash
+            root.to_hash
+          end
+        end
+
+        module Node #:nodoc:
+          CONTENT_ROOT = '__content__'.freeze
+
+          # Convert XML document to hash
+          #
+          # hash::
+          #   Hash to merge the converted element into.
+          def to_hash(hash={})
+            node_hash = {}
+
+            # Insert node hash into parent hash correctly.
+            case hash[name]
+              when Array then hash[name] << node_hash
+              when Hash  then hash[name] = [hash[name], node_hash]
+              when nil   then hash[name] = node_hash
+            end
+
+            # Handle child elements
+            children.each do |c|
+              if c.element?
+                c.to_hash(node_hash)
+              elsif c.text? || c.cdata?
+                node_hash[CONTENT_ROOT] ||= ''
+                node_hash[CONTENT_ROOT] << c.content
+              end
+            end
+
+            # Remove content node if it is blank and there are child tags
+            if node_hash.length > 1 && node_hash[CONTENT_ROOT].blank?
+              node_hash.delete(CONTENT_ROOT)
+            end
+
+            # Handle attributes
+            attribute_nodes.each { |a| node_hash[a.node_name] = a.value }
+
+            hash
+          end
+        end
+      end
+
+      Nokogiri::XML::Document.send(:include, Conversions::Document)
+      Nokogiri::XML::Node.send(:include, Conversions::Node)
+    end
+  end
+end

data/lib/sucker/request.rb

@@ -8,8 +8,8 @@ module Sucker
       :de  => 'ecs.amazonaws.de',
       :ca  => 'ecs.amazonaws.ca',
       :fr  => 'ecs.amazonaws.fr',
-      :jp  => 'ecs.amazonaws.jp' }.freeze
-    PATH = "/onca/xml".freeze
+      :jp  => 'ecs.amazonaws.jp' }
+    PATH = "/onca/xml"
 
     # The Amazon locale to query
     attr_accessor :locale

data/lib/sucker/stub.rb

@@ -1,8 +1,6 @@
 module Sucker
 
-  # Stubs Sucker::Response to run specs offline. Ideally, I'd like to use
-  # a general-purpose stubber for Curb but last time I checked, there was
-  # none.
+  # Stubs Sucker::Response to run specs offline.
   class MockResponse < Response
     def initialize(mock_response_body)
       self.body = mock_response_body

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sucker
 version: !ruby/object:Gem::Version 
-  hash: 63
   prerelease: false
   segments: 
   - 0
-  - 8
+  - 9
   - 0
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Hakan Ensari
@@ -16,57 +15,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 +03:00
+date: 2010-09-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  name: activesupport
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
   name: nokogiri
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 4
         - 0
         version: 1.4.0
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: curb
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         - 7
         - 0
         version: 0.7.0
-  requirement: *id003
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
 description: A paper-thin Ruby wrapper to the Amazon Product Advertising API
 email: code@papercavalier.com
 executables: []
@@ -79,6 +60,8 @@ extra_rdoc_files:
 files: 
 - LICENSE
 - lib/sucker.rb
+- lib/sucker/active_support/core_ext/object/blank.rb
+- lib/sucker/active_support/xml_mini/nokogiri.rb
 - lib/sucker/request.rb
 - lib/sucker/response.rb
 - lib/sucker/stub.rb
@@ -111,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -4366708092572469247
       segments: 
       - 0
       version: "0"
@@ -120,7 +103,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"