trailblazer-finder 0.1.1 → 0.1.2

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

@@ -31,6 +31,10 @@ module Trailblazer
           end
 
           describe 'sorting' do
+            before do
+              Product.delete_all
+            end
+
             after do
               Product.delete_all
             end

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

@@ -16,7 +16,7 @@ module Trailblazer
           end
         end
 
-        def finder_class(&block) # rubocop:disable Metrics/MethodLength
+        def finder_class(&block) 
           define_finder_class do
             adapters DataMapper
 

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

@@ -16,7 +16,7 @@ module Trailblazer
           end
         end
 
-        def finder_class(&block) # rubocop:disable Metrics/MethodLength
+        def finder_class(&block) 
           define_finder_class do
             adapters ActiveRecord
 

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

@@ -0,0 +1,89 @@
+require 'spec_helper_sequel'
+# require 'spec_helper'
+
+      describe "Trailblazer::Finder::Adapters::Sequel::Predicates" do
+        class TestFinder < Trailblazer::Finder
+            features Predicate
+            adapters Sequel
+
+            entity_type { SProduct }
+
+            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
+            SProduct.order(:id).delete
+            10.times do |i|
+              next SProduct.create name: "", price: "1#{i}" if i == 7
+              next SProduct.create name: nil, price: "1#{i}" if i == 8
+              next SProduct.create name: "product_4", price: "1#{i}" if i == 9
+              SProduct.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.all.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.all.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.all.map(&:name)).to eq ["product_0", "product_1", "product_2", "product_3", "product_5", "product_6", ""]
+            expect(finder.results.all.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.all.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.all.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.all.map(&:name)).to eq ["product_0", "product_1", "product_2", "product_3", "product_4"]
+            expect(finder.results.all.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.all.map(&:name)).to eq ["product_0", "product_1", "product_2", "product_3", "product_4", "product_5"]
+            expect(finder.results.all.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.all.map(&:name)).to eq ["product_6", "", nil, "product_4"]
+            expect(finder.results.all.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.all.map(&:name)).to eq ["product_5", "product_6", "", nil, "product_4"]
+            expect(finder.results.all.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

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

@@ -31,6 +31,10 @@ module Trailblazer
           end
 
           describe 'sorting' do
+            before do
+              SProduct.order(:id).delete
+            end
+
             after do
               SProduct.order(:id).delete
             end

data/spec/trailblazer/finder/features/paging_spec.rb

@@ -20,7 +20,7 @@ module Trailblazer
           end
         end
 
-        def finder_class # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+        def finder_class
           define_finder_class do
             entity_type do
               [

data/spec/trailblazer/finder/features/predicates_spec.rb

@@ -0,0 +1,99 @@
+# require 'spec_helper_sequel'
+require 'spec_helper'
+
+module Trailblazer
+  class Finder
+    module Features
+      describe Predicate do
+        class TestFinder < Trailblazer::Finder
+          features Predicate
+
+          def create_product(id, name, price)
+            {
+              id: id,
+              name: name,
+              price: price,
+              created_at: Time.now,
+              updated_at: Time.now
+            }
+          end
+
+          entity_type do
+            Array.new(10) do |i|
+              next create_product(i+1, "", "1#{i}".to_i)if i == 7
+              next create_product(i+1, nil, "1#{i}".to_i) if i == 8
+              next create_product(i+1, "product_4", "1#{i}".to_i) if i == 9
+              create_product(i+1, "product_#{i}", "1#{i}".to_i)
+            end
+          end
+
+          predicates_for :name, :price, :created_at
+        end
+
+        def finder_with_predicate(filter = nil, value = nil, filters = {})
+          TestFinder.new filter: { filter => value }.merge(filters)
+        end
+
+        describe 'eqauls' do
+          it 'it finds single row with name equal to product_5' do
+            finder = finder_with_predicate 'name_eq', 'product_5'
+            expect(finder.results.map { |n| n[: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 { |n| n[: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 { |n| n[:name] }).to eq ["product_0", "product_1", "product_2", "product_3", "product_5", "product_6", ""]
+            expect(finder.results.map { |n| n[: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 { |n| n[: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 { |n| n[: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 { |n| n[:name] }).to eq ["product_0", "product_1", "product_2", "product_3", "product_4"]
+            expect(finder.results.map { |n| n[: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 { |n| n[:name] }).to eq ["product_0", "product_1", "product_2", "product_3", "product_4", "product_5"]
+            expect(finder.results.map { |n| n[: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 { |n| n[:name] }).to eq ["product_6", "", nil, "product_4"]
+            expect(finder.results.map { |n| n[: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 { |n| n[:name] }).to eq ["product_5", "product_6", "", nil, "product_4"]
+            expect(finder.results.map { |n| n[: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 { |n| n[:name] }).to eq ["product_5", "product_6"]
+            expect(finder.results.map { |n| n[:price] }).to eq [15, 16]
+          end
+        end
+      end
+    end
+  end
+end

data/spec/trailblazer/finder/features/sorting_spec.rb

@@ -9,10 +9,9 @@ module Trailblazer
           true
         end
 
-        def finder_class # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-          Class.new do
-            include Trailblazer::Finder::Base
-            include Trailblazer::Finder::Features::Sorting
+        def finder_class
+          Class.new(Trailblazer::Finder) do
+            features Sorting
 
             entity_type do
               [

data/spec/trailblazer/operation/predicates_spec.rb

@@ -0,0 +1,127 @@
+require 'delegate'
+require 'trailblazer'
+require 'spec_helper_active_record'
+
+class Product::PredicateFinderNoEntity < Trailblazer::Finder
+  features Predicate
+  adapters ActiveRecord
+
+  predicates_for :name, :price, :created_at
+
+  filter_by(:category) { |entity_type, _| entity_type.joins(:category) }
+end
+
+class Product::PredicateFinderWithEntity < Trailblazer::Finder
+  features Predicate
+  adapters ActiveRecord
+
+  entity_type { Product }
+
+  predicates_for :name, :price, :created_at
+
+  filter_by(:category) { |entity_type, _| entity_type.joins(:category) }
+end
+
+class Product::PredicateIndex < Trailblazer::Operation
+  step Finder(Product::PredicateFinderNoEntity, :all, Product)
+end
+
+class Product::PredicateIndexNoEntity < Trailblazer::Operation
+  step Finder(Product::PredicateFinderWithEntity, :all)
+end
+
+describe 'Trailblazer::Operation - Finder Macro - Sorting' do
+  before do
+    Product.destroy_all
+    Product.reset_pk_sequence
+    Product.delete_all
+    10.times do |i|
+      next Product.create name: "", price: "1#{i}" if i == 7
+      next Product.create name: nil, price: "1#{i}" if i == 8
+      next Product.create name: "product_4", price: "1#{i}" if i == 9
+      Product.create name: "product_#{i}", price: "1#{i}"
+    end
+  end
+
+  after do
+    Product.destroy_all
+    Product.reset_pk_sequence
+  end
+
+  it 'it finds single row with name equal to product_5' do
+    params = { f: { name_eq: 'product_5' } }
+    result = Product::PredicateIndex.call(params: params)
+
+    expect(result[:finder].results.first.name).to eq "product_5"
+  end
+
+  it 'it finds multiple rows with name equal to product_4' do
+    params = { f: { name_eq: 'product_4' } }
+    result = Product::PredicateIndex.call(params: params)
+
+    expect(result[:finder].results.first.price).to eq 14
+    expect(result[:finder].results.last.price).to eq 19
+  end
+
+  it 'it finds rows with name not equal to product_4' do
+    params = { f: { name_not_eq: 'product_4' } }
+    result = Product::PredicateIndex.call(params: params)
+
+    expect(result[:finder].results.map(&:name)).to eq ["product_0", "product_1", "product_2", "product_3", "product_5", "product_6", ""]
+    expect(result[: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
+    params = { f: { name_blank: true } }
+    result = Product::PredicateIndex.call(params: params)
+
+    expect(result[:finder].results.map(&:price)).to eq [17, 18]
+  end
+
+  it 'it finds multiple rows with name not blank (empty/nil)' do
+    params = { f: { name_not_blank: true } }
+    result = Product::PredicateIndex.call(params: params)
+
+    expect(result[: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
+    params = { f: { price_lt: 15 } }
+    result = Product::PredicateIndex.call(params: params)
+
+    expect(result[:finder].results.map(&:name)).to eq ["product_0", "product_1", "product_2", "product_3", "product_4"]
+    expect(result[: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
+    params = { f: { price_lte: 15 } }
+    result = Product::PredicateIndex.call(params: params)
+
+    expect(result[:finder].results.map(&:name)).to eq ["product_0", "product_1", "product_2", "product_3", "product_4", "product_5"]
+    expect(result[:finder].results.map(&:price)).to eq [10, 11, 12, 13, 14, 15]
+  end
+
+  it 'it finds multiple rows with price greater than 15' do
+    params = { f: { price_gt: 15 } }
+    result = Product::PredicateIndex.call(params: params)
+
+    expect(result[:finder].results.map(&:name)).to eq ["product_6", "", nil, "product_4"]
+    expect(result[: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
+    params = { f: { price_gte: 15 } }
+    result = Product::PredicateIndex.call(params: params)
+
+    expect(result[:finder].results.map(&:name)).to eq ["product_5", "product_6", "", nil, "product_4"]
+    expect(result[: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 = { f: { name_not_eq: 'product_4', name_not_blank: true, price_gt: 14 } }
+    result = Product::PredicateIndex.call(params: params)
+
+    expect(result[:finder].results.map(&:name)).to eq ["product_5", "product_6"]
+    expect(result[:finder].results.map(&:price)).to eq [15, 16]
+  end
+end

data/spec/trailblazer/test_spec.rb

@@ -0,0 +1,41 @@
+# require 'spec_helper_active_record'
+#
+#         class TestFinder < Trailblazer::Finder
+#             features Predicates
+#             adapters ActiveRecord, FriendlyId
+#
+#             entity_type { Product }
+#
+#             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 'eqauls' do
+#           before do
+#             Product.delete_all
+#             10.times do |i|
+#               Product.create name: "product_#{i}", price: "1#{i}"
+#               Product.create name: "product_4", price: "1#{1}" if i == 5
+#             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, 11]
+#           end
+#
+#           it 'it finds rows with name not equal to product_5' 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", "product_7", "product_8", "product_9"]
+#           end
+#         end

data/trailblazer-finder.gemspec

@@ -17,8 +17,6 @@ Gem::Specification.new do |spec|
   spec.test_files     = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths  = ['lib']
 
-  spec.add_dependency 'hashie', '~> 3.5'
-
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'sequel'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-finder
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nick Sutterer
@@ -11,20 +11,6 @@ bindir: bin
 cert_chain: []
 date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -284,6 +270,7 @@ files:
 - lib/trailblazer/finder/adapters.rb
 - lib/trailblazer/finder/adapters/active_record.rb
 - lib/trailblazer/finder/adapters/active_record/paging.rb
+- lib/trailblazer/finder/adapters/active_record/predicates.rb
 - lib/trailblazer/finder/adapters/active_record/sorting.rb
 - lib/trailblazer/finder/adapters/data_mapper.rb
 - lib/trailblazer/finder/adapters/data_mapper/paging.rb
@@ -292,6 +279,7 @@ files:
 - lib/trailblazer/finder/adapters/kaminari.rb
 - lib/trailblazer/finder/adapters/sequel.rb
 - lib/trailblazer/finder/adapters/sequel/paging.rb
+- lib/trailblazer/finder/adapters/sequel/predicates.rb
 - lib/trailblazer/finder/adapters/sequel/sorting.rb
 - lib/trailblazer/finder/adapters/will_paginate.rb
 - lib/trailblazer/finder/base.rb
@@ -302,12 +290,16 @@ files:
 - lib/trailblazer/finder/errors/with_ignored.rb
 - lib/trailblazer/finder/features.rb
 - lib/trailblazer/finder/features/paging.rb
+- lib/trailblazer/finder/features/predicate.rb
 - lib/trailblazer/finder/features/sorting.rb
 - lib/trailblazer/finder/filter.rb
 - lib/trailblazer/finder/find.rb
+- lib/trailblazer/finder/predicates.rb
+- lib/trailblazer/finder/utils/deep_locate.rb
 - lib/trailblazer/finder/utils/extra.rb
 - lib/trailblazer/finder/utils/params.rb
 - lib/trailblazer/finder/utils/parse.rb
+- lib/trailblazer/finder/utils/splitter.rb
 - lib/trailblazer/finder/utils/string.rb
 - lib/trailblazer/finder/version.rb
 - lib/trailblazer/operation/finder.rb
@@ -319,6 +311,7 @@ files:
 - spec/support/sorting_shared_example.rb
 - spec/trailblazer/finder/adapters/active_record/base_spec.rb
 - spec/trailblazer/finder/adapters/active_record/paging_spec.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/base_spec.rb
 - spec/trailblazer/finder/adapters/data_mapper/paging_spec.rb
@@ -327,11 +320,13 @@ files:
 - spec/trailblazer/finder/adapters/kaminari_spec.rb
 - spec/trailblazer/finder/adapters/sequel/base_spec.rb
 - spec/trailblazer/finder/adapters/sequel/paging_spec.rb
+- spec/trailblazer/finder/adapters/sequel/predicates_spec.rb
 - spec/trailblazer/finder/adapters/sequel/sorting_spec.rb
 - spec/trailblazer/finder/adapters/will_paginate_spec.rb
 - spec/trailblazer/finder/adapters_spec.rb
 - spec/trailblazer/finder/base_spec.rb
 - spec/trailblazer/finder/features/paging_spec.rb
+- spec/trailblazer/finder/features/predicates_spec.rb
 - spec/trailblazer/finder/features/sorting_spec.rb
 - spec/trailblazer/finder/features_spec.rb
 - spec/trailblazer/finder/filter_spec.rb
@@ -342,7 +337,9 @@ files:
 - spec/trailblazer/finder/utils/string_spec.rb
 - spec/trailblazer/operation/finder_spec.rb
 - spec/trailblazer/operation/paging_spec.rb
+- spec/trailblazer/operation/predicates_spec.rb
 - spec/trailblazer/operation/sorting_spec.rb
+- spec/trailblazer/test_spec.rb
 - trailblazer-finder.gemspec
 homepage: http://trailblazer.to
 licenses:
@@ -377,6 +374,7 @@ test_files:
 - spec/support/sorting_shared_example.rb
 - spec/trailblazer/finder/adapters/active_record/base_spec.rb
 - spec/trailblazer/finder/adapters/active_record/paging_spec.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/base_spec.rb
 - spec/trailblazer/finder/adapters/data_mapper/paging_spec.rb
@@ -385,11 +383,13 @@ test_files:
 - spec/trailblazer/finder/adapters/kaminari_spec.rb
 - spec/trailblazer/finder/adapters/sequel/base_spec.rb
 - spec/trailblazer/finder/adapters/sequel/paging_spec.rb
+- spec/trailblazer/finder/adapters/sequel/predicates_spec.rb
 - spec/trailblazer/finder/adapters/sequel/sorting_spec.rb
 - spec/trailblazer/finder/adapters/will_paginate_spec.rb
 - spec/trailblazer/finder/adapters_spec.rb
 - spec/trailblazer/finder/base_spec.rb
 - spec/trailblazer/finder/features/paging_spec.rb
+- spec/trailblazer/finder/features/predicates_spec.rb
 - spec/trailblazer/finder/features/sorting_spec.rb
 - spec/trailblazer/finder/features_spec.rb
 - spec/trailblazer/finder/filter_spec.rb
@@ -400,4 +400,6 @@ test_files:
 - spec/trailblazer/finder/utils/string_spec.rb
 - spec/trailblazer/operation/finder_spec.rb
 - spec/trailblazer/operation/paging_spec.rb
+- spec/trailblazer/operation/predicates_spec.rb
 - spec/trailblazer/operation/sorting_spec.rb
+- spec/trailblazer/test_spec.rb