breaker 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e96a4a527f8764f01191e363daf25d59bcfc44a1
-  data.tar.gz: 9707df9e63bbdce0166b471beab29456f67c5c6b
+  metadata.gz: 2a4311ad34e8bbc2fcca6687abcf024fefc4261a
+  data.tar.gz: c77e65d65615794de6ecce5b6a3a0c52b70381d8
 SHA512:
-  metadata.gz: 43cb66bf520aa9d6abd763b274b195a2a64387215c7c31799430f576a742f602dc8ac466edd3b88bcb948d37ade1b5a0f9ac98559ae2673afa9dc1358f4e1dbc
-  data.tar.gz: 4436478a597986c372c032ac72bf0dea6977a2b34b27cfc294113746f6bb6ef4bdf1d454c47d90a794364c57d1421c172b25a218a1e1ae86345bc4a3ebdc0715
+  metadata.gz: 4a9d766120aaffe57c111b316e883376885a825ca698f38f280893afe97c9497aecf964b26b1e7025c79c4b236198bc3656bc5f08ab46ececbc92d43f97cc820
+  data.tar.gz: f05c282d99e9a8dd5153300233a6c1ee9e37f8d4ab2ec80f0daee4baa55f46d8aec2d484cbe63eac6f74c987e0787054add600ed7c9b73115b22d04678b525e2

data/lib/breaker.rb

@@ -50,7 +50,6 @@ module Breaker
     end
 
     def open(clock = Time.now)
-      fuse.failure_count = 1
       fuse.state = :open
       fuse.retry_threshold = clock + retry_timeout
     end
@@ -105,9 +104,8 @@ module Breaker
           result
         rescue => ex
           fuse.failure_count = fuse.failure_count + 1
-          fuse.retry_threshold = clock + retry_timeout
 
-          open clock
+          open clock if tripped?
 
           raise ex
         end
@@ -118,7 +116,7 @@ module Breaker
 
     private
     def tripped?
-      fuse.failure_count != 0
+      fuse.failure_count > fuse.failure_threshold
     end
 
     def half_open?(clock)

data/lib/breaker/test_cases.rb

@@ -18,10 +18,21 @@ module Breaker
     end
 
     def test_goes_into_open_state_when_failure_threshold_reached
-      circuit = Breaker.circuit 'test', failure_threshold: 1, retry_timeout: 30
+      circuit = Breaker.circuit 'test', failure_threshold: 5, retry_timeout: 30
 
       assert circuit.closed?
 
+      circuit.failure_threshold.times do
+        begin
+          circuit.run do
+            raise DummyError
+          end
+        rescue DummyError ; end
+      end
+
+      assert_equal circuit.failure_count, circuit.failure_threshold
+      refute circuit.open?
+
       assert_raises DummyError do
         circuit.run do
           raise DummyError
@@ -29,6 +40,7 @@ module Breaker
       end
 
       assert circuit.open?
+
       assert_raises Breaker::CircuitOpenError do
         circuit.run do
           assert false, "Block should not run in this state"
@@ -40,12 +52,19 @@ module Breaker
       clock = Time.now
       circuit = Breaker.circuit 'test', failure_threshold: 2, retry_timeout: 15
 
-      circuit.open clock
+      (circuit.failure_threshold + 1).times do
+        begin
+          circuit.run clock do
+            raise DummyError
+          end
+        rescue DummyError ; end
+      end
+
       assert circuit.open?
 
       assert_raises Breaker::CircuitOpenError do
         circuit.run clock do
-           # nothing
+          # nothing
         end
       end
 
@@ -58,9 +77,16 @@ module Breaker
 
     def test_failures_in_half_open_state_push_retry_timeout_back
       clock = Time.now
-      circuit = Breaker.circuit 'test', failure_threshold: 2, retry_timeout: 15
+      circuit = Breaker.circuit 'test', failure_threshold: 1, retry_timeout: 15
+
+      (circuit.failure_threshold + 1).times do
+        begin
+          circuit.run clock do
+            raise DummyError
+          end
+        rescue DummyError ; end
+      end
 
-      circuit.open clock
       assert circuit.open?
 
       assert_raises DummyError do

data/lib/breaker/version.rb

@@ -1,3 +1,3 @@
 module Breaker
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/acceptance_test.rb

@@ -10,7 +10,7 @@ class AcceptanceTest < MiniTest::Unit::TestCase
 
   def setup
     @repo = Breaker::InMemoryRepo.new
-    @fuse = InMemoryFuse.new :closed, 0, nil, 3, 15, 10
+    @fuse = InMemoryFuse.new :closed, 0, 1, 3, 15, 10
     super
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: breaker
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - ahawkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler