noodall-form-builder 0.2.9 → 0.2.10

data/app/models/noodall/form.rb

@@ -6,7 +6,7 @@ module Noodall
 
     key :title, String, :required => true
     key :description, String
-    key :email, String, :format => /.+\@.+\..+/
+    key :email, String, :format => /^[-a-z0-9_+\.]+\@([-a-z0-9]+\.)+[a-z0-9]{2,4}$/i
     key :thank_you_message, :default => 'Thank you for getting in contact.'
     key :thank_you_email, :default => 'Thank you for getting in contact.'
 

data/app/models/noodall/form_response.rb

@@ -3,7 +3,7 @@ module Noodall
     include MongoMapper::Document
 
     key :name, String
-    key :email, String, :format => /.+\@.+\..+/
+    key :email, String, :format => /^[-a-z0-9_+\.]+\@([-a-z0-9]+\.)+[a-z0-9]{2,4}$/i
     key :ip, String, :required => true
     key :referrer, String, :required => true
     key :created_at, Time, :required => true
@@ -33,7 +33,7 @@ module Noodall
       self.save!
       self.class.defensio.put_document(defensio_signature, { :allow => false })
     end
-    
+
     def is_spam?
       self.approved == false
     end

data/features/form_module.feature

@@ -30,15 +30,15 @@ Feature: Form Module
     When a form response is deemed to be spam
     Then it should marked as spam
     And they should receive no emails
-    
+
     Given I am viewing the form's responses
     And I mark the response as not spam
-    
+
     Then the email address of the form should receive an email detailing the information submitted
     And they should receive an email confirming the request has been sent
-    
-    
-    
+
+
+
   Scenario: Validation
     Given content exists with a form added via the contact module
     When a website visitor visits the content
@@ -47,6 +47,20 @@ Feature: Form Module
     And it should be rejected if the the response does not meet the validation
     And the website visitor should see an error message
 
+  Scenario Outline: Validate Email Address
+    Given content exists with a form added via the contact module
+    When a website visitor visits the content
+    And fill in "Email" with "<invalid email>"
+    And they submit the form
+    Then I should see "Email is invalid"
+
+    Examples:
+      | invalid email |
+      | steve@moon |
+      | spoon@buttonmooon.com dave@test.com |
+      | spoon@buttonmooon.com; dave@test.com |
+
+
   Scenario: Custom Thank You Messages
     Given a form exists with the following:
       | thank_you_message | Thanks for that |

data/lib/noodall/form_builder/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module FormBuilder
-    VERSION = "0.2.9"
+    VERSION = "0.2.10"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-form-builder
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 2
-  - 9
-  version: 0.2.9
+  - 10
+  version: 0.2.10
 platform: ruby
 authors: 
 - Steve England
@@ -17,13 +17,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-22 00:00:00 +01:00
+date: 2011-06-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: bundler
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -34,12 +33,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id001
-  name: bundler
-- !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
-  type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  name: fastercsv
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,8 +47,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id002
-  name: fastercsv
+  type: :runtime
+  prerelease: false
+  requirement: *id002
 description: Functionality for building custom forms
 email: []
 
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Noodall Form Builder