formvalidator 0.1.3 → 0.1.5

data/AUTHORS

@@ -1 +1 @@
-Travis Whitton <whitton@atlantic.net>
+Travis Whitton <tinymountain@gmail.com>

data/CHANGELOG

@@ -22,7 +22,19 @@ o Wrote additional unit test.
 --------------------------------------------------------------------------------
 8/14/2003 version 0.1.3
 
-o Fixed credit card type detection bugs
-o Fixed a bug regarding invalid field accounting
+o Fixed credit card type detection bugs.
+o Fixed a bug regarding invalid field accounting.
 
 --------------------------------------------------------------------------------
+10/26/2004 version 0.1.4
+
+o Changed obsolete to_a() calls to use Array().
+o Changed type() calls to use class().
+o Fixed apply_string_constraint() to handle multiple elements.
+o Fixed apply_regexp_constraint() to handle multiple elements.
+o Remembered to increment version number.
+
+--------------------------------------------------------------------------------
+8/28/2010 version 0.1.5
+
+o Bugfix for passing hash as profile to constructor

data/README

@@ -1,7 +1,7 @@
 
         FormValidator Library
 
-        Feb. 13, 2003 Travis Whitton <whitton@atlantic.net>
+        Aug. 28, 2010 Travis Whitton <tinymountain@gmail.com>
 
 FormValidator is a full featured form validation library written in pure ruby.
 See README.rdoc for more details.
@@ -12,6 +12,9 @@ See README.rdoc for more details.
 build the docs if you want to
 3. rdoc --main README.rdoc formvalidator.rb README.rdoc
 
+[Alternate installation]
+1. gem install formvalidator
+
 [Copying]
 FormValidator extension library is copywrited free software by Travis Whitton
 <whitton@atlantic.net>. You can redistribute it under the terms specified in

data/formvalidator.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
   s.name = %q{formvalidator}
-  s.version = "0.1.3"
+  s.version = "0.1.5"
   s.date = Time.now
   s.summary = %q{FormValidator is a Ruby port of Perl's Data::FormValidator library.}
   s.author = %q{Travis Whitton}
-  s.email = %q{whitton@atlantic.net}
-  s.homepage = %q{http://grub.ath.cx/formvalidator/}
+  s.email = %q{tinymountain@gmail.com}
+  s.homepage = %q{http://github.com/tmountain/FormValidator}
   s.require_path = %q{.}
   s.autorequire = %q{formvalidator}
   s.files = Dir.glob('**/*') 

data/formvalidator.rb

@@ -1,5 +1,5 @@
 class FormValidator
-  VERSION = "0.1.2"
+  VERSION = "0.1.5"
 
   # Constructor.
   def initialize(profile=nil)
@@ -76,7 +76,7 @@ class FormValidator
     if Hash === profile
       @profile = profile
     else
-      load_profiles
+      load_profiles if @profile_file
       @profile = @profiles[profile]
     end
     check_profile_syntax(@profile)
@@ -103,7 +103,7 @@ class FormValidator
 
   # [:a, :b, :c, [:d, :e, [:f, :g]]] -> ["a", "b", "c", ["d", "e", ["f", "g"]]]
   def strify_array(array)
-    array.to_a.map do |m|
+    Array(array).map do |m|
       m = (Array === m) ? strify_array(m) : m
       m = (Hash === m) ? strify_hash(m) : m
       Symbol === m ? m.to_s : m
@@ -175,7 +175,7 @@ class FormValidator
     #
     #    :required => [:name, :age, :phone]
     def required
-      @profile[:required].to_a.each do |field|
+      Array(@profile[:required]).each do |field|
         @required_fields << field
         @missing_fields.push(field) if @form[field].to_s.empty?
       end
@@ -191,7 +191,7 @@ class FormValidator
     #
     #     :optional => [:name, :age, :phone]
     def optional
-      @profile[:optional].to_a.each do |field|
+      Array(@profile[:optional]).each do |field|
         @optional_fields << field unless @optional_fields.include?(field)
       end
       @optional_fields
@@ -206,7 +206,7 @@ class FormValidator
     #     :required_regexp => /name/
     def required_regexp
       @form.keys.each do |elem|
-        @profile[:required_regexp].to_a.each do |regexp|
+        Array(@profile[:required_regexp]).each do |regexp|
           regexp = Regexp.new(regexp)
           if elem =~ regexp
             @required_fields << elem unless @required_fields.include?(elem)
@@ -225,7 +225,7 @@ class FormValidator
     #     :required_regexp => /name/
     def optional_regexp
       @form.keys.each do |elem|
-        @profile[:optional_regexp].to_a.each do |regexp|
+        Array(@profile[:optional_regexp]).each do |regexp|
           regexp = Regexp.new(regexp)
           if elem =~ regexp
             @optional_fields << elem unless @optional_fields.include?(elem)
@@ -297,14 +297,14 @@ class FormValidator
         if Hash === deps
           deps.keys.each do |key|
             if @form[field].to_s == key
-              deps[key].to_a.each do |dep|
+              Array(deps[key]).each do |dep|
                   @missing_fields.push(dep) if @form[dep].to_s.empty?
               end
             end
           end
         else
           if not @form[field].to_s.empty?
-            deps.to_a.each do |dep|
+            Array(deps).each do |dep|
               @missing_fields.push(dep) if @form[dep].to_s.empty?
             end
           end
@@ -341,11 +341,11 @@ class FormValidator
     #
     #     :filters => :strip
     def filters
-      @profile[:filters].to_a.each do |filter|
+      Array(@profile[:filters]).each do |filter|
         if respond_to?("filter_#{filter}".intern)
           @form.keys.each do |field|
             # If a key has multiple elements, apply filter to each element
-            if @form[field].to_a.length > 1
+            if Array(@form[field]).length > 1
               @form[field].each_index do |i|
                 elem = @form[field][i]
                 @form[field][i] = self.send("filter_#{filter}".intern, elem)
@@ -369,11 +369,11 @@ class FormValidator
     #
     #     :field_filters => { :home_phone => :phone }
     def field_filters
-      @profile[:field_filters].to_a.each do |field,filters|
-        filters.to_a.each do |filter|
+      Array(@profile[:field_filters]).each do |field,filters|
+        Array(filters).each do |filter|
           if respond_to?("filter_#{filter}".intern)
             # If a key has multiple elements, apply filter to each element
-            if @form[field].to_a.length > 1
+            if Array(@form[field]).length > 1
               @form[field].each_index do |i|
                 elem = @form[field][i]
                 @form[field][i] = self.send("filter_#{filter}".intern, elem)
@@ -394,12 +394,12 @@ class FormValidator
     #
     #     :field_filter_regexp_map => { /name/ => :capitalize }
     def field_filter_regexp_map
-      @profile[:field_filter_regexp_map].to_a.each do |re,filters|
-        filters.to_a.each do |filter|
+      Array(@profile[:field_filter_regexp_map]).each do |re,filters|
+        Array(filters).each do |filter|
           if respond_to?("filter_#{filter}".intern)
             @form.keys.select {|key| key =~ re}.each do |match|
               # If a key has multiple elements, apply filter to each element
-              if @form[match].to_a.length > 1
+              if Array(@form[match]).length > 1
                 @form[match].each_index do |i|
                   elem = @form[match][i]
                   @form[match][i] = self.send("filter_#{filter}".intern, elem)
@@ -435,7 +435,7 @@ class FormValidator
     #
     #     :untaint_constraint_fields => %w{ name age }
     def untaint_constraint_fields
-      @profile[:untaint_constraint_fields].to_a.each do |field|
+      Array(@profile[:untaint_constraint_fields]).each do |field|
         @untaint_fields.push(field)
       end
     end
@@ -505,7 +505,7 @@ class FormValidator
     # Valid constraint objects are String, Hash, Array, Proc, and Regexp.
     def do_constraint(key, constraints)
       constraints.each do |constraint|
-        type = constraint.type.to_s.intern
+        type = constraint.class.to_s.intern
         case type
           when :String
             apply_string_constraint(key, constraint)
@@ -540,39 +540,83 @@ class FormValidator
 
     # Applies a builtin constraint to form[key]
     def apply_string_constraint(key, constraint)
-      # FIXME: multiple elements
-      res = self.send("match_#{constraint}".intern, @form[key].to_s)
-      if res
-        if untaint?(key)
-          @form[key] = res 
-          @form[key].untaint
+      ### New code to handle multiple elements (beware!)
+      if Array(@form[key]).length > 1
+        index = 0
+        Array(@form[key]).each do |value|
+          res = self.send("match_#{constraint}".intern, @form[key][index].to_s)
+          if res
+            if untaint?(key)
+              @form[key][index] = res
+              @form[key][index].untaint
+            end
+          else
+            @form[key].delete_at(index)
+            @invalid_fields[key] ||= []
+            unless @invalid_fields[key].include?(constraint)
+              @invalid_fields[key].push(constraint) 
+            end
+            nil
+          end
+          index += 1
         end
+      ### End new code
       else
-        @form.delete(key)
-        @invalid_fields[key] ||= []
-        unless @invalid_fields[key].include?(constraint)
-          @invalid_fields[key].push(constraint) 
+        res = self.send("match_#{constraint}".intern, @form[key].to_s)
+        if res
+          if untaint?(key)
+            @form[key] = res 
+            @form[key].untaint
+          end
+        else
+          @form.delete(key)
+          @invalid_fields[key] ||= []
+          unless @invalid_fields[key].include?(constraint)
+            @invalid_fields[key].push(constraint) 
+          end
+          nil
         end
-        nil
       end
     end
 
     # Applies regexp constraint to form[key]
     def apply_regexp_constraint(key, constraint)
-      # FIXME: multiple elements
-      m = constraint.match(@form[key].to_s)
-      if m
-        if untaint?(key)
-          @form[key] = m[0]
-          @form[key].untaint
+      ### New code to handle multiple elements (beware!)
+      if Array(@form[key]).length > 1
+        index = 0
+        Array(@form[key]).each do |value|
+          m = constraint.match(@form[key][index].to_s)
+          if m
+            if untaint?(key)
+              @form[key][index] = m[0]
+              @form[key][index].untaint
+            end
+          else
+            @form[key].delete_at(index)
+            @invalid_fields[key] ||= []
+            unless @invalid_fields[key].include?(constraint.inspect)
+              @invalid_fields[key].push(constraint.inspect)
+            end
+            nil
+          end
+          index += 1
         end
+      ### End new code
       else
-        @form.delete(key)
-        @invalid_fields[key] ||= []
-        unless @invalid_fields[key].include?(constraint.inspect)
-          @invalid_fields[key].push(constraint.inspect)
+        m = constraint.match(@form[key].to_s)
+        if m
+          if untaint?(key)
+            @form[key] = m[0]
+            @form[key].untaint
+          end
+        else
+          @form.delete(key)
+          @invalid_fields[key] ||= []
+          unless @invalid_fields[key].include?(constraint.inspect)
+            @invalid_fields[key].push(constraint.inspect)
+          end
+          nil
         end
-        nil
       end
     end
 
@@ -599,10 +643,11 @@ class FormValidator
     # If an optional name field is specified then it will be listed as
     # the failed constraint in the invalid_fields hash.
     def apply_hash_constraint(key, constraint)
-      name   = constraint["name"]
-      action = constraint["constraint"]
-      params = constraint["params"]
-      res    = false
+      name     = constraint["name"]
+      action   = constraint["constraint"]
+      params   = constraint["params"]
+      res      = false
+      skip_end = false
 
       # In order to call a builtin or proc, params and action must be present.
       if action and params
@@ -615,21 +660,45 @@ class FormValidator
       end
 
       if Regexp === action
-        # FIXME: multiple elements
-        m = action.match(@form[key].to_s)
-        res = m[0] if m
+        ### New code to handle multiple elements (beware!)
+        if Array(@form[key]).length > 1
+          index = 0
+          skip_end = true
+          Array(@form[key]).each do |value|
+            m = action.match(value)
+            res = m[0] if m
+            if res
+              @form[key][index] = res if untaint?(key)
+            else
+              @form[key].delete_at(index)
+              constraint = (name) ? name : constraint
+              @invalid_fields[key] ||= []
+              unless @invalid_fields[key].include?(constraint)
+                @invalid_fields[key].push(constraint) 
+              end
+              nil
+            end
+            index += 1
+          end
+        ### End new code
+        else
+          m = action.match(@form[key].to_s)
+          res = m[0] if m
+        end
       end
 
-      if res
-        @form[key] = res if untaint?(key)
-      else
-        @form.delete(key)
-        constraint = (name) ? name : constraint
-        @invalid_fields[key] ||= []
-        unless @invalid_fields[key].include?(constraint)
-          @invalid_fields[key].push(constraint) 
+      if not skip_end
+        if res
+          @form[key] = res if untaint?(key)
+        else
+          @form.delete(key)
+          constraint = (name) ? name : constraint
+          @invalid_fields[key] ||= []
+          unless @invalid_fields[key].include?(constraint)
+            @invalid_fields[key].push(constraint) 
+          end
+          nil
         end
-        nil
       end
     end
   end # module ConstraintHelpers
@@ -758,14 +827,14 @@ class FormValidator
 
     # Matches a US state.
     def match_state(state)
-      state = (state.type == String) ? state.intern : state
+      state = (state.class == String) ? state.intern : state
       index = STATES.index(state)
       (index) ? STATES[index].to_s : nil
     end
 
     # Matches a Canadian province.
     def match_province(prov)
-      prov = (prov.type == String) ? prov.intern : prov
+      prov = (prov.class == String) ? prov.intern : prov
       index = PROVINCES.index(prov)
       (index) ? PROVINCES[index].to_s : nil
     end

data/tests/regress.rb

@@ -294,6 +294,16 @@ class TestValidator < Test::Unit::TestCase
     assert_equal(false, form["ip"].tainted?)
   end
 
+  def test_hash_constructor
+    profile = {
+      :test => {
+        :required => [ :foo ]
+      }
+    }
+    fv = FormValidator.new(profile)
+    assert(fv.validate({'foo' => 'bar'}, :test))
+  end
+
   def test_constraint_regexp_map
     form = {
       "zipcode" => "32608"
@@ -492,13 +502,6 @@ class TestValidator < Test::Unit::TestCase
     assert_nil(@fv.match_american_phone("(abc) abc-defg"))
   end
 
-  def test_match_cc_number()
-    # Not a real credit card number! It simply matches the checksum.
-    assert_equal("378282246310005",
-                 @fv.match_cc_number("378282246310005", :AMEX))
-    assert_nil(@fv.match_cc_number("378282256310005", :AMEX))
-  end
-
   def test_match_cc_exp()
     year = Time.new.year
     month = Time.new.month

metadata

@@ -1,59 +1,71 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: "0.8"
-specification_version: 1
 name: formvalidator
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
-date: 2004-10-23
-summary: "FormValidator is a Ruby port of Perl's Data::FormValidator library."
-require_paths: 
-  - "."
-author: Travis Whitton
-email: whitton@atlantic.net
-homepage: http://grub.ath.cx/formvalidator/
-rubyforge_project: 
-description: 
+  version: 0.1.5
+platform: ruby
+authors: 
+- Travis Whitton
 autorequire: formvalidator
-default_executable: 
 bindir: bin
+cert_chain: []
+
+date: 2010-08-28 00:00:00 -04:00
+default_executable: 
+dependencies: []
+
+description: 
+email: tinymountain@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README.rdoc
+files: 
+- install.rb
+- README
+- CHANGELOG
+- README.rdoc
+- tests/testprofile.rb
+- tests/regress.rb
+- examples/simple.rb
+- examples/README
+- examples/profiles/my_profile.rb
+- examples/profiles/extension.rb
+- examples/extend.rb
+- examples/standard.rb
+- examples/file.rb
+- formvalidator.rb
+- formvalidator.gemspec
+- AUTHORS
 has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
+homepage: http://github.com/tmountain/FormValidator
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --main
+- README.rdoc
+require_paths: 
+- .
+required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
   version: 
-platform: ruby
-files: 
-  - tests
-  - README
-  - examples
-  - CHANGELOG
-  - TODO
-  - formvalidator.rb
-  - README.rdoc
-  - install.rb
-  - AUTHORS
-  - formvalidator.gemspec
-  - tests/testprofile.rb
-  - tests/regress.rb
-  - examples/file.rb
-  - examples/standard.rb
-  - examples/profiles
-  - examples/extend.rb
-  - examples/simple.rb
-  - examples/README
-  - examples/profiles/my_profile.rb
-  - examples/profiles/extension.rb
-test_files: 
-  - tests/regress.rb
-rdoc_options: 
-  - "--main"
-  - README.rdoc
-extra_rdoc_files: 
-  - README.rdoc
-executables: []
-extensions: []
 requirements: []
-dependencies: []
+
+rubyforge_project: 
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: FormValidator is a Ruby port of Perl's Data::FormValidator library.
+test_files: 
+- tests/regress.rb

data/TODO

@@ -1,5 +0,0 @@
-Patches are Welcome!
---------------------------------------------------------------------------------
-o Make constraints handle form elements with multiple fields.
-o Make field filters accept proc objects.
-o Make a tutorial on using FormValidator on the Ruby Wiki.