Changeset 461

Timestamp:

08/27/08 17:24:56 (3 months ago)

Author:

deveiant

Message:

• Added some more javascript stuff to the manual resources dir
• Made boolean constraints accept '1' or '0' in Arrow::FormValidator?

Location:

trunk

Files:

• docs/manual/resources/js/jquery.ThickBox.js (added)
• docs/manual/resources/js/jquery.js (added)
• docs/manual/resources/js/manual.js (added)
• docs/manual/resources/js/search.js (added)
• lib/arrow/formvalidator.rb (modified) (1 diff)
• spec/arrow/formvalidator_spec.rb (modified) (2 diffs)

trunk/lib/arrow/formvalidator.rb

@@ -306 +306 @@
     def match_boolean( val )
         rval = nil
-        if ( val =~ /^(t(?:rue)?|y(?:es)?)$/i )
+        if ( val =~ /^(t(?:rue)?|y(?:es)?)|1$/i )
             rval = true
-        elsif ( val =~ /^(no?|f(?:alse)?)$/i )
+        elsif ( val =~ /^(no?|f(?:alse)?)|0$/i )
             rval = false
         end

trunk/spec/arrow/formvalidator_spec.rb

@@ -346 +346 @@
     end
     
+    it "accepts the value '1' for fields with boolean constraints" do
+        params = {'required' => '1', 'bool_constraint' => '1'}
+    
+        @validator.validate( params )
+
+        @validator.should be_okay()
+        @validator.should_not have_errors()
+
+        @validator[:bool_constraint].should be_true()
+    end
+    
     it "accepts the value 'false' for fields with boolean constraints" do
         params = {'required' => '1', 'bool_constraint' => 'false'}
@@ -381 +392 @@
     it "accepts the value 'n' for fields with boolean constraints" do
         params = {'required' => '1', 'bool_constraint' => 'n'}
+    
+        @validator.validate( params )
+
+        @validator.should be_okay()
+        @validator.should_not have_errors()
+
+        @validator[:bool_constraint].should be_false()
+    end
+
+    it "accepts the value '0' for fields with boolean constraints" do
+        params = {'required' => '1', 'bool_constraint' => '0'}
     
         @validator.validate( params )