rails-simple-search 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 544d8e584f073bd4f57b9db0426f8a6dc41d6272
-  data.tar.gz: bc4bbd8caabca8932014b1dd2a7e932670210664
+  metadata.gz: e0cb79f906b5bb0f7c65885ef8787c7b907f3441
+  data.tar.gz: 3c3319e16c6a6faa0a71c73fdb013f5f8fd33eb5
 SHA512:
-  metadata.gz: df18323be0781c21ce3213d55d79435de56946e2efa7c5237dbe4f75ac108a8d90881d78701de558b82dfee9043ef33f1f592a7c572a6388091a3c2fa0ee2466
-  data.tar.gz: abffa445a4f31648637dca3816b6eee095ece3929f4407b3d1034512a2c55cfe400361a761626c8ee019d187073aea997ac7c99706a5fcbf25cd5edda1088630
+  metadata.gz: ff757c3910004616748741ed2fbb3c4e568d2caad9a8b042a87d4816abdda4916cebb17060d7ff07637feb0298a6cce1996653bacb6c38466c29f0cd0145d896
+  data.tar.gz: f5bdd04a091b1d5376e2dbaeeeace3740b3f62826b3d569abcbffaab7a8e309e93d3eed5bcc8f6d580c5504cc567a760aa18377c97d386cd3936b53594775fb2

data/lib/rails-simple-search.rb

@@ -2,6 +2,7 @@ require_relative 'sql_handler'
 
 module RailsSimpleSearch
   DEFAULT_CONFIG = { :exact_match => [], 
+                     :or_separator => '_or_',
                      :paginate => true, 
                      :page_name => 'page', 
                      :offset => 0,

data/lib/sql_handler.rb

@@ -20,9 +20,7 @@ module RailsSimpleSearch
       run_criteria
 
       query = @model_class.joins(@joins_str)
-      if @conditions
-        query = query.where(@conditions)
-      end
+      query = query.where(@condition_group.to_ar_condition) unless @condition_group.empty?
 
       if @config[:paginate]
         @count = query.count
@@ -52,12 +50,15 @@ module RailsSimpleSearch
   
     def run_criteria
       return unless @conditions.nil? 
+      @condition_group = ConditionGroup.new
+      @condition_group.set_relation(:and)
+
       @criteria.each do |key, value|
         if @config[:page_name].to_s == key.to_s
           @page = value.to_i
           @criteria[key] = @page
         else
-          parse_attribute(key, value)
+          @condition_group.add(parse_attribute(key, value))
         end
       end
 
@@ -103,14 +104,8 @@ module RailsSimpleSearch
         verb = '='
       end
 
-      if @conditions.size < 1
-        @conditions[0] = "#{key} #{verb} ?"
-        @conditions[1] = value
-      else
-        @conditions[0] += " and #{key} #{verb} ?"
-        @conditions << value
-      end
-    end     
+      ConditionGroup.new(ConditionItem.new(key, verb, value))
+    end
   
     def insert_join(base_class, asso_ref)
       base_table = base_class.table_name
@@ -132,10 +127,20 @@ module RailsSimpleSearch
     end
   
     def parse_attribute(attribute, value)
+      attributes = attribute.split(@config[:or_separator])
+      if(attributes.size > 1)
+        cg = ConditionGroup.new
+        cg.set_relation(:or)
+        attributes.each do |a|
+          cg.add(parse_attribute(a, value))
+        end
+        return cg
+      end
+
       unless attribute =~ /\./
         field = attribute
-        insert_condition(@model_class, attribute, field, value)
-        return
+        condition = insert_condition(@model_class, attribute, field, value)
+        return condition
       end 
 
       association_fields = attribute.split(/\./)
@@ -148,8 +153,69 @@ module RailsSimpleSearch
         base_class = association_fields.shift.klass
       end
 
-      insert_condition(base_class, attribute, field, value)
+      condition = insert_condition(base_class, attribute, field, value)
+      return condition
     end
   
   end
+
+  class ConditionItem
+    attr_reader :field, :verb, :value
+
+    def initialize(field, verb, value)
+      @field = field
+      @verb = verb
+      @value = value
+    end
+  end
+
+  class ConditionGroup
+    def initialize(item=nil)
+      if item
+        @condition_item = item
+      else
+        @children = []
+      end
+    end
+
+    def add(cg)
+      if leaf?
+        raise "It's not allowed to add child into leaf node"
+      end
+      @children << cg
+    end
+
+    def set_relation(and_or)
+      if leaf?
+        raise "It's not needed to set relation for leaf node"
+      end
+      @relation = and_or
+    end
+
+    def leaf?
+      @condition_item ? true : false
+    end
+
+    def empty?
+      (@children && @children.empty?) ? true : false
+    end
+
+    def to_ar_condition
+      condition = []
+      if leaf?
+        i = @condition_item
+        condition << "#{i.field} #{i.verb} ?"
+        condition << i.value
+      else
+        tmp = @children.map(&:to_ar_condition)
+        condition << "(" + tmp.map(&:first).join(" #{@relation} ") + ")"
+        tmp.each do |t|
+          (1..(t.length-1)).each do |index|
+            condition << t[index]
+          end
+        end
+      end
+      condition
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-simple-search
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Yi Zhang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2016-12-31 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,7 +39,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A very simple and light gem to quickly build search/filter function in rails