spud_inquiries 0.9.1 → 0.9.2

data/README.markdown

@@ -1,6 +1,6 @@
 Spud Inquiries
 ==============
-
+[![Build Status](https://travis-ci.org/spud-rails/spud_inquiries.png?branch=master)](https://travis-ci.org/spud-rails/spud_inquiries)
 Spud Inquiries is a Spud Engine designed to make it easier to generate contact forms and send email notifications when these inquiries occur. This engine works great with the spud_cms engine but it is fully capable of running standalone with spud_core.
 
 Installation/Usage
@@ -19,12 +19,17 @@ Installation/Usage
 
 4. run a rails server instance and point your browser to /spud/admin
 
+Creating a Contact Form
+-----------------------
+Creating a contact form is still fairly new and improvements will be made as time goes on. To create a new form, go to the Inquiries app inside of your spud admin panel. Click the forms button to manage various forms. Here you can set the form name, any content (html safe) you wish to render before the form renders, and add the form fields to the form (Email address is currently at the top of all forms and not adjustable).
+
 Routing to the Inquiries Engine
 -------------------------------
 By default the inquiries gem routes the "/contact" url to the form named "contact". However this and other configuration options can be changed as shown below.
 
 
 		Spud::Inquiries.configure do |config|
+			config.enable_routes = true
 		    config.default_contact_form = "contact"
 		    config.base_layout = "application"
 		    config.from_address = "no-reply@example.org"
@@ -36,9 +41,15 @@ Where "contact" is the name of the form you wish to use (downcased,parameterized
 
 Inquiry will default render to the 'application' layout of your application. You can change this by adjusting the configuration option called "base_layout". More configuration options can be found in the Wiki "Configuration" page.
 
-Creating a Contact Form
------------------------
-Creating a contact form is still fairly new and improvements will be made as time goes on. To create a new form, go to the Inquiries app inside of your spud admin panel. Click the forms button to manage various forms. Here you can set the form name, any content (html safe) you wish to render before the form renders, and add the form fields to the form (Email address is currently at the top of all forms and not adjustable).
+Injecting Forms into Spud CMS Pages
+-----------------------------------
+Spud Supports the use of liquid tags to inject dynamic content into pages. In order to inject a contact form into a spud page simply use the following liquid tag in your content:
+
+```html
+ {% inquiry Contact %}
+```
+The above example will inject a form named "Contact" into your content.
+
 
 Testing
 -----------------
@@ -46,7 +57,7 @@ Testing
 Spud uses RSpec for testing. Get the tests running with a few short commands:
 
 1. Create and migrate the databases:
-   
+
         rake db:create
         rake db:migrate
 

data/app/controllers/contacts_controller.rb

@@ -3,32 +3,31 @@ class ContactsController < ApplicationController
 	caches_action :thankyou,:if => Proc.new { |c| Spud::Inquiries.enable_action_caching }
 	skip_before_filter :verify_authenticity_token
 	layout Spud::Inquiries.base_layout
+	respond_to :html,:js
 	def show
-		url_name = !params[:id].blank? ? params[:id] : Spud::Inquiries.default_contact_form
+		url_name      = !params[:id].blank? ? params[:id] : Spud::Inquiries.default_contact_form
 		@inquiry_form = SpudInquiryForm.where(:url_name => url_name).includes(:spud_inquiry_form_fields).first
 
-
 		if @inquiry_form.blank?
 			flash[:error] = "Contact Inquiry Form not found!"
-			redirect_to root_url and return
+			redirect_to "/" and return
 		end
 		@inquiry = SpudInquiry.new(:spud_inquiry_form_id => @inquiry_form.id)
-
 	end
 
 	def inquire
 		if !params[:other_email].blank?
 			flash[:error] = "You must be a robot! No robots allowed here!"
-			redirect_to request.referer and return
+			redirect_to request.referer || "/" and return
 		end
 		unless params[:spud_inquiry]
 			flash[:error] = "Inquiry Not Found!"
-			redirect_to request.referer and return
+			redirect_to request.referer || "/" and return
 		end
-		@inquiry_form = SpudInquiryForm.find(params[:spud_inquiry][:spud_inquiry_form_id])
+		@inquiry_form = SpudInquiryForm.where(:id => params[:spud_inquiry][:spud_inquiry_form_id]).first
 		if @inquiry_form.blank?
 			flash[:error] = "Form Not Found!"
-			redirect_to request.referer and return
+			redirect_to request.referer || "/" and return
 		end
 		@inquiry = SpudInquiry.new(:spud_inquiry_form_id => params[:spud_inquiry][:spud_inquiry_form_id])
 
@@ -40,17 +39,16 @@ class ContactsController < ApplicationController
 			if field.required && val.blank?
 				flash[:error] = "Not all required fields were entered"
 				@inquiry.errors.add field.name,"is a required field"
-				# redirect_to request.referer and return
 			end
 			@inquiry.spud_inquiry_fields.new(:name => field.name,:value => val)
 		end
-		# params[:spud_inquiry].each_pair do |key,value|
-		# 	if key.to_s != "email" && key.to_s != "spud_inquiry_form_id"
-		# 		@inquiry.spud_inquiry_fields.new(:name => key,:value => value)
-		# 	end
-		# end
+
 		if !@inquiry.errors.empty?
-			render :action => "show" and return
+			respond_to do |format|
+				format.html {render :action => "show"}
+				format.js { render "show.js.erb"}
+			end
+			return
 		end
 		if @inquiry.save
 			flash[:notice] = "Your inquiry was received!"
@@ -59,9 +57,17 @@ class ContactsController < ApplicationController
 			end
 		else
 			flash[:error] = "Whoops! Something went wrong. Please try again!"
-			render :action => "show" and return
+			respond_to do |format|
+				format.html {render :action => "show"}
+				format.js { render "show.js.erb"}
+			end
+			return
+		end
+		respond_to do |format|
+			format.html { redirect_to contact_thankyou_url }
+			format.js { render "thankyou.js.erb"}
 		end
-		redirect_to contact_thankyou_url
+
 	end
 
 

data/app/controllers/spud/admin/inquiries_controller.rb

@@ -3,13 +3,14 @@ class Spud::Admin::InquiriesController < Spud::Admin::ApplicationController
 	belongs_to_spud_app :inquiries
 	add_breadcrumb "Inquiries", :spud_admin_inquiries_path
 	before_filter :load_inquiries,:only => [:edit,:update,:show,:destroy]
+
 	def index
 		@inquiries = SpudInquiry.order("created_at DESC").includes(:spud_inquiry_form).paginate :page => params[:page]
 		respond_with @inquiries
 	end
 
 	def show
-		add_breadcrumb "#{@inquiry.email || "Unknown"}", :spud_admin_inquiry_path
+		add_breadcrumb "#{@inquiry.email || "Unknown"}", ''
 		respond_with @inquiry
 	end
 

data/app/controllers/spud/admin/inquiry_forms_controller.rb

@@ -1,19 +1,19 @@
 class Spud::Admin::InquiryFormsController < Spud::Admin::ApplicationController
 	layout 'spud/admin/detail'
-	belongs_to_spud_app :inquiries
+	belongs_to_spud_app :inquiries, :title => "Inquiry Forms"
 	cache_sweeper :inquiry_sweeper, :only => [:update,:destroy,:create]
 	add_breadcrumb "Inquiries", :spud_admin_inquiries_path
 	add_breadcrumb "Forms", :spud_admin_inquiry_forms_path
+	add_breadcrumb "New", '',:only =>  [:new, :create]
+	add_breadcrumb "Edit", '',:only => [:edit, :update]
 	before_filter :load_form,:only => [:edit,:update,:show,:destroy]
 	def index
 
-		@page_name = "Inquiry Forms"
 		@inquiry_forms = SpudInquiryForm.order(:name).paginate :page => params[:page]
 		respond_with @inquiry_forms
 	end
 
 	def new
-		@page_name = "New Inquiry Form"
 		@inquiry_form = SpudInquiryForm.new
 		respond_with @inquiry_form
 	end
@@ -26,12 +26,10 @@ class Spud::Admin::InquiryFormsController < Spud::Admin::ApplicationController
 	end
 
 	def edit
-		@page_name = "Edit Inquiry Form"
 		respond_with @inquiry_form
 	end
 
 	def update
-		@page_name = "Edit Inquiry Form"
 		flash[:notice] = "Form saved successfully!" if @inquiry_form.update_attributes(params[:spud_inquiry_form])
 		if Spud::Inquiries.enable_action_caching
 			Rails.cache.clear

data/app/controllers/spud/inquiries/sitemaps_controller.rb

@@ -1,7 +1,8 @@
 class Spud::Inquiries::SitemapsController < Spud::ApplicationController
-	caches_page :show,:expires_in => 1.day
-
+	respond_to :xml
+  caches_page :show,:expires_in => 1.day
 	def show
 		@forms = SpudInquiryForm.all
+    respond_with @forms
 	end
 end

data/app/mailers/spud/inquiry_mailer.rb

@@ -1,9 +1,10 @@
 class Spud::InquiryMailer < ActionMailer::Base
-  
+
 
   def inquiry_notification(inquiry)
   	@inquiry = inquiry
-  	@url = "/spud/admin/inquiries/#{@inquiry.id}"
+    @url = spud_admin_inquiry_url(:id => @inquiry.id)
+  	# @url = "/spud/admin/inquiries/#{@inquiry.id}"
   	mail(:from =>Spud::Inquiries.from_address,:to => @inquiry.recipients.split(","), :subject => @inquiry.subject.blank? ? "No Subject" : @inquiry.subject)
   end
 end

data/app/models/spud_inquiry.rb

@@ -1,10 +1,11 @@
 class SpudInquiry < ActiveRecord::Base
 
-	has_many :spud_inquiry_fields
+	has_many :spud_inquiry_fields, :dependent => :destroy
 	belongs_to :spud_inquiry_form
   accepts_nested_attributes_for :spud_inquiry_fields, :reject_if => lambda { |a| a[:name].blank? }
   attr_accessible :spud_inquiry_form_id,:spud_inquiry_fields
 
+
   def email
     email_field = self.spud_inquiry_fields.where(:name => "email").first
     if !email_field.blank?

data/app/models/spud_inquiry_field.rb

@@ -1,4 +1,5 @@
 class SpudInquiryField < ActiveRecord::Base
 	belongs_to :spud_inquiry
 	attr_accessible :name,:value,:spud_inquiry_id
+  # validates :spud_inquiry, :presence => true
 end

data/app/models/spud_inquiry_form.rb

@@ -1,15 +1,17 @@
 class SpudInquiryForm < ActiveRecord::Base
-	has_many :spud_inquiries
+	has_many :spud_inquiries, :dependent => :nullify
 	has_many :spud_inquiry_form_fields,:dependent => :destroy,:order => "field_order ASC"
 
-    accepts_nested_attributes_for :spud_inquiry_form_fields, :reject_if => lambda { |a| a[:name].blank? }, :allow_destroy => true
+  accepts_nested_attributes_for :spud_inquiry_form_fields, :reject_if => lambda { |a| a[:name].blank? }, :allow_destroy => true
 
 	validates :name,:presence => true,:uniqueness => true
 	validates :url_name,:presence => true, :uniqueness => true
 	before_validation :generate_url_name
-	attr_accessible :name,:url_name,:recipients,:content,:subject,:spud_inquiry_form_fields_attributes
+	attr_accessible :name,:url_name,:recipients,:content,:subject,:spud_inquiry_form_fields_attributes, :created_at, :updated_at, :thank_you_content
 
-     def generate_url_name
-          self.url_name = self.name.gsub(/[^a-zA-Z0-9\ ]/," ").gsub(/\ \ +/," ").gsub(/\ /,"-").downcase
-     end
+  def generate_url_name
+    if !self.name.blank?
+      self.url_name = self.name.gsub(/[^a-zA-Z0-9\ ]/," ").gsub(/\ \ +/," ").gsub(/\ /,"-").downcase
+    end
+  end
 end

data/app/models/spud_inquiry_form_field.rb

@@ -2,15 +2,12 @@ class SpudInquiryFormField < ActiveRecord::Base
 	belongs_to :spud_inquiry_form
 	validates :name,:presence => true
 	validates :field_type,:presence => true
-	attr_accessible :name,:options,:default_value,:field_type,:spud_inquiry_form_id,:field_order,:required
-	
+	# validates :spud_inquiry_form_id, :presence => true
+	attr_accessible :name,:options,:default_value,:field_type,:spud_inquiry_form_id,:field_order,:required, :placeholder
 
 	def options_list
 		return [] if self.options.blank?
 		self.options.split(/\,*?(".*?")\,*?/).map{|x| x=~/^".*"$/ ? x.gsub(/\"/,"") : x.split(',')}.flatten.select{|p| !p.strip.blank?}
-
 	end
 
-
-	
 end

data/app/views/contacts/_show.html.erb

@@ -1,19 +1,21 @@
 
-<%=form_for :spud_inquiry, :url => "/contact/inquire",:html => {:class => "form-horizontal"} do |f|%>
+<%=form_for :spud_inquiry, :url => contact_inquire_path,:html => {:class => "form-horizontal", :id => "inquiry_form_#{inquiry_form.id}"}, :remote => true do |f|%>
+<%#=error_messages_for(@inquiry)%>
+
 <fieldset>
 <%=f.hidden_field :spud_inquiry_form_id,:value => inquiry_form.id%>
 
   <%inquiry_form.spud_inquiry_form_fields.each do |field|%>
-    <div class="control-group">
+    <div class="control-group type_<%=field.field_type%>">
       <%=f.label field.name,:class => "control-label"%>
       <div class="controls">
         <%=case field.field_type
           when '0'
-            f.text_field field.name,:value => field.default_value
+            f.text_field field.name,:value => params[:spud_inquiry].blank? || params[:spud_inquiry][field.name].blank? ? field.default_value : params[:spud_inquiry][field.name], :placeholder => field.placeholder
           when '1'
-            f.check_box field.name,:value => field.default_value
+            f.check_box field.name,:value => params[:spud_inquiry].blank? || params[:spud_inquiry][field.name].blank? ? field.default_value : params[:spud_inquiry][field.name]
           when '2'
-            f.text_area field.name,:value => field.default_value,:rows=>5,:cols => 70
+            f.text_area field.name,:value => params[:spud_inquiry].blank? || params[:spud_inquiry][field.name].blank? ? field.default_value : params[:spud_inquiry][field.name],:rows=>5,:cols => 70, :placeholder => field.placeholder
           when '3'
             f.select field.name,field.options_list.collect {|opt| [opt,opt]},:include_blank => true
         end%>

data/app/views/contacts/_show_liquid.html.erb

@@ -0,0 +1,34 @@
+
+<%=form_for :spud_inquiry, :url => "/contact/inquire",:html => {:class => "form-horizontal", :id => "inquiry_form_#{inquiry_form.id}"}, :remote => true do |f|%>
+<fieldset>
+<%=f.hidden_field :spud_inquiry_form_id,:value => inquiry_form.id%>
+
+  <%inquiry_form.spud_inquiry_form_fields.each do |field|%>
+    <div class="control-group type_<%=field.field_type%>">
+      <%=f.label field.name,:class => "control-label"%>
+      <div class="controls">
+        <%=case field.field_type
+          when '0'
+            f.text_field field.name,:value => field.default_value, :placeholder => field.placeholder
+          when '1'
+            f.check_box field.name,:value => field.default_value
+          when '2'
+            f.text_area field.name,:value => field.default_value,:rows=>5,:cols => 70, :placeholder => field.placeholder
+          when '3'
+            f.select field.name,field.options_list.collect {|opt| [opt,opt]},:include_blank => true
+        end%>
+      </div>
+    </div>
+  <%end%>
+  <div class="spud_inquiry_hide">
+    <label id='other_email_label' for='other_email'>Please leave blank:</label>
+    <input type='text' name='other_email' id='other_email'>
+  </div>
+  <div class="form-actions">
+    <%=f.submit "Submit Inquiry",:class => "btn btn-primary"%>
+  </div>
+
+
+</fieldset>
+
+<%end%>

data/app/views/contacts/show.html.erb

@@ -1,23 +1,23 @@
 <h2><%=@inquiry_form.name%></h2>
 <%=@inquiry_form.content.html_safe if !@inquiry_form.content.blank?%>
 
-<%=form_for :spud_inquiry, :url => "/contact/inquire",:html => {:class => "form-horizontal"} do |f|%>
+<%=form_for :spud_inquiry, :url => contact_inquire_url,:html => {:class => "form-horizontal"} do |f|%>
 <%=error_messages_for(@inquiry)%>
 <fieldset>
 <%=f.hidden_field :spud_inquiry_form_id,:value => @inquiry_form.id%>
 
 
 	<%@inquiry_form.spud_inquiry_form_fields.each do |field|%>
-		<div class="control-group">
+		<div class="control-group type_<%=field.field_type%>">
 			<%=f.label field.name,:class => "control-label"%>
 			<div class="controls">
 				<%=case field.field_type
 					when '0'
-						f.text_field field.name,:value => params[:spud_inquiry].blank? || params[:spud_inquiry][field.name].blank? ? field.default_value : params[:spud_inquiry][field.name]
+						f.text_field field.name,:value => params[:spud_inquiry].blank? || params[:spud_inquiry][field.name].blank? ? field.default_value : params[:spud_inquiry][field.name], , :placeholder => field.placeholder
 					when '1'
 						f.check_box field.name,:value => params[:spud_inquiry].blank? || params[:spud_inquiry][field.name].blank? ? field.default_value : params[:spud_inquiry][field.name]
 					when '2'
-						f.text_area field.name,:value => params[:spud_inquiry].blank? || params[:spud_inquiry][field.name].blank? ? field.default_value : params[:spud_inquiry][field.name],:rows=>5,:cols => 70
+						f.text_area field.name,:value => params[:spud_inquiry].blank? || params[:spud_inquiry][field.name].blank? ? field.default_value : params[:spud_inquiry][field.name],:rows=>5,:cols => 70, :placeholder => field.placeholder
 					when '3'
 						f.select field.name,field.options_list.collect {|opt| [opt,opt]},:include_blank => true
 				end%>

data/app/views/contacts/show.js.erb

@@ -0,0 +1 @@
+$('#inquiry_form_<%=@inquiry_form.id%>').replaceWith("<%=escape_javascript(render :partial=>"show",:locals => {:inquiry_form => @inquiry_form})%>");

data/app/views/contacts/thankyou.js.erb

@@ -0,0 +1 @@
+$('#inquiry_form_<%=@inquiry_form.id%>').replaceWith("<%=escape_javascript(@inquiry_form.thank_you_content ? @inquiry_form.thank_you_content.html_safe : 'Thank You')%>");

data/app/views/spud/admin/inquiry_forms/_form.html.erb

@@ -1,9 +1,9 @@
 <%=error_messages_for(f.object)%>
 <fieldset>
   <legend>Form Info</legend>
-  
+
 	  <div class="control-group">
-	      
+
 	    	<%=f.label :name, :required=>true, :class=>"control-label"%>
 		<div class="controls">
 			<%=f.text_field :name%>
@@ -17,17 +17,23 @@
       </div>
       <div class="control-group">
 	    	<%=f.label :subject, :required=>true, :class=>"control-label"%>
-		<div class="controls">
-			<%=f.text_field :subject%>
-		</div>
+    		<div class="controls">
+    			<%=f.text_field :subject%>
+    		</div>
       </div>
       <div class="control-group">
 	    	<%=f.label :content, :required=>true, :class=>"control-label"%>
-			<div class="controls">
-				<%=f.text_area :content,:cols => 75,:rows => 5,:class => "wysiwym tinymce"%>
-			</div>
+  			<div class="controls">
+  				<%=f.text_area :content,:cols => 75,:rows => 5,:class => "wysiwym tinymce"%>
+  			</div>
+      </div>
+      <div class="control-group">
+        <%=f.label :thank_you_content,"Thank You Text", :required=>true, :class=>"control-label"%>
+        <div class="controls">
+          <%=f.text_area :thank_you_content,:cols => 75,:rows => 5,:class => "wysiwym tinymce"%>
+        </div>
       </div>
-  
+
 </fieldset>
 <fieldset>
   <legend>Fields</legend>

data/app/views/spud/admin/inquiry_forms/_spud_inquiry_form_field_fields.html.erb

@@ -12,7 +12,13 @@
 		  		<%=f.select :field_type, [["Text Field",0],["Checkbox",1],["Text Area",2],["Dropdown",3]]%>
 		  	</div>
 
-			
+
+		</div>
+		<div class="control-group">
+			<%=f.label :placeholder,:class => "control-label"%>
+			<div class="controls">
+				<%=f.text_field :placeholder%>
+			</div>
 		</div>
 		<div class="control-group">
 			<%=f.label :options,:class => "control-label"%>
@@ -20,7 +26,7 @@
 				<%=f.text_field :options%>
 			</div>
 		</div>
-		<div class="control-group"> 
+		<div class="control-group">
 			<%=f.label :default_value,:class => "control-label"%>
 			<div class="controls">
 				<%=f.text_field :default_value%>

data/app/views/spud/admin/inquiry_forms/index.html.erb

@@ -5,7 +5,7 @@
 	<div class="page_list">
 			<%@inquiry_forms.each do |inquiry_form|%>
 				<div class="page_row">
-					
+
 				<span class="row_meta"><%=link_to inquiry_form.name,edit_spud_admin_inquiry_form_path(inquiry_form)%></span>
 
 				<span class="edit_controls">

data/app/views/spud/admin/inquiry_forms/new.html.erb

@@ -6,4 +6,4 @@
 <%end%>
 
 
-  
+

data/app/views/spud/inquiries/sitemaps/show.xml.builder

@@ -13,4 +13,4 @@ xml.urlset :xmlns => 'http://www.sitemaps.org/schemas/sitemap/0.9' do
       xml.lastmod form.updated_at.strftime('%Y-%m-%d')
     end
   end
-end
+end

data/config/routes.rb

@@ -1,23 +1,17 @@
 Rails.application.routes.draw do
-   namespace :spud do
-   	namespace :admin do
-   		resources :inquiries
-   		resources :inquiry_forms
-   	end
-      namespace :inquiries do
-         resource :sitemap,:only => [:show]
-      end
-   end
-
-   post "contact/inquire" => "contacts#inquire"
-   match "contact/thankyou" => "contacts#thankyou"
-   if Spud::Inquiries.enable_routes
-      match "/contact" => "contacts#show"
-      match "/contact/:id" => "contacts#show"
-   end
-
-
-
-
+  namespace :spud do
+    namespace :admin do
+       resources :inquiries
+       resources :inquiry_forms
+    end
+    namespace :inquiries do
+       resource :sitemap,:only => [:show]
+    end
+  end
+  post "/contact/inquire" => "contacts#inquire"
+  match "/contact/thankyou" => "contacts#thankyou"
+  if Spud::Inquiries.enable_routes
+    match "/contact" => "contacts#show", :as => :contact
+    match "/contact/:id" => "contacts#show", :as => :contact
+  end
 end
-

data/db/migrate/20120117133412_create_spud_inquiry_fields.rb

@@ -8,6 +8,6 @@ class CreateSpudInquiryFields < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_index :spud_inquiry_fields,:spud_inquiry_id
+    add_index :spud_inquiry_fields,:spud_inquiry_id, :name => "inquiry_field_parent_id"
   end
 end

data/db/migrate/20120122173829_add_field_order_to_spud_inquiry_form_fields.rb

@@ -2,6 +2,6 @@ class AddFieldOrderToSpudInquiryFormFields < ActiveRecord::Migration
   def change
     add_column :spud_inquiry_form_fields, :field_order, :integer
     add_column :spud_inquiry_form_fields, :required, :boolean
-    add_index :spud_inquiry_form_fields,:field_order
+    add_index :spud_inquiry_form_fields,:field_order, :name => "form_field_order"
   end
 end

data/db/migrate/20120126132407_add_spud_inquiry_form_id_to_spud_inquiries.rb

@@ -5,7 +5,7 @@ class AddSpudInquiryFormIdToSpudInquiries < ActiveRecord::Migration
     add_column :spud_inquiries, :subject,:string
     add_column :spud_inquiries, :marked_as_read,:boolean,:default => false
 
-    add_index :spud_inquiries, :marked_as_read
-    add_index :spud_inquiries, :spud_inquiry_form_id
+    add_index :spud_inquiries, :marked_as_read, :name => "idx_inquiry_read"
+    add_index :spud_inquiries, :spud_inquiry_form_id, :name => "idx_inquiry_form"
   end
 end

data/db/migrate/20120127023335_add_url_name_to_spud_inquiry_forms.rb

@@ -1,6 +1,6 @@
 class AddUrlNameToSpudInquiryForms < ActiveRecord::Migration
   def change
     add_column :spud_inquiry_forms, :url_name, :string
-    add_index :spud_inquiry_forms,:url_name
+    add_index :spud_inquiry_forms,:url_name, :name => "idx_form_url_name"
   end
 end

data/db/migrate/20121228145215_add_thank_you_content_to_spud_inquiry_form.rb

@@ -0,0 +1,5 @@
+class AddThankYouContentToSpudInquiryForm < ActiveRecord::Migration
+  def change
+    add_column :spud_inquiry_forms, :thank_you_content, :text
+  end
+end

data/db/migrate/20130627121030_add_placeholder_to_spud_inquiry_form_fields.rb

@@ -0,0 +1,5 @@
+class AddPlaceholderToSpudInquiryFormFields < ActiveRecord::Migration
+  def change
+    add_column :spud_inquiry_form_fields, :placeholder, :string
+  end
+end

data/lib/spud_inquiries/configuration.rb

@@ -2,9 +2,10 @@ module Spud
   module Inquiries
     include ActiveSupport::Configurable
 
-    config_accessor :default_contact_form,:enable_routes,:mail_delivery_format,:base_layout,:from_address,:enable_sitemap,:enable_action_caching
+    config_accessor :default_contact_form,:enable_routes,:mail_delivery_format,:base_layout,:from_address,:enable_sitemap,:enable_action_caching, :automount
 
     self.enable_routes = true
+    self.automount = true
     self.default_contact_form = "contact"
     self.base_layout = "application"
     self.mail_delivery_format = :html

data/lib/spud_inquiries/engine.rb

@@ -15,6 +15,10 @@ module Spud
 			end
 
 			initializer :liquid_form do
+				Spud::Inquiries::FormActionView.class_eval do
+					include Spud::Inquiries::Engine.routes.url_helpers
+	        include Spud::Inquiries::Engine.routes.mounted_helpers
+				end
 		    Liquid::Template.register_tag('inquiry', Spud::Inquiries::InquiryForm) if defined?(Liquid::Template)
 			end
 		 end

data/lib/spud_inquiries/liquid_form.rb

@@ -3,6 +3,7 @@ module Spud
   module Inquiries
     class FormActionView < ActionView::Base
        include ActionView::Helpers
+
        def protect_against_forgery?
         return false
        end
@@ -29,7 +30,7 @@ module Spud
         if !@inquiry_form.blank?
           @inquiry = SpudInquiry.new(:spud_inquiry_form_id => @inquiry_form.id)
           @view.render(
-            :partial => "/contacts/show",
+            :partial => "/contacts/show_liquid",
             :locals => {:inquiry => @inquiry, :inquiry_form => @inquiry_form}
           )
         else

data/lib/spud_inquiries/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Inquiries
-	  VERSION = "0.9.1"
+	  VERSION = "0.9.2"
 	end
 end