awis-sdk-ruby 1.0.0 → 1.1.0

data/lib/awis/utils/extra.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Awis
   module Utils
     module Extra
       def camelize(string)
-        string.split("_").map { |w| w.capitalize }.join
+        string.split('_').map(&:capitalize).join
       end
 
       module_function :camelize

data/lib/awis/utils/hash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Hash
   def deep_find(key, object = self, found = nil)
     return object[key] if object.respond_to?(:key?) && object.key?(key)

data/lib/awis/utils/variable.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Awis
   module Utils
     module Variable
       def custom_instance_variables(options)
         options.each do |key, value|
-          value = (value.class == String && value.empty?) ? nil : value
+          value = value.class == String && value.empty? ? nil : value
 
           instance_variable_set("@#{key}", value)
         end

data/lib/awis/utils/xml.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awis
   module Utils
     class XML
@@ -11,7 +13,7 @@ module Awis
 
         reader.each do |node|
           if node.node_type == Nokogiri::XML::Reader::TYPE_ELEMENT
-            if attributes_in_path && node.attributes.size > 0
+            if attributes_in_path && !node.attributes.empty?
               attributes = []
 
               node.attributes.sort.each do |name, value|

data/lib/awis/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Awis
-  VERSION = "1.0.0"
+  VERSION = '1.1.0'
 end

metadata

@@ -1,110 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: awis-sdk-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Encore Shao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-26 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: aws-sigv4
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby - Amazon Alexa Web Information Service Library (AWIS)
@@ -114,8 +129,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -146,35 +162,30 @@ files:
 - lib/awis/utils.rb
 - lib/awis/utils/extra.rb
 - lib/awis/utils/hash.rb
-- lib/awis/utils/request.rb
 - lib/awis/utils/variable.rb
 - lib/awis/utils/xml.rb
 - lib/awis/version.rb
 homepage: https://github.com/encoreshao/amazon-awis
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1995395337547775
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.6.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby - Amazon Alexa Web Information Service Library (AWIS)
 test_files: []

data/lib/awis/utils/request.rb

@@ -1,153 +0,0 @@
-require "cgi"
-require "base64"
-require "openssl"
-require "uri"
-require "net/https"
-require "time"
-require 'pry'
-
-module Awis
-  module Utils
-    module Request
-      def signature_key(key, date_stamp, region_name, service_name)
-        kDate    = openssl_hmac_digest(encryption_method, aws4 + key, date_stamp)
-        kRegion  = openssl_hmac_digest(encryption_method, kDate, region_name)
-        kService = openssl_hmac_digest(encryption_method, kRegion, service_name)
-        kSigning = openssl_hmac_digest(encryption_method, kService, aws4_request)
-        kSigning
-      end
-
-      # escape str to RFC 3986
-      def escapeRFC3986(str)
-        URI.escape(str, /[^A-Za-z0-9\-_.~]/)
-      end
-
-      def timestamp
-        Time::now.utc.strftime("%Y%m%dT%H%M%SZ")
-      end
-
-      def datestamp
-        Time::now.utc.strftime("%Y%m%d")
-      end
-
-      def headers
-        {
-          "host"        => Awis::SERVICE_ENDPOINT,
-          "x-amz-date"  => timestamp
-        }
-      end
-
-      def query_str
-        params.sort.map{|k,v| k + "=" + escapeRFC3986(v.to_s())}.join('&')
-      end
-
-      def headers_str
-        headers.sort.map{|k,v| k + ":" + v}.join("\n") + "\n"
-      end
-
-      def headers_lst
-        headers.sort.map{|k,v| k}.join(";")
-      end
-
-      def payload_hash
-        digest_sha256_hexdigest ""
-      end
-
-      def canonical_request
-        "GET" + "\n" + Awis::SERVICE_URI + "\n" + query_str + "\n" + headers_str + "\n" + headers_lst + "\n" + payload_hash
-      end
-
-      def algorithm
-        "AWS4-HMAC-SHA256"
-      end
-
-      def credential_scope
-        datestamp + "/" + Awis::SERVICE_REGION + "/" + Awis::SERVICE_NAME + "/" + aws4_request
-      end
-
-      def string_to_sign
-        algorithm + "\n" +  timestamp + "\n" +  credential_scope + "\n" + digest_sha256_hexdigest(canonical_request)
-      end
-
-      def signing_key
-        signature_key(Awis.config.secret_access_key, datestamp, Awis::SERVICE_REGION, Awis::SERVICE_NAME)
-      end
-
-      def signature
-        OpenSSL::HMAC.hexdigest(encryption_method, signing_key, string_to_sign)
-      end
-
-      def authorization_header
-        algorithm + " " +
-          "Credential=" + Awis.config.access_key_id + "/" + credential_scope + ", " +
-          "SignedHeaders=" + headers_lst + ", " +
-          "Signature=" + signature;
-      end
-
-      def uri
-        URI(url + url_params)
-      end
-
-      def request
-        req = Net::HTTP::Get.new(uri.to_s)
-        req["Accept"]         = "application/xml"
-        req["Content-Type"]   = "application/xml"
-        req["x-amz-date"]     = timestamp
-        req["Authorization"]  = authorization_header
-
-        response = Net::HTTP.start(uri.host, uri.port,
-          use_ssl: uri.scheme == 'https',
-          ssl_timeout: @timeout,
-          open_timeout: @open_timeout) { |http|
-          http.request(req)
-        }
-
-        response
-      end
-
-      def handle_response(response)
-        case response.code.to_i
-        when 200...300
-          response
-        when 300...600
-          if response.body.nil?
-            raise ResponseError.new(nil, response)
-          else
-            error_message = MultiXml.parse(response.body).deep_find('ErrorCode')
-            raise ResponseError.new(error_message, response)
-          end
-        else
-          raise ResponseError.new("Unknown code: #{respnse.code}", response)
-        end
-      end
-
-      def aws4
-        "AWS4"
-      end
-
-      def aws4_request
-        "aws4_request"
-      end
-
-      def encryption_method
-        'sha256'
-      end
-
-      def url
-        protocol + '://' + Awis::SERVICE_HOST + Awis::SERVICE_URI
-      end
-
-      def url_params
-        '?' + query_str
-      end
-
-      def openssl_hmac_digest(method, key, secret)
-        OpenSSL::HMAC.digest(method, key, secret)
-      end
-
-      def digest_sha256_hexdigest(key)
-        Digest::SHA256.hexdigest key
-      end
-    end
-  end
-end