resilient 0.4.0.beta1 → 0.4.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d58c0c8c5444d5e583d6667644d2309fd1d76c75
-  data.tar.gz: 92b729571e650001c424eac22b707eabb5f02806
+  metadata.gz: 61b08291053b49bf75e2b32eef05a5ab4fe4b4f2
+  data.tar.gz: fbf4f792be70a627f6c71b587a3efc30f7ff9527
 SHA512:
-  metadata.gz: de26fd92ca043468781a0cc18544d8904a37da9170c86f347141519e07e36304f005be212618f3dd909e379e3f694b638be480a483107a2ef9627440c70153d8
-  data.tar.gz: 149eba99b8f5d6e3310d0ee4933d4b3ea23cdbee945730a74f4d3189665a6432fda514b1a40a43e7eb51f89c1cc16bc0368642e8e37850ad26724c18be8cd151
+  metadata.gz: 9ddd1cb3aa4018a638df2cb1c6b4fa75fe3b69e78b0d927f5aee0c7e5d0be9f3a217b65d11c2929420c1ef68ac77da8c824bcce7b8e57e283398bd853994ccb7
+  data.tar.gz: b60e16a13ae90cba9a2a76e779d50ff3167d069c98fd4cf717cd4141751d7119ce50bec1bf697b1666949ada4cfda4538c7fef87ac20b6b9449588da53838daf

data/README.md

@@ -84,12 +84,14 @@ circuit_breaker = Resilient::CircuitBreaker.get("example", {
 
 ## Tests
 
-To ensure that you have a clean circuit for each test case, be sure to run the following in the setup for your tests (which resets each registered circuit breaker) either before every test case or at a minimum each test case that uses circuit breakers.
+To ensure that you have clean circuit breakers for each test case, be sure to run the following in the setup for your tests (which resets the default registry and thus clears all the registered circuits) either before every test case or at a minimum each test case that uses circuit breakers.
 
 ```ruby
-Resilient::CircuitBreaker.reset
+Resilient::CircuitBreaker::Registry.reset
 ```
 
+**Note**: If you use a non-default registry, you'll need to reset that on your own. If you don't know what I'm talking about, you are fine.
+
 ## Development
 
 ```bash

data/lib/resilient/circuit_breaker.rb

@@ -5,13 +5,6 @@ require "resilient/circuit_breaker/registry"
 
 module Resilient
   class CircuitBreaker
-    # Public: Resets all registered circuit breakers (and thus their state/metrics).
-    # Useful for ensuring a clean environment between tests. If you are using a
-    # registry other than the default, you will need to handle resets on your own.
-    def self.reset
-      Registry.default.reset
-    end
-
     # 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

data/lib/resilient/circuit_breaker/registry.rb

@@ -11,11 +11,19 @@ module Resilient
         @default = value
       end
 
+      # Public: Reset the default registry. This completely wipes all instances
+      # by swapping out the default registry for a new one and letting the old
+      # one get GC'd. Useful in tests to get a completely clean slate.
+      def self.reset
+        default.reset
+      end
+
       def initialize(source = nil)
         @source = source || {}
       end
 
-      # Setup default to new instance.
+      # Setup new instance as default. Needs to be after initialize so hash gets
+      # initialize correctly.
       @default = new
 
       # Internal: To be used by CircuitBreaker to either get an instance for a
@@ -38,7 +46,7 @@ module Resilient
       # breakers, which should only really be used for cleaning up in
       # test environment.
       def reset
-        @source.each_value(&:reset)
+        @source = {}
         nil
       end
     end

data/lib/resilient/test/circuit_breaker_registry_interface.rb

@@ -20,18 +20,17 @@ module Resilient
       end
 
       def test_reset
-        bar_value = Minitest::Mock.new
-        wick_value = Minitest::Mock.new
-        bar_value.expect :reset, nil, []
-        wick_value.expect :reset, nil, []
-
-        @object.fetch("foo") { bar_value }
-        @object.fetch("baz") { wick_value }
+        original_foo = @object.fetch("foo") { Object.new }
+        original_bar = @object.fetch("bar") { Object.new }
 
         assert_nil @object.reset
 
-        bar_value.verify
-        wick_value.verify
+        foo = @object.fetch("foo") { Object.new }
+        bar = @object.fetch("bar") { Object.new }
+
+        # assert that the objects before and after reset are not the same object
+        refute original_foo.equal?(foo)
+        refute original_bar.equal?(bar)
       end
 
       def test_reset_empty_registry

data/lib/resilient/version.rb

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

metadata

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