routemaster-drain 3.6.8 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 431caa4e0158fa1ac795d6feeaa81b96c8e2fe4e
-  data.tar.gz: cceb454d55e593655e39131e7f127a7592101368
+SHA256:
+  metadata.gz: 5244ce30cabc9ab7a8f13fdf327af90c8a4d30647a6bbf7b2c6630e2fd12ac21
+  data.tar.gz: 82671161ef1be99d85dd6d837754ed881e42a3accd9c170d53e32a2593a104ef
 SHA512:
-  metadata.gz: f6b4be9f06e085159e29bf2b53bbf171acb04fece4f740482cb28915545788ef77bd94290d85e024fac0b96d1183c5e54e95a0a27ba6496725ea06e119d6c127
-  data.tar.gz: 677d45ad6541d7301132e90f2e9516131d2c0559ddda86c61b9c2c4270a405202974f26096030fe082019331e3ce786767d64aa6f7d13d5a34b9a30745e8c2dd
+  metadata.gz: 6153b90031a758fd8bb7fd7edb08667b03df8e2441019c2087add39e9cfdaa9f0e9185a00b578a76dbc4fd82f294a4a354af0464ee57f4022f6427935d364e6d
+  data.tar.gz: bd25a70ee7ef6f238820b6873eaedbdab70274026050b1b65943118500c8678a7c20c04cdd4f6ba0fec8d07894e885e40cc829d6ef909ad705c3d8e846ac78ce

data/.circleci/config.yml

@@ -3,10 +3,9 @@
 
 version: 2
 jobs:
-
   build_2.5_rails_5:
     docker:
-      - image: circleci/ruby:2.4.1
+      - image: circleci/ruby:2.7.4
       - image: redis:3-alpine
     steps:
       - checkout
@@ -19,9 +18,9 @@ jobs:
 
       - restore_cache:
           keys: 
-            - v2-bundle-2.5.0-rails_5-{{ .Branch }}
-            - v2-bundle-2.5.0-rails_5
-            - v2-bundle-2.5.0
+            - v3-bundle-2.5.0-rails_5-{{ .Branch }}
+            - v3-bundle-2.5.0-rails_5
+            - v3-bundle-2.5.0
 
       - run: 
           name: Install dependencies
@@ -36,22 +35,65 @@ jobs:
             bundle exec rspec
 
       - save_cache:
-          key: v2-bundle-2.5.0-rails_5-{{ .Branch }}
+          key: v3-bundle-2.5.0-rails_5-{{ .Branch }}
           paths:
             - ~/project/vendor/bundle
       - save_cache:
-          key: v2-bundle-2.5.0-rails_5
+          key: v3-bundle-2.5.0-rails_5
           paths:
             - ~/project/vendor/bundle
       - save_cache:
-          key: v2-bundle-2.5.0
+          key: v3-bundle-2.5.0
           paths:
             - ~/project/vendor/bundle
 
+  build_2.7_rails_6:
+    docker:
+      - image: circleci/ruby:2.7.4
+      - image: redis:6-alpine
+    steps:
+      - checkout
+
+      - run:
+          name: Install bundler
+          command: |
+            gem install bundler -v '~> 2' ;
+            bundle config --local gemfile $PWD/gemfiles/rails_6.gemfile
+
+      - restore_cache:
+          keys: 
+            - bundle-2.7.4-rails_6-{{ .Branch }}
+            - bundle-2.7.4-rails_6
+            - bundle-2.7.4
+
+      - run: 
+          name: Install dependencies
+          command: |
+            bundle install --jobs=3 --retry=3 --path=$PWD/vendor/bundle
+
+      - run:
+          name: Run test suite
+          command: |
+            unset RACK_ENV &&
+            unset RAILS_ENV &&
+            bundle exec rspec
+
+      - save_cache:
+          key: bundle-2.7.4-rails_6-{{ .Branch }}
+          paths:
+            - ~/project/vendor/bundle
+      - save_cache:
+          key: bundle-2.7.4-rails_6
+          paths:
+            - ~/project/vendor/bundle
+      - save_cache:
+          key: bundle-2.7.4
+          paths:
+            - ~/project/vendor/bundle
 
 workflows:
   version: 2
   test:
     jobs:
       - build_2.5_rails_5
-    
+      - build_2.7_rails_6

data/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 _A description of your awesome changes here!_
 
+### 3.7.1
+
+Features:
+
+- Add ruby 3 compability
+
+Bug fixes:
+
+- Explictly set sidekiq gem version
+- Update circleci base image
+- Remove `require 'faraday/request/retry'` dependency since its deprecated in faraday `1.10.3`.
+
+### 3.7.0
+
+Features:
+
+- Adds circuit breaker to PATCH PUT POST requests (#66)
+
 ### 3.6.8
 
 Features:

data/Gemfile

@@ -15,7 +15,7 @@ gem 'dotenv',                     require: false
 gem 'simplecov',                  require: false
 gem 'codecov',                    require: false
 gem 'resque',                     require: false
-gem 'sidekiq',                    require: false
+gem 'sidekiq', '~> 5.2.10',       require: false
 
 gem 'guard-rspec',                require: false
 gem 'pry',                        require: false

data/gemfiles/rails_4.gemfile

@@ -11,7 +11,7 @@ gem "dotenv", :require => false
 gem "simplecov", :require => false
 gem "codecov", :require => false
 gem "resque", :require => false
-gem "sidekiq", :require => false
+gem "sidekiq", '~> 5.2.10', :require => false
 gem "guard-rspec", :require => false
 gem "pry", :require => false
 gem "byebug", :require => false

data/gemfiles/rails_5.gemfile

@@ -11,7 +11,7 @@ gem "dotenv", :require => false
 gem "simplecov", :require => false
 gem "codecov", :require => false
 gem "resque", :require => false
-gem "sidekiq", :require => false
+gem "sidekiq", '~> 5.2.10', :require => false
 gem "guard-rspec", :require => false
 gem "pry", :require => false
 gem "byebug", :require => false

data/gemfiles/rails_6.gemfile

@@ -0,0 +1,24 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "psych", :require => false
+gem "bundler", :require => false
+gem "rake", :require => false
+gem "webmock", :require => false
+gem "rack-test", :require => false
+gem "dotenv", :require => false
+gem "simplecov", :require => false
+gem "codecov", :require => false
+gem "resque", :require => false
+gem "sidekiq", '~> 5.2.10', :require => false
+gem "guard-rspec", :require => false
+gem "pry", :require => false
+gem "byebug", :require => false
+gem "rspec", :require => false
+gem "appraisal", :require => false
+gem "dogstatsd", :require => false
+gem "fork_break", :require => false
+gem "rails", "~> 6.0"
+
+gemspec :path => "../"

data/lib/routemaster/api_client.rb

@@ -22,7 +22,6 @@ require 'typhoeus/adapters/faraday'
 # prevents Faraday's magic class loading pixie dust from tripping over itself in
 # multithreaded use cases.
 require 'uri'
-require 'faraday/request/retry'
 require 'faraday_middleware/request/encode_json'
 require 'faraday_middleware/response/parse_json'
 require 'faraday_middleware/response/mashify'
@@ -73,7 +72,7 @@ module Routemaster
     # Same as {{get}}, except with
     def fget(url, **options)
       uri = _assert_uri(url)
-      Responses::ResponsePromise.new { get(uri, options) }
+      Responses::ResponsePromise.new { get(uri, **options) }
     end
 
     def patch(url, body: {}, headers: {})
@@ -99,11 +98,13 @@ module Routemaster
     private
 
     def patch_post_or_put(type, url, body, headers)
-      _wrapped_response _request(
-        type,
-        url: url,
-        body: body,
-        headers: headers)
+      APIClientCircuit.new(url).call do
+        _wrapped_response _request(
+          type,
+          url: url,
+          body: body,
+          headers: headers)
+      end
     end
 
     def _assert_uri(url)

data/lib/routemaster/api_client_circuit.rb

@@ -25,7 +25,6 @@ module Routemaster
       ENV.fetch('ROUTEMASTER_ENABLE_API_CLIENT_CIRCUIT', 'NO') =~ /\A(YES|TRUE|ON|1)\Z/i
     end
 
-
     def circuit
       Circuitbox.circuit(@circuit_name, {
         sleep_window: configuration_setting(@circuit_name, 'ROUTEMASTER_CIRCUIT_BREAKER_SLEEP_WINDOW', 60).to_i,

data/lib/routemaster/drain.rb

@@ -1,5 +1,5 @@
 module Routemaster
   module Drain
-    VERSION = '3.6.8'.freeze
+    VERSION = '3.7.1'.freeze
   end
 end

data/spec/core_ext/forwardable_spec.rb

@@ -1,17 +1,19 @@
 require 'core_ext/forwardable'
 
-describe Forwardable do
-  class Foo
-    extend Forwardable
+if RUBY_VERSION == '2.4.0'
+  describe Forwardable do
+    class Foo
+      extend Forwardable
 
-    def initialize
-      @bar = :bar
-    end
+      def initialize
+        @bar = :bar
+      end
 
-    def_delegator :@bar, :to_s, :qux
-  end
+      def_delegator :@bar, :to_s, :qux
+    end
 
-  it 'expect delegation to work' do
-    expect(Foo.new.qux).to eq 'bar'
+    it 'expect delegation to work' do
+      expect(Foo.new.qux).to eq 'bar'
+    end
   end
 end

data/spec/routemaster/api_client_circuit_spec.rb

@@ -12,7 +12,10 @@ describe Routemaster::APIClientCircuit do
   context "when enabled" do
     before do
       sb_req
-      allow_any_instance_of(described_class).to receive(:enabled?){ true }
+      allow(ENV).to receive(:fetch).and_call_original
+      allow(ENV)
+        .to receive(:fetch)
+        .with('ROUTEMASTER_ENABLE_API_CLIENT_CIRCUIT', 'NO').and_return('YES')
     end
 
     let(:url){ 'http://example.com/foobar' }

data/spec/routemaster/api_client_spec.rb

@@ -109,10 +109,38 @@ describe Routemaster::APIClient do
     end
   end
 
+  shared_examples 'a circuit breaker wrapped request' do
+    let(:fetcher) { described_class.new(retry_attempts: 0) }
+    let(:url)     { 'https://circuit.example.com/circuit/132' }
+    let(:method)  { :get }
+
+    before do
+      allow(ENV).to receive(:fetch).and_call_original
+      allow(ENV)
+        .to receive(:fetch)
+        .with('ROUTEMASTER_ENABLE_API_CLIENT_CIRCUIT', 'NO').and_return('YES')
+      allow(ENV)
+        .to receive(:fetch)
+        .with('ROUTEMASTER_CIRCUIT_BREAKER_ERROR_THRESHOLD', 50).and_return('1')
+      allow(ENV)
+        .to receive(:fetch)
+        .with('ROUTEMASTER_CIRCUIT_BREAKER_VOLUME_THRESHOLD', 50).and_return('1')
+
+      stub_request(method, url).to_timeout
+    end
+
+    it 'trips after the second request' do
+      5.times { expect { subject }.to raise_error StandardError }
+      expect(a_request(method, url)).to have_been_made.at_most_times(2)
+    end
+  end
+
   describe '#get' do
     subject { fetcher.get(url, headers: headers) }
+
     it_behaves_like 'a GET requester'
     it_behaves_like 'a wrappable response'
+    it_behaves_like 'a circuit breaker wrapped request'
   end
 
   describe '#fget' do
@@ -183,6 +211,9 @@ describe Routemaster::APIClient do
     end
 
     it_behaves_like 'a wrappable response'
+    it_behaves_like 'a circuit breaker wrapped request' do
+      let(:method) { :post }
+    end
   end
 
   describe '#put' do
@@ -206,6 +237,9 @@ describe Routemaster::APIClient do
       end
 
       it_behaves_like 'a wrappable response'
+      it_behaves_like 'a circuit breaker wrapped request' do
+        let(:method) { :put }
+      end
     end
 
     context 'when request times out' do
@@ -282,6 +316,9 @@ describe Routemaster::APIClient do
       end
 
       it_behaves_like 'a wrappable response'
+      it_behaves_like 'a circuit breaker wrapped request' do
+        let(:method) { :patch }
+      end
     end
 
     context 'when request times out' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: routemaster-drain
 version: !ruby/object:Gem::Version
-  version: 3.6.8
+  version: 3.7.1
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2023-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -193,6 +193,7 @@ files:
 - gemfiles/rails_3.gemfile
 - gemfiles/rails_4.gemfile
 - gemfiles/rails_5.gemfile
+- gemfiles/rails_6.gemfile
 - lib/core_ext/forwardable.rb
 - lib/routemaster/api_client.rb
 - lib/routemaster/api_client_circuit.rb
@@ -300,8 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Event receiver for the Routemaster bus