circuit_breakage 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d59c7f0387657741b8cdb896c9fbc9bdeb130c09
-  data.tar.gz: d54f9a2a8c87fbb41c6d47d17d89e8c603b28062
+  metadata.gz: d643902ba2ada91222c75da26be3426d55eb5db4
+  data.tar.gz: f8f3a7c49ec02514e4bd54d54f401c9d257e6430
 SHA512:
-  metadata.gz: 36fd7a9668294099a94db646b5337bfa006ac50211113a357b2c37ad6b8be0b2007264e66a342280880630dcae20df289fcbada91f729eb96b2989cd3a5fe8fd
-  data.tar.gz: 3624cd0493809f40458e82d64aeef20ff3d55be24063eff796ae339896ba0a0ef24c2b2b8c1c1058ef50c043ff07725405beddb673490cbfa0834d3975ff505d
+  metadata.gz: b539db6b88213831b37ec97b00c317b088a87558130c6f2533a2360bae3b3e9b1139a3725be313e88c46f27b4eba55fb9b49c23efe5604a17694c5d2690a587f
+  data.tar.gz: 78ab5583212c28a9368168cc4425c96b6ccf44b2afe5bfa791aa93846bbff3bb130ed942d4ee919c6f6d47fd64fc547ec040816cd7e31189578b6fcee49ea797

data/lib/circuit_breakage/breaker.rb

@@ -21,7 +21,7 @@ module CircuitBreakage
       self.duration           = DEFAULT_DURATION
       self.timeout            = DEFAULT_TIMEOUT
       self.failure_count      ||= 0
-      self.last_failed        ||= Time.at(0)
+      self.last_failed        ||= 0
       self.state              ||= 'closed'
     end
 
@@ -58,7 +58,7 @@ module CircuitBreakage
     end
 
     def time_to_retry?
-      Time.now >= self.last_failed + self.duration
+      Time.now.to_i >= self.last_failed + self.duration
     end
 
     def handle_success
@@ -67,7 +67,7 @@ module CircuitBreakage
     end
 
     def handle_failure(error)
-      self.last_failed = Time.now
+      self.last_failed = Time.now.to_i
       self.failure_count += 1
       if self.failure_count >= self.failure_threshold
         self.state = 'open'

data/lib/circuit_breakage/redis_backed_breaker.rb

@@ -17,16 +17,28 @@ module CircuitBreakage
       super(block)
     end
 
-    [:state, :failure_count, :last_failed].each do |attr|
-      attr_key = "#{@key}/attrs/#{attr}"
+    def state
+      @connection.get("#{@key}/attrs/state")
+    end
 
-      define_method(attr) do
-        @connection.get(attr_key)
-      end
+    def state=(value)
+      @connection.set("#{@key}/attrs/state", value)
+    end
 
-      define_method("#{attr}=") do |value|
-        @connection.set(attr_key, value)
-      end
+    def failure_count
+      @connection.get("#{@key}/attrs/failure_count").to_i
+    end
+
+    def failure_count=(value)
+      @connection.set("#{@key}/attrs/failure_count", value)
+    end
+
+    def last_failed
+      @connection.get("#{@key}/attrs/last_failed").to_i
+    end
+
+    def last_failed=(value)
+      @connection.set("#{@key}/attrs/last_failed", value)
     end
 
     private

data/lib/circuit_breakage/version.rb

@@ -1,3 +1,3 @@
 module CircuitBreakage
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/breaker_spec.rb

@@ -64,7 +64,7 @@ module CircuitBreakage
         before { breaker.state = 'open' }
 
         context 'before the retry_time' do
-          before { breaker.last_failed = Time.now - breaker.duration + 30 }
+          before { breaker.last_failed = Time.now.to_i - breaker.duration + 30 }
 
           it 'raises CircuitBreakage::CircuitOpen' do
             expect { breaker.call(arg) }.to raise_error(CircuitOpen)
@@ -72,7 +72,7 @@ module CircuitBreakage
         end
 
         context 'after the retry time' do
-          before { breaker.last_failed = Time.now - breaker.duration - 30 }
+          before { breaker.last_failed = Time.now.to_i - breaker.duration - 30 }
 
           it 'calls the block' do
             expect(breaker.call(arg)).to eq arg

data/spec/redis_backed_breaker_spec.rb

@@ -30,7 +30,7 @@ module CircuitBreakage
         context 'and the call fails' do
           let(:block) { ->(_) { raise 'some error' } }
 
-          it { is_expected.to change { breaker.failure_count }.by(1) }
+          it { is_expected.to change { breaker.failure_count.to_i }.by(1) }
           it { is_expected.to change { breaker.last_failed } }
 
           context 'and the failure count exceeds the failure threshold' do
@@ -45,7 +45,7 @@ module CircuitBreakage
           before { breaker.timeout = 0.1 }
 
           it 'counts as a failure' do
-            expect { breaker.call(arg) rescue nil }.to change { breaker.failure_count }.by(1)
+            expect { breaker.call(arg) rescue nil }.to change { breaker.failure_count.to_i }.by(1)
           end
         end
       end
@@ -54,7 +54,7 @@ module CircuitBreakage
         before { breaker.state = 'open' }
 
         context 'before the retry_time' do
-          before { breaker.last_failed = Time.now - breaker.duration + 30 }
+          before { breaker.last_failed = Time.now.to_i - breaker.duration + 30 }
 
           it 'raises CircuitBreakage::CircuitOpen' do
             expect { breaker.call(arg) }.to raise_error(CircuitOpen)
@@ -63,7 +63,7 @@ module CircuitBreakage
 
         context 'after the retry time' do
           it 'calls the block' do
-            breaker.last_failed = Time.at(0)
+            breaker.last_failed = 0
             expect(breaker.call(arg)).to eq arg
           end
 
@@ -83,7 +83,8 @@ class MockRedis
   end
 
   def get(key)
-    @stored_data[key]
+    # Redis get() always returns values as strings.
+    @stored_data[key].to_s
   end
 
   def set(key, val)
@@ -100,8 +101,8 @@ class MockRedis
   end
 
   def getset(key, val)
-    old_val = @stored_data[key]
-    @stored_data[key] = val
+    old_val = get(key)
+    set(key, val)
     return old_val
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: circuit_breakage
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - John Hyland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,3 +116,4 @@ test_files:
 - spec/breaker_spec.rb
 - spec/redis_backed_breaker_spec.rb
 - spec/spec_helper.rb
+has_rdoc: