RubyGems - noodall-form-builder - Versions diffs - 0.0.10 → 0.0.11 - Mend

noodall-form-builder 0.0.10 → 0.0.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

data/app/controllers/noodall/form_responses_controller.rb +1 -1
data/app/models/noodall/form.rb +12 -10
data/app/models/noodall/form_response.rb +2 -3
data/app/views/form_mailer/form_response_thankyou.html.erb +2 -4
data/app/views/noodall/admin/form_responses/index.html.erb +1 -1
data/app/views/noodall/admin/forms/show.html.erb +12 -0
data/app/views/noodall/form_responses/create.html.erb +2 -2
data/features/form_builder.feature +9 -8
data/features/form_module.feature +14 -0
data/features/step_definitions/form_builder_steps.rb +15 -9
data/features/support/mm_factory_steps.rb +14 -0
data/lib/noodall/form_builder/version.rb +1 -1
metadata +5 -4

data/app/controllers/noodall/form_responses_controller.rb CHANGED Viewed

@@ -26,7 +26,7 @@ module Noodall
             end
           end
-          flash[:notice] = 'Thank you for getting in contact.'
+          flash[:notice] = @form.thank_you_message
           format.html
           format.xml  { render :xml => @form, :status => :created, :location => @form }
         else

data/app/models/noodall/form.rb CHANGED Viewed

@@ -3,11 +3,13 @@ module Noodall
     include MongoMapper::Document
     plugin MongoMapper::Plugins::MultiParameterAttributes
     plugin Noodall::GlobalUpdateTime
     key :title, String, :required => true
     key :description, String
     key :email, String, :format => /.+\@.+\..+/
+    key :thank_you_message, :default => 'Thank you for getting in contact.'
+    key :thank_you_email, :default => 'Thank you for getting in contact.'
     MANDATORY_FIELDS = ['Name','Email']
     many :fields, :class => Noodall::Field
     many :responses, :class => Noodall::FormResponse do
@@ -18,21 +20,21 @@ module Noodall
         self.select {|r| r.spaminess >= (self.class.defensio_config['spam_threshold'] || 0.75)}
       end
     end
     before_save :create_mandatory_fields!
     timestamps!
     validates_associated :fields, :message => "have not had a name completed"
     def boolean_fields
       self.fields.select{|f| f.class == Noodall::CheckBox }
     end
     def required_fields
       self.fields.select{|f| f.required }
     end
     def create_mandatory_fields!
       MANDATORY_FIELDS.each do |mf|
         if fields.blank? or fields.select{|f| f.name == mf }.empty?
@@ -40,6 +42,6 @@ module Noodall
         end
       end
     end
   end
-end
+end

data/app/models/noodall/form_response.rb CHANGED Viewed

@@ -40,12 +40,11 @@ module Noodall
     def check_for_spam
       if self.defensio_signature.blank?
         status, response = self.class.defensio.post_document(self.defensio_attributes)
-Rails.logger.debug "Defensio said: #{response.inspect}"
         return unless status == 200
         self.defensio_signature = response['signature']
-        self.spaminess = response['spaminess']
-        self.approved = (response['spaminess'] < (self.class.defensio_config['spam_threshold'] || 0.75))
+        self.spaminess = response['spaminess'] || 0
+        self.approved = (spaminess < (self.class.defensio_config['spam_threshold'] || 0.75))
       end
     end

data/app/views/form_mailer/form_response_thankyou.html.erb CHANGED Viewed

@@ -6,9 +6,7 @@
   <body>
     <p>Dear <%= "#{@response.name}" %>,</p>
-<p>Thank you for getting in contact.</p>
-<p>We will be in touch shortly.</p>
+    <%= simple_format(@form.thank_you_email) %>
 <p>Regards<br />
 <%= Noodall::UI.app_name %>
@@ -32,4 +30,4 @@ Subject: <%= "#{Noodall::UI.app_name}: Response to the #{@form.title} form." %><
       </tbody>
     </table>
   </body>
-</html>
+</html>

data/app/views/noodall/admin/form_responses/index.html.erb CHANGED Viewed

@@ -20,7 +20,7 @@
 <% @responses.sort_by(&:created_at).reverse.each do |response| %>
     <tr id="form-<%= response.id %>" class="<%=cycle('odd', 'even')%>">
       <td class="edit"><%= mail_to response.email, h(response.name) %></td>
-      <td><%= @form.fields.collect{|f| "<strong>#{f.name}:</strong> #{response.send(f.underscored_name)}" }.join(",&nbsp;").html_safe %></td>
+      <td><%= @form.fields.collect{|f| "<strong>#{f.name}:</strong> #{response.respond_to?(f.underscored_name) ? response.send(f.underscored_name) : ''}" }.join(",&nbsp;").html_safe %></td>
       <td><%= h response.created_at.to_formatted_s(:long_dot) %></td>
       <td><%= link_to 'Delete', noodall_admin_form_form_response_path(@form, response), :confirm => 'Are you sure?', :method => :delete, :class => 'delete', :title => 'Delete this response' %>
           <%= link_to 'Mark as Spam', mark_as_spam_noodall_admin_form_form_response_path(@form, response), :class => 'spam', :title => 'Mark this response as spam and delete' %></td>

data/app/views/noodall/admin/forms/show.html.erb CHANGED Viewed

@@ -24,6 +24,18 @@
     <span class="input-wrap"><%= f.text_field :email %></span>
   </p>
+   <p>
+    <span class="tooltip" title="Enter an message that will displayed once thet have submitted the form">&nbsp;</span>
+    <%= f.label :thank_you_message %><br/>
+    <span class="input-wrap"><%= f.text_area :thank_you_message, :rows => 3 %></span>
+   </p>
+   <p>
+    <span class="tooltip" title="Enter a message they will see in the thank you email">&nbsp;</span>
+    <%= f.label :thank_you_email %><br/>
+    <span class="input-wrap"><%= f.text_area :thank_you_email, :rows => 3 %></span>
+  </p>
   <div id="form-fields">
     <fieldset>
       <div id="content-table">

data/app/views/noodall/form_responses/create.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <div id="main-content" class="no-nav">
-  <h1><%=h @form.title %>: Thank you for your response</h1>
+  <h1>Thank you</h1>
-  <p>We will be in touch soon.</p>
+  <%= simple_format(@form.thank_you_message) %>
 </div>

data/features/form_builder.feature CHANGED Viewed

@@ -9,15 +9,17 @@ Feature: Form builder
       | Name        |
       | Email       |
     When I fill the following fields:
-      | Field        | Value                      |
-      | Title        | A Contact Form             |
-      | Description  | So people can get in touch |
-      | Email        | hello@weaarebeef.co.uk     |
+      | Field             | Value                      |
+      | Title             | A Contact Form             |
+      | Description       | So people can get in touch |
+      | Email             | hello@weaarebeef.co.uk     |
+      | Thank you message | Cheers then!               |
+      | Thank you email   | Thaanks for that           |
     And I add the fields I want on the form
     And I press "Create"
     Then I should see the new form in the Form List
-  @javscript @wip
+  @javascript
   Scenario Outline: Add fields
     Given I am creating a form
     When I select "<Field Type>" from "Add a new field"
@@ -31,7 +33,7 @@ Feature: Form builder
     | Radio      | Name, Label, Default Option, Options, Required |
     | Check Box  | Name, Label, Default state, Required           |
-  @javscript @wip
+  @javascript
   Scenario: Reorder fields
     Given a form exists with the following fields:
       | Name    | Text Field            |
@@ -43,7 +45,7 @@ Feature: Form builder
     Then the "Title" field should be at position 1
     When I click the "down" arrow next to "Email" once
     Then the "Email" field should be at position 4
-    When I press "Save"
+    When I press "Update"
     And I view the form on the website
     Then I should see the fields in the order I set
@@ -53,7 +55,6 @@ Feature: Form builder
     And I click "Download Responses" on the forms row in the Form List
     Then I should receive a CSV file containing all the responses to that form
-  @javscript @wip
   Scenario: Update an existing form with responses
     Given a form exists that has had many responses
     When I am editing the last form

data/features/form_module.feature CHANGED Viewed

@@ -38,3 +38,17 @@ Feature: Form Module
     Then it should be checked against the validation speficied in the form builder
     And it should be rejected if the the response does not meet the validation
     And the website visitor should see an error message
+  Scenario: Custom Thank You Messages
+    Given a form exists with the following:
+      | thank_you_message | Thanks for that |
+      | thank_you_email   | Cheers then!    |
+    When I view the form on the website
+    And I fill in the following:
+      | Name | Dave |
+      | Email | spoon@buttonmooon.com |
+    And I press "Send"
+    Then I should see "Thanks for that"
+    And "spoon@buttonmooon.com" should receive an email
+    When I open the email
+    Then I should see "Cheers then!" in the email body

data/features/step_definitions/form_builder_steps.rb CHANGED Viewed

@@ -192,7 +192,7 @@ end
 When /^a form response is deemed to be spam$/ do
   When %{a website visitor visits the content}
   defensio_dummy = double("defensio dummy")
-  defensio_dummy.stub(:post_document){ [200, {:spaminess => 1}] }
+  defensio_dummy.stub(:post_document){ [200, {'spaminess' => 1}] }
   Noodall::FormResponse.stub(:defensio).and_return(defensio_dummy)
   When %{they fill in and submit the form}
@@ -229,18 +229,17 @@ end
 Then /^the "([^"]*)" field should be at position (\d+)$/ do |field, position|
   index = 0
-  page.should have_selector('table.content tbody tr') do |fieldset|
+  all('table.content tbody tr').each do |fieldset|
     index = index+1
-    puts fieldset.find('input[value=#{field}]').inspect
-    return unless fieldset.find('input[value=#{field}]').nil?
+    break if fieldset.has_css?("input[value=#{field}]")
   end
   position.to_i.should == index
 end
 When /^I click the "([^\"]*)" arrow next to "([^\"]*)" once$/ do |arrow, field|
-  page.should have_selector('table.content tbody tr') do |fieldset|
-    click_link arrow if fieldset.find('input[value=#{field}]')
+  all('table.content tbody tr').each do |fieldset|
+    fieldset.find("a:contains('#{arrow}')").click if fieldset.has_css?("input[value=#{field}]")
   end
 end
@@ -252,9 +251,16 @@ When /^I view the form on the website$/ do
 end
 Then /^I should see the fields in the order I set$/ do
-  pending # express the regexp above with the code you wish you had
+  within('div.form-wrap') do
+    page.should have_content("Title")
+  end
 end
 When /^I am editing the last form$/ do
   visit noodall_admin_form_path(Noodall::Form.last)
-end
+end
+Given /^a form exists with the following:$/ do |fields|
+  @_form = Factory(:form, fields.rows_hash)
+end

data/features/support/mm_factory_steps.rb ADDED Viewed

@@ -0,0 +1,14 @@
+Factory.factories.values.each do |factory|
+  if factory.build_class.respond_to?(:keys)
+    factory.build_class.keys.each_key do |key|
+      human_column_name = key.downcase.gsub('_', ' ')
+      Given /^an? #{factory.human_name} exists with an? #{human_column_name} of "([^"]*)"$/i do |value|
+        Factory(factory.factory_name, key => value)
+      end
+      Given /^(\d+) #{factory.human_name.pluralize} exist with an? #{human_column_name} of "([^"]*)"$/i do |count, value|
+        count.to_i.times { Factory(factory.factory_name, key => value) }
+      end
+    end
+  end
+end

data/lib/noodall/form_builder/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Noodall
   module FormBuilder
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: noodall-form-builder
 version: !ruby/object:Gem::Version
-  hash: 11
+  hash: 9
   prerelease: false
   segments:
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: []
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-02-03 00:00:00 +00:00
+date: 2011-02-16 00:00:00 +00:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -110,6 +110,7 @@ files:
 - features/step_definitions/web_steps.rb
 - features/support/defensio_mock.rb
 - features/support/env.rb
+- features/support/mm_factory_steps.rb
 - features/support/paths.rb
 - lib/noodall-form-builder.rb
 - lib/noodall/form_builder/engine.rb