Changeset 453

Timestamp:

06/24/08 10:46:09 (5 months ago)

Author:

deveiant

Message:

• Added another component to the untainting of keys in the form validator
• Added a 'timedelta' template tag plugin

Location:

trunk

Files:

• lib/arrow/formvalidator.rb (modified) (1 diff)
• lib/arrow/template/timedelta.rb (added)
• spec/arrow/formvalidator_spec.rb (modified) (4 diffs)

trunk/lib/arrow/formvalidator.rb

@@ -132 +132 @@
         *(Hash.public_instance_methods(false) - ['[]', '[]=', 'inspect'])
 
-
-        
 
     ### Stringified description of the validator

trunk/spec/arrow/formvalidator_spec.rb

@@ -263 +263 @@
     it "should untaint both keys and values in complex hash fields if untainting is turned on" do
         profile = {
+            :required => [
+                'recipe[ingredient][rarity]',
+            ],
             :optional => [
                 'recipe[ingredient][name]',
@@ -268 +271 @@
                 'recipe[yield]'
             ],
+            :constraints    => {
+                'recipe[ingredient][rarity]' => /^([\w\-]+)$/,
+            },
             :untaint_all_constraints => true,
         }
         args = {
+            'recipe[ingredient][rarity]'.taint => 'super-rare'.taint,
             'recipe[ingredient][name]'.taint => 'nutmeg'.taint,
             'recipe[ingredient][cost]'.taint => '$0.18'.taint,
@@ -280 +287 @@
         @validator.valid.should == {
             'recipe' => {
-                'ingredient' => { 'name' => 'nutmeg', 'cost' => '$0.18' },
+                'ingredient' => { 'name' => 'nutmeg', 'cost' => '$0.18', 'rarity' => 'super-rare' },
                 'yield' => '2 loaves'
             }
@@ -286 +293 @@
 
         @validator.valid.keys.all? {|key| key.should_not be_tainted() }
-        @validator.valid.keys.all? {|key| key.should_not be_tainted() }
+        @validator.valid.values.all? {|key| key.should_not be_tainted() }
         @validator.valid['recipe'].keys.all? {|key| key.should_not be_tainted() }
         @validator.valid['recipe']['ingredient'].keys.all? {|key| key.should_not be_tainted() }
         @validator.valid['recipe']['yield'].should_not be_tainted()
+        @validator.valid['recipe']['ingredient']['rarity'].should_not be_tainted()
         @validator.valid['recipe']['ingredient']['name'].should_not be_tainted()
         @validator.valid['recipe']['ingredient']['cost'].should_not be_tainted()