Merge pull request #164 from szTheory/master

For *_equals_any conditions, cast single values to an array, ex: 5 to [5] or 'ben' to ['ben']

Author: binarylogic

lib/searchlogic/search/method_missing.rb

@@ -15,12 +15,15 @@ def method_missing(name, *args, &block)
           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,19 +103,24 @@ def type_cast(value, type, options = {})
             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
                 (casted_value + (Time.zone.utc_offset * -1)).in_time_zone(Time.zone)
               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

searchlogic-2.5.13.gem

@@ -321,6 +321,18 @@
         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"