RubyGems - noodall-form-builder - Versions diffs - 0.0.6 → 0.0.7 - Mend

noodall-form-builder 0.0.6 → 0.0.7

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 (8) hide show

data/app/models/noodall/form.rb +8 -1
data/app/views/form_mailer/_form_response_fields.html.erb +4 -1
data/app/views/form_mailer/form_response.html.erb +18 -2
data/app/views/form_mailer/form_response_thankyou.html.erb +31 -15
data/app/views/noodall/admin/forms/index.html.erb +1 -1
data/app/views/noodall/form_responses/_form.html.erb +4 -1
data/lib/noodall/form_builder/version.rb +1 -1
metadata +8 -8

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

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

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

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

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

@@ -1,5 +1,21 @@
-Response from <%= @response.referrer %>,
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+  </head>
+  <body>
+    <p>Response from <%= @response.referrer %>,</p>
+    <table>
+      <thead>
+        <th>Field</th>
+        <th></th>
+      </thead>
+      <tbody>
 <%= render 'form_mailer/form_response_fields' %>
+      </tbody>
+    </table>
-Sent from: <%= @response.ip %> at <%= @response.created_at.to_formatted_s(:long_dot) %>
+    <p>Sent from: <%= @response.ip %> at <%= @response.created_at.to_formatted_s(:long_dot) %></p>
+  </body>
+</html>

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

@@ -1,19 +1,35 @@
-Dear <%= "#{@response.name}" %>,
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+  </head>
+  <body>
+    <p>Dear <%= "#{@response.name}" %>,</p>
-Thank you for getting in contact.
+<p>Thank you for getting in contact.</p>
-We will be in touch shortly.
-Regards
+<p>We will be in touch shortly.</p>
+<p>Regards<br />
 <%= Noodall::UI.app_name %>
--- Original message --
-To: <%= @form.email %>
-From: <%= @response.email %>
-Subject: <%= "#{Noodall::UI.app_name}: Response to the #{@form.title} form." %>
-<%= render 'form_mailer/form_response_fields' %>
+</p>
+<p>
+<strong>Original message</strong><br />
+To: <%= @form.email %><br />
+From: <%= @response.email %><br />
+Subject: <%= "#{Noodall::UI.app_name}: Response to the #{@form.title} form." %><br />
+</p>
+    <table>
+      <thead>
+        <th>Field</th>
+        <th></th>
+      </thead>
+      <tbody>
+<%= render 'form_mailer/form_response_fields' %>
+      </tbody>
+    </table>
+  </body>
+</html>

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

@@ -22,7 +22,7 @@
       <td class="edit"><%= link_to h(form.title), noodall_admin_form_path(form), :class => 'edit', :title => "Edit #{form.title}" %></td>
       <td><%= form.email %></td>
       <td class="child">
-        <%= link_to pluralize(form.responses.size, "Response"), noodall_admin_form_form_responses_path(form), :title => "View responses for #{h(form.title)}", :class => 'child-no' %> <%= link_to 'Download Responses', noodall_admin_form_form_responses_path(form, :csv), :class => 'download', :title => 'Download the responses for this form in CSV format' %></td>
+        <%= link_to pluralize(form.responses.ham.size, "Response"), noodall_admin_form_form_responses_path(form), :title => "View responses for #{h(form.title)}", :class => 'child-no' %> <%= link_to 'Download Responses', noodall_admin_form_form_responses_path(form, :csv), :class => 'download', :title => 'Download the responses for this form in CSV format' %></td>
       <td><%= link_to 'Delete', noodall_admin_form_path(form), :confirm => 'Are you sure?', :method => :delete, :class => 'delete', :title => 'Delete this form' %></td>
     </tr>
 <% end %>

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

@@ -6,7 +6,9 @@
 <%    for field in form.fields %>
 <%      field_label = (field.label.blank? ? field.name : field.label) %>
       <div class="form-wrap">
-        <%= (f.label field.underscored_name, field_label unless field._type == 'Noodall::Radio') %><%= (field.required ? content_tag('span', ' *', :class => 'required') : '') %>
+      <% unless field._type == 'Noodall::Radio' %>
+        <%= (f.label field.underscored_name, field_label) %><%= (field.required ? content_tag('span', ' *', :class => 'required') : '') %>
+      <% end %>
 <%     case field._type.gsub(/^.*::/,'')
        when 'TextField'
@@ -20,6 +22,7 @@
 <%     when 'Radio' %>
         <fieldset>
           <legend><%= field_label %></legend>
+          <%= (field.required ? content_tag('span', ' *', :class => 'required') : '') %>
           <span class="radio-wrapper">
 <%       field.options.split(',').each do |option|
            option.strip! %>

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

@@ -1,5 +1,5 @@
 module Noodall
   module FormBuilder
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: noodall-form-builder
 version: !ruby/object:Gem::Version
-  hash: 19
-  prerelease:
+  hash: 17
+  prerelease: false
   segments:
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: []
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-01-16 00:00:00 +00:00
+date: 2011-01-28 00:00:00 +00:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -30,10 +30,10 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  type: :development
   name: bundler
   prerelease: false
   version_requirements: *id001
-  type: :development
 - !ruby/object:Gem::Dependency
   requirement: &id002 !ruby/object:Gem::Requirement
     none: false
@@ -44,10 +44,10 @@ dependencies:
         segments:
         - 0
         version: "0"
+  type: :runtime
   name: fastercsv
   prerelease: false
   version_requirements: *id002
-  type: :runtime
 description: Functionality for building custom forms
 email: []
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubyforge_project:
-rubygems_version: 1.4.1
+rubygems_version: 1.3.7
 signing_key:
 specification_version: 3
 summary: Noodall Form Builder