ii_finder 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0ae2fd0943ca59c70d7f10c8f0c7c48d9cac20fddd65af6c0f255a9352c78a2
-  data.tar.gz: 433dddd946b33c7677d3a65ce123c7cc78a5bd1f4defb67b8b2a8b5dc773e6e1
+  metadata.gz: 29ddace819669cddc6f56eb2f7e2f61975e6a71e5e2478eeddde806a6d9aba30
+  data.tar.gz: 744b5c28c6064a4e3459ef4296f5256c02d5f0ceaaaffb1ddc50645609a76ccb
 SHA512:
-  metadata.gz: 549fe65cf139efb23f0ea3cf127091e835f4cdfe1f7e48d6700d4ceae0b436d0375ad60b906075d8e79f8a56439a143c294af012706e631d292e442d2572bc35
-  data.tar.gz: '009952b67ce09720ed1d250fb1337c9fb053661c7e45427c30e144dcab0d875673ad3a2eed933560b7dfebc70929a162ad075b35e751c3d55138dfd146498877'
+  metadata.gz: 0b708694fb6d3084d7b56dae4da34367a6f4e6ff0cb69c59061de3e652d28f8b1941bc4c321298609e633b7f59a054225d7852a56148ebe5797e1955ad1a6925
+  data.tar.gz: db7addc2d731b77733fa05b6c3879f7b4bd69671ebb0b8e85cd7b9412ea4455b6a1e1388fc2607503015ffe5f019ddffd3a16812713a93d21cd6b8551e328cd5

data/.github/workflows/ci.yml

@@ -4,27 +4,41 @@ on: [push, pull_request]
 
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.3, 2.4, 2.5, 2.6, 2.7, 3.0]
-        gemfile: ['rails50', 'rails51', 'rails52', 'rails60', 'rails61']
+        ruby: [2.3, 2.4, 2.5, 2.6, 2.7, '3.0', 3.1]
+        gemfile: ['rails50', 'rails51', 'rails52', 'rails60', 'rails61', 'rails70']
         exclude:
           - ruby: 2.3
             gemfile: rails60
           - ruby: 2.3
             gemfile: rails61
+          - ruby: 2.3
+            gemfile: rails70
           - ruby: 2.4
             gemfile: rails60
           - ruby: 2.4
             gemfile: rails61
+          - ruby: 2.4
+            gemfile: rails70
+          - ruby: 2.5
+            gemfile: rails70
+          - ruby: 2.6
+            gemfile: rails70
           - ruby: 3.0
             gemfile: rails50
           - ruby: 3.0
             gemfile: rails51
           - ruby: 3.0
             gemfile: rails52
+          - ruby: 3.1
+            gemfile: rails50
+          - ruby: 3.1
+            gemfile: rails51
+          - ruby: 3.1
+            gemfile: rails52
 
     name: ruby ${{ matrix.ruby }}, ${{ matrix.gemfile }}
 

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## 2.2.0
+
+* Use coactive 0.3.
+
+## 2.1.0
+
+* Add traversal config.
+* Add callbacks for `call_all`.
+* Add calling instrumentation.
+* Clear class cache when reloaded.
+* Bump coactive version to 0.2.
+
+## 2.0.1
+
+* Return relation after callbacks called.
+
 ## 2.0.0
 
 * Replace chain feature with coactive.

data/README.md

@@ -230,7 +230,9 @@ IIFinder::LogSubscriber.attach_to :ii_finder
 This subscriber will write logs in debug mode as the following example:
 
 ```
-Called ItemsFinder with {:id=>1} (Duration: 9.9ms, Allocations: 915)
+Calling ItemsFinder with {:id=>1}
+...
+Called ItemsFinder (Duration: 9.9ms, Allocations: 915)
 ```
 
 ## Contributing

data/bin/console

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

data/gemfiles/rails60.gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
 gem "rails", "~> 6.0.0"
+gem "psych", "~> 3.3.0"
 
 gemspec path: "../"

data/gemfiles/rails70.gemfile

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

data/ii_finder.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport", ">= 5.0"
-  spec.add_dependency "coactive", ">= 0.1"
+  spec.add_dependency "coactive", ">= 0.3"
 
   spec.add_development_dependency "rails", ">= 5.0"
   spec.add_development_dependency "sqlite3"

data/lib/ii_finder/base.rb

@@ -5,6 +5,8 @@ require_relative 'parameters'
 require_relative 'callbacks'
 require_relative 'instrumentation'
 require_relative 'lookup'
+require_relative 'context'
+require_relative 'contextualizer'
 require_relative 'coactors'
 
 module IIFinder
@@ -14,6 +16,7 @@ module IIFinder
     include Callbacks
     include Instrumentation
     include Lookup
+    include Contextualizer
     include Coactors
   end
 end

data/lib/ii_finder/callbacks.rb

@@ -6,9 +6,16 @@ module IIFinder
     include ActiveSupport::Callbacks
 
     included do
+      define_callbacks :all
       define_callbacks :call
     end
 
+    def call_all
+      run_callbacks :all do
+        super
+      end
+    end
+
     def call
       run_callbacks :call do
         super
@@ -16,6 +23,18 @@ module IIFinder
     end
 
     class_methods do
+      def before_all(*args, &block)
+        set_callback(:all, :before, *args, &block)
+      end
+
+      def after_all(*args, &block)
+        set_callback(:all, :after, *args, &block)
+      end
+
+      def around_all(*args, &block)
+        set_callback(:all, :around, *args, &block)
+      end
+
       def before_call(*args, &block)
         set_callback(:call, :before, *args, &block)
       end

data/lib/ii_finder/coactors.rb

@@ -18,12 +18,5 @@ module IIFinder
         alias_method :chain, :coact
       end
     end
-
-    def call
-      coactors.each do |finder|
-        merge_relation!(finder.call(*@_args))
-      end
-      super
-    end
   end
 end

data/lib/ii_finder/config.rb

@@ -6,7 +6,8 @@ module IIFinder
 
     self.data = {
       lookup_cache: true,
-      merge_relation: true
+      merge_relation: true,
+      traversal: :postorder,
     }
 
     data.keys.each do |key|

data/lib/ii_finder/context.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module IIFinder
+  class Context < Coactive::Context
+  end
+end

data/lib/ii_finder/contextualizer.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module IIFinder
+  module Contextualizer
+    extend ActiveSupport::Concern
+    include Coactive::Contextualizer
+
+    def call
+      contextualize do
+        super
+      end
+    end
+  end
+end

data/lib/ii_finder/core.rb

@@ -3,24 +3,40 @@
 module IIFinder
   module Core
     extend ActiveSupport::Concern
+    include Coactive::Initializer
 
     included do
-      attr_reader :relation, :criteria, :model, :table
+      self.context_class = IIFinder::Context
+      context :relation, output: true
+      context :criteria, :model, :table
     end
 
     def initialize(*args)
-      @_args = args;
-      if args.size == 0 || args.size == 1
-        @model = self.class.lookup
-        raise IIFinder::Error.new("could not find model for #{self.class}") unless @model
-        @relation = @model.all
-        @criteria = args[0] || {}
+      if args[0].is_a?(self.class.context_class)
+        super(args[0])
       else
-        @relation = args[0]
-        @criteria = args[1]
-        @model = @relation.klass
+        relation, criteria = Core.resolve_args(self, *args)
+        model = relation.klass
+        table = model.arel_table if model.respond_to?(:arel_table)
+        super(relation: relation, criteria: criteria, model: model, table: table)
+      end
+    end
+
+    def call_all
+      planned = case IIFinder.config.traversal
+        when :preorder
+          [self] + coactors
+        when :postorder
+          coactors + [self]
+        when :inorder
+          planned = coactors.in_groups(2, false)
+          planned[0] + [self] + planned[1]
+        end
+
+      planned.each do |finder|
+        relation = finder == self ? call : finder.call(@context)
+        @context.relation = @context.relation.merge(relation) if relation.respond_to?(:merge)
       end
-      @table = @model.arel_table if @model.respond_to?(:arel_table)
     end
 
     def call
@@ -30,8 +46,6 @@ module IIFinder
           merge_relation!(send(param.name, value))
         end
       end
-
-      @relation
     end
 
     def fetch_criteria(name)
@@ -50,7 +64,20 @@ module IIFinder
 
     class_methods do
       def call(*args)
-        new(*args).call
+        finder = new(*args).tap(&:call_all)
+        finder.context.relation
+      end
+    end
+
+    class << self
+      def resolve_args(finder, *args)
+        if args.size == 0 || args.size == 1
+          model = finder.class.lookup
+          raise IIFinder::Error.new("could not find model for #{finder.class}") unless model
+          return model.all,  args[0] || {}
+        else
+          return args[0], args[1]
+        end
       end
     end
   end

data/lib/ii_finder/instrumentation.rb

@@ -4,6 +4,11 @@ module IIFinder
   module Instrumentation
     extend ActiveSupport::Concern
 
+    def call_all
+      ActiveSupport::Notifications.instrument 'calling.ii_finder', finder: self
+      super
+    end
+
     def call
       ActiveSupport::Notifications.instrument 'call.ii_finder', finder: self do
         super

data/lib/ii_finder/log_subscriber.rb

@@ -2,13 +2,22 @@
 
 module IIFinder
   class LogSubscriber < ActiveSupport::LogSubscriber
+    def calling(event)
+      debug do
+        finder = event.payload[:finder]
+        "Calling #{finder.class} with #{finder.context}"
+      end
+    end
+
     def call(event)
       debug do
         finder = event.payload[:finder]
-        "Called #{finder.class} with #{finder.criteria} (#{additional_log(event)})"
+        "Called #{finder.class} (#{additional_log(event)})"
       end
     end
 
+    private
+
     def additional_log(event)
       additions = ["Duration: %.1fms" % event.duration]
       additions << "Allocations: %d" % event.allocations if event.respond_to?(:allocations)

data/lib/ii_finder/railtie.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module IIFinder
+  class Railtie < Rails::Railtie
+    ActiveSupport::Reloader.to_prepare do
+      IIFinder::Lookup.cache.clear
+    end
+  end
+end

data/lib/ii_finder/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IIFinder
-  VERSION = '2.0.0'
+  VERSION = '2.2.0'
 end

data/lib/ii_finder.rb

@@ -7,6 +7,7 @@ require 'ii_finder/errors'
 require 'ii_finder/base'
 require 'ii_finder/scope'
 require 'ii_finder/log_subscriber'
+require 'ii_finder/railtie' if defined?(Rails)
 
 module IIFinder
   class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ii_finder
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -130,12 +130,15 @@ files:
 - gemfiles/rails52.gemfile
 - gemfiles/rails60.gemfile
 - gemfiles/rails61.gemfile
+- gemfiles/rails70.gemfile
 - ii_finder.gemspec
 - lib/ii_finder.rb
 - lib/ii_finder/base.rb
 - lib/ii_finder/callbacks.rb
 - lib/ii_finder/coactors.rb
 - lib/ii_finder/config.rb
+- lib/ii_finder/context.rb
+- lib/ii_finder/contextualizer.rb
 - lib/ii_finder/core.rb
 - lib/ii_finder/errors.rb
 - lib/ii_finder/instrumentation.rb
@@ -143,6 +146,7 @@ files:
 - lib/ii_finder/lookup.rb
 - lib/ii_finder/parameter.rb
 - lib/ii_finder/parameters.rb
+- lib/ii_finder/railtie.rb
 - lib/ii_finder/scope.rb
 - lib/ii_finder/version.rb
 homepage: https://github.com/kanety/ii_finder
@@ -163,7 +167,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: A base finder to support building relations from parameters