request_headers_middleware 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 482bdde0e0b23e5af93e73940c52e48c51f2ccbd
-  data.tar.gz: 6d52bb7f30b71e12b55dc160d3b0687a2956c6d8
+SHA256:
+  metadata.gz: 09a7ee538f2104a6109fcfd70232ef743062878b772069fa78b71071386c35ef
+  data.tar.gz: d72c282ea9fced30d6dbd955af7bc8cd0a99760b4ee98802e802a030d0e28ce5
 SHA512:
-  metadata.gz: 7d26b9d1958e822e4fb4e45bf5fb8fa8f485586bbd01fba3e2c93987891fdfbd06bba9cb34ea96f3a94e10e2b8d1cf40f9cd83cb9df14c1547e9785e21981356
-  data.tar.gz: 105f929b62dab5f7dccc415a11bde7099bfdf28f82de17efb39a7be8b239ddcd6831dfcc8546fddfa7e4d6f7985b3de63eed601e4fb08106fac9082f716869e3
+  metadata.gz: 42cf2204c5c96fb519c86ef0517d93513cb2747b2dec87360ce5e86fdca807e1877d30f0901550df1fdd9eb2d1e7828db39a5904937dc03cbd66661f55d7a0d4
+  data.tar.gz: dbe3ea0a4d2855ced1bc7313a319eac57de0aa27f275b47c4371c0ba99d77b2be1b8b35577e4f39fbbac6e399f2d50f6ef530ebf54118f213be87e50e9d93297

data/Gemfile

@@ -6,5 +6,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :test, :development do
-  gem 'byebug'
+  gem 'byebug', '~> 9.0.6'
+  gem 'webmock', '~> 3.3.0'
 end

data/README.md

@@ -76,6 +76,13 @@ Faraday.new(
 ) 
 ```
 
+Or you can use middleware:
+```ruby
+connection = Faraday.new 'http://example.com/api' do |conn|
+  conn.use RequestHeadersMiddleware::FaradayAdapter
+end
+```
+
 ### JsonApiClient
 
 For a class extended from *JsonApiClient* it could work like this. Let's call the class *MyJsonApiClient*.
@@ -86,6 +93,15 @@ MyJsonApiClient.with_headers(RequestHeadersMiddleware.store) do
 end
 ```
 
+Another option is to use it globally for any request by using middleware:
+
+```ruby
+connection do |conn|
+  conn.use RequestHeadersMiddleware::FaradayAdapter
+end
+
+```
+
 ### Whitelist
 
 Per default the middleware applies a whitelist to only filter *X-Request-Id* header. Generally this is just as follows:

data/lib/request_headers_middleware.rb

@@ -2,6 +2,7 @@
 
 require 'request_headers_middleware/railtie' if defined?(Rails)
 require 'request_headers_middleware/middleware'
+require 'request_headers_middleware/faraday_adapter'
 
 module RequestHeadersMiddleware # :nodoc:
   extend self

data/lib/request_headers_middleware/faraday_adapter.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'faraday_middleware'
+
+module RequestHeadersMiddleware
+  class FaradayAdapter < Faraday::Middleware
+    def call(env)
+      env[:request_headers].merge! RequestHeadersMiddleware.store
+
+      @app.call(env)
+    end
+  end
+end

data/lib/request_headers_middleware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RequestHeadersMiddleware
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/request_headers_middleware.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.email         = ['marc.grimme@gmail.com']
   gem.description   = 'RequestHeader gives you per-req global header storage.'
   gem.summary       = 'RequestStore gives you per-reqt global header storage.'
-  gem.homepage      = 'http://github.com/marcgrimme/request_headers_middleware'
+  gem.homepage      = 'http://github.com/fidor/request_headers_middleware'
   gem.licenses      = ['MIT']
 
   gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
@@ -19,10 +19,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'request_store'
-  gem.add_development_dependency 'rack'
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'rubocop'
-  gem.add_development_dependency 'simplecov'
+  gem.add_dependency 'faraday_middleware', '~> 0.9'
+  gem.add_dependency 'request_store', '~> 1.4', '>= 1.4.0'
+  gem.add_development_dependency 'rack', '~> 1.6', '>= 1.6.5'
+  gem.add_development_dependency 'rake', '~> 12.0', '>= 12.0.0'
+  gem.add_development_dependency 'rspec', '~> 3.5', '>= 3.5.0'
+  gem.add_development_dependency 'rubocop', '~> 0.53.0'
+  gem.add_development_dependency 'simplecov', '~> 0.12.0'
 end

data/spec/request_headers_middleware/faraday_adapter.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'webmock/rspec'
+
+describe RequestHeadersMiddleware::FaradayAdapter do
+  context 'when MockRackApp called with a request' do
+    let(:app) { MockRackApp.new }
+    let(:env) do
+      Rack::MockRequest.env_for('/example')
+    end
+    subject { described_class.new(app) }
+
+    it 'merges current headers with RequestHeadersMiddleware.store' do
+      allow(RequestHeadersMiddleware).to receive(:store).and_return('X-Request-Id': '1234')
+      env[:request_headers] = { 'X-Test': '4321' }
+
+      subject.call(env)
+      expect(env[:request_headers]).to eq('X-Test': '4321', 'X-Request-Id': '1234')
+    end
+  end
+
+  context 'adapter is used as faraday middleware ' do
+    before do
+      stub_request(:get, /example.com/)
+
+      Faraday.default_connection = Faraday.new do |conn|
+        conn.request :url_encoded
+        conn.use RequestHeadersMiddleware::FaradayAdapter
+        conn.adapter Faraday.default_adapter
+      end
+    end
+
+    it 'merges current headers with RequestHeadersMiddleware.store' do
+      expect_any_instance_of(RequestHeadersMiddleware::FaradayAdapter).to receive(:call)
+
+      Faraday.get('http://example.com')
+    end
+  end
+end

metadata

@@ -1,99 +1,137 @@
 --- !ruby/object:Gem::Specification
 name: request_headers_middleware
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Marc Grimme
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2020-03-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.53.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.53.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
 description: RequestHeader gives you per-req global header storage.
 email:
 - marc.grimme@gmail.com
@@ -107,20 +145,21 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/travis
 - lib/request_headers_middleware.rb
+- lib/request_headers_middleware/faraday_adapter.rb
 - lib/request_headers_middleware/middleware.rb
 - lib/request_headers_middleware/railtie.rb
 - lib/request_headers_middleware/version.rb
 - request_headers_middleware.gemspec
+- spec/request_headers_middleware/faraday_adapter.rb
 - spec/request_headers_middleware_spec.rb
 - spec/spec_helper.rb
 - spec/support/mock_rack_app.rb
-homepage: http://github.com/marcgrimme/request_headers_middleware
+homepage: http://github.com/fidor/request_headers_middleware
 licenses:
 - MIT
 metadata: {}
@@ -140,11 +179,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: RequestStore gives you per-reqt global header storage.
 test_files:
+- spec/request_headers_middleware/faraday_adapter.rb
 - spec/request_headers_middleware_spec.rb
 - spec/spec_helper.rb
 - spec/support/mock_rack_app.rb

data/Gemfile.lock

@@ -1,65 +0,0 @@
-PATH
-  remote: .
-  specs:
-    request_headers_middleware (0.0.4)
-      request_store
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.0)
-    byebug (9.0.6)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    json (2.1.0)
-    parallel (1.12.1)
-    parser (2.5.0.2)
-      ast (~> 2.4.0)
-    powerpack (0.1.1)
-    rack (1.6.5)
-    rainbow (3.0.0)
-    rake (12.0.0)
-    request_store (1.4.0)
-      rack (>= 1.4)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    rubocop (0.53.0)
-      parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    simplecov (0.12.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    unicode-display_width (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  byebug
-  rack
-  rake
-  request_headers_middleware!
-  rspec
-  rubocop
-  simplecov
-
-BUNDLED WITH
-   1.16.1