rails-simple-search 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 488dab542ff2bca0321fe73926c608d634a90b91
-  data.tar.gz: f38088dc455a4c4ad6080904863f6bc501f6f0e0
+  metadata.gz: 97179f7794faea8e0aa2b3100b6be0b40a4a5399
+  data.tar.gz: 130d3e3862abe9fb11672c29d24be6524ede71ca
 SHA512:
-  metadata.gz: 2bd662eb8cc806a48768eaeb3e6a230fad92ebbc1367edf7dbda840aff12726bc8b23f0b5c12bb027889dbba2119b569db00a868a1c11340973cd09e67fd85e1
-  data.tar.gz: a1e4694ff5e1404eaf0b58a63bf7864641df43fabd202cbc58348d2335f1596df9cac2db3e24fdc7be29efb05dd40385b57474f9dbce1aea8df83bf054ed49e9
+  metadata.gz: 11ae23b082afd9ee052d85fa5f424c56a219309141ad34f442bf2e679028fff79fcdc1215b2efb64d1cbe26574887469c788e2164ac003aca6acc7fe067ca43b
+  data.tar.gz: 403a0bdfb53d743e6d89c9594f763123049de37eb7e76ddc1b86da8c9fee7bd116d1827e7be0ab3f50fd418d7f26d4c02fcabae4ba4ee67537d7a5420a3e2fd2

data/lib/rails-simple-search.rb

@@ -24,6 +24,15 @@ module RailsSimpleSearch
       subclass.send(:include, RailsSimpleSearch::FixModelName)
     end
  
+    def self.pre_process(model_name, &procedure)
+      @pre_processors ||= {}
+      @pre_processors[model_name] = procedure
+    end
+
+    def self.pre_processor(model_name)
+      @pre_processors[model_name]
+    end
+
     def initialize(model_class, criteria={}, config={})
       @criteria = sanitize_criteria(criteria)
       @config = DEFAULT_CONFIG.merge(config)
@@ -51,6 +60,16 @@ module RailsSimpleSearch
       @criteria.merge!(h)
     end
   
+    def remove_criteria(key)
+      value = @criteria[key]
+      @criteria.delete(key)
+      value
+    end
+
+    def append_criteria(key, value)
+      @criteria[key] = value
+    end
+
     private 
 
     def method_missing(method, *args)

data/lib/sql_handler.rb

@@ -6,17 +6,11 @@ module RailsSimpleSearch
       @joins = {}
     end
 
-    def conditions
-      run_criteria
-      @conditions
-    end
-
-    def joins
-      run_criteria
-      @joins_str
-    end
-
     def run
+      if pre_processor = self.class.pre_processor(@model_class.to_s)
+        instance_eval(&pre_processor)
+      end
+
       run_criteria
 
       query = @model_class.joins(@joins_str)
@@ -48,7 +42,6 @@ module RailsSimpleSearch
     end
   
     def run_criteria
-      return unless @conditions.nil? 
       @condition_group = ConditionGroup.new
       @condition_group.set_relation(:and)
 
@@ -67,7 +60,6 @@ module RailsSimpleSearch
       table = base_class.table_name
       key = "#{table}.#{field}"
   
-      @conditions ||= []
       column = base_class.columns_hash[field.to_s]
       return nil unless column
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-simple-search
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Yi Zhang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-28 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies: []
 description: rails-simple-search is a light and easy to use gem. It could help developers
   quickly build a search page.