trailblazer-finder 0.200.0 → 0.201.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90dc16422aad1120e71229592d5754f1cddda1c4b100e5fd204d9489dbc380ff
-  data.tar.gz: f2ded79c05e8bf26bd3607e16bec67622209e667e3e446aec3b5c5987b9217ae
+  metadata.gz: 14052b387273c482eb52d61060c8ea6cc1aac1470c780ffb1f44bdf30a6e8d6a
+  data.tar.gz: 07c618c3ce7d7f4c88011704cfb435f53e0e3414601a8203a3ccb58ef3415b41
 SHA512:
-  metadata.gz: 60b6c26e8b09c3c9a5f833fcd46d84335961a0f633bd4d93743fe9bd69b3fedf2a7e861b2ae2e7f3ceea1d54b4cf4e1f3cab32b0159afcd794069db275a3d41a
-  data.tar.gz: 5af282dd278f41bf9ca9f89d34985989de777e8caa93da8a00107bd49700691e76babe4c665e70f57e1ef59897dc7cb6bbedbe9387f81da3a192a6817ac9d854
+  metadata.gz: 1c9aac700e20cab50ae9ec2ef60ae7fc462e9934122cb1969e93bc5cb72a38a24d7eba7525a1f5eec7f9d620447b40041d08530099a754c466843509aece13df
+  data.tar.gz: 4063ec97d8e558ef48b86776db53ed7ac87524b353663d81db8ead4c988549b993df66ae191c4bcab9738cc4c0b226205eef0a81701fb560e467f577593395ed

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/dsl.rb

@@ -1,27 +1,81 @@
 module Trailblazer
   class Finder
     class Configuration
-      attr_accessor :entity, :paging, :properties, :sorting,
-                    :filters, :adapter, :paginator
+      attr_reader :state
 
       def initialize
-        @paging = {}
-        @properties = {}
-        @sorting = {}
-        @filters = {}
-        @paginator = nil
-        @adapter = "Basic"
+        @state = Trailblazer::Declarative::State(
+          entity: [nil, {}],
+          paging: [{}, {}],
+          properties: [{}, {}],
+          sorting: [{}, {}],
+          filters: [{}, {}],
+          adapter: ["Basic", {}],
+          paginator: [nil, {}]
+        )
       end
 
+      # Accessors that delegate to the state
+      def entity
+        state.get(:entity)
+      end
+
+      def entity=(value)
+        state.set!(:entity, value)
+      end
+
+      def paging
+        state.get(:paging)
+      end
+
+      def paging=(value)
+        state.set!(:paging, value)
+      end
+
+      def properties
+        state.get(:properties)
+      end
+
+      def properties=(value)
+        state.set!(:properties, value)
+      end
+
+      def sorting
+        state.get(:sorting)
+      end
+
+      def sorting=(value)
+        state.set!(:sorting, value)
+      end
+
+      def filters
+        state.get(:filters)
+      end
+
+      def filters=(value)
+        state.set!(:filters, value)
+      end
+
+      def adapter
+        state.get(:adapter)
+      end
+
+      def adapter=(value)
+        state.set!(:adapter, value)
+      end
+
+      def paginator
+        state.get(:paginator)
+      end
+
+      def paginator=(value)
+        state.set!(:paginator, value)
+      end
+
+      # Clone the configuration by copying the state
       def clone
         new_config = Configuration.new
-        new_config.entity = entity
-        new_config.paging = paging.clone
-        new_config.properties = properties.clone
-        new_config.sorting = sorting.clone
-        new_config.filters = filters.clone
-        new_config.adapter = adapter
-        new_config.paginator = paginator
+        new_config.instance_variable_set(:@state, @state.copy)
         new_config
       end
     end
@@ -31,9 +85,8 @@ module Trailblazer
         @config ||= Configuration.new
       end
 
-
       def inherited(base)
-        ## We don't want to inherit the config from Trailblazer::Finder
+        # Skip inheritance for the base Trailblazer::Finder class
         return if name == 'Trailblazer::Finder'
 
         base.config = config.clone
@@ -44,23 +97,21 @@ module Trailblazer
       end
 
       def paging(per_page: 25, min_per_page: 10, max_per_page: 100)
-        config.paging[:per_page] = per_page
-        config.paging[:min_per_page] = min_per_page
-        config.paging[:max_per_page] = max_per_page
+        config.state.update!(:paging) do |paging|
+          paging.merge(per_page: per_page, min_per_page: min_per_page, max_per_page: max_per_page)
+        end
       end
 
       def property(name, options = {})
-        config.properties[name] = options
-        config.properties[name][:type] = options[:type] || Types::String
-        config.sorting[name] = options[:sort_direction] || :desc if options[:sortable]
+        config.state.update!(:properties) { |props| props.merge(name => options.merge(type: options[:type] || Types::String)) }
+        config.state.update!(:sorting) { |sort| sort.merge(name => (options[:sort_direction] || :desc)) } if options[:sortable]
       end
 
       def filter_by(name, options = {}, &block)
         filter_name = name.to_sym
-        config.filters[filter_name] = {}
-        config.filters[filter_name][:name] = name
-        config.filters[filter_name][:with] = options[:with] if options.include?(:with)
-        config.filters[filter_name][:block] = block || nil
+        config.state.update!(:filters) do |filters|
+          filters.merge(filter_name => { name: name, with: options[:with], block: block }.compact)
+        end
       end
 
       def adapter(adapter_name)

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.200.0"
+    VERSION = "0.201.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-finder
 version: !ruby/object:Gem::Version
-  version: 0.200.0
+  version: 0.201.0
 platform: ruby
 authors:
 - Nick Sutterer
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2025-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-types
@@ -319,7 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Trailblazer based finder objects. It is designed to be used on its own as