ace-client 0.0.12 → 0.0.13

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/lib/ace-client.rb

@@ -1,5 +1,6 @@
 require 'ace-client/base'
 require 'ace-client/query2'
+require 'ace-client/query3'
 require 'ace-client/query4'
 
 module AceClient

data/lib/ace-client/base.rb

@@ -22,6 +22,7 @@ module AceClient
       @endpoint = options[:endpoint] || ENV['ACE_ENDPOINT']
       @http_proxy = options[:http_proxy] || ENV['HTTP_PROXY']
       @http_method = options[:http_method] || :post
+      @access_key_id_key = options[:access_key_id_key] || ENV['ACE_ACCESS_KEY_ID_KEY'] || 'AWSAccessKeyId'
       if options.key?(:use_ssl)
         @use_ssl = options[:use_ssl]
       elsif ENV['ACE_USE_SSL']

data/lib/ace-client/query2.rb

@@ -34,7 +34,7 @@ module AceClient
       @params.update(
         'SignatureVersion' => '2',
         'SignatureMethod' => @signature_method,
-        'AWSAccessKeyId' => @access_key_id,
+        @access_key_id_key => @access_key_id,
         'Timestamp' => Time.now.getutc.iso8601.sub(/Z/, sprintf(".%03dZ",(Time.now.getutc.usec/1000)))
       )
       @params['Version'] = @version if @version
@@ -71,7 +71,7 @@ module AceClient
 
     def sample_request(request)
       query = (request.options[:query] || request.options[:body]).dup
-      variable_keys = %w(Version SignatureVersion SignatureMethod Timestamp AWSAccessKeyId Signature)
+      variable_keys = %W(Version SignatureVersion SignatureMethod Timestamp #{access_key_id_key} Signature)
       variables = {}
       variable_keys.each do |key|
         variables[key] = query.delete(key)

data/lib/ace-client/query3.rb

@@ -0,0 +1,85 @@
+require 'openssl'
+require 'cgi'
+require 'nokogiri'
+require 'time'
+
+module AceClient
+  class Query3 < Base
+    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)
+    end
+
+    def dryrun(action, params={})
+      params.update('Action' => action)
+      execute(params, true)
+    end
+
+    def execute(params={}, dryrun=false)
+      @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
+
+      if http_method == :get
+        options[:query] = @params
+        http_method_class = Net::HTTP::Get
+      elsif http_method == :post
+        options[:body] = @params
+        http_method_class = Net::HTTP::Post
+      end
+
+      @before_request.call(@params) if @before_request
+
+      request = HTTParty::Request.new(http_method_class, endpoint_url + @path, options)
+      if dryrun
+        request
+      else
+        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

@@ -8,7 +8,6 @@ module AceClient
     attr_accessor :query
 
     format :xml
-    #debug_output $stdout
 
     def initialize(options)
       super(options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ace-client
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -142,6 +142,7 @@ files:
 - lib/ace-client.rb
 - lib/ace-client/base.rb
 - lib/ace-client/query2.rb
+- lib/ace-client/query3.rb
 - lib/ace-client/query4.rb
 - spec/ace-client_spec.rb
 - spec/spec_helper.rb
@@ -160,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4203289481347981661
+      hash: -3740157810782966641
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: