noodall-form-builder 0.2.11 → 0.3.0

data/Gemfile

@@ -16,7 +16,8 @@ gem 'faker', '~> 0.3.1'
 gem 'defensio'
 gem 'email_spec'
 gem 'fastercsv'
-
+gem 'system_timer'
+gem 'bson_ext'
 
 if RUBY_VERSION < '1.9'
   gem "ruby-debug", ">= 0.10.3"

data/app/controllers/noodall/form_responses_controller.rb

@@ -10,14 +10,16 @@ module Noodall
       @form = Noodall::Form.find(params[:form_id])
 
       @form_response = @form.responses.build(params[:form_response])
-
+      
+      #If the form response hasn't been constructed properly (i.e. a random spam POST)
+      raise MongoMapper::DocumentNotFound, "Form response does not match form" unless @form_response.correct_fields?
+      
       @form_response.ip = request.remote_ip
       @form_response.referrer = request.referer if @form_response.referrer.blank?
       @form_response.created_at = Time.zone.now
 
-      respond_to do |format|
+      respond_to do |format|        
         if @form_response.valid? and @form_response.save
-
           if @form_response.is_spam?
             logger.info "Form response was deemed to be spam: #{@form_response.inspect}"
           else

data/app/models/noodall/field.rb

@@ -6,7 +6,7 @@ module  Noodall
     key :name, String, :required => true
     key :label, String
     key :default, String
-    key :required, Boolean, :default => false, :required => true
+    key :required, Boolean, :default => false
 
     embedded_in :form
 

data/app/models/noodall/form.rb

@@ -12,7 +12,7 @@ module Noodall
 
     MANDATORY_FIELDS = ['Name','Email']
     many :fields, :class => Noodall::Field
-    many :responses, :class => Noodall::FormResponse do
+    many :responses, :class => Noodall::FormResponse, :foreign_key => 'noodall_form_id' do
       def ham
         self.select {|r| r.spaminess < (self.class.defensio_config['spam_threshold'] || 0.75)}
       end

data/app/models/noodall/form_response.rb

@@ -21,6 +21,13 @@ module Noodall
     def required_fields
       self.form.fields.select{ |f| f.required? }
     end
+    
+    def correct_fields?
+      self.form.fields.each do |f|
+        return false unless self.respond_to?(f.name.downcase.to_sym)
+      end
+      return true
+    end
 
     def approve!
       self.approved = true
@@ -53,12 +60,13 @@ module Noodall
     def check_for_spam
       if self.defensio_signature.blank?
         status, response = self.class.defensio.post_document(self.defensio_attributes)
-        return unless status == 200
+        return true unless status == 200
 
         self.defensio_signature = response['signature']
         self.spaminess = response['spaminess']
         self.approved = response['allow']
       end
+      return true 
     end
 
     def self.defensio
@@ -91,20 +99,11 @@ module Noodall
     validate :custom_validation
 
     def custom_validation
-      return if required_fields.nil? || !self.new_record?
+      return true if required_fields.nil? || !self.new_record?
       required_fields.each do |field|
-        self.add_error(field.underscored_name.to_sym, "can't be empty") if self.send(field.underscored_name).blank?
-      end
-    end
-    
-    def method_missing(method)
-      # If the form doesn't have a field that matches this method, act normally. Otherwise, return nil to show the field is empty. 
-      if form.fields.select{|f| f.underscored_name.to_sym == method}.empty? 
-        super
-      else
-        return nil
+        self.errors.add(field.underscored_name.to_sym, "can't be empty") if self.send(field.underscored_name).blank?
       end
+      return true if self.errors.empty? 
     end
-    
   end
 end

data/app/views/noodall/form_responses/_form.html.erb

@@ -5,7 +5,7 @@
     <%= error_messages_for :object => form_response %>
 <%    for field in form.fields %>
       <div class="form-wrap">
-        <%= render :partial => "noodall/form_responses/fields/#{field._type.gsub(/^.*::/, '').downcase}", :locals => {:form_response => form_response, :f => f, :field => field} %>
+        <%= render :partial => "noodall/form_responses/fields/#{field_type(field)}", :locals => {:form_response => form_response, :f => f, :field => field} %>
       </div>
 <%   end %>
 

data/features/form_module.feature

@@ -36,9 +36,12 @@ Feature: Form Module
 
     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: Bad data is POSTed
+    Given content exists with a form added via the contact module
+    Then some random fields are POSTed by a spam bot
+    #todo - better way to structure this feature?
+    
   Scenario: Validation
     Given content exists with a form added via the contact module
     When a website visitor visits the content

data/features/step_definitions/form_builder_steps.rb

@@ -65,7 +65,7 @@ When /^I click "([^\"]*)" on the forms row in the Form List$/ do |arg1|
 end
 
 Then /^I should receive a CSV file containing all the responses to that form$/ do
-  CSV.parse(page.body).should have(10).things # 9 rows plus header
+  CSV.parse(page.source).should have(10).things # 9 rows plus header
 end
 
 

data/features/step_definitions/spam_steps.rb

@@ -0,0 +1,5 @@
+When /^some random fields are POSTed by a spam bot$/ do
+  lambda { 
+    post noodall_form_form_responses_path(@_form), {:test => '123'}
+  }.should raise_error(MongoMapper::DocumentNotFound, "Form response does not match form")
+end

data/lib/noodall/form_builder/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module FormBuilder
-    VERSION = "0.2.11"
+    VERSION = "0.3.0"
   end
 end

data/spec/dummy/config/initializers/dragonfly.rb

@@ -1 +0,0 @@
-require 'noodall/dragonfly'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-form-builder
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 11
-  version: 0.2.11
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Steve England
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 +01:00
+date: 2011-07-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,6 +116,7 @@ files:
 - features/step_definitions/email_steps.rb
 - features/step_definitions/form_builder_steps.rb
 - features/step_definitions/sign_in_steps.rb
+- features/step_definitions/spam_steps.rb
 - features/step_definitions/web_steps.rb
 - features/support/defensio_mock.rb
 - features/support/env.rb