trailblazer-finder 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dbad15894d9e56c23ebe4428acfd379f5854f8948e67073ebde8c898814c1cc
-  data.tar.gz: f265dd84d1b25458fa630823c7c526628017d79e786e5bb362a043f75d864295
+  metadata.gz: 60587025c9bddf5a856868fa908615064b1b5a683c187d9606670e00ceb999f4
+  data.tar.gz: d110b70e65eef74d6cba432740c4df30b2449cd338c9a933e1c82a2b3bb4e9ef
 SHA512:
-  metadata.gz: 2ae3bf32a2ece475570a67222bd371e5092df9a56bf6a195da185d6071e6877da9dc946ad3b00eed0cdefe357aab85a56b2f50eba3c0e63acc06df8f9c346354
-  data.tar.gz: 3aca9b67986a6c62a8c7173bc0bf34b9238b55046dc537865405f70e75e3de6b98bb72c98e39839fd8338085ce978013380f9ff4903590010cb1ba8b514f6f9d
+  metadata.gz: 9ab8dc1682c4a9968af5a442a27ff1be21a98b78c87776cbd477e809ade202bc28732d0bb00fbc6857f107c8a3cb296dd99ffd192557b7de04ba35c24f08ccb1
+  data.tar.gz: 5f5b69d3715e35f3350509fd8b32613e7b39c219049c3411bd95cda17a8f0ad2675dce7ee51dc412bfdbe159a7fb87885c18accbc3847efae2c6ed41009cae5e

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-03-17 03:54:36 +0100 using RuboCop version 0.53.0.
+# on 2018-03-17 16:23:14 +0100 using RuboCop version 0.53.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -35,6 +35,14 @@ Layout/EmptyLinesAroundModuleBody:
   Exclude:
     - 'lib/trailblazer/finder/adapters/sequel/predicates.rb'
 
+# Offense count: 2
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: native, lf, crlf
+Layout/EndOfLine:
+  Exclude:
+    - 'lib/trailblazer/finder/adapters/data_mapper/predicates.rb'
+    - 'spec/trailblazer/finder/adapters/data_mapper/predicates_spec.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -87,19 +95,23 @@ Layout/SpaceInsideParens:
   Exclude:
     - 'lib/trailblazer/finder/utils/splitter.rb'
 
-# Offense count: 4
+# Offense count: 3
 # Cop supports --auto-correct.
 Layout/TrailingWhitespace:
   Exclude:
     - 'lib/trailblazer/finder/filter.rb'
     - 'spec/trailblazer/finder/adapters/active_record/base_spec.rb'
-    - 'spec/trailblazer/finder/adapters/sequel/base_spec.rb'
 
 # Offense count: 1
 Lint/DuplicateMethods:
   Exclude:
     - 'lib/trailblazer/finder/utils/splitter.rb'
 
+# Offense count: 1
+Lint/NestedMethodDefinition:
+  Exclude:
+    - 'spec/trailblazer/finder/adapters/sequel/base_spec.rb'
+
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
@@ -116,10 +128,11 @@ Metrics/AbcSize:
 Metrics/MethodLength:
   Max: 51
 
-# Offense count: 7
+# Offense count: 8
 RSpec/DescribeClass:
   Exclude:
     - 'spec/trailblazer/finder/adapters/active_record/sorting_spec.rb'
+    - 'spec/trailblazer/finder/adapters/data_mapper/sorting_spec.rb'
     - 'spec/trailblazer/finder/adapters/sequel/predicates_spec.rb'
     - 'spec/trailblazer/finder/adapters/sequel/sorting_spec.rb'
     - 'spec/trailblazer/operation/finder_spec.rb'
@@ -127,11 +140,12 @@ RSpec/DescribeClass:
     - 'spec/trailblazer/operation/predicates_spec.rb'
     - 'spec/trailblazer/operation/sorting_spec.rb'
 
-# Offense count: 40
+# Offense count: 50
 # Configuration parameters: CustomTransform, IgnoredWords.
 RSpec/ExampleWording:
   Exclude:
     - 'spec/trailblazer/finder/adapters/active_record/predicates_spec.rb'
+    - 'spec/trailblazer/finder/adapters/data_mapper/predicates_spec.rb'
     - 'spec/trailblazer/finder/adapters/sequel/predicates_spec.rb'
     - 'spec/trailblazer/finder/features/predicates_spec.rb'
     - 'spec/trailblazer/operation/predicates_spec.rb'
@@ -155,6 +169,14 @@ Style/ClassAndModuleChildren:
     - 'spec/trailblazer/operation/predicates_spec.rb'
     - 'spec/trailblazer/operation/sorting_spec.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: compact, expanded
+Style/EmptyMethod:
+  Exclude:
+    - 'spec/trailblazer/finder/adapters/sequel/sorting_spec.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
@@ -180,7 +202,7 @@ Style/PerlBackrefs:
   Exclude:
     - 'lib/trailblazer/finder/utils/splitter.rb'
 
-# Offense count: 153
+# Offense count: 191
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
@@ -189,23 +211,21 @@ Style/StringLiterals:
     - 'lib/trailblazer/finder/adapters/sequel/predicates.rb'
     - 'spec/trailblazer/finder/adapters/active_record/predicates_spec.rb'
     - 'spec/trailblazer/finder/adapters/active_record/sorting_spec.rb'
+    - 'spec/trailblazer/finder/adapters/data_mapper/predicates_spec.rb'
+    - 'spec/trailblazer/finder/adapters/data_mapper/sorting_spec.rb'
     - 'spec/trailblazer/finder/adapters/sequel/predicates_spec.rb'
     - 'spec/trailblazer/finder/features/predicates_spec.rb'
     - 'spec/trailblazer/operation/predicates_spec.rb'
 
-# Offense count: 20
+# Offense count: 24
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, MinSize, WordRegex.
+# Configuration parameters: WordRegex.
 # SupportedStyles: percent, brackets
 Style/WordArray:
-  Exclude:
-    - 'spec/trailblazer/finder/adapters/active_record/predicates_spec.rb'
-    - 'spec/trailblazer/finder/adapters/sequel/predicates_spec.rb'
-    - 'spec/trailblazer/finder/features/predicates_spec.rb'
-    - 'spec/trailblazer/finder/features/sorting_spec.rb'
-    - 'spec/trailblazer/operation/predicates_spec.rb'
+  EnforcedStyle: percent
+  MinSize: 9
 
-# Offense count: 174
+# Offense count: 191
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:

data/CHANGES.md

@@ -1,3 +1,6 @@
+# 0.1.4
+* Updated DataMapper Adapter to include sorting by multiple columns/directions and the predicate feature.
+
 # 0.1.3
 * Added sorting by multiple columns/directions for Hash, ActiveRecord and Sequel. Temporarily disabled sorting for DataMapper Adapter until i can find the time this weekend to update that Adapter as well.
 * Due to the above, a big change in the way sorting works, and which methods are available for it

data/README.md

@@ -257,8 +257,6 @@ At the moment we support:
 - gt: greater than (value converts to float)
 - gte: greater than or equal to (value converts to float)
 
-NOTE: PREDICATES CURRENTLY DO NOT WORK FOR THE OLD DATAMAPPER ADAPTER
-
 #### Predicate Example
 ```ruby
 class Post::Finder < Trailblazer::Finder
@@ -349,8 +347,6 @@ This feature extends the result[:finder] object with the following methods
 ### Sorting
 Really simple sorting feature, fixing the pain of dealing with sorting attributes and directions. Can sort by multiple columns/directions.
 
-NOTE: AS OF 0.1.3 TEMPORARY NOT WORKING FOR DATAMAPPER ADAPTER, WE ARE WORKING ON FIXING IT
-
 #### Sorting Example
 ```ruby
 class Post::Finder < Trailblazer::Finder

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

@@ -15,7 +15,6 @@ module Trailblazer
         end
 
         module ClassMethods
-          # :nocov:
           def normalize_find_handler(handler, key)
             case handler
             when Symbol then ->(entity_type, value) { method(handler).call entity_type, value }
@@ -23,7 +22,6 @@ module Trailblazer
             else ->(entity_type, value) { entity_type.where(key.to_sym => value) unless Utils::String.blank?(value) }
             end
           end
-          # :nocov:
         end
 
         include Paging if defined?(Features::Paging::ClassMethods)

data/lib/trailblazer/finder/adapters/data_mapper.rb

@@ -1,5 +1,6 @@
 require 'trailblazer/finder/adapters/data_mapper/paging'
-# require 'trailblazer/finder/adapters/data_mapper/sorting'
+require 'trailblazer/finder/adapters/data_mapper/sorting'
+require 'trailblazer/finder/adapters/data_mapper/predicates'
 
 module Trailblazer
   class Finder
@@ -8,10 +9,12 @@ module Trailblazer
       module DataMapper
         def self.included(base)
           base.extend ClassMethods
+          base.instance_eval do
+            include DataMapper::Predicates if defined?(Features::Predicate::ClassMethods)
+          end
         end
 
         module ClassMethods
-          # :nocov:
           def normalize_find_handler(handler, key)
             case handler
             when Symbol then ->(entity_type, value) { method(handler).call entity_type, value }
@@ -19,11 +22,10 @@ module Trailblazer
             else ->(entity_type, value) { entity_type.all(key.to_sym => value) unless Utils::String.blank?(value) }
             end
           end
-          # :nocov:
         end
 
         include Paging if defined?(Features::Paging::ClassMethods)
-        # include Sorting if defined?(Features::Sorting::ClassMethods)
+        include Sorting if defined?(Features::Sorting::ClassMethods)
       end
     end
   end

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

@@ -0,0 +1,42 @@
+module Trailblazer
+  class Finder
+    module Adapters
+      module DataMapper
+        # ActiveRecord - Predicate Adapter
+        module Predicates
+          def not_eq(attribute, value, entity_type)
+            entity_type.all(attribute.to_sym.not => value)
+          end
+
+          def eq(attribute, value, entity_type)
+            entity_type.all(attribute.to_sym => value)
+          end
+
+          def blank(attribute, _value, entity_type)
+            entity_type.all(conditions: ["#{attribute} IS NULL OR #{attribute} = ?", ''])
+          end
+
+          def not_blank(attribute, _value, entity_type)
+            entity_type.all(conditions: ["#{attribute} IS NOT NULL AND #{attribute} != ?", ''])
+          end
+
+          def gt(attribute, value, entity_type)
+            entity_type.all(attribute.to_sym.gt => value)
+          end
+
+          def gte(attribute, value, entity_type)
+            entity_type.all(attribute.to_sym.gte => value)
+          end
+
+          def lt(attribute, value, entity_type)
+            entity_type.all(attribute.to_sym.lt => value)
+          end
+
+          def lte(attribute, value, entity_type)
+            entity_type.all(attribute.to_sym.lte => value)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,25 +1,38 @@
-# module Trailblazer
-#   class Finder
-#     module Adapters
-#       module DataMapper
-#         # Sequel - Sorting Adapter
-#         module Sorting
-#           def self.included(base)
-#             base.extend Features::Sorting::ClassMethods
-#           end
-#
-#           private
-#
-#           def sort_it(entity_type, sort_attribute, sort_direction)
-#             case sort_direction
-#             when 'asc', 'ascending'
-#               entity_type.all(order: [sort_attribute.to_sym.asc])
-#             when 'desc', 'descending'
-#               entity_type.all(order: [sort_attribute.to_sym.desc])
-#             end
-#           end
-#         end
-#       end
-#     end
-#   end
-# end
+module Trailblazer
+  class Finder
+    module Adapters
+      module DataMapper
+        # Sequel - Sorting Adapter
+        module Sorting
+          def self.included(base)
+            base.extend Features::Sorting::ClassMethods
+          end
+
+          private
+
+          # def sort_it(entity_type, sort_attribute, sort_direction)
+          #   case sort_direction
+          #   when 'asc', 'ascending'
+          #     entity_type.all(order: [sort_attribute.to_sym.asc])
+          #   when 'desc', 'descending'
+          #     entity_type.all(order: [sort_attribute.to_sym.desc])
+          #   end
+          # end
+
+          def sort_orders(sort_attr, sort_dir)
+            case sort_dir
+            when 'asc', 'ascending'
+              sort_attr.to_sym.asc
+            when 'desc', 'descending'
+              sort_attr.to_sym.desc
+            end
+          end
+
+          def sort_it(entity_type, sort_attributes)
+            entity_type.all(order: sort_attributes.flatten)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -12,11 +12,9 @@ module Trailblazer
           base.instance_eval do
             include Sequel::Predicates if defined?(Features::Predicate::ClassMethods)
           end
-          # require 'trailblazer/finder/adapters/sequel/predicates' if defined?(Features::Predicates::ClassMethods)
         end
 
         module ClassMethods
-          # :nocov:
           def normalize_find_handler(handler, key)
             case handler
             when Symbol then ->(entity_type, value) { method(handler).call entity_type, value }
@@ -24,7 +22,6 @@ module Trailblazer
             else ->(entity_type, value) { entity_type.where(key.to_sym => value) unless Utils::String.blank?(value) }
             end
           end
-          # :nocov:
         end
 
         include Paging if defined?(Features::Paging::ClassMethods)

data/lib/trailblazer/finder/version.rb

@@ -1,5 +1,5 @@
 module Trailblazer
   class Finder
-    VERSION = '0.1.3'.freeze
+    VERSION = '0.1.4'.freeze
   end
 end

data/spec/spec_helper.rb

@@ -9,8 +9,8 @@ RSpec.configure do |config|
   config.expect_with(:rspec) { |c| c.syntax = :expect }
 end
 
-require 'coveralls'
-Coveralls.wear!
+# require 'coveralls'
+# Coveralls.wear!
 
 require_relative 'support/sorting_shared_example'
 require 'trailblazer/finder'

data/spec/trailblazer/finder/adapters/data_mapper/predicates_spec.rb

@@ -0,0 +1,100 @@
+require 'spec_helper_data_mapper'
+# require 'spec_helper'
+
+module Trailblazer
+  class Finder
+    module Adapters
+      module DataMapper
+        describe Predicates do
+          after do
+            DProduct.all.destroy
+          end
+
+          class TestFinder < Trailblazer::Finder
+            features Predicate
+            adapters DataMapper
+
+            entity_type { DProduct }
+
+            predicates_for :name, :price, :created_at
+
+            filter_by(:category) { |entity_type, _| entity_type.joins(:category) }
+          end
+
+          def finder_with_predicate(filter = nil, value = nil, filters = {})
+            TestFinder.new filter: { filter => value }.merge(filters)
+          end
+
+          describe 'equals' do
+            before do
+              10.times do |i|
+                next DProduct.create name: "", price: "1#{i}" if i == 7
+                next DProduct.create name: nil, price: "1#{i}" if i == 8
+                next DProduct.create name: "product_4", price: "1#{i}" if i == 9
+                DProduct.create name: "product_#{i}", price: "1#{i}"
+              end
+            end
+
+            it 'it finds single row with name equal to product_5' do
+              finder = finder_with_predicate 'name_eq', 'product_5'
+              expect(finder.results.map(&:price)).to eq [15]
+            end
+
+            it 'it finds multiple rows with name equal to product_4' do
+              finder = finder_with_predicate 'name_eq', 'product_4'
+              expect(finder.results.map(&:price)).to eq [14, 19]
+            end
+
+            it 'it finds rows with name not equal to product_4' do
+              finder = finder_with_predicate 'name_not_eq', 'product_4'
+              expect(finder.results.map(&:name)).to eq ["product_0", "product_1", "product_2", "product_3", "product_5", "product_6", ""]
+              expect(finder.results.map(&:price)).to eq [10, 11, 12, 13, 15, 16, 17]
+            end
+
+            it 'it finds multiple rows with name blank (empty/nil)' do
+              finder = finder_with_predicate 'name_blank', ''
+              expect(finder.results.map(&:price)).to eq [17, 18]
+            end
+
+            it 'it finds multiple rows with name not blank (empty/nil)' do
+              finder = finder_with_predicate 'name_not_blank', ''
+              expect(finder.results.map(&:name)).to eq ["product_0", "product_1", "product_2", "product_3", "product_4", "product_5", "product_6", "product_4"]
+            end
+
+            it 'it finds multiple rows with price less than 15' do
+              finder = finder_with_predicate 'price_lt', 15
+              expect(finder.results.map(&:name)).to eq ["product_0", "product_1", "product_2", "product_3", "product_4"]
+              expect(finder.results.map(&:price)).to eq [10, 11, 12, 13, 14]
+            end
+
+            it 'it finds multiple rows with price equal to and less than 15' do
+              finder = finder_with_predicate 'price_lte', 15
+              expect(finder.results.map(&:name)).to eq ["product_0", "product_1", "product_2", "product_3", "product_4", "product_5"]
+              expect(finder.results.map(&:price)).to eq [10, 11, 12, 13, 14, 15]
+            end
+
+            it 'it finds multiple rows with price greater than 15' do
+              finder = finder_with_predicate 'price_gt', 15
+              expect(finder.results.map(&:name)).to eq ["product_6", "", nil, "product_4"]
+              expect(finder.results.map(&:price)).to eq [16, 17, 18, 19]
+            end
+
+            it 'it finds multiple rows with price equal to and greater than 15' do
+              finder = finder_with_predicate 'price_gte', 15
+              expect(finder.results.map(&:name)).to eq ["product_5", "product_6", "", nil, "product_4"]
+              expect(finder.results.map(&:price)).to eq [15, 16, 17, 18, 19]
+            end
+
+            it 'it finds rows with name not equal to product_4 and name not blank and price greater than 14' do
+              params = { name_not_blank: true, price_gt: 14 }
+              finder = finder_with_predicate 'name_not_eq', 'product_4', params
+
+              expect(finder.results.map(&:name)).to eq ["product_5", "product_6"]
+              expect(finder.results.map(&:price)).to eq [15, 16]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/trailblazer/finder/adapters/data_mapper/sorting_spec.rb

@@ -1,85 +1,97 @@
-# require 'spec_helper_data_mapper'
-#
-# module Trailblazer
-#   class Finder
-#     module Adapters
-#       module DataMapper
-#         describe Sorting do
-#           def finder_class
-#             Class.new do
-#               include Trailblazer::Finder::Base
-#               include Trailblazer::Finder::Features::Sorting
-#               include Trailblazer::Finder::Adapters::DataMapper
-#
-#               entity_type { DProduct }
-#
-#               sortable_by :name, :price, :created_at
-#
-#               filter_by :name
-#               filter_by :price
-#
-#               # # Need to find a fix for this, not sure how to handle joins with data mapper properly
-#               # filter_by(:d_category) { |entity_type, _| entity_type }
-#             end
-#           end
-#
-#           def finder_with_sort(sort = nil, filters = {})
-#             finder_class.new filter: { sort: sort }.merge(filters)
-#           end
-#
-#           it 'can be inherited' do
-#             child_class = Class.new(finder_class)
-#             expect(child_class.new.sort_attribute).to eq 'name'
-#           end
-#
-#           describe 'sorting' do
-#             after do
-#               DProduct.all.destroy
-#             end
-#
-#             it 'sorts results based on the sort option desc' do
-#               5.times { |i| DProduct.create price: i }
-#
-#               finder = finder_with_sort 'price desc'
-#               expect(finder.results.map(&:price)).to eq [4, 3, 2, 1, 0]
-#             end
-#
-#             it 'sorts results based on the sort option asc' do
-#               5.times { |i| DProduct.create price: i }
-#
-#               finder = finder_with_sort 'price asc'
-#               expect(finder.results.map(&:price)).to eq [0, 1, 2, 3, 4]
-#             end
-#
-#             it 'defaults to first sort by option' do
-#               5.times { |i| DProduct.create name: "Name#{i}" }
-#
-#               finder = finder_with_sort
-#               expect(finder.results.map(&:name)).to eq %w[Name4 Name3 Name2 Name1 Name0]
-#             end
-#
-#             it 'ignores invalid sort values' do
-#               finder = finder_with_sort 'invalid attribute'
-#               expect { finder.results.to_a }.not_to raise_error
-#             end
-#
-#             # TODO: Need to find a fix for this, not sure how to handle joins with data mapper properly
-#             it 'can handle renames of sorting in joins' do
-#               #   older_category = DCategory.create title: 'older'
-#               #   newer_category = DCategory.create title: 'newer'
-#               #
-#               #   product_of_newer_category = DProduct.create name: 'older product', d_category: newer_category
-#               #   product_of_older_category = DProduct.create name: 'newer product', d_category: older_category
-#               #
-#               #   finder = finder_with_sort 'created_at desc', d_category: ''
-#               #
-#               #   expect(finder.results.map(&:name)).to eq [product_of_older_category.name, product_of_newer_category.name]
-#             end
-#           end
-#
-#           it_behaves_like 'a sorting feature'
-#         end
-#       end
-#     end
-#   end
-# end
+require 'spec_helper_data_mapper'
+
+describe "Trailblazer::Finder::Adapters::DataMapper::Sorting", :sorting do
+  class TestDMFinder < Trailblazer::Finder
+    features Sorting
+    adapters DataMapper
+
+    entity_type { DProduct }
+
+    sortable_by :name, :price, :created_at
+
+    filter_by :name
+    filter_by :price
+  end
+
+  def finder_with_sort(sort = nil, filters = {})
+    TestDMFinder.new filter: { sort: sort }.merge(filters)
+  end
+
+  describe 'sorting' do
+    after do
+      DProduct.all.destroy
+    end
+
+    it 'sorts results based on the sort option desc' do
+      5.times { |count| DProduct.create price: count }
+
+      finder = finder_with_sort 'price desc'
+      expect(finder.results.map(&:price)).to eq [4, 3, 2, 1, 0]
+    end
+
+    it 'sorts results based on the sort option asc' do
+      5.times { |count| DProduct.create price: count }
+
+      finder = finder_with_sort 'price asc'
+      expect(finder.results.map(&:price)).to eq [0, 1, 2, 3, 4]
+    end
+
+    it 'defaults to first sort by option' do
+      5.times { |count| DProduct.create name: "Name#{count}" }
+
+      finder = finder_with_sort
+      expect(finder.results.map(&:name)).to eq %w[Name4 Name3 Name2 Name1 Name0]
+    end
+
+    it 'ignores invalid sort values' do
+      finder = finder_with_sort 'invalid attribute'
+      expect { finder.results.to_a }.not_to raise_error
+    end
+
+    # TODO: Need to find a fix for this, not sure how to handle joins with data mapper properly
+    it 'can handle renames of sorting in joins' do
+      #   older_category = DCategory.create title: 'older'
+      #   newer_category = DCategory.create title: 'newer'
+      #
+      #   product_of_newer_category = DProduct.create name: 'older product', d_category: newer_category
+      #   product_of_older_category = DProduct.create name: 'newer product', d_category: older_category
+      #
+      #   finder = finder_with_sort 'created_at desc', d_category: ''
+      #
+      #   expect(finder.results.map(&:name)).to eq [product_of_older_category.name, product_of_newer_category.name]
+    end
+  end
+
+  describe 'sorting by multiple' do
+    before do
+      5.times do |i|
+        DProduct.create name: "Name#{i}", price: "1#{i}"
+      end
+      DProduct.create name: 'Name3', price: '8'
+    end
+
+    after do
+      DProduct.all.destroy
+    end
+
+    it 'sorts by multiple columns name asc and price asc' do
+      finder = finder_with_sort 'name asc, price asc'
+      expect(finder.results.map(&:name)).to eq %w[Name0 Name1 Name2 Name3 Name3 Name4]
+      expect(finder.results.map(&:price)).to eq [10, 11, 12, 8, 13, 14]
+    end
+
+    it 'sorts by multiple columns name asc and price desc' do
+      finder = finder_with_sort 'name asc, price desc'
+      expect(finder.results.map(&:name)).to eq %w[Name0 Name1 Name2 Name3 Name3 Name4]
+      expect(finder.results.map(&:price)).to eq [10, 11, 12, 13, 8, 14]
+    end
+
+    it 'sorts by multiple columns name desc and price desc' do
+      finder = finder_with_sort 'name desc, price desc'
+      expect(finder.results.map(&:name)).to eq %w[Name4 Name3 Name3 Name2 Name1 Name0]
+      expect(finder.results.map(&:price)).to eq [14, 13, 8, 12, 11, 10]
+    end
+  end
+
+  it_behaves_like 'a sorting feature'
+end

data/spec/trailblazer/finder/adapters/sequel/base_spec.rb

@@ -16,7 +16,7 @@ module Trailblazer
           end
         end
 
-        def finder_class(&block) 
+        def finder_class(&block)
           define_finder_class do
             adapters ActiveRecord
 
@@ -25,6 +25,12 @@ module Trailblazer
             filter_by :id
             filter_by :name
             filter_by :slug
+            filter_by :escaped_name, with: :apply_escaped_name
+
+            def apply_escaped_name(entity_type, value)
+              return unless value.present?
+              entity_type.where slug: value
+            end
 
             if block.nil?
               filter_by :value do |entity_type, value|
@@ -105,6 +111,13 @@ module Trailblazer
             finder = finder_with_filter invalid: 'option'
             expect { finder.invalid }.to raise_error NoMethodError
           end
+
+          it 'can filter by symbol specified filters' do
+            10.times { |i| SProduct.create slug: "product_#{i}" }
+            finder = finder_with_filter :escaped_name, 'product_2'
+
+            expect(finder.results.first.slug).to eq 'product_2'
+          end
         end
       end
     end

data/spec/trailblazer/finder/adapters/sequel/sorting_spec.rb

@@ -17,13 +17,16 @@ describe 'Trailblazer::Finder::Adapters::Sequel::Sorting', :sorting do
 
     sortable_by :name, :price, :created_at
 
-    filter_by :name
+    filter_by :name, with: :apply_name_filter
     filter_by :price
     filter_by(:s_category) { |entity_type, _| entity_type.association_join(:s_category) }
+
+    def apply_name_filter(entity_type, value)
+    end
   end
 
   def finder_with_sort(sort = nil, filters = {})
-    TestSequelSortFinder.new filter: (sort.nil? ? {} : { sort: sort }).merge(filters)
+    TestSequelSortFinder.new filter: (sort.nil? ? {} : { name: 'test', sort: sort }).merge(filters)
   end
 
   def finder_with_nil_sort

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-finder
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Nick Sutterer
@@ -274,6 +274,7 @@ files:
 - lib/trailblazer/finder/adapters/active_record/sorting.rb
 - lib/trailblazer/finder/adapters/data_mapper.rb
 - lib/trailblazer/finder/adapters/data_mapper/paging.rb
+- lib/trailblazer/finder/adapters/data_mapper/predicates.rb
 - lib/trailblazer/finder/adapters/data_mapper/sorting.rb
 - lib/trailblazer/finder/adapters/friendly_id.rb
 - lib/trailblazer/finder/adapters/kaminari.rb
@@ -315,6 +316,7 @@ files:
 - spec/trailblazer/finder/adapters/active_record/sorting_spec.rb
 - spec/trailblazer/finder/adapters/data_mapper/base_spec.rb
 - spec/trailblazer/finder/adapters/data_mapper/paging_spec.rb
+- spec/trailblazer/finder/adapters/data_mapper/predicates_spec.rb
 - spec/trailblazer/finder/adapters/data_mapper/sorting_spec.rb
 - spec/trailblazer/finder/adapters/friendly_id_spec.rb
 - spec/trailblazer/finder/adapters/kaminari_spec.rb
@@ -378,6 +380,7 @@ test_files:
 - spec/trailblazer/finder/adapters/active_record/sorting_spec.rb
 - spec/trailblazer/finder/adapters/data_mapper/base_spec.rb
 - spec/trailblazer/finder/adapters/data_mapper/paging_spec.rb
+- spec/trailblazer/finder/adapters/data_mapper/predicates_spec.rb
 - spec/trailblazer/finder/adapters/data_mapper/sorting_spec.rb
 - spec/trailblazer/finder/adapters/friendly_id_spec.rb
 - spec/trailblazer/finder/adapters/kaminari_spec.rb