spud_inquiries 0.3.3 → 0.3.4

data/app/controllers/contacts_controller.rb

@@ -1,15 +1,24 @@
 class ContactsController < ApplicationController
+	caches_action :show,:if => Proc.new { |c| Spud::Inquiries.enable_action_caching }
+	caches_action :thankyou,:if => Proc.new { |c| Spud::Inquiries.enable_action_caching }
 	def show
 		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
 		end
+		@inquiry = SpudInquiry.new(:spud_inquiry_form_id => @inquiry_form.id)
 		render :layout => Spud::Inquiries.base_layout
 	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			
+		end
 		unless params[:spud_inquiry]
 			flash[:error] = "Inquiry Not Found!"
 			redirect_to request.referer and return
@@ -24,10 +33,22 @@ class ContactsController < ApplicationController
 		@inquiry.recipients = @inquiry_form.recipients
 		@inquiry.subject = @inquiry_form.subject
 		
-		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)
+		@inquiry_form.spud_inquiry_form_fields.order(:field_order).all.each do |field|
+			val = params[:spud_inquiry][field.name]
+			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
 		end
 		if @inquiry.save
 			flash[:notice] = "Your inquiry was received!"

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

@@ -32,11 +32,17 @@ class Spud::Admin::InquiryFormsController < Spud::Admin::ApplicationController
 	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
+		end
 		respond_with @inquiry_form, :location => spud_admin_inquiry_forms_url
 	end
 
 	def destroy
 		flash[:notice] = "Inquiry form removed!" if @inquiry_form.destroy
+		if Spud::Inquiries.enable_action_caching
+			Rails.cache.clear
+		end
 		respond_with @inquiry_form,:location => spud_admin_inquiry_forms_url
 	end
 private

data/app/models/spud_inquiry.rb

@@ -1,6 +1,7 @@
 class SpudInquiry < ActiveRecord::Base
+
 	has_many :spud_inquiry_fields
 	belongs_to :spud_inquiry_form
     accepts_nested_attributes_for :spud_inquiry_fields, :reject_if => lambda { |a| a[:name].blank? }
-
+    validates :email,:presence => true
 end

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

@@ -2,12 +2,13 @@
 <%=@inquiry_form.content.html_safe if !@inquiry_form.content.blank?%>
 
 <%=form_for :spud_inquiry, :url => "/contact/inquire" do |f|%>
+<%=error_messages_for(@inquiry)%>
 <fieldset>
 <%=f.hidden_field :spud_inquiry_form_id,:value => @inquiry_form.id%>
 <ol>
 	<li>
 		<%=f.label :email%>
-		<%=f.text_field :email%>
+		<%=f.text_field :email,:value => @inquiry.email%>
 	</li>
 	<%@inquiry_form.spud_inquiry_form_fields.each do |field|%>
 		<li>
@@ -15,16 +16,20 @@
 			
 			<%=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]
 				when '1'
-					f.check_box field.name
+					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
+					f.text_area field.name,:value => params[:spud_inquiry].blank? || params[:spud_inquiry][field.name].blank? ? field.default_value : params[:spud_inquiry][field.name]
 				when '3'
 					f.select field.name,field.options.split(",").collect {|opt| [opt,opt]},:include_blank => true
 			end%>
 		</li>
 	<%end%>
+	<li 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'>
+	</li>
 	<li style="text-align:center;">
 	<%=f.submit "Submit Inquiry"%>
 	</li>	

data/lib/spud_inquiries/configuration.rb

@@ -2,12 +2,13 @@ module Spud
   module Inquiries
     include ActiveSupport::Configurable
 
-    config_accessor :default_contact_form,:mail_delivery_format,:base_layout,:from_address,:enable_sitemap
+    config_accessor :default_contact_form,:mail_delivery_format,:base_layout,:from_address,:enable_sitemap,:enable_action_caching
 
     self.default_contact_form = "contact"
     self.base_layout = "application"
     self.mail_delivery_format = :html
     self.from_address = "no-reply@example.org"
     self.enable_sitemap = true
+    self.enable_action_caching = false
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_inquiries
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000 Z
+date: 2012-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spud_core
-  requirement: &70131548897920 !ruby/object:Gem::Requirement
+  requirement: &70192938617000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *70131548897920
+  version_requirements: *70192938617000
 description: 
 email: destes@redwindsw.com
 executables: []