sucker 1.6.0 → 2.0.0.pre.1

data/lib/sucker/{hash.rb → hash_builder.rb}

@@ -1,7 +1,5 @@
 module Sucker
-
-  # A monkey-patched Hash, safely stashed away in the Sucker namespace.
-  class Hash < ::Hash
+  module HashBuilder
     class << self
 
       # Builds a hash from a Nokogiri XML document.
@@ -14,9 +12,9 @@ module Sucker
       def from_xml(xml)
         case xml
         when Nokogiri::XML::Document
-          new[xml.root.name] = from_xml(xml.root)
+          from_xml(xml.root)
         when Nokogiri::XML::Element
-          result_hash = new
+          result_hash = {}
 
           xml.attributes.each_pair do |key, attribute|
             result_hash[key] = attribute.value

data/lib/sucker/parameters.rb

@@ -1,21 +1,30 @@
+require 'forwardable'
+
 module Sucker
-  class Parameters < ::Hash
+  class Parameters
+    extend Forwardable
+
     CURRENT_API_VERSION = '2010-11-01'
 
+    def_delegators :@parameters, :[], :[]=, :merge!
+
     def initialize
-      populate
+      reset
     end
 
-    def populate
-      self.store 'Service',   'AWSECommerceService'
-      self.store 'Version',   CURRENT_API_VERSION
-      self.store 'Timestamp', timestamp
+    # Creates a new hash to store parameters in.
+    def reset
+      @parameters = {
+        'Service'   => 'AWSECommerceService',
+        'Version'   => CURRENT_API_VERSION,
+        'Timestamp' => timestamp }
     end
 
+    # Returns a normalized parameters hash.
+    #
     # Ensures all keys and values are strings and camelizes former.
     def normalize
-      inject({}) do |hash, kv|
-        k, v = kv
+      @parameters.inject({}) do |hash, (k, v)|
         v = v.is_a?(Array) ? v.join(',') : v.to_s
         k = k.to_s.split('_').map {|w| w[0, 1] = w[0, 1].upcase; w }.join
         hash[k] = v
@@ -26,8 +35,8 @@ module Sucker
 
     private
 
-    def timestamp
-      Time.now.utc.strftime('%Y-%m-%dT%H:%M:%SZ')
-    end
+      def timestamp
+        Time.now.utc.strftime('%Y-%m-%dT%H:%M:%SZ')
+      end
   end
 end

data/lib/sucker/request.rb

@@ -3,7 +3,6 @@ require 'openssl'
 require 'sucker/parameters'
 
 module Sucker
-
   # A wrapper around the API request.
   class Request
     HOSTS = {
@@ -80,8 +79,7 @@ module Sucker
 
     # Resets parameters and returns self.
     def reset
-      parameters.clear
-      parameters.populate
+      parameters.reset
 
       self
     end
@@ -102,33 +100,33 @@ module Sucker
 
     private
 
-    def build_query_string
-      parameters.
-        normalize.
-        merge({ 'AWSAccessKeyId' => key,
-                'AssociateTag'   => associate_tag.to_s }).
-        sort.
-        map { |k, v| "#{k}=" + escape(v) }.
-        join('&')
-    end
+      def build_query_string
+        parameters.
+          normalize.
+          merge({ 'AWSAccessKeyId' => key,
+                  'AssociateTag'   => associate_tag.to_s }).
+          sort.
+          map { |k, v| "#{k}=" + escape(v) }.
+          join('&')
+      end
 
-    def sign(query_string)
-      digest = OpenSSL::Digest::Digest.new('sha256')
-      url_string = ['GET', host, '/onca/xml', query_string].join("\n")
-      hmac = OpenSSL::HMAC.digest(digest, secret, url_string)
-      signature = escape([hmac].pack('m').chomp)
+      def sign(query_string)
+        digest = OpenSSL::Digest::Digest.new('sha256')
+        url_string = ['GET', host, '/onca/xml', query_string].join("\n")
+        hmac = OpenSSL::HMAC.digest(digest, secret, url_string)
+        signature = escape([hmac].pack('m').chomp)
 
-      query_string + '&Signature=' + signature
-    end
+        query_string + '&Signature=' + signature
+      end
 
-    def escape(value)
-      value.gsub(/([^a-zA-Z0-9_.~-]+)/) do
-        '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
+      def escape(value)
+        value.gsub(/([^a-zA-Z0-9_.~-]+)/) do
+          '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
+        end
       end
-    end
 
-    def host
-      HOSTS[locale.to_sym]
-    end
+      def host
+        HOSTS[locale.to_sym]
+      end
   end
 end

data/lib/sucker/response.rb

@@ -1,8 +1,7 @@
 require 'nokogiri'
-require 'sucker/hash'
+require 'sucker/hash_builder'
 
 module Sucker
-
   # A wrapper around the API response.
   class Response
 
@@ -26,7 +25,7 @@ module Sucker
       find(path).each { |match| block.call(match) }
     end
 
-    # Returns an array of errors in the response.
+    # An array of errors in the response.
     def errors
       find('Error')
     end
@@ -38,7 +37,7 @@ module Sucker
     #
     def find(attribute)
       xml.xpath("//xmlns:#{attribute}").map do |element|
-        Hash.from_xml(element)
+        HashBuilder.from_xml(element)
       end
     end
     alias_method :[], :find
@@ -59,7 +58,7 @@ module Sucker
 
     # Parses the response into a simple hash.
     def to_hash
-      Hash.from_xml(xml)
+      HashBuilder.from_xml(xml)
     end
 
     # Checks if the HTTP response is OK.

data/lib/sucker/version.rb

@@ -1,3 +1,3 @@
 module Sucker
-  VERSION = '1.6.0'
+  VERSION = '2.0.0.pre.1'
 end

data/spec/sucker/{hash_spec.rb → hash_builder_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Sucker
-  describe Hash do
+  describe HashBuilder do
     let(:xml) do
       xml = <<-XML
       <?xml version=\"1.0\" ?>
@@ -18,19 +18,19 @@ module Sucker
 
     describe '.from_xml' do
       it 'returns a hash' do
-        Hash.from_xml(xml).should be_an_instance_of Hash
+        HashBuilder.from_xml(xml).should be_an_instance_of Hash
       end
 
       it 'handles only childs' do
-        Hash.from_xml(xml)['Title'].should eql 'Anti-Oedipus'
+        HashBuilder.from_xml(xml)['Title'].should eql 'Anti-Oedipus'
       end
 
       it 'handles arrays' do
-        Hash.from_xml(xml)['Author'].should be_a Array
+        HashBuilder.from_xml(xml)['Author'].should be_a Array
       end
 
       it 'handles attributes' do
-        node = Hash.from_xml(xml)['Creator']
+        node = HashBuilder.from_xml(xml)['Creator']
         node['Role'].should eql 'Translator'
         node['__content__'].should eql 'Robert Hurley'
       end

data/spec/sucker/parameters_spec.rb

@@ -6,21 +6,17 @@ module Sucker
       Parameters.new
     end
 
-    it "is a Hash" do
-      Parameters.ancestors.should include ::Hash
-    end
-
     context "when initialized" do
       it "sets `Service`" do
-        parameters.should have_key "Service"
+        parameters['Service'].should_not be_nil
       end
 
       it "sets `Version`" do
-        parameters.should have_key "Version"
+        parameters['Version'].should_not be_nil
       end
 
       it "set `Timestamp`" do
-        parameters.should have_key "Timestamp"
+        parameters['Timestamp'].should_not be_nil
       end
     end
 

data/spec/sucker/request_spec.rb

@@ -31,12 +31,12 @@ module Sucker
     end
 
     describe "#reset" do
-      it "returns parameters to a pristine state" do
+      it "resets parameters" do
         request << { 'foo' => 'bar' }
         request.reset
 
-        request.parameters.should have_key 'Service'
-        request.parameters.should_not have_key 'foo'
+        request.parameters['Service'].should_not be_nil
+        request.parameters['foo'].should be_nil
       end
 
       it "returns the request object" do

data/spec/sucker/response_spec.rb

@@ -106,7 +106,7 @@ module Sucker
 
     describe '#[]' do
       it 'is an alias of #find' do
-        response['Foo'].should eql response.find('Foo')
+        response['Title'].should eql response.find('Title')
       end
     end
 

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sucker
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
-  - 1
-  - 6
+  - 2
   - 0
-  version: 1.6.0
+  - 0
+  - pre
+  - 1
+  version: 2.0.0.pre.1
 platform: ruby
 authors: 
 - Paper Cavalier
@@ -14,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-31 00:00:00 +01:00
+date: 2011-06-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -178,7 +180,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/sucker/hash.rb
+- lib/sucker/hash_builder.rb
 - lib/sucker/parameters.rb
 - lib/sucker/request.rb
 - lib/sucker/response.rb
@@ -205,7 +207,7 @@ files:
 - spec/fixtures/cassette_library/spec/sucker/request.yml
 - spec/fixtures/cassette_library/spec/sucker/response.yml
 - spec/spec_helper.rb
-- spec/sucker/hash_spec.rb
+- spec/sucker/hash_builder_spec.rb
 - spec/sucker/parameters_spec.rb
 - spec/sucker/request_spec.rb
 - spec/sucker/response_spec.rb
@@ -233,11 +235,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: sucker
@@ -265,7 +269,7 @@ test_files:
 - spec/fixtures/cassette_library/spec/sucker/request.yml
 - spec/fixtures/cassette_library/spec/sucker/response.yml
 - spec/spec_helper.rb
-- spec/sucker/hash_spec.rb
+- spec/sucker/hash_builder_spec.rb
 - spec/sucker/parameters_spec.rb
 - spec/sucker/request_spec.rb
 - spec/sucker/response_spec.rb