rooble 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48792701842c670bc199dec1e90fc047aab59f7d
-  data.tar.gz: a88e321916bd3e9c96b6c891ce29058555b52206
+  metadata.gz: 46e72546278f13c26a17692b00fd42913430bacb
+  data.tar.gz: 7027e46afefd2b51d5cceb2b1ba9884bebaf4475
 SHA512:
-  metadata.gz: 3d7db4a396a694b043bbdeb60d5aaaa1c0aac32a8577c410ca1df963a84e1e1abee644b265dc36ebd08c79351f114e3d5ccaf02f2993859231ad2dbfe5eb06b4
-  data.tar.gz: 15d4aa0ee364a70140363a277e0e0e354c5fdea107661eac6de01218e461a3558c6f8b80a7583b0d5cdab4885988a608a791ac45e132b35a2aa93c1f8ff3dda3
+  metadata.gz: 7f0924480a6a4b756fd8b8fd3e8971742ce0658d4a6c79c82f740da6c9101f6b27d8b018a87ec161887a45363763a9ed16d3cb16718cf9a5434dc2f769143e0d
+  data.tar.gz: 240d66f7efc39b7df4a86a4080346d7062cb7767706b90b61a2c2ba3f9c2344771906cd728acf4f33b1e2d680a1afc6202a325f1e6047fc6938f7c34c6e7aed2

data/README.md

@@ -107,9 +107,9 @@ Model.search(fields, search_term, options={})
 There is an extra options hash that you can pass to this method, the options are:
 
  * `case_sensitive: false` whether you want to make the search case sensitive. Default is false. Note that this relies on the database engine defaults so if the column or table schema is set to be case insensitive it won't mater what you set here.
- * `match_type: all` type of match, `beginning`, `end`, `all` string or `none`. Default is all.
  * `include` an array/hash of symbols if you want to include other relations on the model. Same as with default rails include.
  * `join` an array/hash of symbols if you want to join other relations on the model. Same as with default rails join.
+ * `id_fields: nil` an array of strings with id fields that should be considered on the search. This is important because we cannot do `LIKE` searches on integer fields so if you want to search both for text fields and in ID fields this should be set 
 
 **Examples**
 
@@ -129,13 +129,15 @@ Searching for substrings:
 
 Searching for patterns:
 
+You can use the _percent_ sign to do pattern matching just like in SQL given that the database supports it of course:
+
 ``` ruby
- State.search("name", "Ma", match_type: :beginning)
+ State.search("name", "Ma%")
  # => Yields 3 results where the value starts with Ma: Maine, Maryland and Massachusetts
 ```
 
 ``` ruby
- State.search("name", "Ma", match_type: :end)
+ State.search("name", "%Ma", match_type: :end)
  # => Yields 2 results where the value ends with ma: Alabama, Oklahoma
 ```
 

data/lib/rooble/version.rb

@@ -1,3 +1,3 @@
 module Rooble
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/rooble.rb

@@ -72,13 +72,12 @@ module Rooble
         model = self
       end
 
-      search_beginning = "%"
-      search_end = "%"
       fields = [].push(fields) unless fields.is_a? Array
       search_values = []
       query = ''
       case_sensitive = false
       or_cond = ''
+      id_fields = ['id']
 
       if options.has_key? :case_sensitive
         if options[:case_sensitive]
@@ -86,6 +85,10 @@ module Rooble
         end
       end
 
+      if options.has_key? :id_fields
+        id_fields << options[:id_fields].collect { |id| id.downcase }
+      end
+
       fields.each_with_index do |field,index|
         # set the OR if we have more than one field
         if index > 0
@@ -94,29 +97,13 @@ module Rooble
 
         # lets find out if we are looking for the ID, we can't
         # use like for integers so we use equality instead
-        if field.downcase == "id"
-          # check that the serch term is actually a number
+        if id_fields.include? field.downcase
+          # check that the search term is actually a number
+          next unless search_term.to_i > 0
+
           operator = "="
           search_values.push(search_term.to_i)
         else
-
-          # set the type of search wether just beginning of string
-          # the end or as a whole
-          if options.has_key? :match_type
-            case options[:match_type].to_s
-            when "beginning"
-              search_beginning = nil
-            when "end"
-              search_end = nil
-            when "all"
-              search_beginning = "%"
-              search_end = "%"
-            when "none"
-              search_beginning = nil
-              search_end = nil
-            end
-          end
-
           # set whether we want case sensitive search
           case ActiveRecord::Base.connection.adapter_name
           when "PostgreSQL"
@@ -134,7 +121,7 @@ module Rooble
 
           # downcase the search term if we are doing case insensitive search so
           # the value of downcasing the column matches
-          search_values.push("#{search_beginning}#{search_value}#{search_end}")
+          search_values.push("#{search_value}")
         end
 
         query += " #{or_cond} #{field} #{operator} ? "

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rooble
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Gustavo Rubio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-11 00:00:00.000000000 Z
+date: 2016-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport