rooble 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40e44e737c4f30d4dc8aa00ca5321a64dfb4e3c0
-  data.tar.gz: ae20c6f07893a26981e3fa5cfb020e6b1f6941d3
+  metadata.gz: 28a21415ee2a634a1680dedba3f794c6ae4a1014
+  data.tar.gz: 6c8cdacaa4ae3183d41b176867bdfd2fbc92f74f
 SHA512:
-  metadata.gz: 7887f557a7d2d2aac81cb16c177fc7a9a6f69d328f08daeb63ed91e936996290d7ef76eff74d5482a3323580dc2dc38ee607385ec9aac315d3f549ef4115015d
-  data.tar.gz: a19a5e91bc6263ae4307466298865dc0a7171129309378fa54c326a59e9abc9c8c245b689bffd3c3d5f408b660be07d079e257c022cb7a6c57b7c1990d61a605
+  metadata.gz: 3119159682297c57f36d624922023cde2881183a15477b52f12da4fe540b0c74316c11480f1dd41b38f1b06a543dd935a5454982575a4804bbcb4874bb045977
+  data.tar.gz: bae92d903cd64307609e89cbb952c45aadf09c6478e413566e8759026074bf80ec0c23be58871df5ee7726e7c9e4ff0e489abcf7e6a7e6f596f81ff2140a1c5e

data/lib/rooble.rb

@@ -73,8 +73,9 @@ module Rooble
       end
 
       fields = [].push(fields) unless fields.is_a? Array
+      fields.collect! { |f| f.to_s }
       search_values = []
-      query = ''
+      query = []
       case_sensitive = false
       or_cond = ''
       id_fields = ['id']
@@ -90,19 +91,15 @@ module Rooble
       end
 
       fields.each_with_index do |field,index|
-        # set the OR if we have more than one field
-        if index > 0
-          or_cond = "OR"
-        end
 
         # lets find out if we are looking for the ID, we can't
         # use like for integers so we use equality instead
         if id_fields.include? field.downcase
           # check that the search term is actually a number
-          next unless search_term.gsub('%', '').to_i > 0
+          next unless search_term.to_s.gsub('%', '').to_i > 0
 
           operator = "="
-          search_values.push(search_term.gsub('%', '').to_i)
+          search_values.push(search_term.to_s.gsub('%', '').to_i)
         else
           # set whether we want case sensitive search
           case ActiveRecord::Base.connection.adapter_name
@@ -111,6 +108,8 @@ module Rooble
             search_value = search_term
           when "MySQL", "Mysql2", "SQLite"
             operator = "LIKE"
+            # downcase the search term if we are doing case insensitive search so
+            # the value of downcasing the column matches
             if case_sensitive
               search_value = search_term
             else
@@ -119,15 +118,13 @@ module Rooble
             end
           end
 
-          # downcase the search term if we are doing case insensitive search so
-          # the value of downcasing the column matches
-          search_values.push("#{search_value}")
+          search_values.push("#{search_value.to_s}")
         end
 
-        query += " #{or_cond} #{field} #{operator} ? "
+        query << " #{field} #{operator} ? "
       end
 
-      records = model.where(query, *search_values)
+      records = model.where(query.join(' OR '), *search_values)
     end
 
   end

data/lib/rooble/version.rb

@@ -1,3 +1,3 @@
 module Rooble
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

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