ii_finder 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fbbf6a8d97c83f3d098f3b13d93039491698409623d0137e0b170c83dedd58d
-  data.tar.gz: 9619799961e2416db17aca506f6ef596acd621b3fc1339aa82679b779d3f79e8
+  metadata.gz: a0ae2fd0943ca59c70d7f10c8f0c7c48d9cac20fddd65af6c0f255a9352c78a2
+  data.tar.gz: 433dddd946b33c7677d3a65ce123c7cc78a5bd1f4defb67b8b2a8b5dc773e6e1
 SHA512:
-  metadata.gz: 577f3b00606d238e20a9d24075a92b9b5cdc10f170637e4e6bf6dc58db3bd04bf5de13a75da050af0b7a421d1dfe6bc91b4020188f38051394c39b81133b2fa0
-  data.tar.gz: abd2108a7892aa866ffc8d6a86545b61df42ce7b0c10af079e4272f5194e74be5f3c7146ed3ed671a96ea5eb6240edeabe77da8e51ab675b2a05427212bb2adf
+  metadata.gz: 549fe65cf139efb23f0ea3cf127091e835f4cdfe1f7e48d6700d4ceae0b436d0375ad60b906075d8e79f8a56439a143c294af012706e631d292e442d2572bc35
+  data.tar.gz: '009952b67ce09720ed1d250fb1337c9fb053661c7e45427c30e144dcab0d875673ad3a2eed933560b7dfebc70929a162ad075b35e751c3d55138dfd146498877'

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.0.0
+
+* Replace chain feature with coactive.
+
 ## 1.2.0
 
 * Add chain feature.

data/README.md

@@ -141,9 +141,9 @@ Note that finder does not handle the return value of callback.
 When you want to update `@relation` in the callback,
 reassign `@relation` or use methods like `where!` or `order!`.
 
-#### Chain
+#### Coactors
 
-You can chain multiple finders by using `chain`. For example:
+You can chain multiple finders by using `coact`. For example:
 
 ```ruby
 class NameFinder < IIFinder::Base
@@ -163,28 +163,14 @@ class AgeFinder < IIFinder::Base
 end
 
 class ItemsFinder < IIFinder::Base
-  chain NameFinder, AgeFinder
+  coact NameFinder, AgeFinder
 end
 
 ItemsFinder.call(Item.all, name: 'name', age: 10).to_sql
 #=> SELECT "items".* FROM "items" WHERE "items"."name" = 'name' AND "items"."age" = 10
 ```
 
-You can also use method or block to find finder class dynamically:
-
-```ruby
-class ItemFinder < IIFinder::Base
-  chain -> { NameFinder }
-end
-
-class ItemFinder < IIFinder::Base
-  chain :chain_finder
-
-  def chain_finder
-    NameFinder
-  end
-end
-```
+See [coactive](https://github.com/kanety/coactive) for more `coact` examples:
 
 ### Lookup for model
 

data/ii_finder.gemspec

@@ -18,6 +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_development_dependency "rails", ">= 5.0"
   spec.add_development_dependency "sqlite3"

data/lib/ii_finder/base.rb

@@ -5,7 +5,7 @@ require_relative 'parameters'
 require_relative 'callbacks'
 require_relative 'instrumentation'
 require_relative 'lookup'
-require_relative 'chain'
+require_relative 'coactors'
 
 module IIFinder
   class Base
@@ -14,6 +14,6 @@ module IIFinder
     include Callbacks
     include Instrumentation
     include Lookup
-    include Chain
+    include Coactors
   end
 end

data/lib/ii_finder/coactors.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module IIFinder
+  module Coactors
+    extend ActiveSupport::Concern
+
+    included do
+      include Coactive::Base
+
+      configure_coactive do |config|
+        config.load_paths = ['app/finders']
+        config.class_suffix = 'Finder'
+        config.use_cache = true
+        config.lookup_superclass_until = ['ActiveRecord::Base', 'ActiveModel::Base']
+      end
+
+      class << self
+        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/version.rb

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

data/lib/ii_finder.rb

@@ -1,4 +1,5 @@
 require 'active_support'
+require 'coactive'
 
 require 'ii_finder/version'
 require 'ii_finder/config'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ii_finder
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-08 00:00:00.000000000 Z
+date: 2021-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: coactive
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +134,7 @@ files:
 - lib/ii_finder.rb
 - lib/ii_finder/base.rb
 - lib/ii_finder/callbacks.rb
-- lib/ii_finder/chain.rb
+- lib/ii_finder/coactors.rb
 - lib/ii_finder/config.rb
 - lib/ii_finder/core.rb
 - lib/ii_finder/errors.rb
@@ -149,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A base finder to support building relations from parameters

data/lib/ii_finder/chain.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-module IIFinder
-  module Chain
-    extend ActiveSupport::Concern
-
-    included do
-      class_attribute :_chains
-      self._chains = []
-    end
-
-    def call
-      lookup.each do |finder|
-        merge_relation!(finder.call(*@_args))
-      end
-      super
-    end
-
-    def lookup
-      self.class._chains.map do |finder|
-        if finder.is_a?(Symbol) && respond_to?(finder, true)
-          send(finder)
-        elsif finder.is_a?(Proc)
-          instance_exec(&finder)
-        else
-          finder
-        end
-      end.flatten.compact
-    end
-
-    class_methods do
-      def chain(*finders, &block)
-        self._chains = _chains + finders
-        self._chains << block if block
-      end
-    end
-  end
-end