searchlogic 2.5.13 → 2.5.14

data/lib/searchlogic/search/method_missing.rb

@@ -15,12 +15,15 @@ module Searchlogic
           if setter?(name)
             if scope?(scope_name)
               if args.size == 1
+                options = scope_options(scope_name).respond_to?(:searchlogic_options) ? scope_options(scope_name).searchlogic_options : {}
+                options[:cast_single_val_to_array] = cast_single_val_to_array?(condition_name)
+
                 write_condition(
                   condition_name,
                   type_cast(
                     args.first,
                     cast_type(scope_name),
-                    scope_options(scope_name).respond_to?(:searchlogic_options) ? scope_options(scope_name).searchlogic_options : {}
+                    options
                   )
                 )
               else
@@ -100,7 +103,7 @@ module Searchlogic
             casted_value = column_for_type_cast.type_cast(value)
 
             if Time.zone && casted_value.is_a?(Time)
-              if value.is_a?(String)
+              casted_value = if value.is_a?(String)
                 # if its a string, we should assume the user means the local time
                 # we need to update the object to include the proper time zone without changing
                 # the time
@@ -108,11 +111,16 @@ module Searchlogic
               else
                 casted_value.in_time_zone
               end
-            else
-              casted_value
             end
+
+            options[:cast_single_val_to_array] ? [casted_value] : casted_value
           end
         end
+
+        # For *_equals_any conditions, cast single values to an array, ex: 5 to [5] or 'ben' to ['ben']
+        def cast_single_val_to_array?(condition_name)
+          condition_name =~ /^\w+_equals_any/
+        end
     end
   end
 end

data/lib/searchlogic/version.rb

@@ -1,3 +1,3 @@
 module Searchlogic
-  VERSION = "2.5.13"
+  VERSION = "2.5.14"
 end

data/spec/searchlogic/search_spec.rb

@@ -321,6 +321,18 @@ describe Searchlogic::Search do
         search.id_equals_any.should == [1, 2, 3]
       end
 
+      it "should be an Array given a single value for *_equals_any" do
+        search = Order.search
+        search.id_equals_any = 5
+        search.id_equals_any.should == [5]
+      end
+
+      it "shouldn't change to an Array given a single value for *_equals" do
+        search = Order.search
+        search.id_equals = 5
+        search.id_equals.should_not == [5]
+      end
+
       it "should type cast association conditions" do
         search = User.search
         search.orders_total_gt = "10"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: searchlogic
 version: !ruby/object:Gem::Version
-  version: 2.5.13
+  version: 2.5.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -142,7 +142,6 @@ files:
 - lib/searchlogic/search/unknown_condition_error.rb
 - lib/searchlogic/version.rb
 - rails/init.rb
-- searchlogic-2.5.12.gem
 - searchlogic.gemspec
 - spec/searchlogic/active_record/association_proxy_spec.rb
 - spec/searchlogic/active_record/consistency_spec.rb
@@ -176,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Searchlogic makes using ActiveRecord named scopes easier and less repetitive.