searchlogic 2.3.10 → 2.3.11

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 2
 :minor: 3
 :build: 
-:patch: 10
+:patch: 11

data/lib/searchlogic/search.rb

@@ -92,12 +92,12 @@ module Searchlogic
           else
             raise UnknownConditionError.new(condition_name)
           end
-        elsif scope?(scope_name)
-          if args.size > 0
+        elsif scope?(scope_name) && args.size <= 1
+          if args.size == 0
+            conditions[condition_name]
+          else
             send("#{condition_name}=", *args)
             self
-          else
-            conditions[condition_name]
           end
         else
           scope = conditions.inject(klass.scoped(current_scope) || {}) do |scope, condition|
@@ -112,8 +112,10 @@ module Searchlogic
               else
                 scope
               end
+            elsif arity == -1
+              scope.send(scope_name, *(value.is_a?(Array) ? value : [value]))
             else
-              scope.send(scope_name, *value)
+              scope.send(scope_name, value)
             end
           end
           scope.send(name, *args, &block)

data/searchlogic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.3.10"
+  s.version = "2.3.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Johnson of Binary Logic"]
-  s.date = %q{2010-01-14}
+  s.date = %q{2010-01-19}
   s.description = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [

data/spec/search_spec.rb

@@ -340,13 +340,27 @@ describe "Search" do
       User.search(:order => "ascend_by_username").proxy_options.should == User.ascend_by_username.proxy_options
     end
     
-    it "should pass array values as multiple arguments" do
+    it "should pass array values as multiple arguments with arity -1" do
       User.named_scope(:multiple_args, lambda { |*args|
         raise "This should not be an array, it should be 1" if args.first.is_a?(Array)
         {:conditions => ["id IN (?)", args]}
       })
       User.search(:multiple_args => [1,2]).proxy_options.should == User.multiple_args(1,2).proxy_options
     end
+    
+    it "should pass array as a single value with arity >= 0" do
+      User.named_scope(:multiple_args, lambda { |args|
+        raise "This should be an array" if !args.is_a?(Array)
+        {:conditions => ["id IN (?)", args]}
+      })
+      User.search(:multiple_args => [1,2]).proxy_options.should == User.multiple_args(1,2).proxy_options
+    end
+    
+    it "should not split out dates or times (big fix)" do
+      s = User.search
+      s.created_at_after = Time.now
+      lambda { s.count }.should_not raise_error
+    end
   end
   
   context "method delegation" do
@@ -366,12 +380,12 @@ describe "Search" do
       search2.empty?.should == true
     end
 
-		it "should delegate to named scopes with arity > 1" do
-		  User.named_scope :paged, lambda {|start, limit| { :limit => limit, :offset => start }}
-			User.create(:username => "bjohnson")
-			search = User.search(:username => "bjohnson")
-			search.paged(0, 1).count.should == 1
-			search.paged(0, 0).count.should == 0
-	  end
+    it "should delegate to named scopes with arity > 1" do
+      User.named_scope :paged, lambda {|start, limit| { :limit => limit, :offset => start }}
+      User.create(:username => "bjohnson")
+      search = User.search(:username => "bjohnson")
+      search.paged(0, 1).count.should == 1
+      search.paged(0, 0).count.should == 0
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.3.10
+  version: 2.3.11
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 -05:00
+date: 2010-01-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency