acts_as_wild_searchable 0.0.5 → 0.0.6

data/lib/acts_as_wild_searchable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsWildSearchable
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/acts_as_wild_searchable.rb

@@ -31,11 +31,7 @@ module ActsAsWildSearchable
     def method_missing(method_name, *args)
       # Verify that method start with attribute name followed by like?
       if match = method_name.to_s.match(/^([a-zA-Z]\w*)_like\?$/)
-        if args.nil? or args.empty? or args.first.nil? or args.first.empty?
-          where(nil)
-        else
-          apply_filter(match.captures.first, args)
-        end
+        apply_filter(match.captures.first, args)
       else
         super
       end
@@ -54,8 +50,11 @@ module ActsAsWildSearchable
         element.kind_of? Hash 
       }.reduce({:clause=>"or"}) { |h, pairs| pairs.each { |k,v| h[k]=v}; h}
       
-      conditions = filter.select { |element| 
-        element.kind_of? String
+      
+      conditions = filter.reduce([]) { |group, element| 
+        element.each { |inner_string| group<<inner_string } if element.kind_of? Array
+        group<<element if element.kind_of? String
+        group
       }.map { |condition| 
           wild_condition = "#{condition}"
           if (clauses.has_key?(:left) and clauses[:left]) 
@@ -73,7 +72,7 @@ module ActsAsWildSearchable
           wild_condition
       }         
       
-        sentences = conditions.map { |x| "#{capture} like ?" }
+      sentences = conditions.map { |x| "#{capture} like ?" }
       
       if (clauses.has_key?(:clause) and clauses[:clause]=="and" )
         join_type = " and "
@@ -81,8 +80,12 @@ module ActsAsWildSearchable
         join_type = " or "
       end
       sentences = sentences.join(join_type) if sentences.size > 1
-      sentences = sentences.first if sentences.size == 1      
-      where conditions.prepend sentences
+      sentences = sentences.first if sentences.size == 1
+      if sentences.flatten.size == 0
+        all
+      else
+        where conditions.prepend sentences
+      end
     end
     
   end

data/test/acts_as_wild_searchable_test.rb

@@ -55,8 +55,16 @@ class ActsAsWildSearchableTest < ActiveSupport::TestCase
   
   test "query_nil_args" do
     query = User.name_like?
+    puts query.explain
     #assert query.explain.include?("S")
-    assert_kind_of Array, query
+    assert_kind_of ActiveRecord::Relation, query
+  end
+
+  test "query_empty_array" do
+    query = User.name_like?([])
+    puts query.explain
+    #assert query.explain.include?("S")
+    assert_kind_of ActiveRecord::Relation, query
   end
 
   

data/test/dummy/log/test.log

@@ -1240,3 +1240,156 @@
   User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like 'Herminio%')
   EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like 'Herminio%')
    (0.0ms)  rollback transaction
+   (0.5ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like '%Herminio' and name like '%Kalli')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like '%Herminio' and name like '%Kalli')
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like 'Herminio%' and name like 'Kalli%')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like 'Herminio%' and name like 'Kalli%')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like '%Herminio%' or name like '%Kalli%')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like '%Herminio%' or name like '%Kalli%')
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (NULL)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like '%Herminio' or name like '%Kalli')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like '%Herminio' or name like '%Kalli')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like 'Herminio%' or name like 'Kalli%')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like 'Herminio%' or name like 'Kalli%')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like '%Herminio%')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like '%Herminio%')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like '%Herminio')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like '%Herminio')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like 'Herminio%')
+  EXPLAIN (0.0ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like 'Herminio%')
+   (0.0ms)  rollback transaction
+   (0.5ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like '%Herminio' and name like '%Kalli')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like '%Herminio' and name like '%Kalli')
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like 'Herminio%' and name like 'Kalli%')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like 'Herminio%' and name like 'Kalli%')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like '%Herminio%' or name like '%Kalli%')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like '%Herminio%' or name like '%Kalli%')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like '%Herminio' or name like '%Kalli')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like '%Herminio' or name like '%Kalli')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like 'Herminio%' or name like 'Kalli%')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like 'Herminio%' or name like 'Kalli%')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like '%Herminio%')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like '%Herminio%')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like '%Herminio')
+  EXPLAIN (0.0ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like '%Herminio')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like 'Herminio%')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like 'Herminio%')
+   (0.0ms)  rollback transaction
+   (0.5ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like '%Herminio' and name like '%Kalli')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like '%Herminio' and name like '%Kalli')
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like 'Herminio%' and name like 'Kalli%')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like 'Herminio%' and name like 'Kalli%')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like '%Herminio%' or name like '%Kalli%')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like '%Herminio%' or name like '%Kalli%')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like '%Herminio' or name like '%Kalli')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like '%Herminio' or name like '%Kalli')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like 'Herminio%' or name like 'Kalli%')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like 'Herminio%' or name like 'Kalli%')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like '%Herminio%')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like '%Herminio%')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like '%Herminio')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like '%Herminio')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like 'Herminio%')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like 'Herminio%')
+   (0.0ms)  rollback transaction
+   (0.5ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like '%Herminio' and name like '%Kalli')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like '%Herminio' and name like '%Kalli')
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like 'Herminio%' and name like 'Kalli%')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like 'Herminio%' and name like 'Kalli%')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.0ms)  SELECT "users".* FROM "users" WHERE (NULL)
+  EXPLAIN (0.0ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (NULL)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like '%Herminio%' or name like '%Kalli%')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like '%Herminio%' or name like '%Kalli%')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.0ms)  SELECT "users".* FROM "users" WHERE (NULL)
+  EXPLAIN (0.0ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (NULL)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like '%Herminio' or name like '%Kalli')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like '%Herminio' or name like '%Kalli')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like 'Herminio%' or name like 'Kalli%')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like 'Herminio%' or name like 'Kalli%')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like '%Herminio%')
+  EXPLAIN (0.0ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like '%Herminio%')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like '%Herminio')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like '%Herminio')
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE (name like 'Herminio%')
+  EXPLAIN (0.1ms)  EXPLAIN QUERY PLAN SELECT "users".* FROM "users" WHERE (name like 'Herminio%')
+   (0.0ms)  rollback transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_wild_searchable
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000Z
+date: 2012-04-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70207562156860 !ruby/object:Gem::Requirement
+  requirement: &70247487948800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70207562156860
+  version_requirements: *70247487948800
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70207562156200 !ruby/object:Gem::Requirement
+  requirement: &70247487948100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70207562156200
+  version_requirements: *70247487948100
 description: This gem allows you to use the acts_as_wild_searchable tag to your models
   and make methods for each attribute to search using wild cards and like
 email: