rokaki 0.8.1.2 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f371c83c5d42bd91e4f51363b7ec474807fceb3fb94dc7f9bd76bd067554d167
-  data.tar.gz: 373f24755a5f2bd886aa56575b1f60f475db07db6a67b4716ed419a0896996eb
+  metadata.gz: b5484d6a4935bbc4f908e9081c82fcfd757f2e49770b7cbde2c055ec9ab169b0
+  data.tar.gz: 44a41e6c4ba814bc98934ddb2029a222841fd18425847c73ab3a9a3d86acc66a
 SHA512:
-  metadata.gz: 200432e50f8d847fa7203760b7f52cbfd6743dfdb4247388dfe5e636b79331acec739759fe65b52ebde23585eb90ffbada5802cf5be2f19431410bd612c084f3
-  data.tar.gz: 49207149db07210dc0c55fdfbf976737a404e4c255acff2484347b53339d8b18d2ed9f6bd0ca3a5efc2a79b583bf4f6489583cbc586ecce30aa1bde498201881
+  metadata.gz: e8c29246d64a0fc0c5ca63173c419cee77cf07cd06d99a1fc14bcc53285222d980e8ace9e624bb75d4566814bfc8ce38613305676d2152591da83f8ea04002b1
+  data.tar.gz: 82ac3f4b16473b8adf6aeeb93907a0e71ab811c439d5071e95b063238042828c39818f33763a953fa0898c40c0d0f912cc6b3781b9ff1bb75d6c3227c8efd282

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rokaki (0.8.1.2)
+    rokaki (0.8.2)
       activesupport
 
 GEM

data/lib/rokaki/filter_model.rb

@@ -30,7 +30,6 @@ module Rokaki
         @filter_map_query_key = query_key
 
         @_filter_db = options[:db] || :postgres
-        @_filter_mode = options[:mode] || :and
         like(options[:like]) if options[:like]
         ilike(options[:ilike]) if options[:ilike]
         filters(*options[:match]) if options[:match]
@@ -41,7 +40,6 @@ module Rokaki
         @filter_map_query_key = nil
 
         @_filter_db = options[:db] || :postgres
-        @_filter_mode = options[:mode] || :and
         like(options[:like]) if options[:like]
         ilike(options[:ilike]) if options[:ilike]
         filters(*options[:match]) if options[:match]

data/lib/rokaki/filter_model/like_keys.rb

@@ -16,15 +16,16 @@ module Rokaki
 
       def call
         args.keys.each do |key|
-          like_keys << map_keys(args[key], key)
+          map_keys(args[key], key)
         end
         like_keys
       end
 
       private
 
-      def map_keys(value, key)
+      def map_keys(value, key, key_path = [])
         key_result = {}
+        key_path << key
 
         if value.is_a? Hash
         value.keys.each do |sub_key|
@@ -35,18 +36,26 @@ module Rokaki
               key_result[key] << sub_key
             else
               key_result[key] = [ sub_key ]
+              @like_keys << deep_assign(key_path, key_result[key])
             end
 
           elsif sub_value.is_a? Hash
-            key_result[key] = map_keys(sub_value, sub_key)
+            map_keys(sub_value, sub_key, key_path)
           end
         end
         else
-          key_result = key
+          @like_keys = [key]
         end
 
         key_result
       end
+
+      # Many thanks Cary Swoveland
+      # https://stackoverflow.com/questions/56634950/ruby-dig-set-assign-values-using-hashdig/56635124
+      #
+      def deep_assign(keys, value)
+        keys[0..-2].reverse_each.reduce ({ keys.last => value }) { |h,key| { key=>h } }
+      end
     end
   end
 end

data/lib/rokaki/filter_model/nested_filter.rb

@@ -4,7 +4,7 @@ require 'active_support/inflector'
 module Rokaki
   module FilterModel
     class NestedFilter
-      def initialize(filter_key_object:, prefix:, infix:, like_semantics:, i_like_semantics:, db:, mode: :and)
+      def initialize(filter_key_object:, prefix:, infix:, like_semantics:, i_like_semantics:, db:)
         @filter_key_object = filter_key_object
         @prefix = prefix
         @infix = infix
@@ -13,9 +13,8 @@ module Rokaki
         @filter_methods = []
         @filter_templates = []
         @db = db
-        @mode = mode
       end
-      attr_reader :filter_key_object, :prefix, :infix, :like_semantics, :i_like_semantics, :db, :mode
+      attr_reader :filter_key_object, :prefix, :infix, :like_semantics, :i_like_semantics, :db
       attr_accessor :filter_methods, :filter_templates
 
       def call # _chain_nested_filter

data/lib/rokaki/version.rb

@@ -1,3 +1,3 @@
 module Rokaki
-  VERSION = "0.8.1.2"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rokaki
 version: !ruby/object:Gem::Version
-  version: 0.8.1.2
+  version: 0.8.2
 platform: ruby
 authors:
 - Steve Martin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-21 00:00:00.000000000 Z
+date: 2020-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport