wheelhouse-forms 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7444097ab4ea54c3c2ecca71f86eef1114d1c19e
-  data.tar.gz: 883db66b60d52273a7523bb05145b156ea20c36f
+SHA256:
+  metadata.gz: c9e4acf942d7b099c05b7b709e534b023c89b3a2758b47dd2814b97eea8362aa
+  data.tar.gz: 0bce8ca31b37e8ffc140dd80cc8a603bce405175fddff249d0db53a3e17b637b
 SHA512:
-  metadata.gz: 4ec4d2283e2b276b19bad963301773b25d096afcdfda7215c144536fb4cbe4657e7a1384706e825373e83efb7a557eff84f8ccedf329c6e5f4f0ce14ad80127e
-  data.tar.gz: 7d46fa3ffd93d90992357cd25f9a557634c0838559a4fbfeb740d377ec2c9b0af264efa1219f50abb52a61c6f50c51cbe9671b289bc1b93ed08cf424796df40e
+  metadata.gz: e997f10c3997c8de42fa9956a567d79109081bb485ef4e54c70ae7264b4c38c30fba5451567701964caf159d16e03f12eaab3fd8c9f92b94d7a52543c3b7b958
+  data.tar.gz: ff1022522ac5b740efd27e55443e75f14d3b4a7aec15e37f00979a3d138d886fb8892c599165cce29cf12660824d775394f202c3acfbe55b01232de288fa028d

data/app/assets/stylesheets/wheelhouse-forms/{_fields.css.sass → _fields.sass}

@@ -1,7 +1,7 @@
 .drag-area
   padding: 6px 6px 6px 38px
   margin-left: -32px
-  
+
   .field-set > &
     margin-left: -14px
     padding-bottom: 0
@@ -14,7 +14,7 @@
 .fields
   label
     display: inline
-    
+
   input[type=text]
     width: 40%
     display: inline
@@ -26,104 +26,104 @@
 
   input, select
     font-size: 100%
-    
+
     &.placeholder
       color: #ccc
-  
+
   label
     color: #545454
     font-weight: bold
     margin-right: 0.5em
-    
+
     &.required
       float: right
       margin: 0.5em 0
       margin-right: 10%
       font-weight: normal
       font-size: 95%
-      
+
       input
         margin-right: 4px
-  
+
   span.note
     font-size: 95%
     color: #a9a9a9
-  
+
   .field-set
     @extend %field
     background: #fdfefe
     border: 1px solid #ccc
     padding-left: 14px
-    
+
     .placeholder, .text-field, .text-area, .select-field, .checkbox, .submit-button, .states-dropdown, .countries-dropdown, .radio-buttons, .checkboxes, .custom-field, .content-field
       margin-left: 0
       margin-right: 0
-    
+
     .fields
       margin-right: 5px
-    
+
   .text-field, .text-area, .select-field, .checkbox, .submit-button, .states-dropdown, .countries-dropdown, .radio-buttons, .checkboxes, .custom-field, .content-field
     @extend %field
     min-height: 26px
-    
+
     input[type=text]
       width: 47%
-      
+
     select
       display: inline
       width: 17%
       margin-left: 2%
-    
+
     .drag
       width: 24px
-    
+
     a.delete
       top: 12px
       right: 8px
-  
+
   .text-field, .text-area, .content-field
     +blue
-  
+
   .checkbox, .radio-buttons, .checkboxes
     +orange
-  
+
   .select-field, .states-dropdown, .countries-dropdown
     +green
-  
+
   .submit-button, .custom-field
     +purple
-  
+
   .drag-placeholder
     @extend %field
     border: 1px dashed #ccc
     padding: 0
-  
+
   .content-field
     a.delete
       top: 14px
       right: 14px
-    
+
   .field-set .content-field
     a.delete
       right: 12px
-  
+
   .custom-field
     input[type=text]
       width: 40%
-  
+
   ul.options
     line-height: 2.6em
     min-height: 2em
     margin-top: 0.5em
-    
+
     li
       display: inline
       margin-right: 5px
-    
+
       input[type=text]
         width: auto
         min-width: 8em
-  
+
   .drag
     position: absolute
     top: 0
@@ -133,14 +133,15 @@
     height: 100%
     background: image-url("wheelhouse/backgrounds/drag.png") repeat
     border-right: 1px solid #dfdfdf
-    +border-left-radius(4px)
-    
+    border-top-left-radius: 4px
+    border-bottom-left-radius: 4px
+
     img
       margin: 12px 4px
-  
+
   .fields
     min-height: 100px
-  
+
   a.delete
     position: absolute
     right: 14px
@@ -151,10 +152,10 @@
     background: image-url("wheelhouse/icons/delete-item.png") no-repeat
     text-indent: -9999px
     opacity: 0.5
-    
+
     &:hover
       opacity: 1.0
-  
+
   .field-set a.delete
     top: 12px
 
@@ -162,11 +163,10 @@
   label
     font-size: 115%
     font-weight: bold
-    
+
 .shaded.disabled
   color: #999
   border-color: #e7e7e7
-  
+
   input, textarea
     color: #999
-  

data/app/assets/stylesheets/wheelhouse-forms/{_mixins.css.sass → _mixins.sass}

@@ -2,15 +2,15 @@
   position: relative
   margin: 10px 0
   padding: 0 0 0 32px
-  +border-radius(4px)
+  border-radius: 4px
 
 =colored-field( $background, $border, $text )
   background: $background
   border: 1px solid $border
-  
+
   label
     color: $text
-  
+
   .drag
     border-right: 1px solid $border
 
@@ -25,4 +25,3 @@
 
 =purple
   +colored-field(#fdfafd, #e3d2e3, #987898)
-  

data/app/assets/stylesheets/wheelhouse-forms/{admin.css.sass → admin.sass}

@@ -1,5 +1,3 @@
-@import compass
-
 @import mixins
 @import fields
 @import tools

data/app/controllers/forms/submissions_controller.rb

@@ -1,22 +1,22 @@
 require_dependency "forms/csv_exporter"
 
 class Forms::SubmissionsController < Wheelhouse::ResourceController
-  belongs_to :form, :class_name => Forms::Form
+  belongs_to :form, :class_name => "Forms::Form"
   self.resource_class = Forms::Submission
-  
+
   manage_site_breadcrumb
   breadcrumb { [parent.label, parent] }
-  
+
   actions :show, :destroy, :update
-  
+
   respond_to :csv
-  
+
   def index
     respond_with(parent) do |format|
       format.csv { render :text => Forms::CsvExporter.new(parent).to_csv }
     end
   end
-  
+
   def update
     resource.spam!(params[:spam])
     respond_with(resource)

data/app/handlers/forms/form_handler.rb

@@ -1,17 +1,25 @@
 class Forms::FormHandler < Wheelhouse::ResourceHandler
-  skip_before_filter :verify_authenticity_token
-  
-  before_filter :set_form_context
-  
+  skip_before_action :verify_authenticity_token, raise: false
+
+  before_action :set_form_context
+
   get do
   end
-  
+
   post do
-    @form.submit(params[:submission], request)
+    @form.submit(submission_params, request)
   end
 
 private
   def set_form_context
     @form.view_context = view_context
   end
+
+  def submission_params
+    if params.respond_to?(:require)
+      params.require(:submission).permit!
+    else
+      params[:submission]
+    end
+  end
 end

data/app/mailers/forms/mailer.rb

@@ -4,14 +4,15 @@ class Forms::Mailer < ActionMailer::Base
   def submission(form, submission)
     @form, @submission = form, submission
     
-    mail(:from    => form.email_sender,
-         :to      => form.recipients,
-         :subject => form.subject)
+    mail(:to       => form.notification_email_recipients,
+         :from     => form.notification_email_sender,
+         :subject  => form.notification_email_subject,
+         :reply_to => submission.email)
   end
   
   def confirmation(form, submission)
-    mail(:from    => form.email_sender,
-         :to      => submission.email,
+    mail(:to      => submission.email,
+         :from    => form.confirmation_email_sender,
          :subject => form.confirmation_email_subject,
          :body    => form.confirmation_email_body)
   end

data/app/models/forms/fields/field.rb

@@ -2,27 +2,22 @@ module Forms::Fields
   class Field < Wheelhouse::EmbeddedResource
     class_attribute :renderer
     self.renderer = Forms::FieldRenderer
-    
+
     def render(submission, template)
       self.class.renderer.new(self, submission, template).render
     end
-    
+
     def required?
       read_attribute(:required)
     end
-    
+
     def self.partial
       name.demodulize.underscore
     end
-    
+
     def self.cast(attrs)
-      case attrs
-      when Hash
-        type = attrs.delete('type')
-        Forms::Fields.const_get(type).new(attrs)
-      else
-        super
-      end
+      type = attrs.delete('type')
+      Forms::Fields.const_get(type).new(attrs)
     end
   end
 end

data/app/models/forms/form.rb

@@ -4,40 +4,42 @@ class Forms::Form < Wheelhouse::Resource
   include Wheelhouse::Resource::Addressable
   include Wheelhouse::Resource::Versioned
   include Wheelhouse::Resource::Content
-  
+
   property :title, String, :required => true, :translate => true
   property :fields, FieldCollection, :default => [Forms::Fields::FieldSet.new]
-  
+
   property :submission_notification, Boolean, :default => true
-  property :recipients, MongoModel::Collection[String]
-  property :subject, String, :default => "Form Submission"
-  
+  property :notification_email_sender, String
+  property :notification_email_recipients, MongoModel::Collection[String], :as => 'recipients'
+  property :notification_email_subject, String, :default => "Form Submission", :as => 'subject'
+
   property :confirmation_email, Boolean, :default => false
+  property :confirmation_email_sender, String
   property :confirmation_email_subject, String
   property :confirmation_email_body, String
-  
+
   validates_associated :fields
-  
+
   has_many :submissions, :class => "Forms::Submission"
-  
+
   activities :all
-  
+
   icon "wheelhouse-forms/form.png"
-  
+
   attr_accessor :view_context, :current_submission, :success
-  
+
   def to_s
     render(view_context)
   end
-  
+
   def render(template)
     Forms::FormRenderer.new(self, current_submission, template).render
   end
-  
+
   def submit(params, request)
     submission = submissions.build(:params => params, :ip_address => request.remote_ip)
     Forms::Plugin.config.wheelhouse.forms.spam_filter.check(submission)
-    
+
     if submission.save
       deliver(submission) unless submission.spam?
       self.success = true
@@ -46,40 +48,48 @@ class Forms::Form < Wheelhouse::Resource
       self.success = false
     end
   end
-  
-  def email_sender
-    "noreply@#{site.domain}"
+
+  def notification_email_sender
+    read_attribute(:notification_email_sender).presence || default_email_sender
+  end
+
+  def confirmation_email_sender
+    read_attribute(:confirmation_email_sender).presence || default_email_sender
   end
-  
+
+  def default_email_sender
+    "noreply@#{site.domain}" if site
+  end
+
   def deliver(submission)
     Forms::Mailer.submission(self, submission).deliver if deliver_submission_notification?
     Forms::Mailer.confirmation(self, submission).deliver if deliver_confirmation_email?(submission)
   rescue
     # Mail delivery failed
   end
-  
+
   def success?
     @success
   end
-  
+
   def first_content_field
     @first_content_field ||= fields.flatten.find { |f| f.respond_to?(:label) }
   end
-  
-  def recipients=(recipients)
+
+  def notification_email_recipients=(recipients)
     recipients = recipients.split(/,/) if recipients.is_a?(String)
-    write_attribute(:recipients, recipients.map(&:strip))
+    write_attribute(:notification_email_recipients, recipients.map(&:strip))
   end
-  
+
   def handler
     Forms::FormHandler
   end
 
 protected
   def deliver_submission_notification?
-    submission_notification? && recipients.any?
+    submission_notification? && notification_email_recipients.any?
   end
-  
+
   def deliver_confirmation_email?(submission)
     confirmation_email? && submission.email.present?
   end

data/app/models/forms/submission/parameters.rb

@@ -7,16 +7,17 @@ class Forms::Submission
       end
       result
     end
-  
+
     def self.cast(params)
       case params
-      when Hash
-        self[params]
       when Array
         params.each_with_object({}) { |v, hash| hash[v[0]] = v[1] }
+      else
+        # Assume params behaves like a hash
+        self[params]
       end
     end
-  
+
     def self.from_mongo(params)
       cast(params)
     end

data/app/templates/form/submission.html.haml

@@ -4,7 +4,8 @@
   %head
   
   %body
-    %p= link_to "View this submission online", @submission.admin_url
+    - if Rails.application.config.wheelhouse.forms.show_admin_link_in_notifications
+      %p= link_to "View this submission online", @submission.admin_url
     
     %p
       %strong Submitted at:

data/app/views/forms/forms/designer.haml

@@ -27,18 +27,24 @@
     = form.check_box :submission_notification, :label => "Submission Notification", :data => { :disable => "#submission-notification-options" }
   
   #submission-notification-options.shaded
-    = field :recipients do
-      = form.text_field :recipients, :value => @form.recipients.join(', ')
+    = field :notification_email_recipients do
+      = form.text_field :notification_email_recipients, :value => @form.notification_email_recipients.join(', ')
       = note "Separate email addresses with commas."
+
+    = field :notification_email_sender do
+      = form.text_field :notification_email_sender, :placeholder => @form.default_email_sender
   
-    = field :subject do
-      = form.text_field :subject
+    = field :notification_email_subject do
+      = form.text_field :notification_email_subject
   
   = field :confirmation_email, :label => false, :class => "title" do
     = form.check_box :confirmation_email, :label => "Confirmation Email", :data => { :disable => "#confirmation-email-options" }
     = note "Confirmation emails will be sent to the first form field with a label containing \"email\"."
     
   #confirmation-email-options.shaded
+    = field :confirmation_email_sender do
+      = form.text_field :confirmation_email_sender, :placeholder => @form.default_email_sender
+
     = field :confirmation_email_subject do
       = form.text_field :confirmation_email_subject
     

data/config/locales/en.yml

@@ -4,6 +4,7 @@ en:
       form:
         title: Form Title
         content: Form Content
+        confirmation_email_sender: Confirmation Email Sender
         confirmation_email_subject: Confirmation Email Subject
         confirmation_email_body: Confirmation Email Body
         

data/lib/wheelhouse-forms.rb

@@ -15,10 +15,14 @@ module Forms
   class Plugin < Wheelhouse::Plugin
     config.wheelhouse.forms = ActiveSupport::OrderedOptions.new
     
-    # Disable custom fields by default
+    # Disable custom fields by default.
     config.wheelhouse.forms.custom_fields = false
+
+    # Show 'view submission' link in notification emails.
+    # You may wish to disable this if you plan to reply directly to notification emails.
+    config.wheelhouse.forms.show_admin_link_in_notifications = true
     
-    # Set default spam filter
+    # Set default spam filter.
     config.wheelhouse.forms.spam_filter = defined?(Rakismet) ? AkismetFilter : NullFilter
     
     isolate_namespace Forms
@@ -30,7 +34,7 @@ module Forms
     end
     
     initializer :precompile_assets do |app|
-      app.config.assets.precompile += %w(wheelhouse-forms/admin.* wheelhouse-forms/designer.js wheelhouse-forms/submissions.js)
+      app.config.assets.precompile += %w(wheelhouse-forms/admin.* wheelhouse-forms/designer.js wheelhouse-forms/submissions.js wheelhouse-forms/*.png)
     end
     
     def self.load_yaml(file)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wheelhouse-forms
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wheelhouse
@@ -56,12 +56,12 @@ files:
 - app/assets/javascripts/wheelhouse-forms/jquery.autogrow.js
 - app/assets/javascripts/wheelhouse-forms/jquery.options.js
 - app/assets/javascripts/wheelhouse-forms/submissions.js
-- app/assets/stylesheets/wheelhouse-forms/_fields.css.sass
-- app/assets/stylesheets/wheelhouse-forms/_mixins.css.sass
-- app/assets/stylesheets/wheelhouse-forms/_sidebar.css.sass
-- app/assets/stylesheets/wheelhouse-forms/_submissions.css.sass
-- app/assets/stylesheets/wheelhouse-forms/_tools.css.sass
-- app/assets/stylesheets/wheelhouse-forms/admin.css.sass
+- app/assets/stylesheets/wheelhouse-forms/_fields.sass
+- app/assets/stylesheets/wheelhouse-forms/_mixins.sass
+- app/assets/stylesheets/wheelhouse-forms/_sidebar.sass
+- app/assets/stylesheets/wheelhouse-forms/_submissions.sass
+- app/assets/stylesheets/wheelhouse-forms/_tools.sass
+- app/assets/stylesheets/wheelhouse-forms/admin.sass
 - app/controllers/forms/forms_controller.rb
 - app/controllers/forms/submissions_controller.rb
 - app/handlers/forms/form_handler.rb
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Wheelhouse CMS Forms Plugin