trailblazer-finder 0.10.1 → 0.70.0

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

@@ -38,11 +38,11 @@ module Trailblazer
           it "cannot use kaminari without an actual orm" do
             10.times { |i| Product.create name: "product_#{i}" }
             finder = new_finder do
-              adapters WillPaginate
+              paginator "WillPaginate"
               paging per_page: 2, min_per_page: 1, max_per_page: 5
             end
 
-            expect(finder.errors).to eq [{adapters: "Can't use paging adapters like Kaminari without using an ORM like ActiveRecord or Sequel"}]
+            expect(finder.errors).to eq [{paginator: "Can't use paginator WillPaginate without using an ORM like ActiveRecord or Sequel"}]
           end
         end
 
@@ -50,7 +50,8 @@ module Trailblazer
           it "sets the paging values and shows only the first page results" do
             10.times { |i| Product.create name: "product_#{i}" }
             finder = new_finder do
-              adapters ActiveRecord, WillPaginate
+              adapter "ActiveRecord"
+              paginator "WillPaginate"
               paging per_page: 2, min_per_page: 1, max_per_page: 5
             end
 
@@ -60,7 +61,8 @@ 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
-              adapters ActiveRecord, WillPaginate
+              adapter "ActiveRecord"
+              paginator "WillPaginate"
               paging per_page: 5, min_per_page: 2, max_per_page: 8
             end
 
@@ -71,7 +73,8 @@ module Trailblazer
           it "uses max_per_page in finder as maximum per_page" do
             10.times { |i| Product.create name: "product_#{i}" }
             finder = new_finder page: 2, per_page: 9 do
-              adapters ActiveRecord, WillPaginate
+              adapter "ActiveRecord"
+              paginator "WillPaginate"
               paging per_page: 5, min_per_page: 2, max_per_page: 8
             end
 
@@ -82,7 +85,8 @@ module Trailblazer
           it "uses min_per_page in finder as minimum per_page" do
             10.times { |i| Product.create name: "product_#{i}" }
             finder = new_finder page: 2, per_page: 1 do
-              adapters ActiveRecord, WillPaginate
+              adapter "ActiveRecord"
+              paginator "WillPaginate"
               paging per_page: 5, min_per_page: 2, max_per_page: 8
             end
 
@@ -96,7 +100,8 @@ module Trailblazer
             5.times { |i| Product.create name: "product_#{i}" }
             5.times { |_i| Product.create name: "product" }
             finder = new_finder name_eq: "product", sort: "id desc", page: 2 do
-              adapters ActiveRecord, WillPaginate
+              adapter "ActiveRecord"
+              paginator "WillPaginate"
               paging per_page: 2, min_per_page: 1, max_per_page: 5
               property :name, type: Types::String
               property :id, type: Types::Integer, sortable: true

data/spec/trailblazer/finder/dsl_spec.rb

@@ -60,29 +60,20 @@ module Trailblazer
         it "checks for a valid adapter and returns an error" do
           entity = [{id: 1, value: "Test 1"}, {id: 2, value: "Test 2"}, {id: 3, value: "Test 3"}]
           finder = new_finder entity, value_eq: "Test 1" do
-            adapters :NonExisting
+            adapter :NonExisting
           end
 
-          expect(finder.errors).to eq [{adapters: "One or more of the specified adapters are invalid"}]
-        end
-
-        it "checks if multiple orm adapters are requested and returns an error" do
-          entity = [{id: 1, value: "Test 1"}, {id: 2, value: "Test 2"}, {id: 3, value: "Test 3"}]
-          finder = new_finder entity, value_eq: "Test 1" do
-            adapters :ActiveRecord, :Sequel
-          end
-
-          expect(finder.errors).to eq [{adapters: "More then one ORM adapter specified"}]
+          expect(finder.errors).to eq [{adapter: "The specified adapter are invalid"}]
         end
 
         it "sets the adapter in the config" do
           entity = [{id: 1, value: "Test 1"}, {id: 2, value: "Test 2"}, {id: 3, value: "Test 3"}]
           finder = new_finder entity, value_eq: "Test 1" do
-            adapters ActiveRecord
+            adapter "ActiveRecord"
             property :value, type: Base
           end
 
-          expect(finder.class.config[:adapters]).to eq ["ActiveRecord"]
+          expect(finder.class.config[:adapter]).to eq "ActiveRecord"
         end
       end
 

data/spec/trailblazer/operation/finder_spec.rb

@@ -5,7 +5,7 @@ require "trailblazer"
 require "spec_helper_active_record"
 
 class Product::FinderNoEntity < Trailblazer::Finder
-  adapters ActiveRecord
+  adapter "ActiveRecord"
 
   property :id, type: Types::Integer
   property :name, type: Types::String, sortable: true
@@ -19,7 +19,7 @@ class Product::FinderNoEntity < Trailblazer::Finder
 end
 
 class Product::FinderWithEntity < Trailblazer::Finder
-  adapters ActiveRecord
+  adapter "ActiveRecord"
 
   entity { Product }
 
@@ -54,7 +54,7 @@ describe "Trailblazer::Operation - Finder Macro" do
   before do
     Product.destroy_all
     Product.reset_pk_sequence
-    20.times { |i| Product.create name: "product_#{i}" }
+    22.times { |i| Product.create name: "product_#{i}" }
   end
 
   after do
@@ -69,6 +69,13 @@ describe "Trailblazer::Operation - Finder Macro" do
     expect(result[:finder].name).to eq "product_4"
   end
 
+  it "Can find a single row by id from ActiveSupport::HashWithIndifferentAccess" do
+    params = ActiveSupport::HashWithIndifferentAccess.new({id: 6})
+    result = Product::Show.call(params: params)
+
+    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)
@@ -83,6 +90,13 @@ describe "Trailblazer::Operation - Finder Macro" do
     expect(result[:finder].result.last.name).to eq "product_19"
   end
 
+  it "Can find multiple rows by escaped name if key is string" do
+    params = {"escaped_name" => "product_1"}
+    result = Product::Index.call(params: params)
+
+    expect(result[:finder].result.last.name).to eq "product_19"
+  end
+
   it "Can find a single row by id when no entity type is given in macro" do
     params = {id: 8}
     result = Product::ShowNoEntity.call(params: params)
@@ -101,6 +115,7 @@ describe "Trailblazer::Operation - Finder Macro" do
     params = {escaped_name: "product_1"}
     result = Product::IndexNoEntity.call(params: params)
 
+    expect(result[:finder].result.count).to eq 11
     expect(result[:finder].result.last.name).to eq "product_19"
   end
 end

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.10.1
+  version: 0.70.0
 platform: ruby
 authors:
 - Nick Sutterer
 - Marc Tich
 - Abdelkader Boudih
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-09 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,10 +259,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -285,7 +270,7 @@ files:
 - lib/trailblazer/finder.rb
 - lib/trailblazer/finder/activities/find.rb
 - lib/trailblazer/finder/activities/prepare.rb
-- lib/trailblazer/finder/activities/prepare_adapters.rb
+- lib/trailblazer/finder/activities/prepare_adapter.rb
 - lib/trailblazer/finder/activities/prepare_entity.rb
 - lib/trailblazer/finder/activities/prepare_filters.rb
 - lib/trailblazer/finder/activities/prepare_paging.rb
@@ -341,7 +326,7 @@ homepage: http://trailblazer.to
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -349,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:
   - - ">="
@@ -357,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/.rubocop_todo.yml

@@ -1,78 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2018-08-23 00:10:15 +0200 using RuboCop version 0.58.2.
-# 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
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-Metrics/AbcSize:
-  Max: 31
-
-# Offense count: 2
-Metrics/CyclomaticComplexity:
-  Max: 7
-
-# Offense count: 13
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 283
-
-# Offense count: 1
-# Configuration parameters: CountKeywordArgs.
-Metrics/ParameterLists:
-  Max: 6
-
-# Offense count: 1
-RSpec/DescribeClass:
-  Exclude:
-    - 'spec/trailblazer/operation/finder_spec.rb'
-
-# Offense count: 78
-# Configuration parameters: Max.
-RSpec/ExampleLength:
-  Exclude:
-    - 'spec/trailblazer/finder/adapters/active_record_spec.rb'
-    - 'spec/trailblazer/finder/adapters/basic_spec.rb'
-    - 'spec/trailblazer/finder/adapters/kaminari_spec.rb'
-    - 'spec/trailblazer/finder/adapters/sequel_spec.rb'
-    - 'spec/trailblazer/finder/adapters/will_paginate_spec.rb'
-    - 'spec/trailblazer/finder/base_spec.rb'
-    - 'spec/trailblazer/finder/dsl_spec.rb'
-    - 'spec/trailblazer/finder/utils/string_spec.rb'
-
-# Offense count: 62
-# Configuration parameters: AggregateFailuresByDefault.
-RSpec/MultipleExpectations:
-  Max: 7
-
-# Offense count: 2
-RSpec/RepeatedDescription:
-  Exclude:
-    - 'spec/trailblazer/finder/adapters/basic_spec.rb'
-
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle.
-# SupportedStyles: nested, compact
-Style/ClassAndModuleChildren:
-  Exclude:
-    - 'spec/trailblazer/operation/finder_spec.rb'
-
-# Offense count: 1
-# Configuration parameters: SuspiciousParamNames.
-# SuspiciousParamNames: options, opts, args, params, parameters
-Style/OptionHash:
-  Exclude:
-    - 'lib/trailblazer/finder/dsl.rb'
-
-# Offense count: 3
-Style/Send:
-  Exclude:
-    - 'lib/trailblazer/finder/adapters/sequel/sorting.rb'
-    - 'lib/trailblazer/operation/finder.rb'
-
-RSpec/DescribedClass:
-  SkipBlocks: true

data/.travis.yml

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

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

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-module Trailblazer
-  class Finder
-    module Activities
-      # Adapters Activity
-      class PrepareAdapters < Trailblazer::Activity::Railway
-        def check_for_adapters(ctx, **)
-          adapters = ctx.dig(:config, :adapters)
-          return true if adapters.empty?
-
-          adapters.each do |adapter|
-            return true if Finder::Adapters.constants.include?(adapter.to_sym)
-          end
-          false
-        end
-
-        ## Only one ORM can be accepted
-        def validate_adapters(ctx, **)
-          adapters = ctx.dig(:config, :adapters)
-          return true if adapters.empty?
-
-          adapters.each do |adapter|
-            if ORM_ADAPTERS.include?(adapter)
-              return false if (adapters & (ORM_ADAPTERS - [adapter])).any?
-            end
-          end
-          true
-        end
-
-        def invalid_adapters_error((ctx, flow_options), **_circuit_options)
-          (ctx[:errors] ||= []) << {adapters: "One or more of the specified adapters are invalid"}
-        end
-
-        def multiple_orm_error((ctx, flow_options), **_circuit_options)
-          (ctx[:errors] ||= []) << {adapters: "More then one ORM adapter specified"}
-        end
-
-        def set_adapters(ctx, **)
-          adapters = ctx.dig(:config, :adapters)
-          ctx[:adapters] = (ORM_ADAPTERS & adapters).any? ? adapters : ["Basic"] + adapters
-        end
-
-        step :check_for_adapters
-        fail :invalid_adapters_error, Output(:success) => End(:failure)
-        step :validate_adapters
-        fail :multiple_orm_error
-        step :set_adapters
-      end
-    end
-  end
-end