amazon-ecs 2.2.5 → 2.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTQxOWYzOWY2NjQ3YjBiZTFhNTdkMTQ0ODExYWFmOTUwYTEyODkzYw==
+    YmFlM2Q2N2Q3NWMzMDhmMzI2ZjZlYjIyOTM0ZWU1MmRmNjc1ZTg5NQ==
   data.tar.gz: !binary |-
-    MDdkYTdlNmJiZjc1NmY1NzNlNDU3ZTI4MWJkNjRiMzJmNWU5MzQ3Yw==
-!binary "U0hBNTEy":
+    OGQwYzFiNTUyMzkxNTUyNzNmOTliNTVmNWM1NjZjNjE3ZGE2ZTE0ZA==
+SHA512:
   metadata.gz: !binary |-
-    MWZhN2E1ODllOTBjN2FkODI3OWIzMTQ3MjZmY2ViYWJhNTRlYzY0ZTkxYTRi
-    Y2JhYjNkNTFlYWIwYTFjZjlhZDNhNTg2YmY1OGQwZDNhZGJlOGRhMzdlMTgw
-    NmIwZDg4ZTI2ZmQyNzAzN2ZhZWI0M2QyNjRhYTQ4NWFkMmY5ZTI=
+    NDA2YjEyOGE4ZDE5NGZkYTY0NWU2ZWRhZmUzODJiYTAyODM2YmVhYzY4NWM1
+    ODc2ZDc0NjMyYmZlMjJkMjZmOTEzYmE1MzQ5NWRmODY1YTVlYzFlMzU4ZWJk
+    NWFiMmRiOWNmZTVmYzYwNWM2MjFlZGNiNzAwZjQyODNhMGYyZWM=
   data.tar.gz: !binary |-
-    ZTgyMTI5MmJjMTAyMWU0ZTUwMmUxNmRiMGNlZjBmOWExYzcyZDhjMGIxMzky
-    ZWQwZGI2OWI3NjM3OGUwZGM5MGJmODEwZmQzZWMxZGNmOTA3MDViNWNjOTY0
-    ZDYwZmE0OWVjNWEwNjU3ODkyMDI0NTg5Mzg4YjQzZTE0OWY3ODc=
+    OWFlZjc0YWVlZWYyMmMzMThkNzAwNjUxN2U4MDM3ZDY0Y2E5MmYxY2VkMjc3
+    NzRiNDBlYzFkMDBmZTVhYjQyNTYxYjYxOTlkN2RmZmJkYWQ4MDEwNzU0OGQ1
+    ODIzOWEzZDQxZjZkNTJjYTY3NTBkZTkyZTlkYTU4ZDFjMDZiOGE=

data/CHANGELOG

@@ -1,3 +1,7 @@
+2.3.0 2014-12-05
+----------------
+* Replace deprecated URI::escape with CGI::escape
+
 2.2.5 2014-03-08
 ----------------
 * Replaced Digest::Digest deprecated call 

data/Readme.rdoc

@@ -20,25 +20,26 @@ For HPricot dependency implementation, please install 1.2.x version or checkout
 == EXAMPLE
 
     require 'amazon/ecs'
-	
-    # Set the default options; options will be camelized and converted to REST request parameters.
-    # associate_tag and AWS_access_key_id are required options, associate_tag is required option
-    # since API version 2011-08-01. 
-    #
-    # To sign your request, include AWS_secret_key. 
-    Amazon::Ecs.options = {
-      :associate_tag => '[your associate tag]',
-      :AWS_access_key_id => '[your developer token]',       
-      :AWS_secret_key => '[your secret access key]'
-    }
-
-    # alternatively,
+    
+    # Configure your access key, secret key and other options such as the associate tag.
+    # Options set in the configure block will add/update to the default options, i.e.
+    #  options[:version] => "2011-08-01"
+    #  options[:service] => "AWSECommerceService"
     Amazon::Ecs.configure do |options|
-      options[:associate_tag] = '[your associate tag]'
       options[:AWS_access_key_id] = '[your access key]'
       options[:AWS_secret_key] = '[you secret key]'
+      options[:associate_tag] = '[your associate tag]'
     end
 
+    # Or if you need to replace the default options, set the options value directly.
+    # Amazon::Ecs.options = {
+    #  :version => "2013-08-01",
+    #  :service => "AWSECommerceService"
+    #  :associate_tag => '[your associate tag]',
+    #  :AWS_access_key_id => '[your developer token]',
+    #  :AWS_secret_key => '[your secret access key]'
+    # }
+
     # options provided on method call will merge with the default options
     res = Amazon::Ecs.item_search('ruby', {:response_group => 'Medium', :sort => 'salesrank'})
     

data/lib/amazon/ecs.rb

@@ -30,10 +30,10 @@ require 'openssl'
 
 module Amazon
   class RequestError < StandardError; end
-  
+
   class Ecs
-    VERSION = '2.2.5'
-    
+    VERSION = '2.3.0'
+
     SERVICE_URLS = {
         :us => 'http://ecs.amazonaws.com/onca/xml',
         :uk => 'http://ecs.amazonaws.co.uk/onca/xml',
@@ -45,57 +45,57 @@ module Amazon
         :cn => 'http://webservices.amazon.cn/onca/xml',
         :es => 'http://webservices.amazon.es/onca/xml'
     }
-    
+
     OPENSSL_DIGEST_SUPPORT = OpenSSL::Digest.constants.include?( 'SHA256' ) ||
                              OpenSSL::Digest.constants.include?( :SHA256 )
-    
+
     OPENSSL_DIGEST = OpenSSL::Digest.new( 'sha256' ) if OPENSSL_DIGEST_SUPPORT
-    
+
     @@options = {
       :version => "2011-08-01",
       :service => "AWSECommerceService"
     }
-    
+
     @@debug = false
 
     # Default search options
     def self.options
       @@options
     end
-    
+
     # Set default search options
     def self.options=(opts)
       @@options = opts
     end
-    
+
     # Get debug flag.
     def self.debug
       @@debug
     end
-    
+
     # Set debug flag to true or false.
     def self.debug=(dbg)
       @@debug = dbg
     end
-    
+
     def self.configure(&proc)
       raise ArgumentError, "Block is required." unless block_given?
       yield @@options
     end
-    
+
     # Search amazon items with search terms. Default search index option is 'Books'.
     # For other search type other than keywords, please specify :type => [search type param name].
     def self.item_search(terms, opts = {})
       opts[:operation] = 'ItemSearch'
       opts[:search_index] = opts[:search_index] || 'Books'
-      
+
       type = opts.delete(:type)
-      if type 
+      if type
         opts[type.to_sym] = terms
-      else 
+      else
         opts[:keywords] = terms
       end
-      
+
       self.send_request(opts)
     end
 
@@ -103,42 +103,42 @@ module Amazon
     def self.item_lookup(item_id, opts = {})
       opts[:operation] = 'ItemLookup'
       opts[:item_id] = item_id
-      
+
       self.send_request(opts)
-    end    
+    end
 
     # Search a browse node by BrowseNodeId
     def self.browse_node_lookup(browse_node_id, opts = {})
       opts[:operation] = 'BrowseNodeLookup'
       opts[:browse_node_id] = browse_node_id
-      
+
       self.send_request(opts)
-    end    
-    
+    end
+
     # Generic send request to ECS REST service. You have to specify the :operation parameter.
     def self.send_request(opts)
       opts = self.options.merge(opts) if self.options
-      
+
       # Include other required options
       opts[:timestamp] = Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ")
 
       request_url = prepare_url(opts)
       log "Request URL: #{request_url}"
-      
+
       res = Net::HTTP.get_response(URI::parse(request_url))
       unless res.kind_of? Net::HTTPSuccess
         raise Amazon::RequestError, "HTTP Response: #{res.code} #{res.message}"
       end
       Response.new(res.body)
     end
-    
-    def self.validate_request(opts) 
+
+    def self.validate_request(opts)
       raise Amazon::RequestError, "" if opts[:associate_tag]
     end
 
     # Response object returned after a REST call to Amazon service.
     class Response
-      
+
       # XML input is in string format
       def initialize(xml)
         @doc = Nokogiri::XML(xml, nil, 'UTF-8')
@@ -166,22 +166,22 @@ module Amazon
       def error
         Element.get(@doc, "//Error/Message")
       end
-      
+
       # Return error code
       def error_code
         Element.get(@doc, "//Error/Code")
       end
-      
+
       # Return an array of Amazon::Element item objects.
       def items
         @items ||= (@doc/"Item").collect { |item| Element.new(item) }
       end
-      
+
       # Return the first item (Amazon::Element)
       def first_item
         items.first
       end
-      
+
       # Return current page no if :item_page option is when initiating the request.
       def item_page
         @item_page ||= Element.get(@doc, "//ItemPage").to_i
@@ -191,7 +191,7 @@ module Amazon
       def total_results
         @total_results ||= Element.get(@doc, "//TotalResults").to_i
       end
-      
+
       # Return total pages.
       def total_pages
         @total_pages ||= Element.get(@doc, "//TotalPages").to_i
@@ -205,7 +205,7 @@ module Amazon
         initialize(xml)
       end
     end
-    
+
     protected
       def self.log(s)
         return unless self.debug
@@ -217,8 +217,8 @@ module Amazon
           puts s
         end
       end
-      
-    private 
+
+    private
       def self.prepare_url(opts)
         country = opts.delete(:country)
         country = (country.nil?) ? 'us' : country
@@ -227,18 +227,18 @@ module Amazon
 
         secret_key = opts.delete(:AWS_secret_key)
         request_host = URI.parse(request_url).host
-        
+
         qs = ''
-        
-        opts = opts.collect do |a,b| 
-          [camelize(a.to_s), b.to_s] 
+
+        opts = opts.collect do |a,b|
+          [camelize(a.to_s), b.to_s]
         end
-        
-        opts = opts.sort do |c,d| 
+
+        opts = opts.sort do |c,d|
           c[0].to_s <=> d[0].to_s
         end
-        
-        opts.each do |e| 
+
+        opts.each do |e|
           log "Adding #{e[0]}=#{e[1]}"
           next unless e[1]
           e[1] = e[1].join(',') if e[1].is_a? Array
@@ -247,7 +247,7 @@ module Amazon
           qs << "&" unless qs.length == 0
           qs << "#{e[0]}=#{v}"
         end
-        
+
         signature = ''
         unless secret_key.nil?
           request_to_sign="GET\n#{request_host}\n/onca/xml\n#{qs}"
@@ -256,27 +256,27 @@ module Amazon
 
         "#{request_url}?#{qs}#{signature}"
       end
-      
+
       def self.url_encode(string)
         string.gsub( /([^a-zA-Z0-9_.~-]+)/ ) do
           '%' + $1.unpack( 'H2' * $1.bytesize ).join( '%' ).upcase
         end
       end
-      
+
       def self.camelize(s)
         s.to_s.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
       end
-      
+
       def self.sign_request(url, key)
         return nil if key.nil?
-        
-        if (OPENSSL_DIGEST_SUPPORT)
+
+        if OPENSSL_DIGEST_SUPPORT
           signature = OpenSSL::HMAC.digest(OPENSSL_DIGEST, key, url)
           signature = [signature].pack('m').chomp
         else
-          signature = Base64.encode64( HMAC::SHA256.digest(key, url) ).strip
+          signature = Base64.encode64(HMAC::SHA256.digest(key, url)).strip
         end
-        signature = URI.escape(signature, Regexp.new("[+=]"))
+        signature = CGI.escape(signature)
         return signature
       end
   end
@@ -291,7 +291,7 @@ module Amazon
         result = result.inner_html if result
         result
       end
-    
+
       # Return an unescaped text value of an element.
       def get_unescaped(element, path='.')
         result = self.get(element, path)
@@ -301,7 +301,7 @@ module Amazon
       # Return an array of values based on the given path.
       def get_array(element, path='.')
         return unless element
-      
+
         result = element/path
         if (result.is_a? Nokogiri::XML::NodeSet) || (result.is_a? Array)
           result.collect { |item| self.get(item) }
@@ -313,29 +313,29 @@ module Amazon
       # Return child element text values of the given path.
       def get_hash(element, path='.')
         return unless element
-    
+
         result = element.at_xpath(path)
         if result
           hash = {}
           result = result.children
           result.each do |item|
             hash[item.name] = item.inner_html
-          end 
+          end
           hash
         end
       end
     end
-    
+
     # Pass Nokogiri::XML::Element object
     def initialize(element)
       @element = element
     end
 
-    # Returns Nokogiri::XML::Element object    
+    # Returns Nokogiri::XML::Element object
     def elem
       @element
     end
-    
+
     # Returns a Nokogiri::XML::NodeSet of elements matching the given path. Example: element/"author".
     def /(path)
       elements = @element/path
@@ -349,7 +349,7 @@ module Amazon
       return unless elements
       elements = elements.map{|element| Element.new(element)}
     end
-    
+
     # Similar with search_and_convert but always return first element if more than one elements found
     def get_element(path)
       elements = get_elements(path)
@@ -360,12 +360,12 @@ module Amazon
     def get(path='.')
       Element.get(@element, path)
     end
-    
+
     # Get the unescaped HTML text of the given path.
     def get_unescaped(path='.')
       Element.get_unescaped(@element, path)
     end
-    
+
     # Get the array values of the given path.
     def get_array(path='.')
       Element.get_array(@element, path)
@@ -375,12 +375,12 @@ module Amazon
     def get_hash(path='.')
       Element.get_hash(@element, path)
     end
-    
+
     def attributes
       return unless self.elem
       self.elem.attributes
     end
-    
+
     def to_s
       elem.to_s if elem
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-ecs
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.3.0
 platform: ruby
 authors:
 - Herryanto Siatono
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 2
 summary: Generic Amazon Product Advertising Ruby API.