ace-client 0.0.17 → 0.0.18

data/VERSION

@@ -1 +1 @@
-0.0.17
+0.0.18

data/lib/ace-client.rb

@@ -1,7 +1,11 @@
 require 'ace-client/base'
 require 'ace-client/query2'
+require 'ace-client/base3'
 require 'ace-client/query3'
+require 'ace-client/xml3'
+require 'ace-client/base4'
 require 'ace-client/query4'
+require 'ace-client/json4'
 
 module AceClient
   VERSION = File.read(File.dirname(__FILE__) + '/../VERSION').chomp

data/lib/ace-client/base3.rb

@@ -0,0 +1,40 @@
+require 'openssl'
+require 'cgi'
+require 'nokogiri'
+require 'time'
+
+module AceClient
+  class Base3 < Base
+    attr_accessor :signature_method # TODO: HMAC-SHA256 or HMAC-SHA1
+    attr_accessor :sampler
+
+    format :xml
+
+    def initialize(options={})
+      super(options)
+      @signature_method = options[:signature_method] || 'HmacSHA256'
+      @authorization_key = options[:authorization_key] || 'authorization'
+      @date_key = options[:date_key] || 'x-date'
+      @nonce_key = options[:nonce_key] || 'x-amz-nonce'
+      @authorization_prefix = options[:authorization_prefix] || 'AWS3-HTTPS'
+      @nonce = options[:nonce]
+
+      @sampler = options[:sampler]
+      @before_signature = options[:before_signature]
+      @before_request = options[:before_request]
+    end
+
+    def create_signature
+      digest = OpenSSL::Digest::Digest.new(@signature_method.downcase.gsub(/hmac/, ''))
+      Base64.encode64(OpenSSL::HMAC.digest(digest, secret_access_key, string_to_sign)).strip
+    end
+
+    def string_to_sign
+      @nonce ? date + @nonce : date
+    end
+    
+    def date
+      @date ||= Time.now.utc.rfc822.gsub(/[\-\+]\d{4}$/, 'GMT')
+    end
+  end
+end

data/lib/ace-client/base4.rb

@@ -0,0 +1,183 @@
+module AceClient
+  class Base4 < Base
+    attr_accessor :headers
+    attr_accessor :region
+    attr_accessor :body
+    attr_accessor :service
+    attr_accessor :datetime
+
+    def initialize(options)
+      super(options)
+      @service = options[:service]
+      @region = options[:region]
+    end
+
+    def action(action, params={})
+      params.update('Action' => action)
+      execute(params)
+    end
+
+    def execute(params)
+      @datetime = Time.now.utc.strftime("%Y%m%dT%H%M%SZ")
+      if http_method == :get
+        execute_get(params)
+      else http_method == :post
+        execute_post(params)
+      end
+    end
+
+    def execute_get(params)
+      @headers = {}
+      @headers['host'] = @endpoint
+
+      @params = params
+      @params['Version'] = @version if @version
+      @params.update(
+        'X-Amz-Algorithm' => 'AWS4-HMAC-SHA256',
+        'X-Amz-Credential' => access_key_id + '/' + credential_string(datetime),
+        'X-Amz-Date' => datetime,
+        'X-Amz-SignedHeaders' => signed_headers
+      )
+      options = self.class.default_options.dup
+      options[:query] = @params
+      request = HTTParty::Request.new(Net::HTTP::Get, endpoint_url + @path, options)
+      @query = request.send(:normalize_query, options[:query])
+
+      @params.update('X-Amz-Signature' => signature(datetime))
+
+      @body = ''
+
+      request = HTTParty::Request.new(Net::HTTP::Get, endpoint_url + @path, options)
+      request.perform
+    end
+
+    def execute_post(params)
+      @params = params
+      options = {}
+      options = self.class.default_options.dup
+      options[:body] = @params
+      request = HTTParty::Request.new(Net::HTTP::Post, endpoint_url + @path, options)
+      @body = request.send(:normalize_query, options[:body])
+
+      @headers = {}
+      add_authorization!
+      options[:headers] = headers
+
+      request = HTTParty::Request.new(Net::HTTP::Post, endpoint_url + @path, options)
+      request.perform
+    end
+
+    def querystring
+      if http_method == :post
+        ''
+      elsif http_method == :get
+        @params.sort.collect { |param|
+          "#{CGI::escape(param[0])}=#{CGI::escape(param[1])}"
+        }.join("&").gsub('+', '%20').gsub('%7E', '~')
+      end
+    end
+
+    def add_authorization!
+      headers['content-type'] ||= 'application/x-www-form-urlencoded'
+      headers['host'] = endpoint
+      headers['x-amz-date'] = datetime
+      #headers['x-amz-security-token'] = credentials.session_token if credentials.session_token
+      headers['x-amz-content-sha256'] ||= hexdigest(body || '')
+      headers['authorization'] = authorization(datetime)
+    end
+
+    protected
+
+    def authorization datetime
+      parts = []
+      parts << "AWS4-HMAC-SHA256 Credential=#{access_key_id}/#{credential_string(datetime)}"
+      parts << "SignedHeaders=#{signed_headers}"
+      parts << "Signature=#{signature(datetime)}"
+      parts.join(', ')
+    end
+
+    def signature datetime
+      k_secret = secret_access_key
+      k_date = hmac("AWS4" + k_secret, datetime[0,8])
+      k_region = hmac(k_date, region)
+      k_service = hmac(k_region, service)
+      k_credentials = hmac(k_service, 'aws4_request')
+      hexhmac(k_credentials, string_to_sign(datetime))
+    end
+
+    def string_to_sign datetime
+      parts = []
+      parts << 'AWS4-HMAC-SHA256'
+      parts << datetime
+      parts << credential_string(datetime)
+      parts << hexdigest(canonical_request)
+      parts.join("\n")
+    end
+
+    def credential_string datetime
+      parts = []
+      parts << datetime[0,8]
+      parts << region
+      parts << service
+      parts << 'aws4_request'
+      parts.join("/")
+    end
+
+    def canonical_request
+      parts = []
+      parts << http_method.to_s.upcase
+      parts << @path
+      parts << querystring
+      parts << canonical_headers + "\n"
+      parts << signed_headers
+      if http_method == :post
+        parts << headers['x-amz-content-sha256']
+      else
+        parts << hexdigest('')
+      end
+      parts.join("\n")
+    end
+
+    def signed_headers
+      to_sign = headers.keys.map{|k| k.to_s.downcase }
+      to_sign.delete('authorization')
+      to_sign.sort.join(";")
+    end
+
+    def canonical_headers
+      headers = []
+      self.headers.each_pair do |k,v|
+        headers << [k,v] unless k == 'authorization'
+      end
+      headers = headers.sort_by(&:first)
+      headers.map{|k,v| "#{k}:#{canonical_header_values(v)}" }.join("\n")
+    end
+
+    def canonical_header_values values
+      values = [values] unless values.is_a?(Array)
+      values.map(&:to_s).join(',').gsub(/\s+/, ' ').strip
+    end
+
+    def hexdigest value
+      digest = Digest::SHA256.new
+      if value.respond_to?(:read)
+        chunk = nil
+        chunk_size = 1024 * 1024 # 1 megabyte
+        digest.update(chunk) while chunk = value.read(chunk_size)
+        value.rewind
+      else
+        digest.update(value)
+      end
+      digest.hexdigest
+    end
+
+    def hmac key, value
+      OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha256'), key, value)
+    end
+
+    def hexhmac key, value
+      OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new('sha256'), key, value)
+    end
+  end
+end
+

data/lib/ace-client/json4.rb

@@ -0,0 +1,28 @@
+module AceClient
+  class Json4 < Base4
+    format :json
+
+    def dryrun(action, params={})
+      create_request(action, params)
+    end
+
+    def action(action, params={})
+      create_request(action, params).perform
+    end
+
+    def create_request(action, params={})
+      @datetime = Time.now.utc.strftime("%Y%m%dT%H%M%SZ")
+      @params = params
+      options = self.class.default_options.dup
+      @body = options[:body] = @params.to_json
+
+      @headers = {}
+      headers['x-amz-target'] = "Hoge_20141213.#{action}"
+      add_authorization!
+      options[:headers] = headers
+
+      HTTParty::Request.new(Net::HTTP::Post, endpoint_url + @path, options)
+    end
+  end
+end
+

data/lib/ace-client/query3.rb

@@ -4,27 +4,11 @@ require 'nokogiri'
 require 'time'
 
 module AceClient
-  class Query3 < Base
+  class Query3 < Base3
     attr_accessor :http_method
-    attr_accessor :signature_method # TODO: HMAC-SHA256 or HMAC-SHA1
-    attr_accessor :sampler
 
     format :xml
 
-    def initialize(options={})
-      super(options)
-      @signature_method = options[:signature_method] || 'HmacSHA256'
-      @authorization_key = options[:authorization_key] || 'authorization'
-      @date_key = options[:date_key] || 'x-date'
-      @nonce_key = options[:nonce_key] || 'x-amz-nonce'
-      @authorization_prefix = options[:authorization_prefix] || 'AWS3-HTTPS'
-      @nonce = options[:nonce]
-
-      @sampler = options[:sampler]
-      @before_signature = options[:before_signature]
-      @before_request = options[:before_request]
-    end
-
     def action(action, params={})
       params.update('Action' => action)
       execute(params)
@@ -68,18 +52,5 @@ module AceClient
         record_response { request.perform }
       end
     end
-
-    def create_signature
-      digest = OpenSSL::Digest::Digest.new(@signature_method.downcase.gsub(/hmac/, ''))
-      Base64.encode64(OpenSSL::HMAC.digest(digest, secret_access_key, string_to_sign)).strip
-    end
-
-    def string_to_sign
-      @nonce ? date + @nonce : date
-    end
-    
-    def date
-      @date ||= Time.now.utc.rfc822.gsub(/[\-\+]\d{4}$/, 'GMT')
-    end
   end
 end

data/lib/ace-client/query4.rb

@@ -1,20 +1,9 @@
 module AceClient
-  class Query4 < Base
-    attr_accessor :headers
-    attr_accessor :region
-    attr_accessor :body
-    attr_accessor :service
-    attr_accessor :datetime
+  class Query4 < Base4
     attr_accessor :query
 
     format :xml
 
-    def initialize(options)
-      super(options)
-      @service = options[:service]
-      @region = options[:region]
-    end
-
     def action(action, params={})
       params.update('Action' => action)
       execute(params)
@@ -69,118 +58,6 @@ module AceClient
       request = HTTParty::Request.new(Net::HTTP::Post, endpoint_url + @path, options)
       request.perform
     end
-
-    def querystring
-      if http_method == :post
-        ''
-      elsif http_method == :get
-        @params.sort.collect { |param|
-          "#{CGI::escape(param[0])}=#{CGI::escape(param[1])}"
-        }.join("&").gsub('+', '%20').gsub('%7E', '~')
-      end
-    end
-
-    def add_authorization!
-      headers['content-type'] ||= 'application/x-www-form-urlencoded'
-      headers['host'] = endpoint
-      headers['x-amz-date'] = datetime
-      #headers['x-amz-security-token'] = credentials.session_token if credentials.session_token
-      headers['x-amz-content-sha256'] ||= hexdigest(body || '')
-      headers['authorization'] = authorization(datetime)
-    end
-
-    protected
-
-    def authorization datetime
-      parts = []
-      parts << "AWS4-HMAC-SHA256 Credential=#{access_key_id}/#{credential_string(datetime)}"
-      parts << "SignedHeaders=#{signed_headers}"
-      parts << "Signature=#{signature(datetime)}"
-      parts.join(', ')
-    end
-
-    def signature datetime
-      k_secret = secret_access_key
-      k_date = hmac("AWS4" + k_secret, datetime[0,8])
-      k_region = hmac(k_date, region)
-      k_service = hmac(k_region, service)
-      k_credentials = hmac(k_service, 'aws4_request')
-      hexhmac(k_credentials, string_to_sign(datetime))
-    end
-
-    def string_to_sign datetime
-      parts = []
-      parts << 'AWS4-HMAC-SHA256'
-      parts << datetime
-      parts << credential_string(datetime)
-      parts << hexdigest(canonical_request)
-      parts.join("\n")
-    end
-
-    def credential_string datetime
-      parts = []
-      parts << datetime[0,8]
-      parts << region
-      parts << service
-      parts << 'aws4_request'
-      parts.join("/")
-    end
-
-    def canonical_request
-      parts = []
-      parts << http_method.to_s.upcase
-      parts << @path
-      parts << querystring
-      parts << canonical_headers + "\n"
-      parts << signed_headers
-      if http_method == :post
-        parts << headers['x-amz-content-sha256']
-      else
-        parts << hexdigest('')
-      end
-      parts.join("\n")
-    end
-
-    def signed_headers
-      to_sign = headers.keys.map{|k| k.to_s.downcase }
-      to_sign.delete('authorization')
-      to_sign.sort.join(";")
-    end
-
-    def canonical_headers
-      headers = []
-      self.headers.each_pair do |k,v|
-        headers << [k,v] unless k == 'authorization'
-      end
-      headers = headers.sort_by(&:first)
-      headers.map{|k,v| "#{k}:#{canonical_header_values(v)}" }.join("\n")
-    end
-
-    def canonical_header_values values
-      values = [values] unless values.is_a?(Array)
-      values.map(&:to_s).join(',').gsub(/\s+/, ' ').strip
-    end
-
-    def hexdigest value
-      digest = Digest::SHA256.new
-      if value.respond_to?(:read)
-        chunk = nil
-        chunk_size = 1024 * 1024 # 1 megabyte
-        digest.update(chunk) while chunk = value.read(chunk_size)
-        value.rewind
-      else
-        digest.update(value)
-      end
-      digest.hexdigest
-    end
-
-    def hmac key, value
-      OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha256'), key, value)
-    end
-
-    def hexhmac key, value
-      OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new('sha256'), key, value)
-    end
   end
 end
 

data/lib/ace-client/xml3.rb

@@ -0,0 +1,59 @@
+require 'openssl'
+require 'cgi'
+require 'nokogiri'
+require 'time'
+require 'builder'
+
+module AceClient
+  class Xml3 < Base3
+    format :xml
+
+    def action(method, path, params={})
+      record_response do
+        create_request(method, path, params).perform
+      end
+    end
+
+    def dryrun(method, path, params={})
+      create_request(method, path, params)
+    end
+
+    def create_request(method, path, params={})
+      @params = params
+      @params['Version'] = @version if @version
+
+      @before_signature.call(@params) if @before_signature
+
+      signature = create_signature
+
+      options = self.class.default_options.dup
+      options[:headers] = {}
+      options[:headers]['Date'] = date
+      options[:headers][@authorization_key] = "#{@authorization_prefix} #{@access_key_id_key}=#{access_key_id},Algorithm=#{signature_method},Signature=#{signature}"
+      options[:headers]['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
+      options[:headers]['User-Agent'] = @user_agent if @user_agent
+      options[:headers][@nonce_key] = @nonce if @nonce
+
+      http_method_class = case method
+        when :get; Net::HTTP::Get
+        when :post; Net::HTTP::Post
+        when :delete; Net::HTTP::Delete
+      end
+
+      if !params.empty?
+        builder = Builder::XmlMarkup.new
+        options[:body] = builder.tag!(params.keys.first) do |b|
+		params[params.keys.first].each do |k, v|
+			b.tag!(k, v)
+		end
+	end
+      end
+
+      @path = File.join('/', @version, path)
+
+      @before_request.call(@params) if @before_request
+
+      HTTParty::Request.new(http_method_class, endpoint_url + @path, options)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ace-client
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -141,9 +141,13 @@ files:
 - bin/ace-q2
 - lib/ace-client.rb
 - lib/ace-client/base.rb
+- lib/ace-client/base3.rb
+- lib/ace-client/base4.rb
+- lib/ace-client/json4.rb
 - lib/ace-client/query2.rb
 - lib/ace-client/query3.rb
 - lib/ace-client/query4.rb
+- lib/ace-client/xml3.rb
 - spec/ace-client_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/tily/ace-client
@@ -161,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -293639598898322907
+      hash: -2109146560336915270
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: