trailblazer-finder 0.92.0 → 0.101.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5aa468a471c2d9bb6f7f0196e46a14905a557956a18da87723eb74a3f897b10
-  data.tar.gz: 6d236f533affcf4eb828704e438b2ec9f30270d61626be709aa29d64c5489d5d
+  metadata.gz: e3ced2d8db3f4239864a12183a94edc891ad1ab3d6d36f1508403e651bce0786
+  data.tar.gz: fde469fd7fb6a1d501c8b28a5e174cc06f85df1d3b5f0f5f89479a97d6e9b4c1
 SHA512:
-  metadata.gz: 8067cad54995bf7b42b522dc10fc3574dcb7a0a62ad3548e207785c647737192059c0193dd80420891d7e9ab0e96ae13f66c18f0edee94bd29b211139c6457b6
-  data.tar.gz: 9da38615d6276c0c886ab89396da5e0dcf776eefe8ed8e369d439ce38af3113d477c39dee6482c28d6110a9f4e880aa0c3f4b0a704140ed419ea66a83f06b410
+  metadata.gz: b73ae7096e16f38fa6fa52be523124a45bc41c8778ffc0dfb210dc5602799efc939ad51739e7bdbbc624452c31cf2984a1dc2901963bd734c2874b97647eb22b
+  data.tar.gz: f817f84115eb48db4650587730ebfa5c05a89933ae79d43e27c5378e4af193a17d592c5d7e9e3f23f55976a72a24022c00f13f225850c786fcd5d4eb72cd5fa8

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

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "prepare_adapter"
-require_relative "prepare_entity"
-require_relative "prepare_properties"
-require_relative "prepare_filters"
-require_relative "prepare_params"
-require_relative "prepare_paging"
-require_relative "prepare_sorting"
-
 module Trailblazer
   class Finder
     module Activities

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

@@ -13,7 +13,7 @@ module Trailblazer
         end
 
         def invalid?(_e, (ctx, _flow_options), **_circuit_options)
-          (ctx[:errors] ||= []) << {adapter: "The specified adapter are invalid"}
+          (ctx[:errors] ||= []) << {adapter: "The specified adapter is invalid"}
         end
 
         step :set_adapter

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

@@ -17,7 +17,7 @@ module Trailblazer
         end
 
         step :validate_entity
-        fail :invalid_entity_error
+        left :invalid_entity_error
         step :set_entity
       end
     end

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

@@ -21,7 +21,7 @@ module Trailblazer
         end
 
         step :validate_filters
-        fail :invalid_filters_error
+        left :invalid_filters_error
         step :set_filters
       end
     end

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

@@ -19,7 +19,7 @@ module Trailblazer
         end
 
         step :validate_params
-        fail :invalid_params_error
+        left :invalid_params_error
         step :set_params
       end
     end

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

@@ -32,7 +32,7 @@ module Trailblazer
 
         step :check_property_types
         step :validate_property_types
-        fail :invalid_properties_error
+        left :invalid_properties_error
         step :set_properties
       end
     end

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

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "process_adapters"
-require_relative "process_predicates"
-require_relative "process_paging"
-require_relative "process_sorting"
-require_relative "process_filters"
-
 module Trailblazer
   class Finder
     module Activities

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

@@ -37,7 +37,7 @@ module Trailblazer
         step :set_adapter, fast_track: true
         step Rescue(Dry::Types::ConstraintError, handler: :invalid_paginator_handler) {
           step :set_paginator
-          fail :invalid_paginator_error
+          left :invalid_paginator_error
         }
       end
     end

data/lib/trailblazer/finder/base.rb

@@ -7,7 +7,7 @@ module Trailblazer
       def self.included(base)
         base.include Helpers::Basic
         base.include Helpers::Sorting
-        base.extend Finder::Dsl
+        base.extend Dsl
       end
 
       attr_reader :signal, :errors

data/lib/trailblazer/finder/find.rb

@@ -16,7 +16,6 @@ module Trailblazer
 
       def process_filters(ctx)
         @params.reduce(@entity) do |entity, (name, value)|
-          value = Utils::String.to_date(value) if Utils::String.date?(value)
           filter = @filters[name.to_sym] || @filters[name]
           new_entity = ctx.instance_exec entity, filter[:name], value, &filter[:handler]
           new_entity || entity

data/lib/trailblazer/finder/utils/string.rb

@@ -30,21 +30,6 @@ module Trailblazer
             .tr(" ", "_")
             .downcase
         end
-
-        def self.to_date(value)
-          Date.parse(value).strftime("%Y-%m-%d") if date?(value)
-        end
-
-        def self.date?(date)
-          return false unless
-              date.is_a?(::DateTime) ||
-              date.is_a?(::Date) ||
-              date.is_a?(::String)
-          return false if date.is_a?(::String) && date.size == 36 # Ignore uuids that could get casted to dates
-
-          date_hash = ::Date._parse(date.to_s)
-          Date.valid_date?(date_hash[:year].to_i, date_hash[:mon].to_i, date_hash[:mday].to_i)
-        end
       end
     end
   end

data/lib/trailblazer/finder/version.rb

@@ -2,6 +2,6 @@
 
 module Trailblazer
   class Finder
-    VERSION = "0.92.0"
+    VERSION = "0.101.0"
   end
 end

data/lib/trailblazer/finder.rb

@@ -1,45 +1,28 @@
 # frozen_string_literal: true
 
-require "forwardable"
-require "trailblazer"
-require "dry-types"
-require "ostruct"
+require 'forwardable'
+require 'dry-types'
+require 'ostruct'
+require 'zeitwerk'
+require 'trailblazer/operation'
+require 'trailblazer/macro'
 
-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"
+loader = Zeitwerk::Loader.for_gem_extension(Trailblazer)
+adapters = "#{__dir__}/finder/adapters"
+loader.do_not_eager_load(adapters)
+loader.setup
 
 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")
+    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
 end
+
+loader.eager_load

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::Circuit::TaskAdapter.for_step(Finder.new, binary: true)
+      task = Activity::Circuit::TaskAdapter.for_step(Finder.new, binary: true)
       injections = [
         :params,
         {:"finder.class" => ->(*) { finder_class }},
@@ -17,7 +17,7 @@ module Trailblazer
         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"] = Result.new(!finder.nil?, {})
 
         ctx[:"result.finder"].success?
       end

data/lib/trailblazer-finder.rb

@@ -0,0 +1 @@
+require_relative 'trailblazer/finder'

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-finder
 version: !ruby/object:Gem::Version
-  version: 0.92.0
+  version: 0.101.0
 platform: ruby
 authors:
 - Nick Sutterer
 - Marc Tich
 - Abdelkader Boudih
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-12 00:00:00.000000000 Z
+date: 2025-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-types
@@ -26,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: trailblazer-macro
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.15
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.15
 - !ruby/object:Gem::Dependency
   name: trailblazer-activity
   requirement: !ruby/object:Gem::Requirement
@@ -40,6 +53,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.0
+- !ruby/object:Gem::Dependency
+  name: trailblazer-activity-dsl-linear
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -217,6 +258,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/trailblazer-finder.rb
 - lib/trailblazer/finder.rb
 - lib/trailblazer/finder/activities/find.rb
 - lib/trailblazer/finder/activities/prepare.rb
@@ -261,7 +303,6 @@ licenses:
 - LGPL-3.0
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -276,8 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key:
+rubygems_version: 3.6.5
 specification_version: 4
 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,