trailblazer-finder 0.80.1 → 0.90.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9ed5fd3c089acb644a3c240478b2aae6b028f63108a94fba82e3afb9164e226
-  data.tar.gz: 155a516ced78ae4621595ec091e5cf5c651d187949961ddc793b3d57bc10aaf9
+  metadata.gz: 0c3605d464db4d05bd07e54aec870bd62820657704a730ebc02d11f904dcd964
+  data.tar.gz: e0c677b1cf39def27bef24b5787cf0cc6a475afb9adf227baa77315ee447208b
 SHA512:
-  metadata.gz: dec5f359b98b15578b1bc38f521a43200bfe5f68b92daa3e70e2274bfc0a6e43503564dc012f0478af51f3fd2afdb22dc0b8293239c2919508d0ab2158117dfa
-  data.tar.gz: 363bc66d7057c76290622ed083aaa270896ef956ca16019d63d8c653fd95630764fd116f6df052e9061e8c5442eaec0dec6e130c159a92e829c79e37251f01fa
+  metadata.gz: 251cf565e7ca50200c70a997bbbe8c96d28232b28d8bd8001129612194ee2065f57b6198b965cb60f19420f988ad1af17cdcd50c4ad23a50d6eff2241d4a2845
+  data.tar.gz: dcad67e86a906c097f00b88b6b051b296819287a1401db159c401121142e794028a0a0406b8836fc74f590c368ac6a21045f39ed869d36e7b1f6642495c8ae91

data/lib/trailblazer/finder/version.rb

@@ -2,6 +2,6 @@
 
 module Trailblazer
   class Finder
-    VERSION = "0.80.1"
+    VERSION = "0.90.0"
   end
 end

data/lib/trailblazer/operation/finder.rb

@@ -1,55 +1,57 @@
-# Really gotta clean this up, but can't be bothered right now
-Trailblazer::Operation.instance_eval do
-  def self.Finder(finder_class, action = nil, entity = nil)
-    task = Trailblazer::Activity::TaskBuilder::Binary(Finder.new)
-    injection = Trailblazer::Activity::TaskWrap::Inject::Defaults::Extension(
-      :"finder.class"  => finder_class,
-      :"finder.entity" => entity,
-      :"finder.action" => action
-    )
-
-    {task: task, id: "finder.build", extensions: [injection]}
-  end
-
-  class Finder
-    def call(ctx, **options)
-      builder                = Finder::Builder.new
-      ctx[:finder]           = finder = builder.call(options, options[:params])
-      ctx[:model]            = finder # Don't like it, but somehow it's needed if contracts are loaded
-      ctx[:"result.finder"]  = Trailblazer::Operation::Result.new(!finder.nil?, {})
-
-      ctx[:"result.finder"].success?
+module Trailblazer
+  class Operation
+    def self.Finder(finder_class, action = nil, entity = nil)
+      task = Trailblazer::Activity::TaskBuilder::Binary(Finder.new)
+      injections = [
+        :params,
+        {:"finder.class" => ->(*) { finder_class }},
+        {:"finder.entity" => ->(*) { entity }},
+        {:"finder.action" => ->(*) { action }}
+      ]
+
+      {task: task, id: "finder.build", inject: injections}
     end
 
-    class Builder
-      def call(options, params)
-        finder_class  = options[:"finder.class"]
-        entity        = options[:"finder.entity"]
-        action        = options[:"finder.action"]
-        action        = :all unless %i[all single].include?(action)
+    class Finder
+      def call(ctx, **options)
+        builder = Finder::Builder.new
+        ctx[:finder] = finder = builder.call(options, options[:params])
+        ctx[:model] = finder # Don't like it, but somehow it's needed if contracts are loaded
+        ctx[:"result.finder"] = Trailblazer::Operation::Result.new(!finder.nil?, {})
 
-        send("#{action}!", finder_class, entity, params, options[:"finder.action"])
+        ctx[:"result.finder"].success?
       end
 
-      private
+      class Builder
+        def call(options, params)
+          finder_class = options[:"finder.class"]
+          entity = options[:"finder.entity"]
+          action = options[:"finder.action"]
+          action = :all unless %i[all single].include?(action)
 
-      def all!(finder_class, entity, params, *)
-        finder_class.new(entity: entity, params: params)
-      end
+          send("#{action}!", finder_class, entity, params, options[:"finder.action"])
+        end
 
-      def single!(finder_class, entity, params, *)
-        apply_id(params)
-        if entity.nil?
-          finder_class.new(params: params).result.first
-        else
-          finder_class.new(entity: entity, params: params).result.first
+        private
+
+        def all!(finder_class, entity, params, *)
+          finder_class.new(entity: entity, params: params)
         end
-      end
 
-      def apply_id(params)
-        return if params[:id].nil?
+        def single!(finder_class, entity, params, *)
+          apply_id(params)
+          if entity.nil?
+            finder_class.new(params: params).result.first
+          else
+            finder_class.new(entity: entity, params: params).result.first
+          end
+        end
 
-        params[:id_eq] = params[:id]
+        def apply_id(params)
+          return if params[:id].nil?
+
+          params[:id_eq] = params[:id]
+        end
       end
     end
   end

data/trailblazer-finder.gemspec

@@ -14,12 +14,12 @@ Gem::Specification.new do |spec|
   spec.homepage       = "http://trailblazer.to"
   spec.license        = "LGPL-3.0"
   spec.files          = Dir.glob("lib/**/*")
-  spec.files          << ['trailblazer-finder.gemspec']
+  spec.files << ["trailblazer-finder.gemspec"]
   spec.test_files     = spec.files.grep(%r{^(test)/})
   spec.require_paths  = ["lib"]
 
   spec.add_dependency "dry-types", ">= 1.0.0"
-  spec.add_dependency "trailblazer-activity", ">= 0.10.0", "< 0.13.0"
+  spec.add_dependency "trailblazer-activity", ">= 0.13.0"
 
   spec.add_development_dependency "activerecord"
   spec.add_development_dependency "bundler"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-finder
 version: !ruby/object:Gem::Version
-  version: 0.80.1
+  version: 0.90.0
 platform: ruby
 authors:
 - Nick Sutterer
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-05 00:00:00.000000000 Z
+date: 2022-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-types
@@ -31,9 +31,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-    - - "<"
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :runtime
@@ -41,9 +38,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-    - - "<"
       - !ruby/object:Gem::Version
         version: 0.13.0
 - !ruby/object:Gem::Dependency
@@ -324,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Trailblazer based finder objects. It is designed to be used on its own as