reactor 0.11.2 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8252972581cc95bb4ac6cd93d5a99cc760c67b70
-  data.tar.gz: 8b95946e4f717c78d16ce36e5da4162cb3776fbe
+  metadata.gz: 6f2967da3845ee85524fe9c738839f0e6fdb29c7
+  data.tar.gz: c0ed7956ea7c152528db44ec1c898c47415d1cb5
 SHA512:
-  metadata.gz: 9e09bf4d0cb61913a73877f9b71066c9bc2571ae8d762acb9bd4fda882395f11ec796af4d938e46406aa745bafec05b00a8e49c283bc63ef0bf51b9afce3d29b
-  data.tar.gz: 1f2399204102e398cd463c761d382d9b4633d6bfcc8f4e82dbfcd7b9326f9527cd6a8504484775daae05d0d1dccd53e82d47fa89690c86111cfe1c22dba0b140
+  metadata.gz: a155ca4b6daf0250992a8e3a9a15f8b5a56ccab20a5e8c04ee80e26e19b234a4a9e486e5f6932bbb76226a7d3d3570235402a9eb9873175b0f4c398dc6788be7
+  data.tar.gz: 106ba452f9d9a2b2623157738f271f20afee7a6df280e4f9971a071ff572361e60fae79e414329076a0d4233bce55b8a9e9f2c77b21057f916be4f473ed9ab60

data/Changes.md

@@ -1,5 +1,9 @@
 # Reactor Change Log
 
+0.11.4
+-----------
+Fixes an issue related to class reloading in Rails development and test modes
+
 0.11.2
 -----------
 Safely handle bad UTF-8 encoded strings passed in as event arguments

data/Gemfile.lock

@@ -45,7 +45,7 @@ GEM
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
       rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.2)
+    rspec-core (3.4.4)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)

data/lib/reactor/models/concerns/subscribable.rb

@@ -4,18 +4,25 @@ module Reactor::Subscribable
   class EventHandlerAlreadyDefined < StandardError ; end
 
   module ClassMethods
+
     def on_event(*args, &block)
       options = args.extract_options!
       event, method = args
-      (Reactor::SUBSCRIBERS[event.to_s] ||= []).push(create_static_subscriber(event, method, options, &block))
+      if subscriber = create_static_subscriber(event, method, options, &block)
+        (Reactor::SUBSCRIBERS[event.to_s] ||= []).push(subscriber)
+      end
     end
 
     private
 
     def create_static_subscriber(event, method = nil, options = {}, &block)
       worker_class = build_worker_class
+      handler_name = handler_name(event, options[:handler_name])
+      check_for_duplicate_handler_name(handler_name)
 
-      name_worker_class worker_class, handler_name(event, options[:handler_name])
+      # return if the handler has already been defined (in the case of the class being reloaded)
+      return if static_subscriber_namespace.const_defined?(handler_name)
+      name_worker_class worker_class, handler_name
 
       worker_class.tap do |k|
         k.source = self
@@ -31,6 +38,10 @@ module Reactor::Subscribable
       "#{event == '*' ? 'Wildcard': event.to_s.camelize}Handler"
     end
 
+    def event_handler_names
+      @event_handler_names ||= []
+    end
+
     def build_worker_class
       Class.new do
         include Sidekiq::Worker
@@ -57,13 +68,17 @@ module Reactor::Subscribable
       end
     end
 
-    def name_worker_class(klass, handler_name)
-      if static_subscriber_namespace.const_defined?(handler_name)
+    def check_for_duplicate_handler_name(handler_name)
+      if event_handler_names.include?(handler_name)
         raise EventHandlerAlreadyDefined.new(
           "A Reactor event named #{handler_name} already has been defined on #{static_subscriber_namespace}.
            Specify a `:handler_name` option on your subscriber's `on_event` declaration to name this event handler deterministically."
         )
       end
+      event_handler_names << handler_name
+    end
+
+    def name_worker_class(klass, handler_name)
       static_subscriber_namespace.const_set(handler_name, klass)
     end
 

data/lib/reactor/version.rb

@@ -1,3 +1,3 @@
 module Reactor
-  VERSION = "0.11.2"
+  VERSION = "0.11.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reactor
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.4
 platform: ruby
 authors:
 - winfred
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq