faraday_middleware-aws-signers-v4 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b03901381f827e2c229ace22d97a1f875d4f9e6
-  data.tar.gz: 1ae6a545ace1c81005359eaeff6b19fb74437b25
+  metadata.gz: 4e3a9bbb3bb93756e5c618ba9638f60e606f6bc6
+  data.tar.gz: 2ce7743f98050c5dad4dc57e900743d2137b5935
 SHA512:
-  metadata.gz: b6c9418fd4a22dcf156344de1f0aecd86e69f166358a2f8e3a1f17850337f8b90bc39752517fe9d47f8b36f6c733309486d77afe18b72f71d4f05f268d861208
-  data.tar.gz: 1d6a77f6b3aeeee0003d700a0b8e5cdb647ed14a8dddb6d41510ad0c21d6356db45ea786e6677c4d424129cdbb908d8e172ec00e83e528506dd32d23abc7a3fb
+  metadata.gz: e18b946dfcc1b4d5858282549e9c009148fdf111509ec3b72a52d1d75bf70d3bf000197b32046cec8fedec2d94b2a1ca1318797c83798ceb41baf7db458bfeb1
+  data.tar.gz: d1dd306d49c26656c86e0f42874958fd14ed951511846afa710a813de4d3682ac2f602115ec7880e4fcc01862cc7b4f5fe255503d33c82d224f9786f7924485a

data/faraday_middleware-aws-signers-v4.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = 'faraday_middleware-aws-signers-v4'
-  spec.version       = '0.1.3'
+  spec.version       = '0.1.4'
   spec.authors       = ['Genki Sugawara']
   spec.email         = ['sgwr_dts@yahoo.co.jp']
 

data/lib/faraday_middleware/ext/uri_ext.rb

@@ -0,0 +1,25 @@
+require 'uri'
+require 'aws-sdk'
+
+module URI
+  def self.seahorse_encode_www_form(params)
+    params.map {|key, value|
+      encoded_key = encode_www_form_component(key)
+
+      if value.nil?
+        encoded_key
+      elsif value.respond_to?(:to_ary)
+        value.to_ary.map {|v|
+          if v.nil?
+            # bug?
+            #encoded_key
+          else
+            encoded_key + '=' + Seahorse::Util.uri_escape(v)
+          end
+        }.join('&')
+      else
+        encoded_key + '=' + Seahorse::Util.uri_escape(value)
+      end
+    }.join('&')
+  end
+end

data/lib/faraday_middleware/request/aws_signers_v4.rb

@@ -1,3 +1,4 @@
+require 'faraday_middleware/ext/uri_ext'
 require 'faraday_middleware/aws_signers_v4_ext'
 
 class FaradayMiddleware::AwsSignersV4 < Faraday::Middleware
@@ -32,13 +33,13 @@ class FaradayMiddleware::AwsSignersV4 < Faraday::Middleware
     private
 
     def re_escape_query!(url)
-      unescaped = CGI.unescape(url.query)
+      params = URI.decode_www_form(url.query)
 
-      if unescaped =~ / /
-        url.query = Seahorse::Util.uri_escape(unescaped)
+      if params.any? {|k, v| v =~ / / }
+        url.query = URI.seahorse_encode_www_form(params)
       end
     end
-  end
+  end # of class Request
 
   def initialize(app, options = nil)
     super(app)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday_middleware-aws-signers-v4
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Genki Sugawara
@@ -141,6 +141,7 @@ files:
 - faraday_middleware-aws-signers-v4.gemspec
 - lib/faraday_middleware/aws_signers_v4.rb
 - lib/faraday_middleware/aws_signers_v4_ext.rb
+- lib/faraday_middleware/ext/uri_ext.rb
 - lib/faraday_middleware/request/aws_signers_v4.rb
 homepage: https://github.com/winebarrel/faraday_middleware-aws-signers-v4
 licenses: