awis-sdk-ruby 0.1.0 → 0.1.1

data/README.md

@@ -19,7 +19,10 @@ Awis.config do |c|
   c.access_key_id = AWIS_CONFIG['access_key_id']
   c.secret_access_key = AWIS_CONFIG['secret_access_key']
   c.debug = AWIS_CONFIG['debug']
-  c.protocol = 'https'
+  c.protocol = 'https'    # Default 'https'
+  c.timeout = 5           # Default 5
+  c.open_timeout = 5      # Default 2
+  c.logger = false        # Default nil
 end
 ```
 

data/lib/awis/api/base.rb

@@ -34,7 +34,7 @@ module Awis
       def load_request_uri(params)
         collection = Awis::Connection.new
         collection.setup_params(params)
-        collection.uri
+        collection.request_url
       end
 
       def before_validation_arguments(arguments)

data/lib/awis/config.rb

@@ -3,13 +3,13 @@ require "singleton"
 module Awis
   class Config
     include Singleton
-    attr_accessor :access_key_id, :secret_access_key, :proxy, :debug, :protocol
+    attr_accessor :access_key_id, :secret_access_key, :proxy, :debug, :protocol,
+                  :timeout, :open_timeout, :logger
   end
 
   def self.config
-    if block_given?
-      yield Config.instance
-    end
+    yield Config.instance if block_given?
+
     Config.instance
   end
 end

data/lib/awis/connection.rb

@@ -13,8 +13,14 @@ module Awis
     def initialize
       raise CertificateError.new("Amazon access certificate is missing!") if Awis.config.access_key_id.nil? || Awis.config.secret_access_key.nil?
 
-      @debug = Awis.config.debug || false
-      @protocol = Awis.config.protocol || 'https'
+      setup_options!
+    end
+
+    def setup_options!
+      @debug        = Awis.config.debug || false
+      @protocol     = Awis.config.protocol || 'https'
+      @timeout      = Awis.config.timeout || 5
+      @open_timeout = Awis.config.open_timeout || 2
     end
 
     def params
@@ -49,13 +55,23 @@ module Awis
     end
 
     def request
-      showing_request_uri
+      connection = Faraday.new(url: host_with_port) do |faraday|
+        faraday.request  :url_encoded             # form-encode POST params
+        faraday.response :logger do |logger|
+          logger.filter(/(AWSAccessKeyId=)(\w+)/, '\1[REMOVED]')
+        end if Awis.config.logger
+        faraday.adapter  :net_http
+      end
 
-      Faraday.get(uri)
+      connection.get do |req|
+        req.url url_params
+        req.options.open_timeout = @timeout
+        req.options.timeout = @open_timeout
+      end
     end
 
-    def showing_request_uri
-      puts "[DEBUG] -> #{uri}" if debug
+    def host_with_port
+      protocol + '://' + Awis::API_HOST
     end
 
     def timestamp
@@ -66,8 +82,12 @@ module Awis
       Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest.new("sha256"), Awis.config.secret_access_key, sign)).strip
     end
 
-    def uri
-      URI.parse("#{protocol}://#{Awis::API_HOST}/?" + query_params + "&Signature=" + CGI::escape(signature))
+    def url_params
+      '?' + original_params
+    end
+
+    def request_url
+      URI.parse(host_with_port + url_params)
     end
 
     def default_params
@@ -87,5 +107,9 @@ module Awis
     def query_params
       default_params.merge(params).map { |key, value| "#{key}=#{CGI::escape(value.to_s)}" }.sort.join("&")
     end
+
+    def original_params
+      query_params + "&Signature=" + CGI::escape(signature)
+    end
   end
 end

data/lib/awis/version.rb

@@ -1,3 +1,3 @@
 module Awis
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awis-sdk-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2693191246107031408
+      hash: 862568070736027421
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23