rails-simple-search 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0cb79f906b5bb0f7c65885ef8787c7b907f3441
-  data.tar.gz: 3c3319e16c6a6faa0a71c73fdb013f5f8fd33eb5
+  metadata.gz: 0d4ae3b14edf55ea1998b7f337e1ea6ab23038ef
+  data.tar.gz: 31ef250c3e06666d9929066b1d45c6d3d57ef462
 SHA512:
-  metadata.gz: ff757c3910004616748741ed2fbb3c4e568d2caad9a8b042a87d4816abdda4916cebb17060d7ff07637feb0298a6cce1996653bacb6c38466c29f0cd0145d896
-  data.tar.gz: f5bdd04a091b1d5376e2dbaeeeace3740b3f62826b3d569abcbffaab7a8e309e93d3eed5bcc8f6d580c5504cc567a760aa18377c97d386cd3936b53594775fb2
+  metadata.gz: 0fc0b0e70fa4665031575f847fcea808b72bc73ee60d0252e668b0d69ed871ecc3147753a67a161a742040b3c954452d24d74053ca2b27824b38de469a8676c4
+  data.tar.gz: fc434f7363b1287d207ef8ef885f223080cc36c82fd6a9c06ef8a6b04a88624225dacbd886948972f8d048bfc19213d2970bff3015a8f6e1b6666e80fdcd23d6

data/README.rdoc

@@ -47,6 +47,9 @@ The following is how we implement this searching function with rails-simple-sear
       <%=f.label :email %>
       <%=f.text_field :email %>
 
+      <%=f.label "first name or last name" %>
+      <%=f.text_field "first_name_or_last_name" %>
+
       <%=f.label :from_birth_date %>
       <%=f.text_field :birth_date_greater_than_or_equal_to %>
 
@@ -78,6 +81,7 @@ From version 0.9.1 to 0.9.7, Rails 3 is supported.
 From version 0.9.8 on, this gem started to support Rails 4. Version 0.9.8 is tested under Rails 4.1.1, and version 0.9.9 fixed an issue under
 Rails 4.2.
 
+From version 1.1.0 on, we started to support the "or" relation, e.g., we can use field like "first_name_or_last_name".
 
 There is a real demo application which you can download and run immediately: https://github.com/yzhanginwa/demo_app_for_rails_simple_search
 

data/lib/rails-simple-search.rb

@@ -2,12 +2,7 @@ require_relative 'sql_handler'
 
 module RailsSimpleSearch
   DEFAULT_CONFIG = { :exact_match => [], 
-                     :or_separator => '_or_',
-                     :paginate => true, 
-                     :page_name => 'page', 
-                     :offset => 0,
-                     :limit => 1000, 
-                     :per_page => 20
+                     :or_separator => '_or_'
                    }
 
   module FixModelName
@@ -32,6 +27,8 @@ module RailsSimpleSearch
     def initialize(model_class, criteria={}, config={})
       @criteria = sanitize_criteria(criteria)
       @config = DEFAULT_CONFIG.merge(config)
+      @config[:exact_match] = [@config[:exact_match]] unless @config[:exact_match].respond_to?(:map!)
+      @config[:exact_match].map!{|em| em.to_s}
 
       @model_class = (model_class.is_a?(Symbol) || model_class.is_a?(String))? model_class.to_s.camelize.constantize : model_class
       load_database_handler(@model_class)
@@ -50,18 +47,6 @@ module RailsSimpleSearch
       @count || 0
     end
 
-    def pages
-      (count == 0)? 0 : (count * 1.0 / @config[:per_page]).ceil 
-    end
-
-    def pages_for_select
-      (1..pages).to_a
-    end
-
-    def order=(str)
-      @order = str
-    end
-  
     def add_conditions(h={})
       @criteria.merge!(h)
     end

data/lib/sql_handler.rb

@@ -21,18 +21,7 @@ module RailsSimpleSearch
 
       query = @model_class.joins(@joins_str)
       query = query.where(@condition_group.to_ar_condition) unless @condition_group.empty?
-
-      if @config[:paginate]
-        @count = query.count
-        offset = [((@page || 0) - 1) * @config[:per_page], 0].max
-        limit = @config[:per_page]
-      else
-        offset = @config[:offset]
-        limit = @config[:limit]
-      end
-
-      query = query.order(@order) if @order
-      query.select("distinct #{@model_class.table_name}.*").offset(offset).limit(limit)
+      query.select("distinct #{@model_class.table_name}.*")
     end
 
     private
@@ -54,18 +43,14 @@ module RailsSimpleSearch
       @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
-          @condition_group.add(parse_attribute(key, value))
-        end
+        @condition_group.add(parse_attribute(key, value))
       end
 
       make_joins
     end
 
     def insert_condition(base_class, attribute, field, value)
+debugger
       name_hash = parse_field_name(field)
       field = name_hash[:field_name]
       operator = name_hash[:operator]
@@ -75,6 +60,7 @@ module RailsSimpleSearch
   
       @conditions ||= []
       column = base_class.columns_hash[field.to_s]
+      return nil unless column
 
       if !column.text? && value.is_a?(String)
         if column.respond_to?(:type_cast)
@@ -182,7 +168,7 @@ module RailsSimpleSearch
       if leaf?
         raise "It's not allowed to add child into leaf node"
       end
-      @children << cg
+      @children << cg if cg
     end
 
     def set_relation(and_or)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-simple-search
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Yi Zhang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-31 00:00:00.000000000 Z
+date: 2017-01-02 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.