resilient 0.4.0.beta2 → 0.4.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61b08291053b49bf75e2b32eef05a5ab4fe4b4f2
-  data.tar.gz: fbf4f792be70a627f6c71b587a3efc30f7ff9527
+  metadata.gz: 17c72fc869fd44e4732ac9f438a8303489ca6bed
+  data.tar.gz: 1dcf39dc5da88e0a4d2c62d9d506118e2d807773
 SHA512:
-  metadata.gz: 9ddd1cb3aa4018a638df2cb1c6b4fa75fe3b69e78b0d927f5aee0c7e5d0be9f3a217b65d11c2929420c1ef68ac77da8c824bcce7b8e57e283398bd853994ccb7
-  data.tar.gz: b60e16a13ae90cba9a2a76e779d50ff3167d069c98fd4cf717cd4141751d7119ce50bec1bf697b1666949ada4cfda4538c7fef87ac20b6b9449588da53838daf
+  metadata.gz: cc8a77ebfedd6e9e46d1d12055c989583c1bf9274b646d3d6df4cd85f5095a8c9de72af980fbcdc0e9556c141095a47e71defaf84540ffefbb245b17484eb40a
+  data.tar.gz: 93efab2978a8e1562d835af261a362172ec708a1f211d22faf0bf78acea3f89d2f2020b4ecf45a760ae90a57c2d4ec81da360026afa67abbcdaa9530582f9be3

data/lib/resilient/circuit_breaker.rb

@@ -2,20 +2,23 @@ require "resilient/key"
 require "resilient/circuit_breaker/metrics"
 require "resilient/circuit_breaker/properties"
 require "resilient/circuit_breaker/registry"
+require "forwardable"
 
 module Resilient
   class CircuitBreaker
+    extend Forwardable
+
     # Public: Returns an instance of circuit breaker based on key and registry.
     # Default registry is used if none is provided. If key does not exist, it is
     # registered. If key does exist, it returns registered instance instead of
     # allocating a new instance in order to ensure that state/metrics are the
     # same per key.
     #
-    #  See #initialize for docs on key, properties and metrics.
-    def self.get(key, properties = nil, metrics = nil, registry = nil)
+    #  See #initialize for docs on key and properties.
+    def self.get(key, properties = nil, registry = nil)
       key = Key.wrap(key)
       (registry || Registry.default).fetch(key) {
-        new(key, properties, metrics)
+        new(key, properties)
       }
     end
 
@@ -26,10 +29,11 @@ module Resilient
       end
     end
 
+    def_delegator :@properties, :metrics
+
     attr_reader :key
     attr_reader :open
     attr_reader :opened_or_last_checked_at_epoch
-    attr_reader :metrics
     attr_reader :properties
 
     # Private: Builds new instance of a CircuitBreaker.
@@ -41,32 +45,14 @@ module Resilient
     #               circuit breaker should behave. Optional. Defaults to new
     #               Resilient::CircuitBreaker::Properties instance.
     #
-    #  metrics - The object that stores successes and failures. Optional.
-    #            Defaults to new Resilient::CircuitBreaker::Metrics instance
-    #            based on window size and bucket size properties.
-    #
     # Returns CircuitBreaker instance.
-    def initialize(key, properties = nil, metrics = nil)
+    def initialize(key, properties = nil)
       raise ArgumentError, "key argument is required" if key.nil?
 
       @key = Key.wrap(key)
+      @properties = Properties.wrap(properties)
       @open = false
       @opened_or_last_checked_at_epoch = 0
-
-      @properties = if properties
-        Properties.wrap(properties)
-      else
-        Properties.new
-      end
-
-      @metrics = if metrics
-        metrics
-      else
-        Metrics.new({
-          window_size_in_seconds: @properties.window_size_in_seconds,
-          bucket_size_in_seconds: @properties.bucket_size_in_seconds,
-        })
-      end
     end
 
     def allow_request?
@@ -95,7 +81,7 @@ module Resilient
           payload[:closed_the_circuit] = true
           close_circuit
         else
-          @metrics.success
+          metrics.success
         end
         nil
       }
@@ -103,7 +89,7 @@ module Resilient
 
     def failure
       instrument("resilient.circuit_breaker.failure", key: @key) { |payload|
-        @metrics.failure
+        metrics.failure
         nil
       }
     end
@@ -112,7 +98,7 @@ module Resilient
       instrument("resilient.circuit_breaker.reset", key: @key) { |payload|
         @open = false
         @opened_or_last_checked_at_epoch = 0
-        @metrics.reset
+        metrics.reset
         nil
       }
     end
@@ -127,15 +113,15 @@ module Resilient
     def close_circuit
       @open = false
       @opened_or_last_checked_at_epoch = 0
-      @metrics.reset
+      metrics.reset
     end
 
     def under_request_volume_threshold?
-      @metrics.requests < @properties.request_volume_threshold
+      metrics.requests < @properties.request_volume_threshold
     end
 
     def under_error_threshold_percentage?
-      @metrics.error_percentage < @properties.error_threshold_percentage
+      metrics.error_percentage < @properties.error_threshold_percentage
     end
 
     def open?

data/lib/resilient/circuit_breaker/properties.rb

@@ -12,6 +12,8 @@ module Resilient
           hash_or_instance
         when Hash
           new(hash_or_instance)
+        when NilClass
+          new
         else
           raise TypeError, "properties must be Hash or Resilient::Properties instance"
         end
@@ -45,6 +47,9 @@ module Resilient
       # size of buckets in statistical window
       attr_reader :bucket_size_in_seconds
 
+      # metrics instance used to keep track of success and failure
+      attr_reader :metrics
+
       def initialize(options = {})
         @force_open = options.fetch(:force_open, false)
         @force_closed = options.fetch(:force_closed, false)
@@ -64,6 +69,13 @@ module Resilient
             "window_size_in_seconds must be perfectly divisible by" +
             " bucket_size_in_seconds in order to evenly partition the buckets"
         end
+
+        @metrics = options.fetch(:metrics) {
+          Metrics.new({
+            window_size_in_seconds: @window_size_in_seconds,
+            bucket_size_in_seconds: @bucket_size_in_seconds,
+          })
+        }
       end
     end
   end

data/lib/resilient/version.rb

@@ -1,3 +1,3 @@
 module Resilient
-  VERSION = "0.4.0.beta2"
+  VERSION = "0.4.0.beta3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resilient
 version: !ruby/object:Gem::Version
-  version: 0.4.0.beta2
+  version: 0.4.0.beta3
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler