semian 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0532f143d15332f8eecabff2391ed1c76ce8eb91
-  data.tar.gz: c2ea379d573f6aa1c8deb9424e58dee11e2a5aac
+  metadata.gz: 2297213cb021d0958a8826c46536af57862e7582
+  data.tar.gz: cd2683b720caa4b4e5dfe2e8db5a774b822f13ca
 SHA512:
-  metadata.gz: 82b383f6258ffd5a781f7cdd02f240ac09c9a9614939e6ddb4f9c0a10cae937c496297ea304f65f55f4849371f3a379f781c5e970b99d6031d8286b420a31d11
-  data.tar.gz: 13a138c9f5e63f07ea20bb317e7af3e561cad52a8a00545305c0cd73aa72ec4620eccd5917da49e9f4d0abf62db06f6bb48bd47a55c1074034b731524f6914d7
+  metadata.gz: cb26790fd5481ada268ae712f500ccbf52df6b39bb05634d913811c8fe55d75d1e5cd2523157386dca701b154dfacc6f48a233215bccef3485ffed52ab8c9974
+  data.tar.gz: 1d193bb017105f5d4c5aaa7f4872034997f564d9bd8a863fccc285f7b9e94fe6465a917101161e43dfee0383dccc1157d83fc0054479526ecb8a288bcab55e60

data/lib/semian/circuit_breaker.rb

@@ -2,6 +2,8 @@ module Semian
   class CircuitBreaker #:nodoc:
     extend Forwardable
 
+    def_delegators :@state, :closed?, :open?, :half_open?
+
     def initialize(name, exceptions:, success_threshold:, error_threshold:, error_timeout:, implementation:)
       @name = name.to_sym
       @success_count_threshold = success_threshold
@@ -15,6 +17,8 @@ module Semian
     end
 
     def acquire
+      half_open if open? && error_timeout_expired?
+
       raise OpenCircuitError unless request_allowed?
 
       result = nil
@@ -30,9 +34,10 @@ module Semian
     end
 
     def request_allowed?
-      return true if closed?
-      half_open if error_timeout_expired?
-      !open?
+      closed? ||
+        half_open? ||
+        # The circuit breaker is officially open, but it will transition to half-open on the next attempt.
+        (open? && error_timeout_expired?)
     end
 
     def mark_failed(_error)
@@ -64,9 +69,6 @@ module Semian
 
     private
 
-    def_delegators :@state, :closed?, :open?, :half_open?
-    private :closed?, :open?, :half_open?
-
     def close
       log_state_transition(:closed)
       @state.close

data/lib/semian/protected_resource.rb

@@ -3,7 +3,8 @@ module Semian
     extend Forwardable
 
     def_delegators :@resource, :destroy, :count, :semid, :tickets, :name
-    def_delegators :@circuit_breaker, :reset, :mark_failed, :mark_success, :request_allowed?
+    def_delegators :@circuit_breaker, :reset, :mark_failed, :mark_success, :request_allowed?,
+                   :open?, :closed?, :half_open?
 
     def initialize(resource, circuit_breaker)
       @resource = resource

data/lib/semian/unprotected_resource.rb

@@ -30,6 +30,18 @@ module Semian
     def reset
     end
 
+    def open?
+      false
+    end
+
+    def closed?
+      true
+    end
+
+    def half_open?
+      false
+    end
+
     def request_allowed?
       true
     end

data/lib/semian/version.rb

@@ -1,3 +1,3 @@
 module Semian
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/test/circuit_breaker_test.rb

@@ -86,6 +86,18 @@ class TestCircuitBreaker < Minitest::Test
     Semian.destroy(:three)
   end
 
+  def test_request_allowed_query_doesnt_trigger_transitions
+    Timecop.travel(Time.now - 6) do
+      open_circuit!
+
+      refute_predicate @resource, :request_allowed?
+      assert_predicate @resource, :open?
+    end
+
+    assert_predicate @resource, :request_allowed?
+    assert_predicate @resource, :open?
+  end
+
   private
 
   def open_circuit!(resource = @resource)

data/test/net_http_test.rb

@@ -11,7 +11,7 @@ class TestNetHTTP < Minitest::Test
     end
   end
 
-  HOSTNAME = "localhost"
+  HOSTNAME = "127.0.0.1"
   PORT = 31_050
   TOXIC_PORT = PORT + 1
   DEFAULT_SEMIAN_OPTIONS = {
@@ -346,7 +346,7 @@ class TestNetHTTP < Minitest::Test
       with_server(addresses: ["#{HOSTNAME}:#{PORT + 100}"], reset_semian_state: false) do |hostname, port|
         with_toxic(hostname: hostname, upstream_port: port, toxic_port: port + 1) do |_|
           assert_raises Net::CircuitOpenError do
-            Net::HTTP.get(URI("http://localhost:#{port + 1}/200"))
+            Net::HTTP.get(URI("http://#{HOSTNAME}:#{port + 1}/200"))
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semian
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Scott Francis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Bulkheading for Ruby with SysV semaphores