stance 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5c5e32182840703a7fd87799e835b4227de0d7c79967573359d71baa41531ee
-  data.tar.gz: f572eaa1014020ff06816056a1bc41f37304a0fba26c6b991cd0d37458fa678b
+  metadata.gz: 7d3da127347d4aa45a684e5d4b5f50b6e2bf0450fd3a4c31275db63d92795a9c
+  data.tar.gz: 7809c5b0ac48089ddb6f68aea05c74e435b3ca85a64d40a8bcce8a909419d4fe
 SHA512:
-  metadata.gz: 12cd7a6cd36aa7460d683085717b544fa3af4b1ffbf497f3db743ef0beb839dd14fc07a8209935371cecd11dc7129ae74bb5d608a111624822f678690969153e
-  data.tar.gz: 5dad82f9ab70dcb3637d9f0e00b40b31ff64b1e42eadfccb6c9561c8f7a55e15507469016d889cae9124ef06d7a3c599ba104a2c1d813daefe107f70a82cadf0
+  metadata.gz: 9414f176abd6c14837c562534ae1130c989ab54f79483c0c1b9ce0ae1b88f343922f9e0e60c3f1349cf797a20a0dc1fbcf799ac722afa18b79a4542d61f4dad6
+  data.tar.gz: 648e01a5b37bf44abef52efa508b3fbaddeb3d087f638a645c1b5aee446199643f193cc9c2714b89ec7d3c555a038642b8c99d5d4515296b3bb0c85644d706e3

data/.rubocop.yml

@@ -8,3 +8,5 @@ Metrics/MethodLength:
   Max: 15
 Style/ClassVars:
   Enabled: false
+Metrics/AbcSize:
+  Max: 20

data/Gemfile.lock

@@ -1,33 +1,74 @@
 PATH
   remote: .
   specs:
-    stance (0.6.0)
-      activerecord (>= 6)
+    stance (0.7.1)
       multi_json
-      railties (>= 6)
+      rails (>= 7.0.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.3)
-      actionview (= 7.0.3)
-      activesupport (= 7.0.3)
+    actioncable (7.0.4)
+      actionpack (= 7.0.4)
+      activesupport (= 7.0.4)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (7.0.4)
+      actionpack (= 7.0.4)
+      activejob (= 7.0.4)
+      activerecord (= 7.0.4)
+      activestorage (= 7.0.4)
+      activesupport (= 7.0.4)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.4)
+      actionpack (= 7.0.4)
+      actionview (= 7.0.4)
+      activejob (= 7.0.4)
+      activesupport (= 7.0.4)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.0)
+    actionpack (7.0.4)
+      actionview (= 7.0.4)
+      activesupport (= 7.0.4)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.3)
-      activesupport (= 7.0.3)
+    actiontext (7.0.4)
+      actionpack (= 7.0.4)
+      activerecord (= 7.0.4)
+      activestorage (= 7.0.4)
+      activesupport (= 7.0.4)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.0.4)
+      activesupport (= 7.0.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (7.0.3)
-      activesupport (= 7.0.3)
-    activerecord (7.0.3)
-      activemodel (= 7.0.3)
-      activesupport (= 7.0.3)
-    activesupport (7.0.3)
+    activejob (7.0.4)
+      activesupport (= 7.0.4)
+      globalid (>= 0.3.6)
+    activemodel (7.0.4)
+      activesupport (= 7.0.4)
+    activerecord (7.0.4)
+      activemodel (= 7.0.4)
+      activesupport (= 7.0.4)
+    activestorage (7.0.4)
+      actionpack (= 7.0.4)
+      activejob (= 7.0.4)
+      activerecord (= 7.0.4)
+      activesupport (= 7.0.4)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -41,75 +82,116 @@ GEM
       thor (>= 0.14.6)
     concurrent-ruby (1.1.10)
     crass (1.0.6)
-    erubi (1.10.0)
-    i18n (1.10.0)
+    date (3.3.3)
+    erubi (1.12.0)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
-    loofah (2.18.0)
+    json (2.6.3)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
+    mail (2.8.0)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.2)
     method_source (1.0.0)
-    mini_portile2 (2.8.0)
-    minitest (5.16.2)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.1)
+    minitest (5.17.0)
     minitest-autotest (1.1.1)
       minitest-server (~> 1.0)
       path_expander (~> 1.0)
     minitest-focus (1.3.1)
       minitest (>= 4, < 6)
-    minitest-server (1.0.6)
-      minitest (~> 5.0)
-    mocha (1.14.0)
+    minitest-server (1.0.7)
+      minitest (~> 5.16)
+    mocha (2.0.2)
+      ruby2_keywords (>= 0.0.5)
     multi_json (1.15.0)
-    nokogiri (1.13.6)
+    net-imap (0.3.4)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    nio4r (2.5.8)
+    nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
     path_expander (1.1.1)
-    racc (1.6.0)
-    rack (2.2.4)
+    racc (1.6.2)
+    rack (2.2.5)
     rack-test (2.0.2)
       rack (>= 1.3)
+    rails (7.0.4)
+      actioncable (= 7.0.4)
+      actionmailbox (= 7.0.4)
+      actionmailer (= 7.0.4)
+      actionpack (= 7.0.4)
+      actiontext (= 7.0.4)
+      actionview (= 7.0.4)
+      activejob (= 7.0.4)
+      activemodel (= 7.0.4)
+      activerecord (= 7.0.4)
+      activestorage (= 7.0.4)
+      activesupport (= 7.0.4)
+      bundler (>= 1.15.0)
+      railties (= 7.0.4)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
-    railties (7.0.3)
-      actionpack (= 7.0.3)
-      activesupport (= 7.0.3)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (7.0.4)
+      actionpack (= 7.0.4)
+      activesupport (= 7.0.4)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.5.0)
+    regexp_parser (2.6.1)
     rexml (3.2.5)
-    rubocop (1.31.1)
+    rubocop (1.42.0)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.18.0, < 2.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.18.0)
+    rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
-    rubocop-minitest (0.20.1)
+    rubocop-minitest (0.25.1)
       rubocop (>= 0.90, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
-    sqlite3 (1.4.4)
+    ruby2_keywords (0.0.5)
+    sqlite3 (1.5.4)
+      mini_portile2 (~> 2.8.0)
     thor (1.2.1)
-    tzinfo (2.0.4)
+    timeout (0.3.1)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.2.0)
-    zeitwerk (2.6.0)
+    unicode-display_width (2.4.2)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby

data/lib/generators/stance/install_generator.rb

@@ -21,7 +21,7 @@ module Stance
       end
 
       def properties_type
-        case ActiveRecord::Base.connection_config[:adapter].to_s
+        case ActiveRecord::Base.connection_db_config.adapter
         when /postg/i # postgres, postgis
           'jsonb'
         when /mysql/i

data/lib/stance/engine.rb

@@ -5,11 +5,5 @@ require 'rails'
 module Stance
   class Engine < ::Rails::Engine
     isolate_namespace Stance
-
-    # initializer 'active_record.include_event_concern' do
-    #   ActiveSupport.on_load(:active_record) do
-    #     ActiveRecord::Base.include Stance::EventConcern
-    #   end
-    # end
   end
 end

data/lib/stance/event.rb

@@ -5,9 +5,7 @@ module Stance
     include ActiveSupport::Callbacks
 
     define_callbacks :create
-    attr_reader :record, :options
-
-    delegate :subject, :name, to: :record
+    attr_reader :record, :options, :name
 
     class << self
       def before_create(*methods, &block)
@@ -20,14 +18,22 @@ module Stance
     end
 
     def initialize(name, subject, metadata, options)
+      @subject = subject
+      @name = name
+      @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
+      if subject.is_a?(ActiveRecord::Base)
         attrs[:subject] = subject
+      elsif subject.is_a?(Class) && subject < ActiveRecord::Base
+        attrs[:subject_type] = subject.name
+      else
+        @options[:record] = false
       end
+
+      return unless @options[:record]
+
       @record = Stance::EventRecord.new(attrs)
     end
 
@@ -40,9 +46,7 @@ module Stance
           if self.class.name != 'Stance::Event'
             Rails.logger.info "Event: #{full_name}"
 
-            (public_methods(false) - Stance::Event.instance_methods(false)).each do |method|
-              send method
-            end
+            callback_methods.each { |method| send method }
           end
 
           record.save if @options[:record]
@@ -53,11 +57,19 @@ module Stance
     end
 
     def full_name
-      "#{record.subject_type.downcase}.#{name}"
+      "#{subject.class.name.downcase}.#{name}"
+    end
+
+    def subject
+      try(:record)&.subject || @subject
     end
 
     private
 
+    def callback_methods
+      public_methods(false) - Stance::Event.instance_methods(false)
+    end
+
     # Event is a singleton and already exists.
     def singleton_exists?
       options[:singleton] && subject.events.active.exists?(name: name)

data/lib/stance/eventable.rb

@@ -5,24 +5,26 @@ module Stance
     extend ActiveSupport::Concern
 
     included do
-      has_many :events, as: :subject, class_name: 'Stance::EventRecord'
+      has_many :events, as: :subject, class_name: 'Stance::EventRecord' if respond_to?(:has_many)
     end
 
     class_methods do
-      def publish_event(name, metadata = {})
+      # An event class may also exist in one or more namespaces (see `Stance.config.namespaces`).
+      # The event will be published to all classes that define the event class, and the class which
+      # defined the event takes priority.
+      def publish_event(name, metadata = {}, subject = self)
         name = name.to_s
-        ensure_event! name
+        subject.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])
+        # Find the Event class - if any - and initialize it. Falls back to Stance::Event.
+        ev = subject.event_class(name)
+                    .new(name, subject, metadata, subject.events_class.events[name])
 
         return ev if Stance.disabled_events.include?(ev.full_name)
 
-        events_class.new(ev).run_callbacks(:create) { ev.create }
+        subject.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] }
@@ -35,7 +37,7 @@ module Stance
       end
 
       def events_class_name
-        @events_class_name ||= "#{model_name.name}Events"
+        @events_class_name ||= "#{name}Events"
       end
 
       def event_class(name)
@@ -51,22 +53,14 @@ module Stance
     #
     # Returns the results of `call`ing the event class.
     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, 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 }
+      self.class.publish_event name, metadata, self
     end
 
     # Raise EventNotFound if the event has not been defined.
     def ensure_event!(name)
       return if events_class.events.one? { |event, options| name == event && !options[:class] }
 
-      raise Stance::EventNotFound, "Event `#{name}` not found"
+      raise Stance::EventNotFound, "Event `#{name}` not found in #{events_class}"
     end
 
     def events_class
@@ -74,9 +68,10 @@ module Stance
     end
 
     def events_class_name
-      @events_class_name ||= "#{model_name.name}Events"
+      @events_class_name ||= "#{self.class.name}Events"
     end
 
+    # The class which defines the event. There will be only one.
     def event_class(name)
       "#{events_class_name}::#{name.tr('.', '/').classify}".constantize
     rescue NameError

data/lib/stance/events.rb

@@ -9,11 +9,21 @@ module Stance
     define_callbacks :create
 
     class << self
-      attr_reader :events
+      attr_accessor :events
+
+      def inherited(child)
+        @events ||= {}
+        child.events ||= @events.dup
+        super
+      end
 
       def event(name, options = {})
         @events ||= {}
-        @events[name.to_s] = options
+        sname = name.to_s
+
+        raise DuplicateEvent, "Cannot redefine event :#{sname} on #{self}" if @events.key?(sname)
+
+        @events[sname] = options
       end
 
       def before_create(*methods, &block)

data/lib/stance/version.rb

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

data/lib/stance.rb

@@ -4,7 +4,9 @@ require 'stance/version'
 require 'stance/engine'
 
 module Stance
-  class EventNotFound < StandardError; end
+  class Error < StandardError; end
+  class EventNotFound < Error; end
+  class DuplicateEvent < Error; end
 
   mattr_accessor :disabled_events
   @@disabled_events = []

data/stance.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
   spec.metadata['changelog_uri'] = "#{spec.homepage}/releases"
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -24,8 +25,6 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '>= 6'
   spec.add_dependency 'multi_json'
-  spec.add_dependency 'railties', '>= 6'
-  spec.metadata['rubygems_mfa_required'] = 'true'
+  spec.add_dependency 'rails', '>= 7.0.4'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: stance
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2023-01-04 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: 7.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: 7.0.4
 description:
 email:
 - joel@developwithstyle.com
@@ -105,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Event System for Rails