sf6 0.2 → 0.3

data/lib/sf6.rb

@@ -3,53 +3,61 @@ module SF6
   class Unavailable < StandardError
   end
 
-  def self.stamp(data, attr, bucket)
-    timestamp = Time.now.to_i / bucket
-    data[:counts][attr] = 0 unless data[:timestamps][attr] == timestamp
-    timestamp
-  end
-
-  def self.increment(data, attr, timestamp)
-    data[:timestamps][attr] = timestamp
-    data[:counts][attr] += 1
-  end
+  module Base
 
-  def self.test(data, attr, value, &blk)
-    if value == 0 || data[:counts][attr] < value
-      yield
-    else
-      raise(Unavailable, attr)
+    def reset!(attr)
+      data[:timestamps][attr] = 0
+      data[:counts][attr] = 0
     end
-  end
 
-  module Limiter
+    private
 
-    def self.data
+    def data
       @data ||= {:counts => Hash.new(0), :timestamps => Hash.new(0)}
     end
 
-    def self.check(attr, value, bucket, &blk)
-      timestamp = SF6.stamp(data, attr, bucket)
-      SF6.increment(data, attr, timestamp)
-      SF6.test(data, attr, value) do
+    def stamp(attr, bucket)
+      timestamp = Time.now.to_i / bucket
+      data[:counts][attr] = 0 unless data[:timestamps][attr] == timestamp
+      timestamp
+    end
+
+    def increment(attr, timestamp)
+      data[:timestamps][attr] = timestamp
+      data[:counts][attr] += 1
+    end
+
+    def test(attr, value, &blk)
+      if value == 0 || data[:counts][attr] < value
         yield
+      else
+        raise(Unavailable, attr)
       end
     end
   end
 
-  module Breaker
+  module Limiter
+    extend Base
 
-    def self.data
-      @data ||= {:counts => Hash.new(0), :timestamps => Hash.new(0)}
+    def self.check(attr, value, bucket, &blk)
+      timestamp = stamp(attr, bucket)
+      increment(attr, timestamp)
+      test(attr, value) do
+        yield
+      end
     end
+  end
+
+  module Breaker
+    extend Base
 
     def self.check(attr, value, bucket, &blk)
-      timestamp = SF6.stamp(data, attr, bucket)
-      SF6.test(data, attr, value) do
+      timestamp = stamp(attr, bucket)
+      test(attr, value) do
         begin
           yield
         rescue => e
-          SF6.increment(data, attr, timestamp)
+          increment(attr, timestamp)
           raise
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sf6
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies: []
 description: Circuit breaker, Rate limiter.
 email: mark.fine@gmail.com