Allow booleans to be given to validate_inclusion_of [#89 status:resol…

…ved]
carlosbrando · Jul 16, 2009 · c7a2323 · c7a2323
1 parent 4e56579
commit c7a2323
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/remarkable_activerecord/CHANGELOG b/remarkable_activerecord/CHANGELOG
@@ -1,3 +1,5 @@
+* Allow booleans to be given to validate_inclusion_of [#89]
+
 * Allow allow_values_for and allow_mass_assignment_of matchers to be executed in
   the negative form by including Remarkable::Negative module [#85]
 

diff --git a/...rkable_activerecord/lib/remarkable_activerecord/matchers/validate_exclusion_of_matcher.rb b/...rkable_activerecord/lib/remarkable_activerecord/matchers/validate_exclusion_of_matcher.rb
@@ -14,10 +14,9 @@ class ValidateExclusionOfMatcher < AllowValuesForMatcher #:nodoc:
           def valid_values
             if @in_range
               [ @options[:in].first - 1, @options[:in].last + 1 ]
-            elsif @options[:in].empty?
-              []
             else
-              [ @options[:in].map(&:to_s).max.to_s.next ]
+              value = @options[:in].select{ |i| i.is_a?(String) }.max
+              value ? [ value.next ] : []
             end
           end
 

diff --git a/...rkable_activerecord/lib/remarkable_activerecord/matchers/validate_inclusion_of_matcher.rb b/...rkable_activerecord/lib/remarkable_activerecord/matchers/validate_inclusion_of_matcher.rb
@@ -18,10 +18,9 @@ def valid_values
           def invalid_values
             if @in_range
               [ @options[:in].first - 1, @options[:in].last + 1 ]
-            elsif @options[:in].empty?
-              []
             else
-              [ @options[:in].map(&:to_s).max.to_s.next ]
+              value = @options[:in].select{ |i| i.is_a?(String) }.max
+              value ? [ value.next ] : []
             end
           end
 

diff --git a/remarkable_activerecord/spec/validate_inclusion_of_matcher_spec.rb b/remarkable_activerecord/spec/validate_inclusion_of_matcher_spec.rb
@@ -49,6 +49,9 @@ def define_and_validate(options={})
     it { should_not define_and_validate(:in => ['X', 'Y', 'Z']).in('X', 'Y') }
     it { should_not define_and_validate(:in => ['X', 'Y', 'Z']).in('A') }
 
+    it { should define_and_validate(:in => [true, false]).in(true, false) }
+    it { should_not define_and_validate(:in => [true, false]).in('A') }
+
     it { should define_and_validate(:in => 2..3).in(2..3) }
     it { should define_and_validate(:in => 2..20).in(2..20) }
     it { should_not define_and_validate(:in => 2..20).in(1..20) }