trailblazer-finder 0.90.0 → 0.91.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c3605d464db4d05bd07e54aec870bd62820657704a730ebc02d11f904dcd964
-  data.tar.gz: e0c677b1cf39def27bef24b5787cf0cc6a475afb9adf227baa77315ee447208b
+  metadata.gz: 299e4ce460407b5ae703246c2c0cd3a9306560a3d540be1ded926a1cc892456e
+  data.tar.gz: 470abe97adffcaa66406a2013bae3990ad6a2d82e89132f7cb0ca157b038458e
 SHA512:
-  metadata.gz: 251cf565e7ca50200c70a997bbbe8c96d28232b28d8bd8001129612194ee2065f57b6198b965cb60f19420f988ad1af17cdcd50c4ad23a50d6eff2241d4a2845
-  data.tar.gz: dcad67e86a906c097f00b88b6b051b296819287a1401db159c401121142e794028a0a0406b8836fc74f590c368ac6a21045f39ed869d36e7b1f6642495c8ae91
+  metadata.gz: 4585a52d42fc8e86dd0570c2e30e290a1af08ffce6ab965e4ed674011e909006a9bd3c7ec45408a7485536e080b150d90a731e6f37c2e31d2483e6f8be5bf049
+  data.tar.gz: 75a02a268b5ce8d2fa02a47cf3b9f2c5fc90b08f94920c03136c5ec6070b822ce58a1716ea92a99f375b56916433577bc778d9d0e87a2f1049f96c2969223af0

data/lib/trailblazer/finder/activities/prepare_adapter.rb

@@ -9,16 +9,17 @@ module Trailblazer
         end
 
         def validate_adapter(_ctx, adapter:, **)
-          (ORM_ADAPTERS + ["Basic"]).include? adapter.to_s
+          ORM_ADAPTERS.(adapter.to_s)
         end
 
-        def invalid?((ctx, _flow_options), **_circuit_options)
+        def invalid?(_e, (ctx, _flow_options), **_circuit_options)
           (ctx[:errors] ||= []) << {adapter: "The specified adapter are invalid"}
         end
 
         step :set_adapter
-        step :validate_adapter
-        fail :invalid?
+        step Rescue(Dry::Types::ConstraintError, handler: :invalid?) {
+          step :validate_adapter
+        }
       end
     end
   end

data/lib/trailblazer/finder/activities/process_adapters.rb

@@ -17,8 +17,8 @@ module Trailblazer
         def set_paginator(ctx, **)
           paginator = ctx.dig(:config, :paginator)
           return true unless paginator
-          return false unless ORM_ADAPTERS.include?(ctx[:orm][:adapter])
-          return false unless PAGING_ADAPTERS.include?(paginator)
+          return false unless EXT_ORM_ADAPTERS.(ctx[:orm][:adapter])
+          return false unless PAGING_ADAPTERS.(paginator)
 
           ctx[:orm][:paging] = "Trailblazer::Finder::Adapters::#{paginator}::Paging"
           true
@@ -33,9 +33,15 @@ module Trailblazer
           }
         end
 
+        def invalid_paginator_handler(_e, (ctx, _flow_options), **)
+          invalid_paginator_error(ctx)
+        end
+
         step :set_adapter, fast_track: true
-        step :set_paginator
-        fail :invalid_paginator_error
+        step Rescue(Dry::Types::ConstraintError, handler: :invalid_paginator_handler) {
+          step :set_paginator
+          fail :invalid_paginator_error
+        }
       end
     end
   end

data/lib/trailblazer/finder/base.rb

@@ -2,8 +2,6 @@
 
 module Trailblazer
   class Finder
-    ORM_ADAPTERS = %w[ActiveRecord Sequel].freeze
-    PAGING_ADAPTERS = %w[Kaminari WillPaginate].freeze
 
     module Base
       def self.included(base)

data/lib/trailblazer/finder/version.rb

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

data/lib/trailblazer/finder.rb

@@ -5,37 +5,40 @@ require "trailblazer"
 require "dry-types"
 require "ostruct"
 
-require "trailblazer/finder/utils/array"
-require "trailblazer/finder/utils/hash"
-require "trailblazer/finder/utils/string"
-require "trailblazer/finder/utils/splitter"
-require "trailblazer/finder/utils/extra"
-require "trailblazer/finder/adapters/active_record/predicates"
-require "trailblazer/finder/adapters/active_record/paging"
-require "trailblazer/finder/adapters/active_record/sorting"
-require "trailblazer/finder/adapters/kaminari/paging"
-require "trailblazer/finder/adapters/will_paginate/paging"
-require "trailblazer/finder/adapters/sequel/predicates"
-require "trailblazer/finder/adapters/sequel/paging"
-require "trailblazer/finder/adapters/sequel/sorting"
-require "trailblazer/finder/adapters/basic/predicates"
-require "trailblazer/finder/adapters/basic/paging"
-require "trailblazer/finder/adapters/basic/sorting"
-require "trailblazer/finder/activities/prepare"
-require "trailblazer/finder/activities/process"
-require "trailblazer/finder/activities/find"
-require "trailblazer/finder/helpers/basic"
-require "trailblazer/finder/helpers/sorting"
-require "trailblazer/finder/dsl"
-require "trailblazer/finder/find"
-require "trailblazer/finder/base"
-require "trailblazer/operation/finder"
+require_relative "finder/utils/array"
+require_relative "finder/utils/hash"
+require_relative "finder/utils/string"
+require_relative "finder/utils/splitter"
+require_relative "finder/utils/extra"
+require_relative "finder/adapters/active_record/predicates"
+require_relative "finder/adapters/active_record/paging"
+require_relative "finder/adapters/active_record/sorting"
+require_relative "finder/adapters/kaminari/paging"
+require_relative "finder/adapters/will_paginate/paging"
+require_relative "finder/adapters/sequel/predicates"
+require_relative "finder/adapters/sequel/paging"
+require_relative "finder/adapters/sequel/sorting"
+require_relative "finder/adapters/basic/predicates"
+require_relative "finder/adapters/basic/paging"
+require_relative "finder/adapters/basic/sorting"
+require_relative "finder/activities/prepare"
+require_relative "finder/activities/process"
+require_relative "finder/activities/find"
+require_relative "finder/helpers/basic"
+require_relative "finder/helpers/sorting"
+require_relative "finder/dsl"
+require_relative "finder/find"
+require_relative "finder/base"
+require_relative "operation/finder"
 
 module Trailblazer
   class Finder
     module Types
       include Dry.Types(default: :nominal)
     end
+    EXT_ORM_ADAPTERS = Types::Strict::String.enum("ActiveRecord", "Sequel")
+    ORM_ADAPTERS = EXT_ORM_ADAPTERS | Types::Strict::String.enum("Basic")
+    PAGING_ADAPTERS = Types::Strict::String.enum("Kaminari", "WillPaginate")
 
     include Base
   end

data/lib/trailblazer/operation/finder.rb

@@ -1,7 +1,7 @@
 module Trailblazer
   class Operation
     def self.Finder(finder_class, action = nil, entity = nil)
-      task = Trailblazer::Activity::TaskBuilder::Binary(Finder.new)
+      task = Trailblazer::Activity::Circuit::TaskAdapter.for_step(Finder.new, binary: true)
       injections = [
         :params,
         {:"finder.class" => ->(*) { finder_class }},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-finder
 version: !ruby/object:Gem::Version
-  version: 0.90.0
+  version: 0.91.0
 platform: ruby
 authors:
 - Nick Sutterer
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-07 00:00:00.000000000 Z
+date: 2024-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-types
@@ -111,21 +111,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-- !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
+  name: maxitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -139,21 +125,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-- !ruby/object:Gem::Dependency
-  name: rubocop
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -167,7 +139,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -181,21 +153,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sequel
+  name: trailblazer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: trailblazer-developer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -209,21 +181,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: trailblazer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: trailblazer-developer
+  name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -237,7 +195,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: will_paginate
+  name: minitest-trailblazer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -298,11 +256,11 @@ files:
 - lib/trailblazer/finder/utils/string.rb
 - lib/trailblazer/finder/version.rb
 - lib/trailblazer/operation/finder.rb
-- trailblazer-finder.gemspec
-homepage: http://trailblazer.to
+homepage: https://trailblazer.to
 licenses:
 - LGPL-3.0
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -318,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: Trailblazer based finder objects. It is designed to be used on its own as

data/trailblazer-finder.gemspec

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-lib = File.expand_path("lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "trailblazer/finder/version"
-
-Gem::Specification.new do |spec|
-  spec.name           = "trailblazer-finder"
-  spec.version        = Trailblazer::Finder::VERSION
-  spec.description    = "Trailblazer Finder Objects"
-  spec.summary        = "Trailblazer based finder objects. It is designed to be used on its own as a separate gem. It was influenced by popular Ransack gem, but in addition to ActiveRecord, it can be used with Sequel, Hash objects, and RomRB."
-  spec.authors        = ["Nick Sutterer", "Marc Tich", "Abdelkader Boudih"]
-  spec.email          = %w[apotonick@gmail.com marc@mudsu.com terminale@gmail.com]
-  spec.homepage       = "http://trailblazer.to"
-  spec.license        = "LGPL-3.0"
-  spec.files          = Dir.glob("lib/**/*")
-  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.13.0"
-
-  spec.add_development_dependency "activerecord"
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "kaminari"
-  spec.add_development_dependency "kaminari-activerecord"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 3.5"
-  spec.add_development_dependency "rspec_junit_formatter"
-  spec.add_development_dependency "rspec-mocks", "~> 3.5"
-  spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "rubocop-rspec"
-  spec.add_development_dependency "sequel"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "trailblazer", "~> 2.1.0"
-  spec.add_development_dependency "trailblazer-developer"
-  spec.add_development_dependency "will_paginate"
-
-  spec.required_ruby_version = ">= 2.5.0"
-end