named_return 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f252510b6986e02f0ef431ca08b045c722092bc
-  data.tar.gz: 91bf016d226be3a6ff5221212835c9e62fc39b1a
+  metadata.gz: f6f0e72a7eaef30e12c8bc5abfc11339f2732646
+  data.tar.gz: 190650a389ecfdedb126730708d1092bcb4fb774
 SHA512:
-  metadata.gz: ac5b138b9d6bb2e5f8e62348367273279a13ca3dbe89cc5defa8bd05577642a171be5bf33677950d18ceee9ee0f88f980d7165da04b741102f51366a36ccde88
-  data.tar.gz: 70659daf030d1dbec058b62d713cf5ed2e77ca2c0335c676c76af6c6f914f6d5f2fd500275a6f3b47ca1224fe9705763a8372a807eecf8c9182d0556c3a8396a
+  metadata.gz: b2f2ce6f93c641021bdadc3f9f6315c9fcc11a00599707d02d3e58e5cf5d72e33fecbf8765debd17f6c6f77fe6f709b620ee9785c54eb2984ba3b4f96fd50923
+  data.tar.gz: a904a67f9deff795abf69b863fb8c895fafa7d9eee9db054d5e3404a343c3a3cc83721854a39e3fbb2f4b1944700faa54ba2e064e6ebdc60e0098ef0ff47be5a

data/README.md

@@ -24,6 +24,10 @@ Or install it yourself as:
 
 TODO: Write usage instructions here
 
+## Thread Safety
+
+I've used this in an app that called methods simultaneously and [it blew up but then I fixed it so] it works, thus as far as I know it's threadsafe, yay!
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -32,7 +36,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/named_return.
+Bug reports and pull requests are welcome on GitHub at https://github.com/sfcgeorge/named_return.
 
 
 ## License

data/lib/named_return/proxy.rb

@@ -15,17 +15,18 @@ module NamedReturn
       return unless @wrap_method == true # not just truthy, true for reals
 
       @wrap_method = :overriding # this prevents infinite loops :P
-      wrapped_method = WrappedMethod.new meth, config
-      override_method(obj, wrapped_method, singleton)
+      override_method(obj, meth, singleton)
       @wrap_method = nil
     end
 
     private
 
-    def override_method(obj, wrapped, singleton)
+    def override_method(obj, meth, singleton)
       base = self
-      obj.send(:"define#{singleton}_method", wrapped.name) do |*args, &block|
-        wrapped.reset(self)
+      config = self.config
+      obj.send(:"define#{singleton}_method", meth.name) do |*args, &block|
+        # WrappedMethod.new needs to be here for thread safety
+        wrapped = WrappedMethod.new(meth, config, self)
         # skip the magic if test mode is on
         return wrapped.call_original(*args, &block) if base.config.test
 

data/lib/named_return/version.rb

@@ -1,3 +1,3 @@
 module NamedReturn
-  VERSION = "0.1.0".freeze
+  VERSION = "1.0.0".freeze
 end

data/lib/named_return/wrapped_method.rb

@@ -4,9 +4,12 @@ module NamedReturn
     attr_reader :config
 
     # Wrap a method with catch DSL and pass in config.
-    def initialize(method, config)
+    def initialize(method, config, bind)
       @method = method
       @config = config
+      @callbacks = {}
+      @response = {}
+      bind(bind)
     end
 
     # Get wrapped method name.
@@ -19,13 +22,6 @@ module NamedReturn
       @callbacks[label] = block
     end
 
-    # Prepare for next run.
-    def reset(bind)
-      @callbacks = {}
-      @response = {}
-      bind(bind)
-    end
-
     # Call the wrapped method with catches inserted by the DSL.
     def call(*args, &block)
       return_pair = recursive_catch(@callbacks.to_a, *args, &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: named_return
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Simon George
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler