reactor 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6dee2f6b8acebcf4c7d68e0fc81397a04902535
-  data.tar.gz: e5ec764bc828e954889aca4cb8c53ff378a04a46
+  metadata.gz: e406cf4fa1d19fae39e7bfc19d2088d8e3975bda
+  data.tar.gz: 0ea82c5d9076c52f985ea09df8f4acade6b23f57
 SHA512:
-  metadata.gz: ec7723313e82c0ce3c745e778b36c985ee0d9d4f81e8e39ee5464cc7accf865bbedbfc5d35374850b8bc599d53075f5ccab99ff168c50c0bb198e0086ced227b
-  data.tar.gz: fdf059680229b3521218b72ae4f88d26fb04aee49659da3780c050db455ca0ea28197334279a47cf2d921ffa1ab400fc4d0eab6b7ca6612c5000dea938890d25
+  metadata.gz: a9cbffeb2aef6cf566d8721bbf556cf6d404e791a8e0572f610d60613b8e4881f5bd51e7ff7aef13343c14a0756399f2bbae31d7cad11356abaf99c3c1a3fde8
+  data.tar.gz: b9d02b1842161c50f6c084a1777cd2117469fef70a4bd926fdb7e8fcaee76d3a1e99fee11e0040d93184256293bf402709fe239f8f456494f0919137502cb1ed

data/Gemfile.lock

@@ -1,33 +1,76 @@
 PATH
   remote: .
   specs:
-    reactor (0.13.0)
-      activerecord (~> 5.0.1)
+    reactor (0.14.0)
+      rails (~> 5.0.2)
       sidekiq
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.0.1)
-      activesupport (= 5.0.1)
-    activerecord (5.0.1)
-      activemodel (= 5.0.1)
-      activesupport (= 5.0.1)
+    actioncable (5.0.2)
+      actionpack (= 5.0.2)
+      nio4r (>= 1.2, < 3.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.2)
+      actionpack (= 5.0.2)
+      actionview (= 5.0.2)
+      activejob (= 5.0.2)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.2)
+      actionview (= 5.0.2)
+      activesupport (= 5.0.2)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.2)
+      activesupport (= 5.0.2)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.0.2)
+      activesupport (= 5.0.2)
+      globalid (>= 0.3.6)
+    activemodel (5.0.2)
+      activesupport (= 5.0.2)
+    activerecord (5.0.2)
+      activemodel (= 5.0.2)
+      activesupport (= 5.0.2)
       arel (~> 7.0)
-    activesupport (5.0.1)
+    activesupport (5.0.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (7.1.4)
+    builder (3.2.3)
     byebug (9.0.6)
     coderay (1.1.1)
-    concurrent-ruby (1.0.4)
+    concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
     diff-lcs (1.3)
-    i18n (0.7.0)
+    docile (1.1.5)
+    erubis (2.7.0)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
+    i18n (0.8.1)
+    json (2.0.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.5)
+      mime-types (>= 1.16, < 4)
     method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
     minitest (5.10.1)
+    nio4r (2.0.0)
+    nokogiri (1.7.2)
+      mini_portile2 (~> 2.1.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -35,11 +78,36 @@ GEM
     pry-byebug (3.4.2)
       byebug (~> 9.0)
       pry (~> 0.10)
-    rack (2.0.1)
-    rack-protection (1.5.3)
+    rack (2.0.3)
+    rack-protection (2.0.0)
       rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (5.0.2)
+      actioncable (= 5.0.2)
+      actionmailer (= 5.0.2)
+      actionpack (= 5.0.2)
+      actionview (= 5.0.2)
+      activejob (= 5.0.2)
+      activemodel (= 5.0.2)
+      activerecord (= 5.0.2)
+      activesupport (= 5.0.2)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 5.0.2)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.0.2)
+      actionpack (= 5.0.2)
+      activesupport (= 5.0.2)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
-    redis (3.3.2)
+    redis (3.3.3)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -56,18 +124,34 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    sidekiq (4.2.9)
+    sidekiq (4.2.10)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
       redis (~> 3.2, >= 3.2.1)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     slop (3.6.0)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
     test_after_commit (1.1.0)
       activerecord (>= 3.2)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 
 PLATFORMS
   ruby
@@ -80,8 +164,9 @@ DEPENDENCIES
   reactor!
   rspec
   rspec-its
+  simplecov
   sqlite3
   test_after_commit
 
 BUNDLED WITH
-   1.13.6
+   1.14.6

data/lib/reactor/controllers/concerns/actions/action_event.rb

@@ -1,9 +1,13 @@
-class Reactor::ResourceActionable::ActionEvent
-  def self.perform(&block)
-    @perform_block = block
-  end
+module Reactor
+  module ResourceActionable
+    class ActionEvent
+      def self.perform(&block)
+        @perform_block = block
+      end
 
-  def self.perform_on(ctx)
-    ctx.instance_exec(&@perform_block)
+      def self.perform_on(ctx)
+        ctx.instance_exec(&@perform_block)
+      end
+    end
   end
-end
+end

data/lib/reactor/controllers/concerns/actions/create_event.rb

@@ -1,14 +1,18 @@
-class Reactor::ResourceActionable::CreateEvent < Reactor::ResourceActionable::ActionEvent
-  perform do
-    if actionable_resource.valid?
-      action_event "#{resource_name}_created",
-                   target: actionable_resource,
-                   attributes: params[resource_name]
-    else
-      action_event "#{resource_name}_create_failed",
-                   errors: actionable_resource.errors.as_json,
-                   attributes: params[resource_name],
-                   target: nested_resource
+module Reactor
+  module ResourceActionable
+    class CreateEvent < ActionEvent
+      perform do
+        if actionable_resource.valid?
+          action_event "#{resource_name}_created",
+                       target: actionable_resource,
+                       attributes: params[resource_name]
+        else
+          action_event "#{resource_name}_create_failed",
+                       errors: actionable_resource.errors.as_json,
+                       attributes: params[resource_name],
+                       target: nested_resource
+        end
+      end
     end
   end
-end
+end

data/lib/reactor/controllers/concerns/actions/destroy_event.rb

@@ -1,5 +1,9 @@
-class Reactor::ResourceActionable::DestroyEvent < Reactor::ResourceActionable::ActionEvent
-  perform do
-    action_event "#{resource_name}_destroyed", last_snapshot: actionable_resource.as_json
+module Reactor
+  module ResourceActionable
+    class DestroyEvent < ActionEvent
+      perform do
+        action_event "#{resource_name}_destroyed", last_snapshot: actionable_resource.as_json
+      end
+    end
   end
-end
+end

data/lib/reactor/controllers/concerns/actions/edit_event.rb

@@ -1,5 +1,9 @@
-class Reactor::ResourceActionable::EditEvent < Reactor::ResourceActionable::ActionEvent
-  perform do
-    action_event "edit_#{resource_name}_form_viewed", target: actionable_resource
+module Reactor
+  module ResourceActionable
+    class EditEvent < ActionEvent
+      perform do
+        action_event "edit_#{resource_name}_form_viewed", target: actionable_resource
+      end
+    end
   end
-end
+end

data/lib/reactor/controllers/concerns/actions/index_event.rb

@@ -1,5 +1,9 @@
-class Reactor::ResourceActionable::IndexEvent < Reactor::ResourceActionable::ActionEvent
-  perform do
-    action_event "#{resource_name.pluralize}_indexed", target: nested_resource
+module Reactor
+  module ResourceActionable
+    class IndexEvent < ActionEvent
+      perform do
+        action_event "#{resource_name.pluralize}_indexed", target: nested_resource
+      end
+    end
   end
-end
+end

data/lib/reactor/controllers/concerns/actions/new_event.rb

@@ -1,5 +1,9 @@
-class Reactor::ResourceActionable::NewEvent < Reactor::ResourceActionable::ActionEvent
-  perform do
-    action_event "new_#{resource_name}_form_viewed", target: nested_resource
+module Reactor
+  module ResourceActionable
+    class NewEvent < ActionEvent
+      perform do
+        action_event "new_#{resource_name}_form_viewed", target: nested_resource
+      end
+    end
   end
-end
+end

data/lib/reactor/controllers/concerns/actions/show_event.rb

@@ -1,5 +1,9 @@
-class Reactor::ResourceActionable::ShowEvent < Reactor::ResourceActionable::ActionEvent
-  perform do
-    action_event "#{resource_name}_viewed", target: actionable_resource
+module Reactor
+  module ResourceActionable
+    class ShowEvent < ActionEvent
+      perform do
+        action_event "#{resource_name}_viewed", target: actionable_resource
+      end
+    end
   end
 end

data/lib/reactor/controllers/concerns/actions/update_event.rb

@@ -1,14 +1,18 @@
-class Reactor::ResourceActionable::UpdateEvent < Reactor::ResourceActionable::ActionEvent
-  perform do
-    if actionable_resource.valid?
-      action_event "#{resource_name}_updated",
-                   target: actionable_resource,
-                   changes: actionable_resource.previous_changes.as_json
-    else
-      action_event "#{resource_name}_update_failed",
-                   target: actionable_resource,
-                   errors: actionable_resource.errors.as_json,
-                   attributes: params[resource_name]
+module Reactor
+  module ResourceActionable
+    class UpdateEvent < ActionEvent
+      perform do
+        if actionable_resource.valid?
+          action_event "#{resource_name}_updated",
+                       target: actionable_resource,
+                       changes: actionable_resource.previous_changes.as_json
+        else
+          action_event "#{resource_name}_update_failed",
+                       target: actionable_resource,
+                       errors: actionable_resource.errors.as_json,
+                       attributes: params[resource_name]
+        end
+      end
     end
   end
-end
+end

data/lib/reactor/controllers/concerns/resource_actionable.rb

@@ -1,45 +1,47 @@
-module Reactor::ResourceActionable
-  extend ActiveSupport::Concern
+module Reactor
+  module ResourceActionable
+    extend ActiveSupport::Concern
 
-  included do
-    around_filter :infer_basic_action_event
-  end
+    included do
+      around_filter :infer_basic_action_event
+    end
 
-  def infer_basic_action_event
-    yield if block_given?
+    def infer_basic_action_event
+      yield if block_given?
 
-    if (event_descriptor = "Reactor::ResourceActionable::#{action_name.camelize}Event".safe_constantize).present?
-      event_descriptor.perform_on self
-    else
-      action_event "#{resource_name}_#{action_name}"
+      if (event_descriptor = "Reactor::ResourceActionable::#{action_name.camelize}Event".safe_constantize).present?
+        event_descriptor.perform_on self
+      else
+        action_event "#{resource_name}_#{action_name}"
+      end
     end
-  end
 
-  module ClassMethods
-    def actionable_resource(ivar_name = nil)
-      @resource_ivar_name ||= ivar_name
-    end
+    module ClassMethods
+      def actionable_resource(ivar_name = nil)
+        @resource_ivar_name ||= ivar_name
+      end
 
-    def nested_resource(ivar_name = nil)
-      @nested_resource_ivar_name ||= ivar_name
-    end
+      def nested_resource(ivar_name = nil)
+        @nested_resource_ivar_name ||= ivar_name
+      end
 
-    # this is so our API controller subclasses can re-use the resource declarations
-    def inherited(subclass)
-      [:resource_ivar_name, :nested_resource_ivar_name].each do |inheritable_attribute|
-        instance_var = "@#{inheritable_attribute}"
-        subclass.instance_variable_set(instance_var, instance_variable_get(instance_var))
+      # this is so our API controller subclasses can re-use the resource declarations
+      def inherited(subclass)
+        [:resource_ivar_name, :nested_resource_ivar_name].each do |inheritable_attribute|
+          instance_var = "@#{inheritable_attribute}"
+          subclass.instance_variable_set(instance_var, instance_variable_get(instance_var))
+        end
       end
     end
-  end
 
-  def actionable_resource; instance_variable_get(self.class.actionable_resource); end
-  def nested_resource; self.class.nested_resource && instance_variable_get(self.class.nested_resource); end
+    def actionable_resource; instance_variable_get(self.class.actionable_resource); end
+    def nested_resource; self.class.nested_resource && instance_variable_get(self.class.nested_resource); end
 
-  private
+    private
 
-  def resource_name
-    self.class.actionable_resource.to_s.gsub('@','').underscore
+    def resource_name
+      self.class.actionable_resource.to_s.gsub('@','').underscore
+    end
   end
 end
 
@@ -50,4 +52,4 @@ require "reactor/controllers/concerns/actions/edit_event"
 require "reactor/controllers/concerns/actions/create_event"
 require "reactor/controllers/concerns/actions/update_event"
 require "reactor/controllers/concerns/actions/destroy_event"
-require "reactor/controllers/concerns/actions/show_event"
+require "reactor/controllers/concerns/actions/show_event"

data/lib/reactor/controllers.rb

@@ -0,0 +1,2 @@
+# FIXME - these are not properly namespaced. The directories mean nothing
+require "reactor/controllers/concerns/resource_actionable"

data/lib/reactor/errors.rb

@@ -0,0 +1,7 @@
+module Reactor
+
+  class UnconfiguredWorkerError < StandardError ; end
+  class EventHandlerAlreadyDefined < StandardError ; end
+  class UndeliverableMailError < StandardError ; end
+
+end

data/lib/reactor/event.rb

@@ -117,8 +117,8 @@ class Reactor::Event
 
   def fire_database_driven_subscribers(data, name)
     #TODO: support more matching?
-    Reactor::Subscriber.where(event_name: [name, '*']).each do |subscriber|
-      Reactor::Subscriber.delay.fire subscriber.id, data
+    Reactor::Subscriber.where(event_name: [name, '*']).pluck(:id).each do |model_id|
+      Reactor::Workers::DatabaseSubscriberWorker.perform_async model_id, data
     end
   end
 

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

@@ -1,94 +1,47 @@
-module Reactor::Subscribable
-  extend ActiveSupport::Concern
-
-  class EventHandlerAlreadyDefined < StandardError ; end
-
-  module ClassMethods
-
-    def on_event(*args, &block)
-      options = args.extract_options!
-      event, method = args
-      if subscriber = create_static_subscriber(event, method, options, &block)
-        (Reactor::SUBSCRIBERS[event.to_s] ||= []).push(subscriber)
+module Reactor
+  module Subscribable
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+
+      def on_event(*args, &block)
+        options = args.extract_options!
+        options[:event_name], options[:action] = args
+        options[:action] ||= block
+        options[:source] = self
+        add_subscription(options)
       end
-    end
 
-    private
+      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)
+      def add_subscription(options = {})
+        event_name = options[:event_name]
+        check_for_duplicate_subscription!(event_name, options[:handler_name_option])
+        subscription = Subscription.new(options)
 
-      # 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
+        handler_names << subscription
+        handler_names.uniq!
 
-      worker_class.tap do |k|
-        k.source = self
-        k.method = method || block
-        k.delay = options[:delay] || 0
-        k.in_memory = options[:in_memory]
-        k.dont_perform = Reactor.test_mode?
+        Reactor.add_subscriber(event_name, subscription.worker_class)
       end
-    end
-
-    def handler_name(event, handler_name_option = nil)
-      return handler_name_option.to_s.camelize if handler_name_option
-      "#{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
 
-        class_attribute :method, :delay, :source, :in_memory, :dont_perform
-
-        def perform(data)
-          return :__perform_aborted__ if dont_perform && !Reactor::TEST_MODE_SUBSCRIBERS.include?(source)
-          event = Reactor::Event.new(data)
-          if method.is_a?(Symbol)
-            source.delay_for(delay).send(method, event)
-          else
-            method.call(event)
-          end
-        end
-
-        def self.perform_where_needed(data)
-          if in_memory
-            new.perform(data)
-          else
-            perform_async(data)
-          end
-        end
+      def handler_names
+        @handler_names ||= []
       end
-    end
 
-    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."
-        )
+      def duplicate_subscription?(handler_name)
+        handler_names.include?(handler_name)
       end
-      event_handler_names << handler_name
-    end
-
-    def name_worker_class(klass, handler_name)
-      static_subscriber_namespace.const_set(handler_name, klass)
-    end
 
-    def static_subscriber_namespace
-      ns = self.name.demodulize
-      unless Reactor::StaticSubscribers.const_defined?(ns, false)
-        Reactor::StaticSubscribers.const_set(ns, Module.new)
+      def check_for_duplicate_subscription!(event_name, handler_name_option = nil)
+        handler_name = Subscription.build_handler_name(event_name, handler_name_option)
+        if duplicate_subscription?(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
       end
-
-      Reactor::StaticSubscribers.const_get(ns, false)
     end
   end
 end

data/lib/reactor/models/subscriber.rb

@@ -1,26 +1,28 @@
-class Reactor::Subscriber < ActiveRecord::Base
-  attr_accessor :event
+module Reactor
+  class Subscriber < ActiveRecord::Base
+    attr_accessor :event
 
-  def event_name=(event)
-    write_attribute :event_name, event.to_s
-  end
+    def event_name=(event)
+      write_attribute :event_name, event.to_s
+    end
 
-  def fire(data)
-    self.event = Reactor::Event.new(data)
-    instance_exec &self.class.on_fire
-    self
-  end
+    def fire(data)
+      self.event = Reactor::Event.new(data)
+      instance_exec &self.class.on_fire
+      self
+    end
 
-  class << self
-    def on_fire(&block)
-      if block
-        @fire_block = block
+    class << self
+      def on_fire(&block)
+        if block
+          @fire_block = block
+        end
+        @fire_block
       end
-      @fire_block
-    end
 
-    def fire(subscriber_id, data)
-      Reactor::Subscriber.find(subscriber_id).fire data
+      def fire(subscriber_id, data)
+        Reactor::Subscriber.find(subscriber_id).fire data.with_indifferent_access
+      end
     end
   end
-end
+end

data/lib/reactor/models.rb

@@ -0,0 +1,5 @@
+# FIXME - these are not properly namespaced. The directories mean nothing
+require "reactor/models/concerns/publishable"
+require "reactor/models/concerns/subscribable"
+require "reactor/models/concerns/optionally_subclassable"
+require "reactor/models/subscriber"

data/lib/reactor/static_subscribers.rb

@@ -0,0 +1,7 @@
+# This module is where named worker classes will live - examples:
+# Reactor::StaticSubscribers::ArbitraryModule::WilcardHandler
+# Reactor::StaticSubscribers::ArbitraryModule::MyEventNameHandler
+module Reactor
+  module StaticSubscribers
+  end
+end