stance 0.3.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51b0695fffdd5e9543b325277fabfd2244cac3a84ffefb2660ed9c48499bdf12
-  data.tar.gz: 28c77b84783964cc08617e2d28b8c1906105fe621b4ad83236bb571327e6dfc0
+  metadata.gz: '0094c269ae824b6cf2ecf9c2684dc3ef421b0517eb200771811e50e22d2cb329'
+  data.tar.gz: b49537957c9cc39e52e779d0205ad05057355a513327a852cdd9de68fc3b472e
 SHA512:
-  metadata.gz: 2816cde14c5643554d55faa81122667e13b123bc8591e8d959d412a40e204b72aeca434b41a4b98a5270b07f828652f59064e60851c5e9e83a34aa21b6c97b52
-  data.tar.gz: '049bd51dd0ddb46eaa7e52b4a2fa0f7a709fd1c101510499637411c5d55e0ae374e5fca1de23a30760276213b1b38b43a56c353f392df9fe20272cee46eb0dcc'
+  metadata.gz: c4031fcd0b7366810a4787570d8e351957bbdf7f720a3df10a8c9d7d477e78911fbec1e5e9375ee8bd61e612bdf60dc98a955f661a0621cef4c9c05f4282d219
+  data.tar.gz: 22fb2da87d3c7b90a022ba34f33104fbf4cf47931e4f14268f0e50b50181e07344a370ed5a7798b312792858f0f40bc287fffb2996c8fa8bff721d4651a25c0c

data/.rubocop.yml

@@ -5,4 +5,6 @@ Style/Documentation:
 Layout/LineLength:
   Max: 100
 Metrics/MethodLength:
-  Max: 12
+  Max: 15
+Style/ClassVars:
+  Enabled: false

data/Gemfile

@@ -10,6 +10,9 @@ gem 'combustion'
 gem 'minitest'
 gem 'minitest-autotest'
 gem 'minitest-focus'
-gem 'rake', '~> 12.0'
+gem 'mocha'
+gem 'rake', '~> 13.0'
 gem 'rubocop'
+gem 'rubocop-minitest'
+gem 'rubocop-rake'
 gem 'sqlite3'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stance (0.2.0)
+    stance (0.5.1)
       activerecord (>= 5)
       multi_json
       railties (>= 5)
@@ -9,62 +9,65 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.0.3.2)
-      actionview (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.4)
+      actionview (= 6.1.4)
+      activesupport (= 6.1.4)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.3.2)
-      activesupport (= 6.0.3.2)
+    actionview (6.1.4)
+      activesupport (= 6.1.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activerecord (6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activesupport (6.0.3.2)
+    activemodel (6.1.4)
+      activesupport (= 6.1.4)
+    activerecord (6.1.4)
+      activemodel (= 6.1.4)
+      activesupport (= 6.1.4)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    ast (2.4.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
     autotest-suffix (1.1.0)
     builder (3.2.4)
-    combustion (1.3.0)
+    combustion (1.3.1)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
-    erubi (1.9.0)
-    i18n (1.8.5)
+    erubi (1.10.0)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    loofah (2.6.0)
+    loofah (2.10.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
+    mini_portile2 (2.5.3)
+    minitest (5.14.4)
     minitest-autotest (1.1.1)
       minitest-server (~> 1.0)
       path_expander (~> 1.0)
-    minitest-focus (1.2.1)
+    minitest-focus (1.3.1)
       minitest (>= 4, < 6)
     minitest-server (1.0.6)
       minitest (~> 5.0)
+    mocha (1.13.0)
     multi_json (1.15.0)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    nokogiri (1.11.7)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    parallel (1.20.1)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     path_expander (1.1.0)
+    racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -73,35 +76,38 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    railties (6.1.4)
+      actionpack (= 6.1.4)
+      activesupport (= 6.1.4)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      rake (>= 0.13)
+      thor (~> 1.0)
     rainbow (3.0.0)
-    rake (12.3.3)
-    regexp_parser (1.7.1)
-    rexml (3.2.4)
-    rubocop (0.89.0)
+    rake (13.0.6)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rubocop (1.18.3)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.1.0, < 1.0)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.3.0)
-      parser (>= 2.7.1.4)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.8.0)
+      parser (>= 3.0.1.1)
+    rubocop-minitest (0.14.0)
+      rubocop (>= 0.90, < 2.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    ruby-progressbar (1.11.0)
     sqlite3 (1.4.2)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.4.0)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -112,10 +118,13 @@ DEPENDENCIES
   minitest
   minitest-autotest
   minitest-focus
-  rake (~> 12.0)
+  mocha
+  rake (~> 13.0)
   rubocop
+  rubocop-minitest
+  rubocop-rake
   sqlite3
   stance!
 
 BUNDLED WITH
-   2.1.4
+   2.2.18

data/README.md

@@ -1,6 +1,14 @@
-# Stance - Simple Events for Rails apps
+# Stance - Simple & Explicit Events for Rails apps
+
+## Usage
 
 ```ruby
+# Your model
+class Appointment < ActiveRecord::Base
+  include Stance::Eventable
+end
+
+# Define your events
 class AppointmentEvents < Stance::Events
   # Define events.
   event :my_event
@@ -13,6 +21,12 @@ class AppointmentEvents < Stance::Events
   # Singleton event: only one active event with this name can exist for the same subject.
   event :my_event, singleton: true
 
+  # By default, events are recorded in the database, unless you set the `record` option to false,
+  event :my_recordless_event, record: false
+
+  # You can define a class event, which is published on the class instead of the instance.
+  event :my_class_event, class: true
+
   # Will be called before/after each event in this class. Have access to the event `subject` and
   # `record`.
   before_create :do_something_before
@@ -30,6 +44,36 @@ end
 Appointment.find(1).publish_event :some_event
 Appointment.find(1).publish_event 'offers.create'
 Appointment.find(1).publish_event :event_with_metadata, foo: :bah
+Appointment.publish_event :my_class_event
+```
+
+### ActiveRecord Callbacks
+
+Stance comes with a couple of opt-in modules to help ease your Callback spaghetti...
+
+```ruby
+class Appointment < ActiveRecord::Base
+  include Stance::Eventable
+  include Stance::ActiveRecordCallbacks
+end
+
+class AppointmentEvents < Stance::Events
+  include Stance::ActiveRecordEvents
+end
+
+# Now all your model callbacks will trigger an event of the same name, where any public methods
+# defined will be called.
+class AppointmentEvents::AfterCreate < Stance::Event
+  include Stance::ActiveRecordEvents
+
+  # This method will be called upon the :after_create callback of the Appointment model.
+  def do_something;end
+
+  private
+
+    # Private methods will not be called by the callback.
+    def my_private_method;end
+end
 ```
 
 ## Installation

data/app/models/stance/event_record.rb

@@ -36,7 +36,7 @@ module Stance
     end
 
     def event_class_name
-      @event_class_name ||= "#{subject.model_name.name}Events::#{name.tr('.', '/').classify}"
+      @event_class_name ||= "#{subject_type}Events::#{name.tr('.', '/').classify}"
     end
 
     def event_class

data/lib/stance.rb

@@ -19,4 +19,6 @@ module Stance
   autoload :Events, 'stance/events'
   autoload :Event, 'stance/event'
   autoload :Eventable, 'stance/eventable'
+  autoload :ActiveRecordCallbacks, 'stance/active_record_callbacks'
+  autoload :ActiveRecordEvents, 'stance/active_record_events'
 end

data/lib/stance/active_record_callbacks.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Stance
+  module ActiveRecordCallbacks
+    extend ActiveSupport::Concern
+
+    CALLBACKS = %i[after_initialize before_validation after_validation before_save before_create
+                   after_create before_update after_update before_destroy after_destroy after_save
+                   after_touch after_commit after_save_commit after_create_commit
+                   after_update_commit after_destroy_commit after_rollback].freeze
+
+    included do
+      CALLBACKS.each do |cb|
+        send(cb) { publish_event cb }
+      end
+    end
+  end
+end

data/lib/stance/active_record_events.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Stance
+  module ActiveRecordEvents
+    extend ActiveSupport::Concern
+
+    included do
+      with_options record: false do
+        Stance::ActiveRecordCallbacks::CALLBACKS.each { |ev| event(ev) }
+      end
+    end
+  end
+end

data/lib/stance/event.rb

@@ -20,16 +20,32 @@ module Stance
     end
 
     def initialize(name, subject, metadata, options)
-      @options = { singleton: false }.merge(options)
-      @record = Stance::EventRecord.new(name: name, subject: subject, metadata: metadata)
+      @options = { singleton: false, record: true, class: false }.merge(options)
+
+      attrs = { name: name, metadata: metadata }
+      if subject.is_a?(String)
+        attrs[:subject_type] = subject
+      else
+        attrs[:subject] = subject
+      end
+      @record = Stance::EventRecord.new(attrs)
     end
 
     def create
       return self if singleton_exists?
 
+      Rails.logger.info "Event: #{full_name}"
+
       Stance::EventRecord.transaction do
         run_callbacks :create do
-          record.save
+          # Call each public method of the Event class if a custom class.
+          if self.class.name != 'Stance::Event'
+            (public_methods(false) - Stance::Event.instance_methods(false)).each do |method|
+              send method
+            end
+          end
+
+          record.save if @options[:record]
         end
       end
 
@@ -37,7 +53,7 @@ module Stance
     end
 
     def full_name
-      "#{subject.model_name.singular}.#{name}"
+      "#{record.subject_type.downcase}.#{name}"
     end
 
     private

data/lib/stance/eventable.rb

@@ -8,6 +8,43 @@ module Stance
       has_many :events, as: :subject, class_name: 'Stance::EventRecord'
     end
 
+    class_methods do
+      def publish_event(name, metadata = {})
+        name = name.to_s
+        ensure_event! name
+
+        # Find the Event class - if any - and call it. Falls back to Stance::Event.
+        ev = event_class(name).new(name, model_name.name, metadata, events_class.events[name])
+
+        return ev if Stance.disabled_events.include?(ev.full_name)
+
+        events_class.new(ev).run_callbacks(:create) { ev.create }
+      end
+
+      private
+
+      # Raise EventNotFound if the class event has not been defined.
+      def ensure_event!(name)
+        return if events_class.events.one? { |event, options| name == event && options[:class] }
+
+        raise Stance::EventNotFound, "Class event `#{name}` not found"
+      end
+
+      def events_class
+        @events_class ||= events_class_name.constantize
+      end
+
+      def events_class_name
+        @events_class_name ||= "#{model_name.name}Events"
+      end
+
+      def event_class(name)
+        name.constantize
+      rescue NameError
+        Stance::Event
+      end
+    end
+
     # Publish an event.
     #
     # Creates an EventRecord with the given `name`, `metadata` and self as the 'subject'.
@@ -18,19 +55,16 @@ module Stance
       ensure_event! name
 
       # Find the Event class - if any - and call it. Falls back to Stance::Event.
-      event_class_name = "#{events_class_name}::#{name.to_s.tr('.', '/').classify}"
-      ev = event_class(event_class_name).new(name, self, metadata, events_class.events[name])
+      ev = event_class(name).new(name, self, metadata, events_class.events[name])
 
       return ev if Stance.disabled_events.include?(ev.full_name)
 
       events_class.new(ev).run_callbacks(:create) { ev.create }
     end
 
-    private
-
     # Raise EventNotFound if the event has not been defined.
     def ensure_event!(name)
-      return if events_class.events.keys.include?(name)
+      return if events_class.events.one? { |event, options| name == event && !options[:class] }
 
       raise Stance::EventNotFound, "Event `#{name}` not found"
     end
@@ -44,7 +78,7 @@ module Stance
     end
 
     def event_class(name)
-      name.constantize
+      "#{events_class_name}::#{name.tr('.', '/').classify}".constantize
     rescue NameError
       Stance::Event
     end

data/lib/stance/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Stance
-  VERSION = '0.3.0'
+  VERSION = '0.5.2'
 end

data/stance.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Event System for Rails'
   spec.homepage      = 'https://github.com/joelmoss/stance'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stance
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Joel Moss
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
-description: 
+description:
 email:
 - joel@developwithstyle.com
 executables: []
@@ -74,6 +74,8 @@ files:
 - lib/generators/stance/install_generator.rb
 - lib/generators/stance/templates/migration.rb.tt
 - lib/stance.rb
+- lib/stance/active_record_callbacks.rb
+- lib/stance/active_record_events.rb
 - lib/stance/engine.rb
 - lib/stance/event.rb
 - lib/stance/eventable.rb
@@ -87,7 +89,7 @@ metadata:
   homepage_uri: https://github.com/joelmoss/stance
   source_code_uri: https://github.com/joelmoss/stance
   changelog_uri: https://github.com/joelmoss/stance/releases
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,15 +97,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Event System for Rails
 test_files: []