ace-client 0.0.4 → 0.0.5

data/README.md

@@ -166,6 +166,26 @@ Then output would be:
         </ResponseMetadata>
     </CreateQueueResponse>
 
+### Rewrite Parameters before Creating Signature
+
+You can rewrite default parameters with `:before_signature` hook before creating signature.
+For example, you have to specify `AccessKeyId` instead of `AWSAccessKeyId` when using NIFTY Cloud API (http://cloud.nifty.com/api/rest/authenticate.htm).
+You can intercept params and rewrite `AWSAccessKeyId` to `AccessKeyId` using `:before_signature`.
+
+    require 'ace-client'
+    
+    compute = AceClient::Query2.new(
+      :endpoint => 'cp.cloud.nifty.com',
+      :path => '/api',
+      :access_key_id => ENV['AWS_ACCESS_KEY_ID'],
+      :secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'],
+      :before_signature => lambda {|params|
+        params['AccessKeyId'] = params.delete('AWSAccessKeyId')
+      }
+    )
+    p compute.action('DescribeRegions')
+    # => #<HTTParty::Response:0x7c0b0a0 parsed_response={"DescribeRegionsResponse"=>{"requestId"=>"df9de22f-cb3b-4cf9-9ee0-377e78742bf4", "regionInfo"=>{"item"=>[{"regionName"=>"east-1", "regionEndpoint"=>"east-1.cp.cloud.nifty.com", "messageSet"=>{"item"=>nil}, "isDefault"=>"true"}, {"regionName"=>"west-1", "regionEndpoint"=>"west-1.cp.cloud.nifty.com", "messageSet"=>{"item"=>nil}, "isDefault"=>"false"}]}}}, @response=#<Net::HTTPOK 200 OK readbody=true>, @headers={"date"=>["Sat, 23 Nov 2013 05:03:20 GMT"], "x-frame-options"=>["SAMEORIGIN"], "content-type"=>["text/xml;charset=utf-8"], "content-length"=>["558"], "vary"=>["Accept-Encoding"], "connection"=>["close"]}>
+
 ## TODO
 
 * query + sig4 support

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/ace-client/base.rb

@@ -4,6 +4,7 @@ require 'uri'
 module AceClient
   class Base
     include HTTParty
+    ssl_version :SSLv3
 
     attr_accessor :access_key_id
     attr_accessor :secret_access_key
@@ -16,10 +17,10 @@ module AceClient
     attr_accessor :user_agent
 
     def initialize(options)
-      @access_key_id = options[:access_key_id]
-      @secret_access_key = options[:secret_access_key]
-      @endpoint = options[:endpoint]
-      @http_proxy = options[:http_proxy]
+      @access_key_id = options[:access_key_id] || ENV['ACE_ACCESS_KEY_ID']
+      @secret_access_key = options[:secret_access_key] || ENV['ACE_SECRET_ACCESS_KEY']
+      @endpoint = options[:endpoint] || ENV['ACE_ENDPOINT']
+      @http_proxy = options[:http_proxy] || ENV['HTTP_PROXY']
       @http_method = options[:http_method] || :post
       @use_ssl = options[:use_ssl] || true
       @version = options[:version]

data/lib/ace-client/query2.rb

@@ -15,6 +15,8 @@ module AceClient
       super(options)
       @signature_method = options[:signature_method] || 'HmacSHA256'
       @sampler = options[:sampler]
+      @before_signature = options[:before_signature]
+      @before_request = options[:before_request]
     end
 
     def action(action, params={})
@@ -36,23 +38,26 @@ module AceClient
         'Timestamp' => Time.now.getutc.iso8601.sub(/Z/, sprintf(".%03dZ",(Time.now.getutc.usec/1000)))
       )
       @params['Version'] = @version if @version
+
+      @before_signature.call(@params) if @before_signature
+
       @params['Signature'] = create_signature
 
       options = self.class.default_options.dup
-      options.merge!(
-        :headers => {
-          'Content-Type' => 'application/x-www-form-urlencoded;charset=UTF-8'
-        },
-        :query => @params
-      )
+      options[:headers] = {}
+      options[:headers]['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
       options[:headers]['User-Agent'] = @user_agent if @user_agent
 
       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
@@ -65,7 +70,7 @@ module AceClient
     end
 
     def sample_request(request)
-      query = request.options[:query].dup
+      query = (request.options[:query] || request.options[:body]).dup
       variable_keys = %w(Version SignatureVersion SignatureMethod Timestamp AWSAccessKeyId Signature)
       variables = {}
       variable_keys.each do |key|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ace-client
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000Z
+date: 2013-11-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &135907300 !ruby/object:Gem::Requirement
+  requirement: &182806060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *135907300
+  version_requirements: *182806060
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &135906120 !ruby/object:Gem::Requirement
+  requirement: &182804780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *135906120
+  version_requirements: *182804780
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &135904500 !ruby/object:Gem::Requirement
+  requirement: &182803780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *135904500
+  version_requirements: *182803780
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &135903340 !ruby/object:Gem::Requirement
+  requirement: &182802740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.8.7
   type: :development
   prerelease: false
-  version_requirements: *135903340
+  version_requirements: *182802740
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &135900940 !ruby/object:Gem::Requirement
+  requirement: &182800860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *135900940
+  version_requirements: *182800860
 description: Simple ACE(Amazon Compatible Environment) Client
 email: tily05@gmail.com
 executables: []
@@ -101,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1694008381801661221
+      hash: -3654989663999187690
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: