faraday_middleware-aws-sigv4 0.2.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5261b18d9aa30fdf39be58b9c030156590629001
-  data.tar.gz: 7e8879d43e869b8a7c72b869601d3265d9a3f0ab
+SHA256:
+  metadata.gz: d0e5eb23ca6df3387ac50a4917e304311f606276c96fbab4aa0a8e8946ed97c4
+  data.tar.gz: 326b17872f5fe6d1127533eec5a46af0f2c5d5918485be48bfaf6c53ed198328
 SHA512:
-  metadata.gz: fde65a4dbb4c7f1099b08262db7d699757e4b77bf13c5e028bcd1671b974f978c7a3da5d6bcb045aafe3d94343b9d085b10e8bc757ca78574180352bd72b0858
-  data.tar.gz: 9a5f8f306279fb1ee07b4ef29d214bc77ad8b07d38b0df5d9d0609fbd8eb8a93b609956d93d5c1af9defd611babc0489fc3a4303fef451299d619bf8c631a106
+  metadata.gz: 7cb0cc83b9b82920b26106ebc2039684c17679161ef97c93a65c01a72bcf54daa9d510cc0d0d7e40fbb6888db28dcd1a4a62b6c3defc9823b4889aba75088570
+  data.tar.gz: c5165646f89f56de6b3c653112d6f71bcdb60cf63dcc1949de6fb9ec905bd9858c32c552564ecc916cde03479ee7f01f63890bbd883276fc6dedc9e8a2a7f3af

data/.github/workflows/test.yml

@@ -0,0 +1,50 @@
+name: test
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - 2.4
+          - 2.5
+          - 2.6
+          - 2.7
+        gemfile:
+          - gemfiles/faraday_0.15.gemfile
+          - gemfiles/faraday_0.16.gemfile
+          - gemfiles/faraday_0.17.gemfile
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - uses: actions/cache@v2
+        with:
+          path: gemfiles/vendor/bundle
+          key: ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ matrix.gemfile }}-${{ hashFiles('faraday_middleware-aws-sigv4.gemspec', '**/Gemfile', '${{ matrix.gemfile }}') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ matrix.gemfile }}-
+
+      - name: Setup dependencies
+        run: |
+          bundle config path vendor/bundle
+          bundle install
+        env:
+          BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+
+      - name: Run tests
+        run: ${{ matrix.env }} bundle exec rake
+        env:
+          BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+
+      - name: Coveralls GitHub Action
+        uses: coverallsapp/github-action@v1.1.2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

data/.gitignore

@@ -8,6 +8,7 @@
 /spec/reports/
 /tmp/
 test.rb
+/gemfiles/*.lock
 
 # rspec failure tracking
 .rspec_status

data/.simplecov

@@ -0,0 +1,4 @@
+SimpleCov.start do
+  # exclude directories and files
+  add_filter "/spec/"
+end

data/Appraisals

@@ -0,0 +1,15 @@
+appraise 'faraday-0.15' do
+  gem 'faraday', '~> 0.15.0'
+end
+
+appraise 'faraday-0.16' do
+  gem 'faraday', '~> 0.16.0'
+end
+
+appraise 'faraday-0.17' do
+  gem 'faraday', '~> 0.17.0'
+end
+
+appraise 'faraday-1.0' do
+  gem 'faraday', '~> 1.0.0'
+end

data/README.md

@@ -3,9 +3,15 @@
 [Faraday](https://github.com/lostisland/faraday) middleware for AWS Signature Version 4 using [aws-sigv4](https://rubygems.org/gems/aws-sigv4).
 
 [![Gem Version](https://badge.fury.io/rb/faraday_middleware-aws-sigv4.svg)](https://badge.fury.io/rb/faraday_middleware-aws-sigv4)
-[![Build Status](https://travis-ci.org/winebarrel/faraday_middleware-aws-sigv4.svg?branch=master)](https://travis-ci.org/winebarrel/faraday_middleware-aws-sigv4)
+![test](https://github.com/winebarrel/faraday_middleware-aws-sigv4/workflows/test/badge.svg)
 [![Coverage Status](https://coveralls.io/repos/github/winebarrel/faraday_middleware-aws-sigv4/badge.svg?branch=master)](https://coveralls.io/github/winebarrel/faraday_middleware-aws-sigv4?branch=master)
 
+* `faraday_middleware-aws-sigv4 < 0.3.0`
+  * `faraday < 0.15`
+* `faraday_middleware-aws-sigv4 >= 0.3.0`
+  * `ruby >= 2.3`
+  * `faraday >= 0.15`
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -25,7 +31,8 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-# `gem install faraday_middleware` is required.
+# `gem install faraday_middleware` is required for this example.
+# However, FaradayMiddleware::AwsSigV4 works without faraday_middleware.
 require 'faraday_middleware'
 require 'faraday_middleware/aws_sigv4'
 require 'pp'
@@ -38,7 +45,10 @@ conn = Faraday.new(url: 'https://apigateway.us-east-1.amazonaws.com') do |farada
     secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
   # see http://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/Sigv4/Signer.html
 
-  faraday.response :json, :content_type => /\bjson\b/
+  # NOTE: The following middleware is from `faraday_middleware`
+  # cf. https://github.com/lostisland/faraday_middleware/blob/master/lib/faraday_middleware.rb
+  # **It is not an essential middleware to work.**
+  faraday.response :json, content_type: /\bjson\b/
   faraday.response :raise_error
 
   faraday.adapter Faraday.default_adapter
@@ -58,7 +68,18 @@ pp res.body
 #    "throttleSettings"=>{"rateLimit"=>10000.0, "burstLimit"=>5000}}
 ```
 
+## Upgrading from `faraday_middleware-aws-signers-v4`
+
+If you previously provided the `service_name` option, you need to rename it `service`
+
+## Test
+
+```sh
+bundle install
+bundle exec appraisal install
+bundle exec appraisal faraday-0.16 rake
+```
+
 ## Related Links
 
 * http://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/Sigv4/Signer.html
-* https://github.com/winebarrel/faraday_middleware-aws-signers-v4 (aws-sdk-v2 version)

data/faraday_middleware-aws-sigv4.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'faraday_middleware-aws-sigv4'
-  spec.version       = '0.2.2'
+  spec.version       = '0.4.0'
   spec.authors       = ['Genki Sugawara']
   spec.email         = ['sugawara@cookpad.com']
 
@@ -20,7 +20,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'faraday', '~> 0.13'
+  spec.required_ruby_version = '>= 2.3'
+
+  spec.add_dependency 'faraday', '>= 0.15'
   spec.add_dependency 'aws-sigv4', '~> 1.0'
 
   spec.add_development_dependency 'faraday_middleware'
@@ -28,6 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'timecop'
-  spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'aws-sdk-core', '~> 3.0'
+  spec.add_development_dependency 'aws-sdk-core', '~> 3.14.0'
+  spec.add_development_dependency 'appraisal', '>= 2.2'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'simplecov-lcov'
 end

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/faraday_0.15.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "faraday", "~> 0.15.0"
+
+gemspec path: "../"

data/gemfiles/faraday_0.16.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "faraday", "~> 0.16.0"
+
+gemspec path: "../"

data/gemfiles/faraday_0.17.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "faraday", "~> 0.17.0"
+
+gemspec path: "../"

data/gemfiles/faraday_1.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "faraday", "~> 1.0.0"
+
+gemspec path: "../"

data/lib/faraday_middleware/request/aws_sigv4.rb

@@ -18,14 +18,12 @@ class FaradayMiddleware::AwsSigV4 < Faraday::Middleware
   private
 
   def sign!(env)
-    if net_http_adapter?
-      normalize_for_net_http!(env)
-    end
-
     request = build_aws_sigv4_request(env)
     signature = @signer.sign_request(request)
 
-    env.request_headers.update(signature.headers)
+    signature.headers.each do |name, value|
+      env.request_headers[name] = value
+    end
   end
 
   def build_aws_sigv4_request(env)
@@ -36,8 +34,4 @@ class FaradayMiddleware::AwsSigV4 < Faraday::Middleware
       body: env.body,
     }
   end
-
-  def net_http_adapter?
-    @app.is_a?(Faraday::Adapter::NetHttp)
-  end
 end

data/lib/faraday_middleware/request/aws_sigv4_util.rb

@@ -1,13 +1,4 @@
 module FaradayMiddleware::AwsSigV4Util
-  def normalize_for_net_http!(env)
-    if Net::HTTP::HAVE_ZLIB
-      env.request_headers['Accept-Encoding'] ||= 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3'
-    end
-
-    env.request_headers['Accept'] ||= '*/*'
-    env
-  end
-
   def seahorse_encode_query(url)
     return url unless url.query
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: faraday_middleware-aws-sigv4
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: aws-sigv4
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: aws-sdk-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.14.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.14.0
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,19 +151,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-core
+  name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: Faraday middleware for AWS Signature Version 4 using aws-sigv4.
 email:
 - sugawara@cookpad.com
@@ -143,9 +171,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".simplecov"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -153,6 +183,11 @@ files:
 - bin/console
 - bin/setup
 - faraday_middleware-aws-sigv4.gemspec
+- gemfiles/.bundle/config
+- gemfiles/faraday_0.15.gemfile
+- gemfiles/faraday_0.16.gemfile
+- gemfiles/faraday_0.17.gemfile
+- gemfiles/faraday_1.0.gemfile
 - lib/faraday_middleware/aws_sigv4.rb
 - lib/faraday_middleware/request/aws_sigv4.rb
 - lib/faraday_middleware/request/aws_sigv4_util.rb
@@ -168,15 +203,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Faraday middleware for AWS Signature Version 4 using aws-sigv4.

data/.travis.yml

@@ -1,8 +0,0 @@
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.2.6
-  - 2.3.4
-  - 2.4.1
-before_install: gem install bundler -v 1.14.3