trailblazer-finder 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d90691d88aed4c8d7e43ccd1fd4160ed6f445b7915becf4c76bd025ca4d0f661
-  data.tar.gz: e66c8f81873325b16f81e2d4ae9b99111f16a704c54d01de24bcac27bdb1d479
+  metadata.gz: 1878b1acf62f66eb1c410b476037ab0c0aa45b761805f151fe987f6d81b24ecc
+  data.tar.gz: 27e69700c5507481a8c06828889d451c98976c92a1b8542602565ecf438461e0
 SHA512:
-  metadata.gz: c2af6f7a7e82d96a8385d23d88702501881eee63ee2a23e0308a4a2a4eaca9c217721df62479088f03716a1adc3e790f18b32fb26de76685b1e6aef4459d3fe8
-  data.tar.gz: 7f44b76f696ce6788584c7a97f703e5e4b4e4ced2a39fded2f672ad3468623f3e161a868bfc6861cdf1d4d5117f1eb57f28ebe0816fae8f78a48b1a7b75c2604
+  metadata.gz: fe66baf784a25237ee917eee6c261af6dba12e4f5e63df164a1cc37d268fad4b893c315594c2aea9d4083fc20ab3fedab50baf52a447dc198ea19ae0b260cc38
+  data.tar.gz: 50051b6a1e6a8413c1d4d70d455310fa2f4114e598737c0334fe1f1a0124906227c77f42d01e4722e76b352fc6ca55af1beef90f50309bf2d8ffd8690e034f4a

data/CHANGES.md

@@ -1,3 +1,6 @@
+# 0.10.3
+* Add support for strings in filters keys.
+
 # 0.10.2
 * Add support for ActiveSupport::Hash as params
 

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

@@ -11,13 +11,13 @@ module Trailblazer
         def process_params(ctx, params:,  **)
           params.each do |attribute, value|
             result = {}
-
-            fetch_filters(ctx, result, attribute) || result if ctx[:filters].include?(attribute)
-            fetch_properties(result, attribute, value, ctx[:properties]) || result
+            filter_attribute = attribute.to_sym
+            fetch_filters(ctx, result, filter_attribute) || result if ctx[:filters].include?(filter_attribute)
+            fetch_properties(result, filter_attribute, value, ctx[:properties]) || result
             next ctx[:params].delete(attribute) if result.empty?
 
             ctx[:process] ||= {}
-            ctx[:process][attribute] = result.merge!(value: value)
+            ctx[:process][filter_attribute] = result.merge!(value: value)
           end
           true
         end

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

@@ -16,9 +16,9 @@ module Trailblazer
           ctx[:entity] = ctx.dig(:options,:entity) || instance_eval(&ctx[:config][:entity])
         end
 
-        step (:validate_entity)
-        fail (:invalid_entity_error)
-        step (:set_entity)
+        step :validate_entity
+        fail :invalid_entity_error
+        step :set_entity
       end
     end
   end

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

@@ -27,15 +27,9 @@ module Trailblazer
           true
         end
 
-        step (:check_paging),
-             Output(:failure) => Track(:end_paging)
-        step (:set_paging),
-             Output(:success) => Track(:end_paging),
-             Output(:failure) => Track(:failure)
-        step (:clear_paging),
-             magnetic_to: :end_paging,
-             Output(:success) => Track(:success),
-             Output(:failure) => Track(:failure)
+        step :check_paging, Output(:failure) => Track(:end_paging)
+        step :set_paging
+        step :clear_paging, magnetic_to: :end_paging
       end
     end
   end

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

@@ -18,9 +18,9 @@ module Trailblazer
           ctx[:params] = ctx[:options][:params] || {}
         end
 
-        step (:validate_params)
-        fail (:invalid_params_error)
-        step (:set_params)
+        step :validate_params
+        fail :invalid_params_error
+        step :set_params
       end
     end
   end

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

@@ -37,15 +37,10 @@ module Trailblazer
           true
         end
 
-        step (:check_sorting),
-             Output(:success) => Track(:paging),
+        step :check_sorting,
              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
+        step :set_sorting
+        step :clear_sorting, magnetic_to: :end_sorting
       end
     end
   end

data/lib/trailblazer/finder/dsl.rb

@@ -26,10 +26,11 @@ module Trailblazer
       end
 
       def filter_by(name, options = {}, &block)
-        config[:filters][name] = {}
-        config[:filters][name][:name] = name
-        config[:filters][name][:with] = options[:with] if options.include?(:with)
-        config[:filters][name][:block] = block || nil
+        filter_name = name.to_sym
+        config[:filters][filter_name] = {}
+        config[:filters][filter_name][:name] = name
+        config[:filters][filter_name][:with] = options[:with] if options.include?(:with)
+        config[:filters][filter_name][:block] = block || nil
       end
 
       def adapters(*adapters)

data/lib/trailblazer/finder/version.rb

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

data/spec/trailblazer/operation/finder_spec.rb

@@ -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
@@ -91,6 +91,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)
@@ -109,6 +116,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-finder
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Nick Sutterer