coactive 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d34754b34f7bf3ed8e44b8f7b1ef42eff9a8c2915c335e5098e119b891c27053
-  data.tar.gz: e9194f39d2395961bceb2f88613de90e2f8acb7028af24ffd868c651f78f60c8
+  metadata.gz: b15dae4695420734d0486669dd7f88d7eeceb8815932dc5f47d37cedf0dd4c61
+  data.tar.gz: cd7f7aae30957f69c76230b8cb97ca846ad4d4c99f6c02045f54b9c866d2ec68
 SHA512:
-  metadata.gz: c78fca95b4d4ffc86a5be1327d2049e9bd8023844aa48ff864185aa5ce6852cd9170fb8080bb412792db11db23b591ca67d79699c8b9ebeecbcc8ce8063247b3
-  data.tar.gz: 7c95f6e44e30304170a983db92c41ca446605d1b5abc15ffe92a680b76a0fba376ab5b629abf78c7ea6bf39aef81a174358db16628617ee1fe104f817bd6b5f3
+  metadata.gz: eebff4ac3fdb067eb44a59ffc634e4fdda567663e6be2c30923828a311f29a52679ea2aaf3295e17412ee492ef3705c1ff200a0065f5bfee03bbf36a045dd007
+  data.tar.gz: e94206eda575c397edc5686fe012cf7ebd66074fa74b1a4215c733d7462b01099a9e2d537041749a039bcfe079bbf4ade6c71d4c2a249e65fa2849175ed94532

data/.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.3, 2.4, 2.5, 2.6, 2.7, '3.0', 3.1]
+        ruby: [2.3, 2.4, 2.5, 2.6, 2.7, '3.0', 3.1, 3.2]
         gemfile: ['rails50', 'rails51', 'rails52', 'rails60', 'rails61', 'rails70']
         exclude:
           - ruby: 2.3
@@ -39,6 +39,12 @@ jobs:
             gemfile: rails51
           - ruby: 3.1
             gemfile: rails52
+          - ruby: 3.2
+            gemfile: rails50
+          - ruby: 3.2
+            gemfile: rails51
+          - ruby: 3.2
+            gemfile: rails52
 
     name: ruby ${{ matrix.ruby }}, ${{ matrix.gemfile }}
 
@@ -46,7 +52,7 @@ jobs:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 0.4.1
+
+* Clear registry of coactions when reloaded.
+
+## 0.4.0
+
+* Improve lookup performance for named coactors.
+
 ## 0.3.0
 
 * Reduce inspection size for context.

data/lib/coactive/coactants.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Coactive
+  module Coactants
+    extend ActiveSupport::Concern
+
+    included do
+      class_attribute :_coactants
+      self._coactants = []
+    end
+
+    class_methods do
+      def coact(*coactants, **options, &block)
+        if block
+          self._coactants = _coactants + [block]
+        elsif options[:before]
+          index = self._coactants.index { |coactant| coactant == options[:before] }
+          self._coactants = self._coactants.insert(index, *coactants)
+        else
+          self._coactants = _coactants + coactants
+        end
+      end
+
+      def coactants
+        self._coactants
+      end
+
+      def clear_coactants
+        self._coactants = []
+      end
+    end
+  end
+end

data/lib/coactive/coaction.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Coactive
+  class Coaction < Struct.new(:coactor, :name, :options)
+    def priority
+      options[:priority] || 1 << 63
+    end
+  end
+end

data/lib/coactive/coactions.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative 'coaction'
+
+module Coactive
+  module Coactions
+    extend ActiveSupport::Concern
+
+    class << self
+      class_attribute :registry
+      self.registry = {}
+
+      def [](base, name)
+        registry.dig(base, name)
+      end
+
+      def []=(base, name, array)
+        registry[base] ||= {}
+        registry[base][name] = array
+      end
+    end
+
+    class_methods do
+      def coaction(*names, **options)
+        base = coactive_config.base_class
+        names.each do |name|
+          coactions = Coactions[base, name].to_a + [Coaction.new(self, name, options)]
+          Coactions[base, name] = coactions.sort_by.with_index { |coaction, i| [coaction.priority, i] }
+        end
+      end
+    end
+  end
+end

data/lib/coactive/coactor.rb

@@ -2,14 +2,14 @@
 
 require_relative 'loader'
 require_relative 'lookup'
-require_relative 'coactors/coactants'
-require_relative 'coactors/coactions'
+require_relative 'coactants'
+require_relative 'coactions'
 
 module Coactive
   module Coactor
     extend ActiveSupport::Concern
-    include Coactors::Coactants
-    include Coactors::Coactions
+    include Coactants
+    include Coactions
 
     def coactors
       self.class._coactants.map do |coactant|

data/lib/coactive/loader.rb

@@ -3,18 +3,34 @@
 module Coactive
   module Loader
     class << self
+      class_attribute :loaded
+      self.loaded = {}
+
       def call(paths)
         return unless defined?(Rails)
-        return if Rails.application.config.eager_load
-        return if paths.blank?
+        return if Rails.application.config.eager_load || paths.blank?
+
+        Array.wrap(paths).each do |path|
+          unless loaded[path]
+            load(path)
+            loaded[path] = true
+          end
+        end
+      end
+
+      private
 
-        engines = [Rails] + Rails::Engine.subclasses.map(&:instance)
-        engines.each do |engine|
-          Dir["#{engine.root}/{#{Array(paths).join(',')}}/**/*.rb"].each do |file|
+      def load(path)
+        rails_engines.each do |engine|
+          Dir["#{engine.root}/#{path}/**/*.rb"].each do |file|
             require_dependency file
           end
         end
       end
+
+      def rails_engines
+        [Rails] + Rails::Engine.subclasses.map(&:instance)
+      end
     end
   end
 end

data/lib/coactive/lookups/base.rb

@@ -6,6 +6,7 @@ module Coactive
       def initialize(klass, coactant)
         @klass = klass
         @coactant = coactant
+        @config = @klass.coactive_config
       end
 
       def call

data/lib/coactive/lookups/name.rb

@@ -11,14 +11,11 @@ module Coactive
       private
 
       def load_files
-        Coactive::Loader.call(@klass.coactive_config.load_paths)
+        Loader.call(@config.load_paths)
       end
 
       def lookup
-        @klass.coactive_config.base_class.descendants.each_with_object({}).with_index do |(coactor, hash), i|
-          coaction = coactor.coactions.detect { |coaction| coaction.name == @coactant }
-          hash[[coaction.priority || 1 << 63, i]] = coactor if coaction
-        end.sort.map { |x| x[1] }
+        Coactions[@config.base_class, @coactant].to_a.map(&:coactor)
       end
 
       class << self

data/lib/coactive/lookups/object.rb

@@ -14,13 +14,13 @@ module Coactive
 
         if coactant.name.present? && (coactor = resolve(coactant))
           coactor
-        elsif @klass.coactive_config.lookup_superclass_for_object && coactant.superclass
+        elsif @config.lookup_superclass_for_object && coactant.superclass
           lookup(coactant.superclass)
         end
       end
 
       def terminate?(coactant)
-        coactant.name.to_s.in?(@klass.coactive_config.lookup_superclass_until)
+        coactant.name.to_s.in?(@config.lookup_superclass_until)
       end
 
       def resolve(coactant)
@@ -30,7 +30,7 @@ module Coactive
       end
 
       def resolve_name(coactant)
-        suffix = @klass.coactive_config.class_suffix
+        suffix = @config.class_suffix
         namespace = @klass.name.to_s.sub(/#{suffix}$/, '').to_s
         [namespace, "#{coactant.name}#{suffix}"].join('::')
       end

data/lib/coactive/railtie.rb

@@ -3,7 +3,9 @@
 module Coactive
   module Railtie
     ActiveSupport::Reloader.to_prepare do
+      Coactive::Loader.loaded.clear
       Coactive::Lookup.cache.clear
+      Coactive::Coactions.registry.clear
     end
   end
 end

data/lib/coactive/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coactive
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-08 00:00:00.000000000 Z
+date: 2023-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -120,10 +120,10 @@ files:
 - gemfiles/rails70.gemfile
 - lib/coactive.rb
 - lib/coactive/base.rb
+- lib/coactive/coactants.rb
+- lib/coactive/coaction.rb
+- lib/coactive/coactions.rb
 - lib/coactive/coactor.rb
-- lib/coactive/coactors/coactants.rb
-- lib/coactive/coactors/coaction.rb
-- lib/coactive/coactors/coactions.rb
 - lib/coactive/config.rb
 - lib/coactive/configure.rb
 - lib/coactive/context.rb
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Make classes coactive

data/lib/coactive/coactors/coactants.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Coactive
-  module Coactors
-    module Coactants
-      extend ActiveSupport::Concern
-
-      included do
-        class_attribute :_coactants
-        self._coactants = []
-      end
-
-      class_methods do
-        def coact(*coactants, **options, &block)
-          if block
-            self._coactants = _coactants + [block]
-          elsif options[:before]
-            index = self._coactants.index { |coactant| coactant == options[:before] }
-            self._coactants = self._coactants.insert(index, *coactants)
-          else
-            self._coactants = _coactants + coactants
-          end
-        end
-
-        def coactants
-          self._coactants
-        end
-
-        def clear_coactants
-          self._coactants = []
-        end
-      end
-    end
-  end
-end

data/lib/coactive/coactors/coaction.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Coactive
-  module Coactors
-    class Coaction < Struct.new(:name, :options)
-      def priority
-        options[:priority]
-      end
-    end
-  end
-end

data/lib/coactive/coactors/coactions.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'coaction'
-
-module Coactive
-  module Coactors
-    module Coactions
-      extend ActiveSupport::Concern
-
-      included do
-        class_attribute :_coactions
-        self._coactions = []
-      end
-
-      class_methods do
-        def coaction(*names, **options)
-          self._coactions = _coactions + names.map { |name| Coaction.new(name, options) }
-        end
-
-        def coactions
-          self._coactions
-        end
-
-        def clear_coactions
-          self._coactions = []
-        end
-      end
-    end
-  end
-end