trailblazer-finder 0.50.0 → 0.70.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfcac8d017065a8faea558faebaa1bd9e742b7ceb9444a50eafd79d2c759bbfc
-  data.tar.gz: fdfafe463cba185afb34934f981b3428bb357a4031f941e22cb44e1c45608e11
+  metadata.gz: 39f554fa2720ae7fe8f7bdc61eb44e636167a7ec85cb4c0b47da5027f80d4c3e
+  data.tar.gz: 83e4e41732b0c4fef9d4d5793e3f6de7ad6b66086c906854127e6018f7a7eaa5
 SHA512:
-  metadata.gz: 89c313cc891e5ef6b1d6e07145e23541d74698b543e47f4213d621e21925ec18c60d01d66cdbc2c6fe9d2ddbbfc4d5ef201f1bb80a1264ffe70c01f3e37772e0
-  data.tar.gz: 2a00366ecc9c10ae045ce1d1c69f455cc7a8b101be8bb360228cf8cb148833502ea6039ce30740781bd93f97c8cabf878a6129beeb072c9e4e6e0b13b5c3128f
+  metadata.gz: d8e69bb8c68980e657d2399fb1e6b50d63b1538e38346eb1a40465e60737940f431c052689a29c3b4ca9fdfc69b6e7d26f49f59db015e30beb5ba736522e81e5
+  data.tar.gz: 9fe89ed1a67614bff0a9d5a69242972ce4bd219b0d20e72bb0d356637f7dbc9c2f3ea6e27fd32eb42c32e5502e67716545f4be5e9498a3d94c3863c92e4db1e0

data/.github/workflows/ci.yml

@@ -0,0 +1,16 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.5, 2.6, 2.7, '3.0']
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - run: bundle exec rake

data/.rubocop.yml

@@ -2,4 +2,10 @@ require: rubocop-rspec
 
 inherit_from:
   - https://raw.githubusercontent.com/trailblazer/meta/master/rubocop.yml
-  - .rubocop_todo.yml
+
+RSpec/ExampleLength:
+  Enabled: false
+RSpec/MultipleExpectations:
+  Enabled: false
+Layout/LineLength:
+  Enabled: false

data/CHANGES.md

@@ -1,3 +1,9 @@
+# 0.70.0
+* Drop Support Legacy Dry-types
+
+# 0.60.0
+* Support Ruby 3.0
+
 # 0.50.0
 * Breaking change: Use adapter and paginator configs instead of mixing them in adapters config.
 

data/Gemfile

@@ -4,7 +4,9 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "pry-byebug"
+gem "debug", platform: :mri
+gem "jdbc-sqlite3", :platform => :jruby
+gem "sqlite3", platform: :mri
 
 # Had to add this for a bit, since none of the latest changes have been pushed to gems yet
 # gem "trailblazer", github: "trailblazer/trailblazer"

data/Rakefile

@@ -16,12 +16,6 @@ end
 
 RuboCop::RakeTask.new(:rubocop)
 
-desc "Remove temporary files"
-task :clean do
-  `rm -rf *.gem doc pkg coverage test-reports`
-  %x(rm -f `find . -name '*.rbc'`)
-end
-
 desc "Build the gem"
 task :gem do
   `gem build trailblazer-finder.gemspec`

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

@@ -6,8 +6,7 @@ module Trailblazer
       class Find < Trailblazer::Activity::Railway
         PREDICATES = %w[eq not_eq blank not_blank lt lte gt gte sw not_sw ew not_ew cont not_cont].freeze
 
-
-        def process_params(ctx, params:,  **)
+        def process_params(ctx, params:, **)
           params.each do |attribute, value|
             result = {}
             filter_attribute = attribute.to_sym
@@ -31,23 +30,24 @@ module Trailblazer
         step :set_finder
 
         private
-          def fetch_filters(ctx, result, attribute)
-            filter_attribute = ctx[:filters][attribute]
-            result[:filter] = {}
-            result[:name] = attribute
-            result[:filter][:handler] = filter_attribute[:with] || filter_attribute[:block]
-          end
 
-          def fetch_properties(result, attribute, value, properties)
-            splitter = Utils::Splitter.new attribute, value
-            PREDICATES.each do |predicate|
-              next unless splitter.split_key predicate
-              next unless properties.include?(splitter.field.to_sym)
+        def fetch_filters(ctx, result, attribute)
+          filter_attribute = ctx[:filters][attribute]
+          result[:filter] = {}
+          result[:name] = attribute
+          result[:filter][:handler] = filter_attribute[:with] || filter_attribute[:block]
+        end
 
-              result[:name] = splitter.field
-              result[:predicate] = predicate
-            end
+        def fetch_properties(result, attribute, value, properties)
+          splitter = Utils::Splitter.new attribute, value
+          PREDICATES.each do |predicate|
+            next unless splitter.split_key predicate
+            next unless properties.include?(splitter.field.to_sym)
+
+            result[:name] = splitter.field
+            result[:predicate] = predicate
           end
+        end
       end
     end
   end

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

@@ -4,7 +4,6 @@ module Trailblazer
   class Finder
     module Activities
       class PrepareAdapter < Trailblazer::Activity::Railway
-
         def set_adapter(ctx, **)
           ctx[:adapter] = ctx.dig(:config, :adapter) || "Basic"
         end
@@ -13,13 +12,13 @@ module Trailblazer
           (ORM_ADAPTERS + ["Basic"]).include? adapter.to_s
         end
 
-        def is_invalid?((ctx, _flow_options), **_circuit_options)
+        def invalid?((ctx, _flow_options), **_circuit_options)
           (ctx[:errors] ||= []) << {adapter: "The specified adapter are invalid"}
         end
 
         step :set_adapter
         step :validate_adapter
-        fail :is_invalid?
+        fail :invalid?
       end
     end
   end

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

@@ -5,7 +5,7 @@ module Trailblazer
     module Activities
       class PrepareEntity < Trailblazer::Activity::Railway
         def validate_entity(ctx, **)
-          ctx.dig(:options,:entity) || ctx.dig(:config,:entity)
+          ctx.dig(:options, :entity) || ctx.dig(:config, :entity)
         end
 
         def invalid_entity_error(ctx, **)
@@ -13,7 +13,7 @@ module Trailblazer
         end
 
         def set_entity(ctx, **)
-          ctx[:entity] = ctx.dig(:options,:entity) || instance_eval(&ctx[:config][:entity])
+          ctx[:entity] = ctx.dig(:options, :entity) || instance_eval(&ctx[:config][:entity])
         end
 
         step :validate_entity

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

@@ -12,8 +12,8 @@ module Trailblazer
         end
 
         def set_paging(ctx, **)
-          ctx[:paging] = ctx.dig(:config,:paging) || {}
-          ctx[:paging][:current_page] = ctx.dig(:params,:page) || 1
+          ctx[:paging] = ctx.dig(:config, :paging) || {}
+          ctx[:paging][:current_page] = ctx.dig(:params, :page) || 1
           return true unless ctx[:params][:per_page]
 
           ctx[:paging][:per_page] = ctx[:params][:per_page].to_i || ctx[:paging][:per_page]

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

@@ -18,11 +18,7 @@ module Trailblazer
           return true if properties.empty?
 
           properties.each do |key, _value|
-            if LEGACY_DRY_TYPES
-              return properties[key][:type].class.ancestors.include?(::Dry::Types::Definition)
-            else
-              return properties[key][:type].class.ancestors.include?(::Dry::Types::Nominal)
-            end
+            return properties[key][:type].class.ancestors.include?(::Dry::Types::Nominal)
           end
         end
 

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

@@ -4,7 +4,7 @@ module Trailblazer
   class Finder
     module Activities
       class ProcessAdapters < Trailblazer::Activity::Railway
-        def set_adapter((ctx, flow_options), **)
+        def set_adapter((ctx, _flow_options), **)
           adapter = ctx[:adapter]
           ctx[:orm] = {}
           ctx[:orm][:adapter] = adapter
@@ -19,12 +19,18 @@ module Trailblazer
           return true unless paginator
           return false unless ORM_ADAPTERS.include?(ctx[:orm][:adapter])
           return false unless PAGING_ADAPTERS.include?(paginator)
+
           ctx[:orm][:paging] = "Trailblazer::Finder::Adapters::#{paginator}::Paging"
           true
         end
 
         def invalid_paginator_error(ctx, **)
-          (ctx[:errors] ||= []) << {paginator: "Can't use paginator #{ctx.dig(:config, :paginator)} without using an ORM like ActiveRecord or Sequel"}
+          (ctx[:errors] ||= []) << {
+            paginator: "Can't use paginator #{ctx.dig(
+              :config,
+              :paginator
+            )} without using an ORM like ActiveRecord or Sequel"
+          }
         end
 
         step :set_adapter, fast_track: true

data/lib/trailblazer/finder/adapters/active_record/paging.rb

@@ -10,7 +10,7 @@ module Trailblazer
           module_function
 
           def set_paging_handler
-            lambda do |current_page, per_page, entity|
+            ->(current_page, per_page, entity) do
               entity.limit(per_page).offset(([current_page, 1].max - 1) * per_page)
             end
           end

data/lib/trailblazer/finder/adapters/active_record/predicates.rb

@@ -10,7 +10,7 @@ module Trailblazer
           module_function
 
           def set_eq_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s)
 
               entity.where(attribute => value)
@@ -18,7 +18,7 @@ module Trailblazer
           end
 
           def set_not_eq_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s)
 
               entity.where.not(attribute => value)
@@ -26,73 +26,73 @@ module Trailblazer
           end
 
           def set_blank_handler
-            lambda do |entity, attribute, _value|
+            ->(entity, attribute, _value) do
               entity.where(attribute.to_sym => [nil, ""])
             end
           end
 
           def set_not_blank_handler
-            lambda do |entity, attribute, _value|
+            ->(entity, attribute, _value) do
               entity.where.not(attribute.to_sym => [nil, ""])
             end
           end
 
           def set_gt_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where("#{attribute} > ?", value.to_f)
             end
           end
 
           def set_gte_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where("#{attribute} >= ?", value.to_f)
             end
           end
 
           def set_lt_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where("#{attribute} < ?", value.to_f)
             end
           end
 
           def set_lte_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where("#{attribute} <= ?", value.to_f)
             end
           end
 
           def set_cont_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where("#{attribute} LIKE ?", "%#{value}%")
             end
           end
 
           def set_not_cont_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where("#{attribute} NOT LIKE ?", "%#{value}%")
             end
           end
 
           def set_sw_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where("#{attribute} LIKE ?", "#{value}%")
             end
           end
 
           def set_not_sw_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where("#{attribute} NOT LIKE ?", "#{value}%")
             end
           end
 
           def set_ew_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where("#{attribute} LIKE ?", "%#{value}")
             end
           end
 
           def set_not_ew_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where("#{attribute} NOT LIKE ?", "%#{value}")
             end
           end

data/lib/trailblazer/finder/adapters/active_record/sorting.rb

@@ -10,7 +10,7 @@ module Trailblazer
           module_function
 
           def set_sorting_handler
-            lambda do |sort_attributes, entity|
+            ->(sort_attributes, entity) do
               sort_attributes.delete(:handler)
               attributes = []
               sort_attributes.each do |attr|

data/lib/trailblazer/finder/adapters/basic/paging.rb

@@ -10,7 +10,7 @@ module Trailblazer
           module_function
 
           def set_paging_handler
-            lambda do |current_page, per_page, entity|
+            ->(current_page, per_page, entity) do
               entity.drop(([current_page, 1].max - 1) * per_page).first(per_page)
             end
           end

data/lib/trailblazer/finder/adapters/basic/predicates.rb

@@ -10,7 +10,7 @@ module Trailblazer
           module_function
 
           def set_eq_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s) || Utils::String.blank?(attribute.to_s)
 
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && v.to_s == value.to_s && !v.nil? }, entity
@@ -18,7 +18,7 @@ module Trailblazer
           end
 
           def set_not_eq_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s)
 
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && v.to_s != value.to_s && !v.nil? }, entity
@@ -26,43 +26,43 @@ module Trailblazer
           end
 
           def set_blank_handler
-            lambda do |entity, attribute, _value|
+            ->(entity, attribute, _value) do
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && Utils::String.blank?(v.to_s) }, entity
             end
           end
 
           def set_not_blank_handler
-            lambda do |entity, attribute, _value|
+            ->(entity, attribute, _value) do
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && !Utils::String.blank?(v.to_s) }, entity
             end
           end
 
           def set_gt_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && v.to_f > value.to_f }, entity
             end
           end
 
           def set_gte_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && v.to_f >= value.to_f }, entity
             end
           end
 
           def set_lt_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && v.to_f < value.to_f }, entity
             end
           end
 
           def set_lte_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && v.to_i <= value.to_f }, entity
             end
           end
 
           def set_cont_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s) || Utils::String.blank?(attribute.to_s)
 
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && v.to_s.include?(value.to_s) && !v.nil? }, entity
@@ -70,7 +70,7 @@ module Trailblazer
           end
 
           def set_not_cont_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s) || Utils::String.blank?(attribute.to_s)
 
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && !v.to_s.include?(value.to_s) && !v.nil? }, entity
@@ -78,7 +78,7 @@ module Trailblazer
           end
 
           def set_sw_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s) || Utils::String.blank?(attribute.to_s)
 
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && v.to_s.start_with?(value.to_s) && !v.nil? }, entity
@@ -86,7 +86,7 @@ module Trailblazer
           end
 
           def set_not_sw_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s) || Utils::String.blank?(attribute.to_s)
 
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && !v.to_s.start_with?(value.to_s) && !v.nil? }, entity
@@ -94,7 +94,7 @@ module Trailblazer
           end
 
           def set_ew_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s) || Utils::String.blank?(attribute.to_s)
 
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && v.to_s.end_with?(value.to_s) && !v.nil? }, entity
@@ -102,7 +102,7 @@ module Trailblazer
           end
 
           def set_not_ew_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s) || Utils::String.blank?(attribute.to_s)
 
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && !v.to_s.end_with?(value.to_s) && !v.nil? }, entity

data/lib/trailblazer/finder/adapters/basic/sorting.rb

@@ -10,7 +10,7 @@ module Trailblazer
           module_function
 
           def set_sorting_handler
-            lambda do |sort_attributes, entity|
+            ->(sort_attributes, entity) do
               sort_attributes.delete(:handler)
               attributes = []
               sort_attributes.each do |attr|

data/lib/trailblazer/finder/adapters/kaminari/paging.rb

@@ -9,7 +9,7 @@ module Trailblazer
           module_function
 
           def set_paging_handler
-            lambda do |current_page, per_page, entity|
+            ->(current_page, per_page, entity) do
               entity.page(current_page).per(per_page)
             end
           end

data/lib/trailblazer/finder/adapters/sequel/paging.rb

@@ -10,7 +10,7 @@ module Trailblazer
           module_function
 
           def set_paging_handler
-            lambda do |current_page, per_page, entity|
+            ->(current_page, per_page, entity) do
               entity.limit(per_page).offset(([current_page, 1].max - 1) * per_page)
             end
           end

data/lib/trailblazer/finder/adapters/sequel/predicates.rb

@@ -10,7 +10,7 @@ module Trailblazer
           module_function
 
           def set_eq_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s)
 
               entity.where { ::Sequel[attribute.to_sym] =~ value }
@@ -18,7 +18,7 @@ module Trailblazer
           end
 
           def set_not_eq_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s)
 
               entity.where { ::Sequel[attribute.to_sym] !~ value }
@@ -26,74 +26,74 @@ module Trailblazer
           end
 
           def set_blank_handler
-            lambda do |entity, attribute, _value|
+            ->(entity, attribute, _value) do
               entity.where { ::Sequel.|({::Sequel[attribute.to_sym] => nil}, {::Sequel[attribute.to_sym] => ""}) }
             end
           end
 
           def set_not_blank_handler
-            lambda do |entity, attribute, _value|
+            ->(entity, attribute, _value) do
               entity.exclude(::Sequel[attribute.to_sym] => nil, ::Sequel[attribute.to_sym] => "")
               # entity.exclude(attribute.to_sym => nil).exclude(attribute.to_sym => "")
             end
           end
 
           def set_gt_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where { ::Sequel[attribute.to_sym] > value.to_f }
             end
           end
 
           def set_gte_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where { ::Sequel[attribute.to_sym] >= value.to_f }
             end
           end
 
           def set_lt_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where { ::Sequel[attribute.to_sym] < value.to_f }
             end
           end
 
           def set_lte_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where { ::Sequel[attribute.to_sym] <= value.to_f }
             end
           end
 
           def set_cont_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where(::Sequel.like(attribute.to_sym, "%#{value}%"))
             end
           end
 
           def set_not_cont_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where(~::Sequel.like(attribute.to_sym, "%#{value}%"))
             end
           end
 
           def set_sw_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where(::Sequel.like(attribute.to_sym, "#{value}%"))
             end
           end
 
           def set_not_sw_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where(~::Sequel.like(attribute.to_sym, "#{value}%"))
             end
           end
 
           def set_ew_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where(::Sequel.like(attribute.to_sym, "%#{value}"))
             end
           end
 
           def set_not_ew_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where(~::Sequel.like(attribute.to_sym, "%#{value}"))
             end
           end

data/lib/trailblazer/finder/adapters/sequel/sorting.rb

@@ -10,7 +10,7 @@ module Trailblazer
           module_function
 
           def set_sorting_handler
-            lambda do |sort_attributes, entity|
+            ->(sort_attributes, entity) do
               sort_attributes.delete(:handler)
               attributes = []
               sort_attributes.each do |attr|

data/lib/trailblazer/finder/adapters/will_paginate/paging.rb

@@ -9,7 +9,7 @@ module Trailblazer
           module_function
 
           def set_paging_handler
-            lambda do |current_page, per_page, entity|
+            ->(current_page, per_page, entity) do
               entity.paginate per_page: per_page, page: current_page.zero? ? nil : current_page
             end
           end

data/lib/trailblazer/finder/dsl.rb

@@ -13,7 +13,7 @@ module Trailblazer
         config[:entity] = block
       end
 
-      def paging(options, **)
+      def paging(**options)
         config[:paging][:per_page] = options[:per_page] || 25
         config[:paging][:min_per_page] = options[:min_per_page] || 10
         config[:paging][:max_per_page] = options[:max_per_page] || 100

data/lib/trailblazer/finder/find.rb

@@ -24,7 +24,8 @@ module Trailblazer
       end
 
       def process_paging(ctx)
-        ctx.instance_exec @paging[:current_page], @paging[:per_page], (@sorting.empty? ? (process_filters ctx) : (process_sorting ctx)), &@paging[:handler]
+        ctx.instance_exec @paging[:current_page], @paging[:per_page],
+                          (@sorting.empty? ? (process_filters ctx) : (process_sorting ctx)), &@paging[:handler]
       end
 
       def process_sorting(ctx)

data/lib/trailblazer/finder/helpers/sorting.rb

@@ -31,7 +31,10 @@ module Trailblazer
           if sorting.nil?
             params.merge! sort: "#{attribute} #{sort_direction_for(attribute)}"
           elsif sorting.include?(attribute.to_s)
-            params.merge! sort: sorting.gsub(/#{attribute} #{sort_direction_for(attribute)}/, "#{attribute} #{reverse_sort_direction_for(attribute)}")
+            params.merge! sort: sorting.gsub(
+              /#{attribute} #{sort_direction_for(attribute)}/,
+              "#{attribute} #{reverse_sort_direction_for(attribute)}"
+            )
           else
             params.merge! sort: "#{sorting}, #{attribute} #{sort_direction_for(attribute)}"
           end

data/lib/trailblazer/finder/version.rb

@@ -2,6 +2,6 @@
 
 module Trailblazer
   class Finder
-    VERSION = "0.50.0".freeze
+    VERSION = "0.70.0"
   end
 end

data/lib/trailblazer/finder.rb

@@ -33,14 +33,8 @@ require "trailblazer/operation/finder"
 
 module Trailblazer
   class Finder
-    DRY_TYPES_VERSION = Gem::Version.new(Dry::Types::VERSION)
-    LEGACY_DRY_TYPES = DRY_TYPES_VERSION <= Gem::Version.new('1')
     module Types
-      if LEGACY_DRY_TYPES
-        include Dry::Types.module
-      else
-        include Dry.Types(default: :nominal)
-      end
+      include Dry.Types(default: :nominal)
     end
 
     include Base

data/lib/trailblazer/operation/finder.rb

@@ -12,13 +12,12 @@ Trailblazer::Operation.instance_eval do
   end
 
   class Finder
-    def call(ctx, options, **)
+    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?
     end
 
@@ -49,6 +48,7 @@ Trailblazer::Operation.instance_eval do
 
       def apply_id(params)
         return if params[:id].nil?
+
         params[:id_eq] = params[:id]
       end
     end

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "bundler/setup"
-require "pry-byebug"
 require "trailblazer/developer"
 require "trailblazer/activity"
 require "trailblazer/activity/testing"

data/spec/trailblazer/finder/adapters/active_record_spec.rb

@@ -132,7 +132,7 @@ module Trailblazer
 
           it "sets the property and works with sw predicate" do
             5.times { |i| Product.create name: "product_#{i}" }
-            1.times { |i| Product.create name: "predicate_#{i}" }
+            Product.create name: "predicate_0"
             4.times { |i| Product.create name: "none_#{i}" }
             finder = new_finder name_sw: "pr" do
               property :name, type: Types::String
@@ -144,7 +144,7 @@ module Trailblazer
 
           it "sets the property and works with not_sw predicate" do
             5.times { |i| Product.create name: "product_#{i}" }
-            1.times { |i| Product.create name: "predicate_#{i}" }
+            Product.create name: "predicate_0"
             4.times { |i| Product.create name: "none_#{i}" }
             finder = new_finder name_not_sw: "pr" do
               property :name, type: Types::String
@@ -156,7 +156,7 @@ module Trailblazer
 
           it "sets the property and works with ew predicate" do
             5.times { |i| Product.create name: "product_#{i}_end" }
-            1.times { |i| Product.create name: "predicate_#{i}_endwow" }
+            Product.create name: "predicate_0_endwow"
             4.times { |i| Product.create name: "none_#{i}" }
             finder = new_finder name_ew: "end" do
               property :name, type: Types::String
@@ -168,7 +168,7 @@ module Trailblazer
 
           it "sets the property and works with not_ew predicate" do
             5.times { |i| Product.create name: "product_#{i}_end" }
-            1.times { |i| Product.create name: "predicate_#{i}_endwow" }
+            Product.create name: "predicate_0_endwow"
             4.times { |i| Product.create name: "none_#{i}" }
             finder = new_finder name_not_ew: "end" do
               property :name, type: Types::String

data/spec/trailblazer/finder/adapters/basic_spec.rb

@@ -173,7 +173,10 @@ module Trailblazer
           end
 
           it "accepts per_page as a parameter" do
-            entity = [{id: 1, value: "Test 1"}, {id: 2, value: "Test 2"}, {id: 3, value: "Test 3"}, {id: 4, value: "Test 4"}, {id: 5, value: "Test 5"}, {id: 6, value: "Test 6"}, {id: 7, value: "Test 7"}, {id: 8, value: "Test 8"}, {id: 9, value: "Test 9"}, {id: 10, value: "Test 10"}]
+            entity = [
+              {id: 1, value: "Test 1"}, {id: 2, value: "Test 2"}, {id: 3, value: "Test 3"}, {id: 4, value: "Test 4"},
+              {id: 5, value: "Test 5"}, {id: 6, value: "Test 6"}, {id: 7, value: "Test 7"}, {id: 8, value: "Test 8"}, {id: 9, value: "Test 9"}, {id: 10, value: "Test 10"}
+            ]
             finder = new_finder entity, page: 2, per_page: 4 do
               paging per_page: 5, min_per_page: 2, max_per_page: 8
             end
@@ -183,7 +186,10 @@ module Trailblazer
           end
 
           it "uses max_per_page in finder as maximum per_page" do
-            entity = [{id: 1, value: "Test 1"}, {id: 2, value: "Test 2"}, {id: 3, value: "Test 3"}, {id: 4, value: "Test 4"}, {id: 5, value: "Test 5"}, {id: 6, value: "Test 6"}, {id: 7, value: "Test 7"}, {id: 8, value: "Test 8"}, {id: 9, value: "Test 9"}, {id: 10, value: "Test 10"}]
+            entity = [
+              {id: 1, value: "Test 1"}, {id: 2, value: "Test 2"}, {id: 3, value: "Test 3"}, {id: 4, value: "Test 4"},
+              {id: 5, value: "Test 5"}, {id: 6, value: "Test 6"}, {id: 7, value: "Test 7"}, {id: 8, value: "Test 8"}, {id: 9, value: "Test 9"}, {id: 10, value: "Test 10"}
+            ]
             finder = new_finder entity, page: 2, per_page: 9 do
               paging per_page: 5, min_per_page: 2, max_per_page: 8
             end
@@ -193,7 +199,10 @@ module Trailblazer
           end
 
           it "uses min_per_page in finder as minimum per_page" do
-            entity = [{id: 1, value: "Test 1"}, {id: 2, value: "Test 2"}, {id: 3, value: "Test 3"}, {id: 4, value: "Test 4"}, {id: 5, value: "Test 5"}, {id: 6, value: "Test 6"}, {id: 7, value: "Test 7"}, {id: 8, value: "Test 8"}, {id: 9, value: "Test 9"}, {id: 10, value: "Test 10"}]
+            entity = [
+              {id: 1, value: "Test 1"}, {id: 2, value: "Test 2"}, {id: 3, value: "Test 3"}, {id: 4, value: "Test 4"},
+              {id: 5, value: "Test 5"}, {id: 6, value: "Test 6"}, {id: 7, value: "Test 7"}, {id: 8, value: "Test 8"}, {id: 9, value: "Test 9"}, {id: 10, value: "Test 10"}
+            ]
             finder = new_finder entity, page: 2, per_page: 1 do
               paging per_page: 5, min_per_page: 2, max_per_page: 8
             end

data/spec/trailblazer/finder/adapters/kaminari_spec.rb

@@ -59,7 +59,7 @@ module Trailblazer
           it "accepts per_page as a parameter" do
             10.times { |i| Product.create name: "product_#{i}" }
             finder = new_finder page: 2, per_page: 4 do
-               adapter "ActiveRecord"
+              adapter "ActiveRecord"
               paginator "Kaminari"
               paging per_page: 5, min_per_page: 2, max_per_page: 8
             end

data/spec/trailblazer/finder/adapters/sequel_spec.rb

@@ -132,7 +132,7 @@ module Trailblazer
 
           it "sets the property and works with sw predicate" do
             5.times { |i| SProduct.create name: "product_#{i}" }
-            1.times { |i| SProduct.create name: "predicate_#{i}" }
+            SProduct.create name: "predicate_0"
             4.times { |i| SProduct.create name: "none_#{i}" }
             finder = new_finder name_sw: "pr" do
               property :name, type: Types::String
@@ -144,7 +144,7 @@ module Trailblazer
 
           it "sets the property and works with not_sw predicate" do
             5.times { |i| SProduct.create name: "product_#{i}" }
-            1.times { |i| SProduct.create name: "predicate_#{i}" }
+            SProduct.create name: "predicate_0"
             4.times { |i| SProduct.create name: "none_#{i}" }
             finder = new_finder name_not_sw: "pr" do
               property :name, type: Types::String
@@ -156,7 +156,7 @@ module Trailblazer
 
           it "sets the property and works with ew predicate" do
             5.times { |i| SProduct.create name: "product_#{i}_end" }
-            1.times { |i| SProduct.create name: "predicate_#{i}_endwow" }
+            SProduct.create name: "predicate_0_endwow"
             4.times { |i| SProduct.create name: "none_#{i}" }
             finder = new_finder name_ew: "end" do
               property :name, type: Types::String
@@ -168,7 +168,7 @@ module Trailblazer
 
           it "sets the property and works with not_ew predicate" do
             5.times { |i| SProduct.create name: "product_#{i}_end" }
-            1.times { |i| SProduct.create name: "predicate_#{i}_endwow" }
+            SProduct.create name: "predicate_0_endwow"
             4.times { |i| SProduct.create name: "none_#{i}" }
             finder = new_finder name_not_ew: "end" do
               property :name, type: Types::String

data/spec/trailblazer/operation/finder_spec.rb

@@ -76,7 +76,6 @@ describe "Trailblazer::Operation - Finder Macro" do
     expect(result[:finder].name).to eq "product_5"
   end
 
-
   it "Can find a single row by name" do
     params = {name_eq: "product_2"}
     result = Product::Show.call(params: params)

data/trailblazer-finder.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files     = spec.files.grep(%r{^(test)/})
   spec.require_paths  = ["lib"]
 
-  spec.add_dependency "dry-types"
+  spec.add_dependency "dry-types", ">= 1.0.0"
   spec.add_dependency "trailblazer-activity", ">= 0.10.0"
 
   spec.add_development_dependency "activerecord"
@@ -26,16 +26,15 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "kaminari-activerecord"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.5"
-  spec.add_development_dependency "rspec-mocks", "~> 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 "sqlite3"
   spec.add_development_dependency "trailblazer", "~> 2.1.0"
-  spec.add_development_dependency "will_paginate"
   spec.add_development_dependency "trailblazer-developer"
+  spec.add_development_dependency "will_paginate"
 
-  spec.required_ruby_version = ">= 2.3.8"
+  spec.required_ruby_version = ">= 2.5.0"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-finder
 version: !ruby/object:Gem::Version
-  version: 0.50.0
+  version: 0.70.0
 platform: ruby
 authors:
 - Nick Sutterer
 - Marc Tich
 - Abdelkader Boudih
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-types
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: trailblazer-activity
   requirement: !ruby/object:Gem::Requirement
@@ -124,20 +124,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
-- !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: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -153,21 +139,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -181,7 +167,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sequel
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -195,7 +181,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -209,7 +195,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -237,7 +223,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: will_paginate
+  name: trailblazer-developer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -251,7 +237,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: trailblazer-developer
+  name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -273,9 +259,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -340,7 +326,7 @@ homepage: http://trailblazer.to
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -348,7 +334,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.8
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -356,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 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,

data/.travis.yml

@@ -1,7 +0,0 @@
-language: ruby
-cache: bundler
-before_install:
-  - gem install bundler
-matrix:
-  include:
-    - rvm: 2.6.5