trailblazer-finder 0.3.0 → 0.10.0

data/lib/trailblazer/finder/activity/prepare_sorting.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Trailblazer
+  class Finder
+    module Activity
+      class PrepareSorting < Trailblazer::Activity::Railway
+        def check_sorting(ctx, **)
+          sorting = ctx[:config][:sorting] || nil
+          return true unless ctx[:config][:sorting].empty? || sorting.nil?
+        end
+
+        def set_sorting(ctx, **)
+          return true if ctx[:params][:sort].nil?
+
+          sorting = ctx[:params][:sort]
+          config = ctx[:config][:sorting]
+          ctx[:sorting] = ctx[:sorting] || {}
+          sorting.split(",").each do |sorter|
+            spt = sorter.split
+            ctx[:sorting][spt[0]] = fetch_sort_direction(config[spt[0].to_sym], spt[1]) if config.include?(spt[0].to_sym)
+          end
+        end
+
+        def fetch_sort_direction(config_direction, params_direction = nil)
+          return config_direction == :asc ? :asc : :desc if params_direction.nil?
+
+          case params_direction
+            when ":asc", :asc, "asc"
+              :asc
+            else
+              :desc
+          end
+        end
+
+        def clear_sorting(ctx, **)
+          ctx[:params].delete(:sort) unless ctx[:params][:sort].nil?
+          true
+        end
+
+        step (:check_sorting),
+             Output(:success) => Track(:paging),
+             Output(:failure) => Track(:end_sorting)
+        step (:set_sorting),
+             magnetic_to: :paging,
+             Output(:success) => Track(:end_sorting),
+             Output(:failure) => Track(:failure)
+        step (:clear_sorting),
+             magnetic_to: :end_sorting
+      end
+    end
+  end
+end

data/lib/trailblazer/finder/activity/process.rb

@@ -1,17 +1,21 @@
 # frozen_string_literal: true
 
+require_relative "process_adapters"
+require_relative "process_predicates"
+require_relative "process_paging"
+require_relative "process_sorting"
+require_relative "process_filters"
+
 module Trailblazer
   class Finder
     module Activity
       # Process Activity
-      module Process
-        extend Trailblazer::Activity::Railway()
-
-        step Subprocess(Process::Adapters), id: :process_adapters
-        step Subprocess(Process::Predicates), id: :process_predicates
-        step Subprocess(Process::Filters), id: :process_filters
-        step Subprocess(Process::Paging), id: :process_paging
-        step Subprocess(Process::Sorting), id: :process_sorting
+      class Process < Trailblazer::Activity::Railway
+        step Subprocess(ProcessAdapters)
+        step Subprocess(ProcessPredicates)
+        step Subprocess(ProcessFilters)
+        step Subprocess(ProcessPaging)
+        step Subprocess(ProcessSorting)
       end
     end
   end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Trailblazer
+  class Finder
+    module Activity
+      class ProcessAdapters < Trailblazer::Activity::Railway
+        def set_orm_adapters(ctx, **)
+          ctx[:adapters].each do |adapter|
+            next unless (ORM_ADAPTERS + ["Basic"]).include?(adapter)
+
+            ctx[:orm] = {}
+            ctx[:orm][:adapter] = adapter
+            ctx[:orm][:predicates] = "Trailblazer::Finder::Adapters::#{adapter}::Predicates"
+            ctx[:orm][:paging] = "Trailblazer::Finder::Adapters::#{adapter}::Paging"
+            ctx[:orm][:sorting] = "Trailblazer::Finder::Adapters::#{adapter}::Sorting"
+            return true
+          end
+        end
+
+        def set_paging_adapters(ctx, **)
+          ctx[:adapters].each do |adapter|
+            next unless PAGING_ADAPTERS.include?(adapter)
+            return false if ctx[:adapters].include?("Basic")
+            ctx[:orm][:paging] = "Trailblazer::Finder::Adapters::#{adapter}::Paging"
+            return true
+          end
+          true
+        end
+
+        def invalid_paging_adapter_error(ctx, **)
+          (ctx[:errors] ||= []) << {adapters: "Can't use paging adapters like Kaminari without using an ORM like ActiveRecord or Sequel"}
+        end
+
+        step :set_orm_adapters
+        step :set_paging_adapters
+        fail :invalid_paging_adapter_error
+      end
+    end
+  end
+end

data/lib/trailblazer/finder/activity/process_filters.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Trailblazer
+  class Finder
+    module Activity
+      class ProcessFilters < Trailblazer::Activity::Railway
+        def set_filter_handlers(ctx, **)
+          return true unless ctx[:process]
+
+          ctx[:process].each do |key, value|
+            next if ctx[:process][key][:filter].nil?
+
+            ctx[:process][key][:handler] = Utils::Extra.apply_handler(value[:filter] ? value[:filter][:handler] : "none")
+          end
+        end
+
+        step :set_filter_handlers
+      end
+    end
+  end
+end

data/lib/trailblazer/finder/activity/process_paging.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Trailblazer
+  class Finder
+    module Activity
+      class ProcessPaging < Trailblazer::Activity::Railway
+        def set_paging_handler(ctx, **)
+          return true if ctx[:paging].nil?
+
+          ctx[:paging][:handler] = Utils::Extra.apply_handler(
+            (Object.const_get(ctx[:orm][:paging]).__send__ :set_paging_handler)
+          )
+        end
+
+        step :set_paging_handler
+      end
+    end
+  end
+end

data/lib/trailblazer/finder/activity/process_predicates.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Trailblazer
+  class Finder
+    module Activity
+      class ProcessPredicates < Trailblazer::Activity::Railway
+        def set_properties_handler(ctx, **)
+          return true if ctx[:process].nil?
+
+          ctx[:process].each do |key, _value|
+            next if ctx[:process][key][:predicate].nil?
+
+            ctx[:process][key][:handler] = Utils::Extra.apply_handler(
+              (Object.const_get(ctx[:orm][:predicates]).__send__ "set_#{ctx[:process][key][:predicate]}_handler".to_sym)
+            )
+          end
+        end
+
+        step :set_properties_handler
+      end
+    end
+  end
+end

data/lib/trailblazer/finder/activity/process_sorting.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Trailblazer
+  class Finder
+    module Activity
+      class ProcessSorting < Trailblazer::Activity::Railway
+        def set_sorting_handler(ctx, **)
+          return true if ctx[:sorting].nil?
+
+          ctx[:sorting][:handler] = Utils::Extra.apply_handler(
+            (Object.const_get(ctx[:orm][:sorting]).__send__ :set_sorting_handler)
+          )
+        end
+
+        step :set_sorting_handler
+      end
+    end
+  end
+end

data/lib/trailblazer/finder/version.rb

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

data/lib/trailblazer/operation/finder.rb

@@ -1,63 +1,56 @@
-# frozen_string_literal: true
-
 # Really gotta clean this up, but can't be bothered right now
-module Trailblazer
-  class Operation
-    def self.Finder(finder_class, action = nil, entity = nil)
-      task = Trailblazer::Activity::TaskBuilder::Binary(Finder.new)
-
-      extension = Trailblazer::Activity::TaskWrap::Merge.new(
-        Wrap::Inject::Defaults(
-            :"finder.class" => finder_class,
-            :"finder.entity" => entity,
-            :"finder.action" => action
-        )
-      )
-
-      {task: task, id: "finder.build", Trailblazer::Activity::DSL::Extension.new(extension) => true}
-    end
+Trailblazer::Operation.instance_eval do
+  def self.Finder(finder_class, action = nil, entity = nil)
+    task = Trailblazer::Activity::TaskBuilder::Binary(Finder.new)
+    injection = Trailblazer::Activity::TaskWrap::Inject::Defaults::Extension(
+      :"finder.class"  => finder_class,
+      :"finder.entity" => entity,
+      :"finder.action" => action
+    )
+
+    {task: task, id: "finder.build", extensions: [injection]}
+  end
 
-    class Finder
-      def call(options, params:, **)
-        builder                   = Finder::Builder.new
-        options[:finder]          = finder = builder.call(options, params)
-        options[:model]           = finder # Don't like it, but somehow it's needed if contracts are loaded
-        options["result.finder"]  = result = Result.new(!finder.nil?, {})
+  class Finder
+    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?, {})
 
-        result.success?
-      end
 
-      class Builder
-        def call(options, params)
-          finder_class  = options[:"finder.class"]
-          entity        = options[:"finder.entity"]
-          action        = options[:"finder.action"]
-          action        = :all unless %i[all single].include?(action)
-
-          send("#{action}!", finder_class, entity, params, options[:"finder.action"])
-        end
+      ctx[:"result.finder"].success?
+    end
 
-        private
+    class Builder
+      def call(options, params)
+        finder_class  = options[:"finder.class"]
+        entity        = options[:"finder.entity"]
+        action        = options[:"finder.action"]
+        action        = :all unless %i[all single].include?(action)
 
-        def all!(finder_class, entity, params, *)
-          finder_class.new(entity: entity, params: params)
-        end
+        send("#{action}!", finder_class, entity, params, options[:"finder.action"])
+      end
 
-        def single!(finder_class, entity, params, *)
-          apply_id(params)
-          if entity.nil?
-            finder_class.new(params: params).result.first
-          else
-            finder_class.new(entity: entity, params: params).result.first
-          end
-        end
+      private
 
-        def apply_id(params)
-          return if params[:id].nil?
+      def all!(finder_class, entity, params, *)
+        finder_class.new(entity: entity, params: params)
+      end
 
-          params[:id_eq] = params[:id] unless params.key?("id")
+      def single!(finder_class, entity, params, *)
+        apply_id(params)
+        if entity.nil?
+          finder_class.new(params: params).result.first
+        else
+          finder_class.new(entity: entity, params: params).result.first
         end
       end
+
+      def apply_id(params)
+        return if params[:id].nil?
+        params[:id_eq] = params[:id] unless params.key?("id")
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -2,9 +2,13 @@
 
 require "bundler/setup"
 require "pry-byebug"
+require "trailblazer/developer"
+require "trailblazer/activity"
+require "trailblazer/activity/testing"
 
 RSpec.configure do |config|
   config.expect_with(:rspec) { |c| c.syntax = :expect }
+  config.include Trailblazer::Activity::Testing::Assertions
 end
 
 require "trailblazer/finder"

data/trailblazer-finder.gemspec

@@ -9,16 +9,16 @@ Gem::Specification.new do |spec|
   spec.version        = Trailblazer::Finder::VERSION
   spec.description    = "Trailblazer Finder Objects"
   spec.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, it can be used with Sequel, Hash objects, and RomRB."
-  spec.authors        = ["Nick Sutterer", "Marc Tich"]
-  spec.email          = ["apotonick@gmail.com", "marc@mudsu.com"]
+  spec.authors        = ["Nick Sutterer", "Marc Tich", "Abdelkader Boudih"]
+  spec.email          = ["apotonick@gmail.com", "marc@mudsu.com", "terminale@gmail.com"]
   spec.homepage       = "http://trailblazer.to"
   spec.license        = "LGPL-3.0"
   spec.files          = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.test_files     = spec.files.grep(%r{^(test)/})
   spec.require_paths  = ["lib"]
 
-  spec.add_dependency "dry-types", "~> 0.14.1"
-  spec.add_dependency "trailblazer-activity", "~> 0.7.1"
+  spec.add_dependency "dry-types"
+  spec.add_dependency "trailblazer-activity", ">= 0.10.0"
 
   spec.add_development_dependency "activerecord"
   spec.add_development_dependency "bundler"
@@ -33,10 +33,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sequel"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "trailblazer", "~> 2.1.0.rc1", "< 2.1.0.rc11"
-  spec.add_development_dependency "trailblazer-macro", "~> 2.1.0.rc1", "< 2.1.0.rc11"
-  spec.add_development_dependency "trailblazer-operation", "~> 0.4.1"
+  spec.add_development_dependency "trailblazer", "~> 2.1.0"
   spec.add_development_dependency "will_paginate"
+  spec.add_development_dependency "trailblazer-developer"
 
   spec.required_ruby_version = ">= 2.3.8"
 end

metadata

@@ -1,44 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-finder
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Nick Sutterer
 - Marc Tich
+- Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: trailblazer-activity
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -227,56 +228,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0.rc1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.1.0.rc11
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0.rc1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.1.0.rc11
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: trailblazer-macro
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0.rc1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.1.0.rc11
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0.rc1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.1.0.rc11
-- !ruby/object:Gem::Dependency
-  name: trailblazer-operation
+  name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: will_paginate
+  name: trailblazer-developer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -293,12 +268,12 @@ description: Trailblazer Finder Objects
 email:
 - apotonick@gmail.com
 - marc@mudsu.com
+- terminale@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rubocop-https---raw-githubusercontent-com-trailblazer-meta-master-rubocop-yml"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"
@@ -310,19 +285,19 @@ files:
 - lib/trailblazer/finder.rb
 - lib/trailblazer/finder/activity/find.rb
 - lib/trailblazer/finder/activity/prepare.rb
-- lib/trailblazer/finder/activity/prepare/adapters.rb
-- lib/trailblazer/finder/activity/prepare/entity.rb
-- lib/trailblazer/finder/activity/prepare/filters.rb
-- lib/trailblazer/finder/activity/prepare/paging.rb
-- lib/trailblazer/finder/activity/prepare/params.rb
-- lib/trailblazer/finder/activity/prepare/properties.rb
-- lib/trailblazer/finder/activity/prepare/sorting.rb
+- lib/trailblazer/finder/activity/prepare_adapters.rb
+- lib/trailblazer/finder/activity/prepare_entity.rb
+- lib/trailblazer/finder/activity/prepare_filters.rb
+- lib/trailblazer/finder/activity/prepare_paging.rb
+- lib/trailblazer/finder/activity/prepare_params.rb
+- lib/trailblazer/finder/activity/prepare_properties.rb
+- lib/trailblazer/finder/activity/prepare_sorting.rb
 - lib/trailblazer/finder/activity/process.rb
-- lib/trailblazer/finder/activity/process/adapters.rb
-- lib/trailblazer/finder/activity/process/filters.rb
-- lib/trailblazer/finder/activity/process/paging.rb
-- lib/trailblazer/finder/activity/process/predicates.rb
-- lib/trailblazer/finder/activity/process/sorting.rb
+- lib/trailblazer/finder/activity/process_adapters.rb
+- lib/trailblazer/finder/activity/process_filters.rb
+- lib/trailblazer/finder/activity/process_paging.rb
+- lib/trailblazer/finder/activity/process_predicates.rb
+- lib/trailblazer/finder/activity/process_sorting.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