circuitbox 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d76522a6fa77c9f707fdec676e5e1f85269f4f07
-  data.tar.gz: 6ec1f0e24a71c79422cd34aac919387950dafb98
+  metadata.gz: f75524d25326132f1bac120effbfa9b130f95bf1
+  data.tar.gz: ee8a589ff7b55ea95f5e5d119e7c30fe7be4e640
 SHA512:
-  metadata.gz: a981649408dcbd732c63cfa90793169427c43bbc4ef6e6dc4d45291a74fd95dbe44224ec096947d478fbd0d2e44e4e63bcc3362287f046cedf7110b3bb5ace85
-  data.tar.gz: 1c9e9ddc9419cb80e6a99fca710d4a314c7a615fe315df7201a6063147d00296b931d540a8185968cd715fe310df2c5f625474a784e5e2e60c34630ef521eb86
+  metadata.gz: 280e82433f43b428b48ee4e5a5a713da46deb723f8df9d886b3e2bf1e7eb922a119c367a706f66d82ee5d731090580773de06030f451ea40784ae544218e1953
+  data.tar.gz: 1b64ba171cfe40c0956ed38f94cc3e37c3e848a051cc987a2944b7578362ab5f51992757208dea50559cb5338d3fcff9c7fa2537ba9df047bfb05f1dabbc4038

data/README.md

@@ -218,9 +218,12 @@ use with Unicorn. It depends on the `daybreak` gem.
 
 ```ruby
 require "daybreak"
-Circuitbox.circuit :identifier, cache: Moneta.new(:Daybreak, file: "db.daybreak")
+Circuitbox.circuit :identifier, cache: Moneta.new(:Daybreak, file: "db.daybreak", expires: true)
 ```
 
+It is important for the store to have
+[expires](https://github.com/minad/moneta#backend-feature-matrix) support.
+
 ## Faraday
 
 Circuitbox ships with [Faraday HTTP client](https://github.com/lostisland/faraday) middleware.
@@ -297,6 +300,12 @@ c.use Circuitbox::FaradayMiddleware, open_circuit: lambda { |response| response.
 ## CHANGELOG
 ### version next
 
+### v1.0.3
+- fix timeout issue for default configuration, as default `:Memory` adapter does
+  not natively support expires, we need to actually load it on demand.
+- fix memoization of `circuit_breaker_options` not actually doing memoization in
+  `excon` and `faraday` middleware.
+
 ### v1.0.2
 - Fix timeout issue [#51](https://github.com/yammer/circuitbox/issues/51)
   [sebastian-juliu](https://github.com/sebastian-julius)

data/lib/circuitbox.rb

@@ -36,7 +36,7 @@ class Circuitbox
   end
 
   def self.circuit_store
-    self.instance.circuit_store ||= Moneta.new(:Memory)
+    self.instance.circuit_store ||= Moneta.new(:Memory, expires: true)
   end
 
   def self.circuit_store=(store)

data/lib/circuitbox/excon_middleware.rb

@@ -86,7 +86,7 @@ class Circuitbox
     end
 
     def circuit_breaker_options
-      return @circuit_breaker_options if @current_adapter
+      return @circuit_breaker_options if @circuit_breaker_options
 
       @circuit_breaker_options = opts.fetch(:circuit_breaker_options, {})
       @circuit_breaker_options.merge!(

data/lib/circuitbox/faraday_middleware.rb

@@ -63,7 +63,7 @@ class Circuitbox
     end
 
     def circuit_breaker_options
-      return @circuit_breaker_options if @current_adapter
+      return @circuit_breaker_options if @circuit_breaker_options
 
       @circuit_breaker_options = opts.fetch(:circuit_breaker_options, {})
       @circuit_breaker_options.merge!(

data/lib/circuitbox/version.rb

@@ -1,3 +1,3 @@
 class Circuitbox
-VERSION='1.0.2'
+VERSION='1.0.3'
 end

data/test/circuit_breaker_test.rb

@@ -151,55 +151,29 @@ class CircuitBreakerTest < Minitest::Test
   end
 
   describe 'closing the circuit after sleep' do
-    class GodTime < SimpleDelegator
-      def now
-        self
-      end
-
-      def initialize(now=nil)
-        @now = now || Time.now
-        super(@now)
-      end
-
-      def __getobj__
-        @now
-      end
-
-      def __setobj__(obj)
-        @now = obj
-      end
-
-      def jump(interval)
-        __setobj__ @now + interval
-      end
-    end
-
     def cb_options
       {
-        sleep_window:     70,
-        time_window:      60,
+        sleep_window:     1,
+        time_window:      2,
         volume_threshold: 5,
-        error_threshold:  33,
-        timeout_seconds:  1,
-        time_class: @timer
+        error_threshold:  5,
+        timeout_seconds:  1
       }
     end
 
     def setup
-      @timer   = GodTime.new
       @circuit = Circuitbox::CircuitBreaker.new(:yammer, cb_options)
     end
 
-
     it 'close the circuit after sleeping time' do
       # lets open the circuit
-      10.times { @circuit.run { raise RequestFailureError } }
+      (cb_options[:error_threshold] + 1).times { @circuit.run { raise RequestFailureError } }
       run_count = 0
       @circuit.run { run_count += 1 }
       assert_equal 0, run_count, 'circuit is not open'
+      # it is + 2 on purpose, because + 1 is flaky here
+      sleep cb_options[:sleep_window] + 2
 
-      @timer.jump(cb_options[:sleep_window] + 1)
-      @circuit.try_close_next_time
       @circuit.run { run_count += 1 }
       assert_equal 1, run_count, 'circuit is not closed'
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: circuitbox
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Fahim Ferdous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler