noodall-form-builder 0.4.2 → 0.5.0

data/Gemfile

@@ -1,24 +1,25 @@
 source :rubygems
-
+source "http://gems.github.com"
 gemspec
 
-gem 'mm-versionable', '0.2.5'
 gem 'rails', '3.1.3'
 gem 'noodall-ui'
-gem 'capybara', '>= 0.3.9'
-gem 'rspec-rails', '>= 2.0.0.beta'
-gem 'database_cleaner'
-gem 'cucumber-rails'
-gem 'launchy'    # So you can do Then show me the page
-gem 'rmagick', :require => 'RMagick'
 gem 'dragonfly', '~> 0.7.6'
-gem 'factory_girl', '~> 1.3.2'
-gem 'faker', '~> 0.3.1'
 gem 'defensio'
-gem 'email_spec'
 gem 'fastercsv'
 gem 'bson_ext'
 
+group :test do
+  gem 'email_spec'
+  gem 'cucumber-rails'
+  gem 'rspec-rails', '>= 2.0.0.beta'
+  gem 'factory_girl_rails'
+  gem 'faker', '~> 0.3.1'
+  gem 'capybara', '>= 0.3.9'
+  gem 'database_cleaner'
+  gem 'launchy'    # So you can do Then show me the page
+end
+
 if RUBY_VERSION < '1.9'
   gem 'system_timer'
   gem "ruby-debug", ">= 0.10.3"

data/README.rdoc

@@ -1,3 +1,24 @@
-= Noodall-form-builder
+= Noodall Form Builder
 
-This project rocks and uses MIT-LICENSE.
+Form building for Noodall
+
+== Getting Started
+
+Add to Gemfile
+
+  gem 'noodall-form-builder'
+
+Install the gem
+
+  bundle install
+
+Add the Form Builder routes to config/routes.rb
+
+  require 'noodall/form_builder/routes'
+  Noodall::FormBuilder::Routes.draw <AppNameConstantGoesHere>::Application
+
+Add ContactForm to required slots in config/initializers/noodall.rb
+
+  Noodall::Node.slot :large, ContactForm
+
+This project rocks and uses MIT-LICENSE.

data/app/assets/javascripts/admin/formbuilder.js

@@ -1,5 +1,5 @@
 function new_form_field(type) {
-  if ($.inArray(type, ['text_field', 'select', 'multiselect', 'radio', 'check_box']) == -1) {
+  if ($.inArray(type, ['text_field', 'select', 'multiselect', 'date_field', 'radio', 'check_box']) == -1) {
     alert('Unknown field type.');
   } else {
     // find an index for the new form field (largest index plus one)

data/app/controllers/noodall/admin/form_responses_controller.rb

@@ -41,7 +41,7 @@ module Noodall
                   nil
                 end
               end
-              response_row += [response.created_at.to_formatted_s(:long_dot), response.ip, response.referrer]
+              response_row += [response.created_at.to_formatted_s(:long), response.ip, response.referrer]
               csv << response_row
             end
           end
@@ -67,17 +67,17 @@ module Noodall
 
     def mark_as_spam
       @response = @form.responses.find(params[:id])
-      @response.mark_as_spam!     
+      @response.mark_as_spam!
       redirect_to(noodall_admin_form_form_responses_url(@form))
     end
-    
+
     def mark_as_not_spam
       @response = @form.responses.find(params[:id])
-      @response.approve!     
-      
+      @response.approve!
+
       FormMailer.form_response(@form, @response).deliver unless @form.email.blank?
       FormMailer.form_response_thankyou(@form, @response).deliver
-      
+
       redirect_to(noodall_admin_form_form_responses_url(@form))
     end
 

data/app/helpers/forms_helper.rb

@@ -1,20 +1,16 @@
 module FormsHelper
 
   def response_setup(form)
-    # collect the default values together
-    defaults = {}
-    form.fields.collect{|f| defaults[f.underscored_name.to_sym] = f.default } unless form.nil? || form.fields.nil?
-
-    Noodall::FormResponse.new(defaults)
+    form.responses.build
   end
 
   def field_type(field)
     field_type = field._type.gsub(/^.*::/, '').downcase
-    
+
     if field_type == "textfield" && field.rows > 1
       field_type = "textarea"
     end
-    
+
     return field_type
   end
 

data/app/models/noodall/date_field.rb

@@ -0,0 +1,5 @@
+module Noodall
+  class DateField < Noodall::Field
+    key :default, Date
+  end
+end

data/app/models/noodall/field.rb

@@ -1,6 +1,7 @@
 module  Noodall
   class Field
     include MongoMapper::EmbeddedDocument
+    plugin MongoMapper::Plugins::MultiParameterAttributes
 
     key :_type, String, :required => true
     key :name, String, :required => true
@@ -14,11 +15,11 @@ module  Noodall
     def default_label
       self.label = self.name if self.label.blank?
     end
-    
+
     def underscored_name
       name.parameterize.gsub('-','_').to_s
     end
-    
+
     def default_class(response)
       'default-value' if response.send(underscored_name.to_sym) == default
     end

data/app/models/noodall/form.rb

@@ -1,7 +1,6 @@
 module Noodall
   class Form
     include MongoMapper::Document
-    plugin MongoMapper::Plugins::MultiParameterAttributes
     plugin Noodall::GlobalUpdateTime
 
     key :title, String, :required => true
@@ -19,6 +18,15 @@ module Noodall
       def spam
         self.select {|r| r.spaminess >= (self.class.defensio_config['spam_threshold'] || 0.75)}
       end
+      def build(attrs={})
+        doc = klass.new
+        apply_scope(doc)
+        doc.set_up_keys!
+        doc.attributes = attrs
+        @target ||= [] unless loaded?
+        @target << doc
+        doc
+      end
     end
 
     before_save :create_mandatory_fields!

data/app/models/noodall/form_response.rb

@@ -2,7 +2,7 @@ module Noodall
   class FormResponse
     include MongoMapper::Document
 
-    key :name, String
+    key :name, String, :required => true
     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
@@ -15,19 +15,16 @@ module Noodall
 
     attr_protected :approved
 
+
     timestamps!
 
     belongs_to :form, :class => Noodall::Form, :foreign_key => 'noodall_form_id'
 
-    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.parameterize("_").to_sym)
+    # Overiden to set up keys after find
+    def initialize_from_database(attrs={})
+      super.tap do
+        set_up_keys!
       end
-      return true
     end
 
     def approve!
@@ -46,18 +43,22 @@ module Noodall
       self.approved == false
     end
 
-    def string_value(name)
-      return '' unless self.respond_to?(name)
-      value = self.send(name)
+    # Create appropriate MongoMapper keys for current instance
+    # based on the fields of the form it belongs to
+    def set_up_keys!
+      form.fields.each do |f|
+        class_eval do
+          key f.underscored_name, f.keys['default'].type, :required => f.required, :default => f.default
+        end
+      end if form
+    end
 
-      if value.is_a?(Array)
-        value.join(', ')
-      else
-        value.to_s
-      end
+    # Merge meta keys with real keys
+    def keys
+      super.merge( class_eval( 'keys' ) )
     end
 
-  protected
+    protected
     def defensio_configuired?
       defined?(Defensio) && !self.class.defensio_config.blank?
     end
@@ -103,26 +104,5 @@ module Noodall
       }
     end
 
-
-  private
-    validate :custom_validation
-
-    def custom_validation
-      return true if required_fields.nil? || !self.new_record?
-      required_fields.each do |field|
-        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
-
-    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
-      end
-    end
-
   end
 end

data/app/views/form_mailer/_form_response_fields.html.erb

@@ -1,6 +1,6 @@
 <% for field in @form.fields %>
     <tr>
       <td><%= field.name %></td>
-      <td><%= @response.string_value(field.underscored_name) %></td>
+      <td><%= @response.send(field.underscored_name) %></td>
     </tr>
 <% end %>

data/app/views/noodall/admin/fields/_date_field.html.erb

@@ -0,0 +1,14 @@
+<%= fields_for "form[fields][#{index}]", field do |f| %>
+    <tr>
+      <td><%= f.hidden_field :_type %><%= f.label :name, 'Name *' %><%= f.text_field :name %></td>
+      <td>Date Select</td>
+      <td><%= f.label :label, 'Label' %><%= f.text_field :label %></td>
+      <td><%= f.label :default, 'Default Option' %><%= f.text_field :default %></td>
+      <td class="center">-</td>
+      <td>-</td>
+      <td><%= f.label :required, 'Required?' %><%= f.check_box :required %></td>
+      <td width="25" class="up"><a class="page_up" title="Move this field up">up</a></td>
+      <td width="30" class="down"><a class="page_down" title="Move this field down">down</a></td>
+      <td><%= link_to_function 'Delete', 'return delete_form_field(this);', :class => 'delete' %></td>
+    </tr>
+<% end %>

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

@@ -21,7 +21,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.string_value(f.underscored_name)}" }.join(",&nbsp;").html_safe %></td>
+      <td><%= @form.fields.collect{|f| "<strong>#{f.name}:</strong> #{response.send(f.underscored_name)}" }.join(",&nbsp;").html_safe %></td>
       <td><%= h response.created_at.to_formatted_s(:long_dot) %></td>
       <td class="spam <%= 'flagged' unless response.approved %>">
         <% if response.approved  %>

data/app/views/noodall/admin/forms/_field_select.html.erb

@@ -5,6 +5,7 @@
       <option value="text_field">Text</option>
       <option value="select">Select Box</option>
       <option value="multiselect">Multi-Select Box</option>
+      <option value="date_field">Date</option>
       <option value="radio">Radio Buttons</option>
       <option value="check_box">Check Box</option>
     </select>

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

@@ -50,6 +50,9 @@
 		<p id="multiselect" class="field-help">
 			Similar to Select. <strong>Examples:</strong> Acceptable Contact Methods, Phone, Phone AND Email, Phone AND Text AND Mail
 		</p>
+		<p id="date_select" class="field-help">
+			Similar to Select but allows you to select the day, month and year.
+		</p>
 		<p id="radio" class="field-help">
 			<strong>Examples:</strong> Yes or No Questions, Multiple Choice<br/><br/>
 			The radio button only allows one option to be chosen.

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

@@ -14,3 +14,4 @@
         <%= f.submit "Reset Form", :name => 'reset', :type => 'reset', :id => "form-reset" %>
       </p>
 <%  end %>
+sdfsdf

data/app/views/noodall/form_responses/fields/_datefield.html.erb

@@ -0,0 +1,6 @@
+<%= (f.label field.underscored_name, field.label) %>
+<%= (field.required ? content_tag('span', ' *', :class => 'required') : '') %>
+
+<%= f.text_field field.underscored_name, :class => 'date-field' %>
+<hr />
+

data/features/form_builder.feature

@@ -27,11 +27,12 @@ Feature: Form builder
     Then I should see a new field with the options "<Options>"
 
     Examples:
-    | Field Type | Options                                        |
-    | Text       | Name, Label, Default, Rows, Required           |
-    | Select     | Name, Label, Default Option, Options, Required |
-    | Radio      | Name, Label, Default Option, Options, Required |
-    | Check Box  | Name, Label, Default state, Required           |
+      | Field Type  | Options                                        |
+      | Text        | Name, Label, Default, Rows, Required           |
+      | Select      | Name, Label, Default Option, Options, Required |
+      | Radio       | Name, Label, Default Option, Options, Required |
+      | Check Box   | Name, Label, Default state, Required           |
+      | Date        | Name, Label, Default, Required                 |
 
   @javascript
   Scenario: Reorder fields

data/features/form_module.feature

@@ -72,6 +72,7 @@ Feature: Form Module
     And I fill in the following:
       | Name | Dave |
       | Email | spoon@buttonmooon.com |
+      | Date | 30/03/1976 |
     And I press "Send"
     Then I should see "Thanks for that"
     And "spoon@buttonmooon.com" should receive an email

data/features/step_definitions/cms_node_steps.rb

@@ -8,7 +8,7 @@ When /^I click on a root$/ do
   within("tbody tr:last") { click_link "Children" }
 end
 
-Then /^I should see a list the of the root’s children$/ do
+Then /^I should see a list the of the root's children$/ do
   @_page.children.each do |child|
     page.should have_content(child.title)
   end
@@ -19,7 +19,7 @@ When /^I click on a child$/ do
   within(:css, "tbody tr:first") { click_link "Children" }
 end
 
-Then /^I should see a list of the child’s children$/ do
+Then /^I should see a list of the child's children$/ do
   @_child.children.each do |gchild|
     page.should have_content(gchild.title)
   end
@@ -50,7 +50,7 @@ Then /^I should be able to create a new child$/ do
   page.should have_content(' was successfully created.')
 end
 
-Then /^I should see the child listed within the root’s children$/ do
+Then /^I should see the child listed within the root's children$/ do
   visit noodall_admin_node_nodes_path(@_page)
   page.should have_content('New Child')
 end
@@ -63,7 +63,7 @@ Then /^I should be able to delete content$/ do
   page.should have_content("deleted")
 end
 
-Then /^the content and all of it’s sub content will be removed from the website$/ do
+Then /^the content and all of it's sub content will be removed from the website$/ do
 
   lambda { visit node_path(@_deleted_node) }.should raise_error(MongoMapper::DocumentNotFound)
 
@@ -83,14 +83,14 @@ Then /^I should be able to move a child content to another parent$/ do
   click_button 'Draft'
 end
 
-Then /^I should see the child listed within the other parent’s children$/ do
+Then /^I should see the child listed within the other parent's children$/ do
   visit noodall_admin_node_nodes_path(@_new_parent)
   within('tbody') do
     page.should have_content(@_child.title)
   end
 end
 
-Then /^I should be able change the order of the root’s children$/ do
+Then /^I should be able change the order of the root's children$/ do
   table = table(tableish("table tr", 'td, th'))
   title = table.hashes[2]['Title'] # 2 as zero index
   within(:css, 'table tbody tr:nth(3)') { click_link "up" }

data/features/step_definitions/component_steps.rb

@@ -11,13 +11,13 @@ When /^(?:|I )click a "([^"]*)" component slot$/ do |slot_name|
 end
 
 When /^(?:|I )select the "([^\"]+)" component$/ do |component_name|
-  within "#fancybox-inner" do
+  within "#fancybox-content" do
     select component_name, :from => 'Select the type of component'
   end
 end
 
 When /^(?:|I )fill in the following within the component:$/ do |fields|
-  within "#fancybox-inner" do
+  within "#fancybox-content" do
     fields.rows_hash.each do |name, value|
       When %{I fill in "#{name}" with "#{value}"}
     end
@@ -25,7 +25,7 @@ When /^(?:|I )fill in the following within the component:$/ do |fields|
 end
 
 When /^(?:|I )press "([^"]*)" within the component$/ do |button|
-  within "#fancybox-inner" do
+  within "#fancybox-content" do
     click_button(button)
     sleep 3
   end
@@ -33,7 +33,7 @@ end
 
 When /^(?:|I )select an image from the asset library$/ do
   asset = Factory(:asset, :title => "My Image")
-  within "#fancybox-inner" do
+  within "#fancybox-content" do
     pending
   end
 end

data/features/step_definitions/form_builder_steps.rb

@@ -111,7 +111,7 @@ When /^a website visitor visits the content$/ do
 end
 
 Then /^they should see the form$/ do
-  Then %{I should see the form I selected}
+  step %{I should see the form I selected}
 end
 
 When /^they fill in and submit the form$/ do
@@ -122,24 +122,26 @@ When /^they fill in and submit the form$/ do
     else
       if field.class == Noodall::TextField
         fill_in "form_response[#{field.underscored_name}]", :with => 'Weopunggggggggst'
+      elsif field.class == Noodall::DateField
+        fill_in "form_response[#{field.underscored_name}]", :with => '30/03/1976'
       end
     end
   end
 
-  When %{they submit the form}
+  step %{they submit the form}
 end
 
 Then /^the email address of the form should receive an email detailing the information submitted$/ do
-  Then %{"#{@_form.email}" should receive an email}
+  step %{"#{@_form.email}" should receive an email}
   @_form.fields do |field|
-    Then %{they should see "#{field.name}:" in the email body}
+    step %{they should see "#{field.name}:" in the email body}
   end
 end
 
 Then /^they should receive an email confirming the request has been sent$/ do
-  Then %{"hello@example.com" should receive an email}
+  step %{"hello@example.com" should receive an email}
   @_form.fields do |field|
-    Then %{they should see "#{field.name}:" in the email body}
+    step %{they should see "#{field.name}:" in the email body}
   end
 end
 
@@ -163,7 +165,7 @@ Then /^it should be rejected if the spam filter deems the response to be spam$/
 end
 
 Then /^the website visitor should see an spam message$/ do
-  Then %{it should be rejected if the spam filter deems the response to be spam}
+  step %{it should be rejected if the spam filter deems the response to be spam}
 end
 
 Then /^it should be checked against the validation speficied in the form builder$/ do
@@ -175,7 +177,7 @@ Then /^it should be checked against the validation speficied in the form builder
 end
 
 Then /^it should be rejected if the the response does not meet the validation$/ do
-  Then %{it should be checked against the validation speficied in the form builder}
+  step %{it should be checked against the validation speficied in the form builder}
 end
 
 Then /^the website visitor should see an error message$/ do
@@ -183,7 +185,7 @@ Then /^the website visitor should see an error message$/ do
 end
 
 When /^a website visitor fills in and submits a form$/ do
-  When %{they fill in and submit the form}
+  step %{they fill in and submit the form}
 end
 
 When /^they submit the form$/ do
@@ -191,13 +193,13 @@ When /^they submit the form$/ do
 end
 
 When /^a form response is deemed to be spam$/ do
-  When %{a website visitor visits the content}
+  step %{a website visitor visits the content}
   defensio_dummy = double("defensio dummy")
   defensio_dummy.stub(:post_document){ [200, {'spaminess' => 1, "allow" => false}] }
   defensio_dummy.stub(:put_document){ [200, {"allow" => false}] }
 
   Noodall::FormResponse.stub(:defensio).and_return(defensio_dummy)
-  When %{they fill in and submit the form}
+  step %{they fill in and submit the form}
 end
 
 Then /^it should marked as spam$/ do
@@ -225,8 +227,8 @@ When /^I am editing the form$/ do
 end
 
 When /^I click the "([^\"]*)" arrow next to "([^\"]*)" twice$/ do |arrow, field|
-  When %{I click the "#{arrow}" arrow next to "#{field}" once}
-  When %{I click the "#{arrow}" arrow next to "#{field}" once}
+  step %{I click the "#{arrow}" arrow next to "#{field}" once}
+  step %{I click the "#{arrow}" arrow next to "#{field}" once}
 end
 
 Then /^the "([^"]*)" field should be at position (\d+)$/ do |field, position|
@@ -249,7 +251,7 @@ When /^I view the form on the website$/ do
   @_node = Factory(:page_a)
   @_node.wide_slot_0 = Factory(:contact_form, :form_id => @_form.id)
   @_node.save
-  When %{a website visitor visits the content}
+  step %{a website visitor visits the content}
 end
 
 Then /^I should see the fields in the order I set$/ do
@@ -271,7 +273,7 @@ Given /^I am viewing the form's responses$/ do
 end
 
 Given /^I mark the response as not spam$/ do
-  When %{I follow "Not Spam?"} # This is tied to the current page, could be abstracted a little more
+  step %{I follow "Not Spam?"} # This is tied to the current page, could be abstracted a little more
 end
 
 

data/features/step_definitions/web_steps.rb

@@ -1,6 +1,6 @@
 # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a 
-# newer version of cucumber-rails. Consider adding your own code to a new file 
+# It is recommended to regenerate this file in the future when you upgrade to a
+# newer version of cucumber-rails. Consider adding your own code to a new file
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
@@ -62,7 +62,7 @@ end
 When /^(?:|I )fill in the following(?: within "([^"]*)")?:$/ do |selector, fields|
   with_scope(selector) do
     fields.rows_hash.each do |name, value|
-      When %{I fill in "#{name}" with "#{value}"}
+      step %{I fill in "#{name}" with "#{value}"}
     end
   end
 end
@@ -191,7 +191,7 @@ Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should not be checked$/ do |
     end
   end
 end
- 
+
 Then /^(?:|I )should be on (.+)$/ do |page_name|
   current_path = URI.parse(current_url).path
   if current_path.respond_to? :should
@@ -205,8 +205,8 @@ Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
   query = URI.parse(current_url).query
   actual_params = query ? CGI.parse(query) : {}
   expected_params = {}
-  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')} 
-  
+  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')}
+
   if actual_params.respond_to? :should
     actual_params.should == expected_params
   else

data/features/support/env.rb

@@ -10,8 +10,8 @@ require File.expand_path("../../../spec/dummy/config/environment.rb",  __FILE__)
 require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
 require 'cucumber/rails/rspec'
 require 'cucumber/rails/world'
+require 'email_spec'
 require 'email_spec/cucumber'
-require 'cucumber/web/tableish'
 require 'cucumber/rspec/doubles'
 
 require 'capybara/rails'
@@ -41,6 +41,7 @@ require 'database_cleaner/cucumber'
 DatabaseCleaner.strategy = :truncation
 
 require 'factory_girl'
+require 'faker'
 
 Factory.definition_file_paths = [
   File.expand_path("../../../spec/factories",  __FILE__)
@@ -49,5 +50,5 @@ Factory.find_definitions
 
 require 'factory_girl/step_definitions'
 require 'csv' #for checking CSV content
-require 'ruby-debug'
+#require 'ruby-debug'
 

data/features/support/mm_factory_steps.rb

@@ -1,13 +1,15 @@
-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
+FactoryGirl.factories.each do |factory|
+  factory.human_names.each do |human_name|
+    if factory.build_class.respond_to?(:keys)
+      factory.build_class.keys.each_key do |key|
+        human_column_name = key.downcase.gsub('_', ' ')
+        Given /^an? #{human_name} exists with an? #{human_column_name} of "([^"]*)"$/i do |value|
+          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) }
+        Given /^(\d+) #{human_name.pluralize} exist with an? #{human_column_name} of "([^"]*)"$/i do |count, value|
+          count.to_i.times { Factory(factory.name, key => value) }
+        end
       end
     end
   end

data/lib/noodall/form_builder/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module FormBuilder
-    VERSION = "0.4.2"
+    VERSION = "0.5.0"
   end
 end

data/script/cucumber

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+vendored_cucumber_bin = Dir["#{File.dirname(__FILE__)}/../vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+if vendored_cucumber_bin
+  load File.expand_path(vendored_cucumber_bin)
+else
+  require 'rubygems' unless ENV['NO_RUBYGEMS']
+  require 'cucumber'
+  load Cucumber::BINARY
+end

data/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+ENGINE_PATH = File.expand_path('../..',  __FILE__)
+load File.expand_path('../../spec/dummy/script/rails',  __FILE__)

data/spec/factories/field.rb

@@ -14,3 +14,5 @@ Factory.define :radio_field, :parent => :select_field, :class => Noodall::Radio
 end
 Factory.define :check_box_field, :parent => :field, :class => Noodall::CheckBox do |field|
 end
+Factory.define :date_field, :parent => :field, :class => Noodall::DateField do |field|
+end

data/spec/factories/form.rb

@@ -7,11 +7,16 @@ Factory.define :form, :class => Noodall::Form do |form|
     5.times do
       fields << Factory(:text_field)
     end
-    fields << Factory(:check_box_field)
-    fields << Factory(:select_field)
-    fields << Factory(:check_box_field)
-    fields << Factory(:radio_field)
+    fields << Factory(:check_box_field, :name => 'Check' )
+    fields << Factory(:select_field, :name => 'Select')
+    fields << Factory(:radio_field, :name => 'Radio')
+    fields << Factory(:date_field, :name => 'Date', :required => true)
 
     fields
   end
 end
+
+Factory.define :blank_form, :class => Noodall::Form do |form|
+  form.title "A Form"
+  form.email "hello@wearebeef.co.uk"
+end

data/spec/models/form_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Noodall::FormResponse do
+
+  it "should have methods based on it's forms fields" do
+    form = Factory(:form)
+    r = form.responses.build
+    test_date = Time.now
+    r.date = test_date
+    r.date.should == test_date.to_date
+  end
+
+  it "should validate fields marked required in it's form" do
+    form = Factory(:form)
+    r = form.responses.build()
+    r.save
+    r.errors.messages.should have_key(:date)
+  end
+
+  it "should not persist feilds in the class" do
+    form = Factory(:form)
+    r1 = form.responses.build
+    r1.save
+    r1.errors.messages.should have_key(:date)
+
+    form = Factory(:blank_form)
+    r = form.responses.build
+    r.save
+    r.errors.messages.should_not have_key(:date)
+
+    r1.save
+    r1.errors.messages.should have_key(:date)
+  end
+end

data/spec/spec_helper.rb

@@ -2,6 +2,8 @@
 ENV["RAILS_ENV"] = "test"
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require 'faker'
+require 'factory_girl_rails'
 require "rails/test_help"
 require "rspec/rails"
 
@@ -19,12 +21,15 @@ Capybara.default_selector = :css
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-Rspec.configure do |config|
+RSpec.configure do |config|
   # Remove this line if you don't want Rspec's should and should_not
   # methods or matchers
   require 'rspec/expectations'
-  config.include Rspec::Matchers
+  config.include RSpec::Matchers
 
   # == Mock Framework
   config.mock_with :rspec
+
+  config.backtrace_clean_patterns = [
+  ]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noodall-form-builder
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000Z
+date: 2012-02-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &16665900 !ruby/object:Gem::Requirement
+  requirement: &13206780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *16665900
+  version_requirements: *13206780
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &16665320 !ruby/object:Gem::Requirement
+  requirement: &13206260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,7 +34,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16665320
+  version_requirements: *13206260
 description: Functionality for building custom forms
 email: []
 executables: []
@@ -57,6 +57,7 @@ files:
 - app/mailers/form_mailer.rb
 - app/models/contact_form.rb
 - app/models/noodall/check_box.rb
+- app/models/noodall/date_field.rb
 - app/models/noodall/field.rb
 - app/models/noodall/form.rb
 - app/models/noodall/form_response.rb
@@ -70,6 +71,8 @@ files:
 - app/views/form_mailer/form_response.html.erb
 - app/views/form_mailer/form_response_thankyou.html.erb
 - app/views/noodall/admin/fields/_check_box.html.erb
+- app/views/noodall/admin/fields/_date_field.html.erb
+- app/views/noodall/admin/fields/_field.html.erb
 - app/views/noodall/admin/fields/_multiselect.html.erb
 - app/views/noodall/admin/fields/_radio.html.erb
 - app/views/noodall/admin/fields/_select.html.erb
@@ -82,6 +85,7 @@ files:
 - app/views/noodall/form_responses/_form.html.erb
 - app/views/noodall/form_responses/create.html.erb
 - app/views/noodall/form_responses/fields/_checkbox.html.erb
+- app/views/noodall/form_responses/fields/_datefield.html.erb
 - app/views/noodall/form_responses/fields/_multiselect.html.erb
 - app/views/noodall/form_responses/fields/_radio.html.erb
 - app/views/noodall/form_responses/fields/_select.html.erb
@@ -111,6 +115,8 @@ files:
 - lib/noodall/form_builder/routes.rb
 - lib/noodall/form_builder/version.rb
 - noodall-form-builder.gemspec
+- script/cucumber
+- script/rails
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
@@ -154,7 +160,7 @@ files:
 - spec/factories/user.rb
 - spec/files/beef.png
 - spec/integration/navigation_spec.rb
-- spec/noodall_form_builder_spec.rb
+- spec/models/form_spec.rb
 - spec/spec_helper.rb
 homepage: http://rubygems.org/gems/noodall-form-builder
 licenses: []
@@ -170,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2066216638698586933
+      hash: 2489411277551539261
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/spec/noodall_form_builder_spec.rb

@@ -1,7 +0,0 @@
-require 'spec_helper'
-
-describe Noodall::FormBuilder::Form do
-  it "should be valid" do
-    Noodall::FormBuilder::Form.should be_a(Module)
-  end
-end