coactive 0.2.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc658ad8e03f5de6bb345b90606d45be83e91ec260e39abcdf4008f2890d6505
-  data.tar.gz: bbe87c6271b5a42b4f4a08fc4c095d1f2078d9d4d9a4e6b8c8d0d7e05b771725
+  metadata.gz: 55895695a2ad27b38fd2ca9f1d8c38b1135975cd3e3ff41fe3f7e53b4564c5ba
+  data.tar.gz: e51d7e8e74748cd29284e9795d199c7fe9b2737ecdc79f57412632114c3bdee8
 SHA512:
-  metadata.gz: 6f48fcf54084e267df1533eefe6569fca5ee5d36181c8e4ed36ab6327b1cd94b81d1a163f0dfdbe54058c061bc58410d10e925b7fa3d180a95bb0ebe740fe6c5
-  data.tar.gz: f4f2339513f0292800d5d65862b631c989a0ccd0ae8d3aad3ad9e2f906692b71c1eca0df4684ffbb9e61475d3f1b80c6ed815758949de472da3ff4f6694d14e3
+  metadata.gz: 92e2fbe3d500452f8b9584174e2f34c9383b03e12b2eb70d58324caf5ba48b793bb86d6f8153f5a54c454141e1dd223825d1d3fd1ad1c6b8f0c375a5a2c40a8d
+  data.tar.gz: c9c6da5d6f236221af0f20927eeff9c4846a3ef5cb3940c481a0409842d98186b778b772f777589743d525b2f0914206ef41206530a3043e91098663e937fafe

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']
+        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
@@ -33,6 +33,18 @@ jobs:
             gemfile: rails51
           - ruby: 3.0
             gemfile: rails52
+          - ruby: 3.1
+            gemfile: rails50
+          - ruby: 3.1
+            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 }}
 
@@ -40,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.0
+
+* Improve lookup performance for named coactors.
+
+## 0.3.0
+
+* Reduce inspection size for context.
+
 ## 0.2.2
 
 * Allow overwrite context variables.

data/bin/console

@@ -10,5 +10,5 @@ require "coactive"
 # require "pry"
 # Pry.start
 
-# require "irb"
-# IRB.start
+require "irb"
+IRB.start

data/gemfiles/rails70.gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem "rails", "~> 7.0.0"
+gem "rails", "~> 7.0.1"
 
 gemspec path: "../"

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,23 @@
+# frozen_string_literal: true
+
+require_relative 'coaction'
+
+module Coactive
+  module Coactions
+    extend ActiveSupport::Concern
+
+    included do
+      class_attribute :coactions_map
+      self.coactions_map = {}
+    end
+
+    class_methods do
+      def coaction(*names, **options)
+        names.each do |name|
+          coactions = coactions_map[name].to_a + [Coaction.new(self, name, options)]
+          coactions_map[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/context.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
+require_relative 'contexts/inspect'
+
 module Coactive
   class Context
+    include Contexts::Inspect
+
     attr_reader :_data
 
     def initialize(data = {}, &block)
@@ -25,11 +29,6 @@ module Coactive
       @_data
     end
 
-    def to_s
-      attrs = @_data.map { |k, v| "#{k}=#{v.to_s.truncate(300)}" }.join(', ')
-      "#<#{self.class} #{attrs}>"
-    end
-
     def define_accessors!(keys)
       Array(keys).each do |key|
         define_singleton_method key do

data/lib/coactive/contexts/inspect.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Coactive
+  module Contexts
+    module Inspect
+      extend ActiveSupport::Concern
+
+      def to_s
+        "#<#{self.class} #{self.class.inspect(@_data)}>"
+      end
+
+      class_methods do
+        def inspect(data)
+          data.map { |k, v| "#{k}=#{Coactive::Contexts::Inspect.call(v)}" }.join(', ')
+        end
+      end
+
+      class << self
+        class_attribute :max_num, :max_length
+        self.max_num = 5
+        self.max_length = 300
+
+        def call(data)
+          if data.is_a?(Array)
+            str = data.take(max_num).map { |v| call(v) }.join(', ')
+            str += '...' if data.size > max_num
+            "[#{str}]"
+          elsif data.is_a?(Hash)
+            str = data.take(max_num).map { |k, v| "#{k}: #{call(v)}" }.join(', ')
+            str += '...' if data.size > max_num
+            "{#{str}}"
+          else
+            data.to_s.truncate(max_length)
+          end
+        end
+      end
+    end
+  end
+end

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)
+        Coactive::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] }
+        @config.base_class.coactions_map[@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,6 +3,7 @@
 module Coactive
   module Railtie
     ActiveSupport::Reloader.to_prepare do
+      Coactive::Loader.loaded.clear
       Coactive::Lookup.cache.clear
     end
   end

data/lib/coactive/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coactive
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-05 00:00:00.000000000 Z
+date: 2023-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -120,13 +120,14 @@ 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
+- lib/coactive/contexts/inspect.rb
 - lib/coactive/contextualizer.rb
 - lib/coactive/errors.rb
 - lib/coactive/initializer.rb
@@ -158,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+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