searchlogic 2.4.2 → 2.4.3

data/Rakefile

@@ -14,7 +14,6 @@ begin
     gem.add_dependency "activerecord", ">= 2.0.0"
   end
   Jeweler::GemcutterTasks.new
-  Jeweler::RubyforgeTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/VERSION.yml

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

data/lib/searchlogic/search.rb

@@ -61,11 +61,13 @@ module Searchlogic
     
     # Accepts a hash of conditions.
     def conditions=(values)
-      values.each do |condition, value|
-        value.delete_if { |v| ignore_value?(v) } if value.is_a?(Array)
-        next if ignore_value?(value)
+      @setting_mass_conditions = true
+      result = values.each do |condition, value|
+        mass_conditions[condition.to_sym] = value
         send("#{condition}=", value)
       end
+      @setting_mass_conditions = false
+      result
     end
     
     # Delete a condition from the search. Since conditions map to named scopes,
@@ -84,6 +86,7 @@ module Searchlogic
         
         if setter?(name)
           if scope?(scope_name)
+            mass_conditions.delete(scope_name.to_sym) if !setting_mass_conditions?
             if args.size == 1
               conditions[condition_name] = type_cast(args.first, cast_type(scope_name))
             else
@@ -102,20 +105,26 @@ module Searchlogic
         else
           scope = conditions_array.inject(klass.scoped(current_scope) || {}) do |scope, condition|
             scope_name, value = condition
-            scope_name = normalize_scope_name(scope_name)
-            klass.send(scope_name, value) if !klass.respond_to?(scope_name)
-            arity = klass.named_scope_arity(scope_name)
             
-            if !arity || arity == 0
-              if value == true
-                scope.send(scope_name)
+            value.delete_if { |v| ignore_value?(scope_name, v) } if value.is_a?(Array)
+            if !ignore_value?(scope_name, value)
+              scope_name = normalize_scope_name(scope_name)
+              klass.send(scope_name, value) if !klass.respond_to?(scope_name)
+              arity = klass.named_scope_arity(scope_name)
+            
+              if !arity || arity == 0
+                if value == true
+                  scope.send(scope_name)
+                else
+                  scope
+                end
+              elsif arity == -1
+                scope.send(scope_name, *(value.is_a?(Array) ? value : [value]))
               else
-                scope
+                scope.send(scope_name, value)
               end
-            elsif arity == -1
-              scope.send(scope_name, *(value.is_a?(Array) ? value : [value]))
             else
-              scope.send(scope_name, value)
+              klass.scoped({})
             end
           end
           scope.send(name, *args, &block)
@@ -163,6 +172,14 @@ module Searchlogic
         end
       end
       
+      def mass_conditions
+        @mass_conditions ||= {}
+      end
+      
+      def setting_mass_conditions?
+        @setting_mass_conditions == true
+      end
+      
       def type_cast(value, type)
         case value
         when Array
@@ -188,8 +205,8 @@ module Searchlogic
         end
       end
       
-      def ignore_value?(value)
-        (value.is_a?(String) && value.blank?) || (value.is_a?(Array) && value.empty?)
+      def ignore_value?(scope_name, value)
+        mass_conditions.key?(scope_name.to_sym) && (value.is_a?(String) && value.blank?) || (value.is_a?(Array) && value.empty?)
       end
   end
 end

data/searchlogic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.4.2"
+  s.version = "2.4.3"
 
   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-26}
+  s.date = %q{2010-02-02}
   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

@@ -69,10 +69,12 @@ describe "Search" do
       search.username.should == "bjohnson"
     end
     
-    it "should ignore blank values" do
+    # We ignore them upon execution. But we still want to accept the condition so that returning the conditions
+    # preserves the values.
+    it "should not ignore blank values" do
       search = User.search
       search.conditions = {"username" => ""}
-      search.username.should be_nil
+      search.username.should == ""
     end
     
     it "should use custom scopes before normalizing" do
@@ -87,7 +89,7 @@ describe "Search" do
     it "should ignore blank values in arrays" do
       search = User.search
       search.conditions = {"username_equals_any" => [""]}
-      search.username_equals_any.should be_blank
+      search.username_equals_any.first.should be_blank
     end
   end
   
@@ -361,6 +363,24 @@ describe "Search" do
       s.created_at_after = Time.now
       lambda { s.count }.should_not raise_error
     end
+    
+    it "should ignore blank values" do
+      search = User.search
+      search.conditions = {"username_equals" => ""}
+      search.proxy_options.should == {}
+    end
+    
+    it "should not ignore blank values when explicitly set" do
+      search = User.search
+      search.username_equals = ""
+      search.proxy_options.should == {:conditions => ["users.username = ?", ""]}
+    end
+    
+    it "should ignore blank values in arrays" do
+      search = User.search
+      search.conditions = {"username_equals_any" => [""]}
+      search.proxy_options.should == {}
+    end
   end
   
   context "method delegation" do

metadata

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