rokaki 0.8.1 → 0.8.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a4312a80ff21e5c59187f2677c803626aa2d9bd2331316dea46de60461c50fa
-  data.tar.gz: f2d1b2b2aeefb8f82cf7be3ecfe5f058472701ad23064a8909fe09e6c289e4d7
+  metadata.gz: 44e54fda626422f9ed27d25aa30aa7f6303722a16b0bb931b6aeead9965b380f
+  data.tar.gz: 2b5a2ea0ce4284e84fcf006071b5831e41df8dfbd83399be23fd62f2cae7ad9c
 SHA512:
-  metadata.gz: c4d9d19c3d0f008721cfe2cbae3364f29e46fc094edd03af7738999a5cbe3680606f9201d884d4ce1316d5ad3da54b1f572d8bec7bcc3a00cc60696e36a0db11
-  data.tar.gz: 2c83644c0338d9024422de614edb92d336ec542261f3453b07f5713e676e8c0c6c5947e8e75fb85bfde6f862185f56a9eac44664ea6769767dda2e901937b9ea
+  metadata.gz: '039a420452518968761d8eff610603a643825fa98de17d51cb038f6fcd79f4870b898688c5bbc6fc61a193ccc21a6cd86b7a50027aa6219520fa1cd3b25469d6'
+  data.tar.gz: 5c69385b228a28f6378b2c8a4e584e597c6e80b5781b634fd8ca977e16f67d65c64c4ca16a1f6ff2bfe6c0cd3a55410033eabe2ac8f195fc46d23cba2ac7c624

data/lib/rokaki/filter_model.rb

@@ -27,9 +27,10 @@ module Rokaki
 
       def filter_map(model, query_key, options)
         filter_model(model)
-        @_query_key = query_key
+        @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]
@@ -37,16 +38,18 @@ module Rokaki
 
       def filter(model, options)
         filter_model(model)
+        @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]
       end
 
       def filters(*filter_keys)
-        if @_query_key
-          define_filter_map(@_query_key, *filter_keys)
+        if @filter_map_query_key
+          define_filter_map(@filter_map_query_key, *filter_keys)
         else
           define_filter_keys(*filter_keys)
         end
@@ -100,9 +103,9 @@ module Rokaki
         end
       end
 
-      def associated_table(association)
-        @model.reflect_on_association(association).klass.table_name
-      end
+      # def associated_table(association)
+      #   @model.reflect_on_association(association).klass.table_name
+      # end
 
       def filter_model(model_class)
         @model = (model_class.is_a?(Class) ? model_class : Object.const_get(model_class.capitalize))

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:)
+      def initialize(filter_key_object:, prefix:, infix:, like_semantics:, i_like_semantics:, db:, mode: :and)
         @filter_key_object = filter_key_object
         @prefix = prefix
         @infix = infix
@@ -13,8 +13,9 @@ module Rokaki
         @filter_methods = []
         @filter_templates = []
         @db = db
+        @mode = mode
       end
-      attr_reader :filter_key_object, :prefix, :infix, :like_semantics, :i_like_semantics, :db
+      attr_reader :filter_key_object, :prefix, :infix, :like_semantics, :i_like_semantics, :db, :mode
       attr_accessor :filter_methods, :filter_templates
 
       def call # _chain_nested_filter
@@ -56,7 +57,7 @@ module Rokaki
       end
 
       def find_i_like_key(keys)
-        return nil unless like_semantics && i_like_semantics.keys.any?
+        return nil unless i_like_semantics && i_like_semantics.keys.any?
         current_like_key = i_like_semantics
         keys.each do |key|
           current_like_key = current_like_key[key]

data/lib/rokaki/filterable.rb

@@ -23,6 +23,10 @@ module Rokaki
         end
       end
 
+      def define_query_key(key = nil)
+        @filter_map_query_key = key
+      end
+
       def filter_key_prefix(prefix = nil)
         @filter_key_prefix ||= prefix
       end

data/lib/rokaki/version.rb

@@ -1,3 +1,3 @@
 module Rokaki
-  VERSION = "0.8.1"
+  VERSION = "0.8.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rokaki
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.1.1
 platform: ruby
 authors:
 - Steve Martin