rails-simple-search 1.1.6 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 488dab542ff2bca0321fe73926c608d634a90b91
-  data.tar.gz: f38088dc455a4c4ad6080904863f6bc501f6f0e0
+SHA256:
+  metadata.gz: 25a52a9d4df55218b58ed0bfd14fd26b83d1073a9e7cf595ad43d6614e6b1bb8
+  data.tar.gz: 304a1ac4d8784efa69d5ecaa5f6f16b891b26ab45e01a686684b40a0beac64f8
 SHA512:
-  metadata.gz: 2bd662eb8cc806a48768eaeb3e6a230fad92ebbc1367edf7dbda840aff12726bc8b23f0b5c12bb027889dbba2119b569db00a868a1c11340973cd09e67fd85e1
-  data.tar.gz: a1e4694ff5e1404eaf0b58a63bf7864641df43fabd202cbc58348d2335f1596df9cac2db3e24fdc7be29efb05dd40385b57474f9dbce1aea8df83bf054ed49e9
+  metadata.gz: 4f6efabcecb4eaaddfe0380a56456c9351fdcab77406156e213238a4df1c9cb3e38ca850b91677e3ecba80e4bb245096d293759f02b622055e138f1a1d8319e4
+  data.tar.gz: 879154bc961b75adf9374a199b8403232c5db5601326aa42f49ebfaa119a1e96eafad63b3827bf5f5bc52f74e9dc4b8747c43b09f77fe5e026c6714d0fc94e7b

data/README.rdoc

@@ -1,4 +1,4 @@
-= rails-simple-search
+=rails-simple-search
 
 rails-simple-search is a Ruby gem. It helps you quickly implement searching/filtering function for your web site. This plugin has paginating feature built in. If you're not looking for a full-text searching solution, this plugin will most probably satisfy all your searching requirement.
 
@@ -41,7 +41,7 @@ The following is how we implement this searching function with rails-simple-sear
 
 4. Code in views:
 
-    <% form_for @search, url => "/xxxxxx" do |f| %>
+    <% form_for @search, url => "/xxxxxx", data: {turbo: false} do |f| %>
 
       <%=f.label :email %>
       <%=f.text_field :email %>
@@ -69,7 +69,7 @@ The following is how we implement this searching function with rails-simple-sear
     <% end %>
 
 5. Add route for the post to url "/xxxxxx" (config/route.rb)
-    match "/xxxxxx" => "yyyyyyy#zzzzzz"
+    post "/xxxxxx" => "yyyyyyy#zzzzzz"
 
 == Note
 
@@ -84,8 +84,12 @@ From version 1.1.0 on, we started to support the "or" relation, e.g., we can use
 
 From version 1.1.3 on, we started to support Rails 5.
 
+For Rails 7, please use version 1.1.7.
+
 There is a real demo application which you can download and run immediately: https://github.com/yzhanginwa/demo_app_for_rails_simple_search
 
+For Rails 7 demo, please see here: https://github.com/yzhanginwa/rails_simple_search_demo
+
 == License
 
 Copyright (c) 2012 [Yi Zhang], released under the MIT license

data/lib/rails-simple-search.rb

@@ -12,6 +12,8 @@ module RailsSimpleSearch
   end
 
   class Base
+    attr_reader :criteria
+
     def self.inherited(subclass)
       class << subclass
          # in rails 3, the call to "form_for" invokes the model_name 
@@ -24,6 +26,17 @@ module RailsSimpleSearch
       subclass.send(:include, RailsSimpleSearch::FixModelName)
     end
  
+    def self.pre_process(model_name, &procedure)
+      model_name.each { |internal_model_name| pre_process(internal_model_name, &procedure) } if model_name.is_a?(Array)
+      @pre_processors ||= {}
+      @pre_processors[model_name] = procedure
+    end
+
+    def self.pre_processor(model_name)
+      @pre_processors ||= {}
+      @pre_processors[model_name]
+    end
+
     def initialize(model_class, criteria={}, config={})
       @criteria = sanitize_criteria(criteria)
       @config = DEFAULT_CONFIG.merge(config)
@@ -48,9 +61,18 @@ module RailsSimpleSearch
     end
 
     def add_conditions(h={})
-      @criteria.merge!(h)
+      @criteria.merge!(h.stringify_keys)
     end
   
+    def remove_criteria(key)
+      key.each { |internal_key| remove_criteria(internal_key) } if key.is_a?(Array)
+      @criteria.delete(key.to_s)
+    end
+
+    def append_criteria(key, value)
+      @criteria[key.to_s] = value
+    end
+
     private 
 
     def method_missing(method, *args)
@@ -88,7 +110,7 @@ module RailsSimpleSearch
           c[key] = value
         end
       end
-      c
+      c.stringify_keys
     end
   end
 end

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.8
 platform: ruby
 authors:
 - Yi Zhang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-28 00:00:00.000000000 Z
+date: 2023-12-24 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.
@@ -39,8 +39,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: A very simple and light gem to quickly build search/filter function in rails