spud_inquiries 0.8.3 → 0.9.0

data/README.markdown

@@ -40,3 +40,22 @@ 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).
 
+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
+
+2. Load the schema in to the test database:
+
+        rake app:db:test:prepare
+
+3. Run the tests with RSpec
+
+        rspec spec
+
+After the tests have completed the current code coverage stats is available by opening ```/coverage/index.html``` in a browser.

data/Rakefile

@@ -20,21 +20,9 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task :default => :test
+require 'rake'

data/app/controllers/contacts_controller.rb

@@ -1,6 +1,7 @@
 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 }
+	skip_before_filter :verify_authenticity_token
 	layout Spud::Inquiries.base_layout
 	def show
 		url_name = !params[:id].blank? ? params[:id] : Spud::Inquiries.default_contact_form
@@ -12,13 +13,13 @@ class ContactsController < ApplicationController
 			redirect_to root_url 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!"
@@ -27,13 +28,13 @@ class ContactsController < ApplicationController
 		@inquiry_form = SpudInquiryForm.find(params[:spud_inquiry][:spud_inquiry_form_id])
 		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(:email => params[:spud_inquiry][:email],:spud_inquiry_form_id => params[:spud_inquiry][:spud_inquiry_form_id])
-		
+		@inquiry = SpudInquiry.new(:spud_inquiry_form_id => params[:spud_inquiry][:spud_inquiry_form_id])
+
 		@inquiry.recipients = @inquiry_form.recipients
 		@inquiry.subject = @inquiry_form.subject
-		
+
 		@inquiry_form.spud_inquiry_form_fields.order(:field_order).all.each do |field|
 			val = params[:spud_inquiry][field.name]
 			if field.required && val.blank?
@@ -58,11 +59,14 @@ class ContactsController < ApplicationController
 			end
 		else
 			flash[:error] = "Whoops! Something went wrong. Please try again!"
+			render :action => "show" and return
 		end
 		redirect_to contact_thankyou_url
 	end
 
+
+
 	def thankyou
 		render
-	end	
+	end
 end

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

@@ -2,14 +2,14 @@ class Spud::Admin::InquiriesController < Spud::Admin::ApplicationController
 	layout 'spud/admin/detail'
 	belongs_to_spud_app :inquiries
 	add_breadcrumb "Inquiries", :spud_admin_inquiries_path
-	before_filter :load_inquiries,:only => [:edit,:update,:show,:destroy]	
+	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}", :spud_admin_inquiry_path
+		add_breadcrumb "#{@inquiry.email || "Unknown"}", :spud_admin_inquiry_path
 		respond_with @inquiry
 	end
 

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

@@ -1,11 +1,12 @@
 class Spud::Admin::InquiryFormsController < Spud::Admin::ApplicationController
 	layout 'spud/admin/detail'
 	belongs_to_spud_app :inquiries
+	cache_sweeper :inquiry_sweeper, :only => [:update,:destroy,:create]
 	add_breadcrumb "Inquiries", :spud_admin_inquiries_path
 	add_breadcrumb "Forms", :spud_admin_inquiry_forms_path
-	before_filter :load_form,:only => [:edit,:update,:show,:destroy]	
+	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
@@ -20,7 +21,7 @@ class Spud::Admin::InquiryFormsController < Spud::Admin::ApplicationController
 	def create
 		@inquiry_form = SpudInquiryForm.new(params[:spud_inquiry_form])
 		flash[:notice] = "Form saved successfully!" if @inquiry_form.save
-		
+
 		respond_with @inquiry_form,:location => spud_admin_inquiry_forms_url
 	end
 

data/app/models/spud_inquiry.rb

@@ -2,8 +2,14 @@ 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
+  accepts_nested_attributes_for :spud_inquiry_fields, :reject_if => lambda { |a| a[:name].blank? }
+  attr_accessible :spud_inquiry_form_id,:spud_inquiry_fields
 
-    attr_accessible :spud_inquiry_form_id,:email,:spud_inquiry_fields
+  def email
+    email_field = self.spud_inquiry_fields.where(:name => "email").first
+    if !email_field.blank?
+      return email_field.value
+    end
+    return "Unknown Sender"
+  end
 end

data/app/observers/inquiry_observer.rb

@@ -0,0 +1,43 @@
+class InquiryObserver < ActiveRecord::Observer
+  observe :spud_inquiry_form,:spud_inquiry_form_field
+
+  def before_save(record)
+    if record.is_a?(SpudInquiryForm)
+      @old_name = record.name_was
+    else
+      @old_name = nil
+    end
+  end
+
+  def after_save(record)
+    if record.is_a?(SpudInquiryFormField)
+      reset_cms_pages(record.spud_inquiry_form)
+    else
+      reset_cms_pages(record)
+    end
+  end
+  def after_destroy(record)
+    if record.is_a?(SpudInquiryFormField)
+      reset_cms_pages(record.spud_inquiry_form)
+    else
+      reset_cms_pages(record)
+    end
+  end
+private
+  def reset_cms_pages(record)
+    if SpudPageLiquidTag
+      values = [record.name]
+      values << @old_name if !@old_name.blank?
+      SpudPageLiquidTag.where(:tag_name => "inquiry",:value => values).includes(:spud_page_partial).each do |tag|
+        partial = tag.spud_page_partial
+        partial.postprocess_content
+        partial.save
+        partial.spud_page.updated_at = Time.now.utc
+        partial.spud_page.save
+      end
+
+    end
+  end
+
+
+end

data/app/observers/inquiry_sweeper.rb

@@ -0,0 +1,44 @@
+class InquirySweeper < ActionController::Caching::Sweeper
+  observe :spud_inquiry_form,:spud_inquiry_form_field
+
+  def before_save(record)
+    if record.is_a?(SpudInquiryForm)
+      @old_name = record.name_was
+    else
+      @old_name = nil
+    end
+  end
+
+  def after_save(record)
+    if record.is_a?(SpudInquiryFormField)
+      reset_cms_pages(record.spud_inquiry_form)
+    else
+      reset_cms_pages(record)
+    end
+  end
+  def after_destroy(record)
+    if record.is_a?(SpudInquiryFormField)
+      reset_cms_pages(record.spud_inquiry_form)
+    else
+      reset_cms_pages(record)
+    end
+  end
+private
+  def reset_cms_pages(record)
+    if defined? Spud::Cms::Engine #Is CMS Being Used?
+      values = [record.name]
+      values << @old_name if !@old_name.blank?
+      SpudPageLiquidTag.where(:tag_name => "inquiry",:value => values).includes(:spud_page_partial).each do |tag|
+        partial = tag.spud_page_partial
+        partial.postprocess_content
+        partial.save
+        partial.spud_page.updated_at = Time.now.utc
+        partial.spud_page.save
+      end
+
+    end
+  end
+
+
+
+end

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

@@ -0,0 +1,34 @@
+
+<%=form_for :spud_inquiry, :url => "/contact/inquire",:html => {:class => "form-horizontal"} 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">
+      <%=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
+          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
+          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

@@ -6,12 +6,7 @@
 <fieldset>
 <%=f.hidden_field :spud_inquiry_form_id,:value => @inquiry_form.id%>
 
-	<div class="control-group">
-		<%=f.label :email,:class => "control-label"%>
-		<div class="controls">
-			<%=f.text_field :email,:value => @inquiry.email%>
-		</div>
-	</div>
+
 	<%@inquiry_form.spud_inquiry_form_fields.each do |field|%>
 		<div class="control-group">
 			<%=f.label field.name,:class => "control-label"%>
@@ -35,9 +30,9 @@
 	</div>
 	<div class="form-actions">
 		<%=f.submit "Submit Inquiry",:class => "btn btn-primary"%>
-	</div>	
+	</div>
 
 
 </fieldset>
-	
-<%end%>
+
+<%end%>

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

@@ -6,11 +6,11 @@
 	<div class="page_list">
 			<%@inquiries.each do |inquiry|%>
 				<div class="page_row">
-					
+
 				<span class="row_meta"><%=link_to "#{inquiry.spud_inquiry_form.blank? ? "No Form" : inquiry.spud_inquiry_form.name}: #{inquiry.email}",spud_admin_inquiry_path(inquiry)%></span>
 
 				<span class="edit_controls">
-				
+
 				<%=link_to "Remove",spud_admin_inquiry_path(inquiry),:method => :delete,:class => 'btn btn-danger',:confirm => "Are you sure you want to remove this inquiry?"%></span>
 				<br style="clear:both;"/>
 			</div>
@@ -19,4 +19,4 @@
 
 	</div>
 
-<%end%>
+<%end%>

data/app/views/spud/inquiry_mailer/inquiry_notification.html.erb

@@ -5,11 +5,11 @@
   </head>
 <body>
 <h2>Inquiry Received</h2>
-<p><strong>From:</strong> <%=link_to @inquiry.email,"mailto:#{@inquiry.email}"%></p>
+
 	<%@inquiry.spud_inquiry_fields.each do |field|%>
 		<p><strong><%=field.name%></strong>
 		<%=field.value%>
 		</p>
 	<%end%>
 </body>
-</html>
+</html>

data/app/views/spud/inquiry_mailer/inquiry_notification.text.erb

@@ -2,7 +2,6 @@
 Inquiry Received
 =================
 
-From: <%=@inquiry.email%>
 <%@inquiry.spud_inquiry_fields.each do |field|%>
 <%=field.name%>: <%=field.value%>
 <%end%>

data/config/routes.rb

@@ -8,11 +8,16 @@ Rails.application.routes.draw do
          resource :sitemap,:only => [:show]
       end
    end
-   match "/contact" => "contacts#show"
+
    post "contact/inquire" => "contacts#inquire"
    match "contact/thankyou" => "contacts#thankyou"
-   match "/contact/:id" => "contacts#show"
+   if Spud::Inquiries.enable_routes
+      match "/contact" => "contacts#show"
+      match "/contact/:id" => "contacts#show"
+   end
+
+
+
 
-   
 end
 

data/lib/spud_inquiries.rb

@@ -1,6 +1,7 @@
 module Spud
 	module Inquiries
 		require 'spud_inquiries/configuration'
+    require 'spud_inquiries/liquid_form'
 		require 'spud_inquiries/engine' if defined?(Rails)
 	end
 end

data/lib/spud_inquiries/configuration.rb

@@ -2,8 +2,9 @@ module Spud
   module Inquiries
     include ActiveSupport::Configurable
 
-    config_accessor :default_contact_form,: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
 
+    self.enable_routes = true
     self.default_contact_form = "contact"
     self.base_layout = "application"
     self.mail_delivery_format = :html
@@ -11,4 +12,4 @@ module Spud
     self.enable_sitemap = true
     self.enable_action_caching = false
   end
-end
+end

data/lib/spud_inquiries/engine.rb

@@ -1,8 +1,10 @@
 require 'spud_core'
+require 'liquid'
 module Spud
 	module Inquiries
 		 class Engine < Rails::Engine
-		    engine_name :spud_inquiries
+	    engine_name :spud_inquiries
+
 			initializer :admin do
 				Spud::Core.configure do |config|
 					config.admin_applications += [{:name => "Inquiries",:thumbnail => "spud/admin/contacts_thumb.png",:url => "/spud/admin/inquiries",:order => 88}]
@@ -10,7 +12,10 @@ module Spud
 						config.sitemap_urls += [:spud_inquiries_sitemap_url]
 					end
 				end
-				
+			end
+
+			initializer :liquid_form do
+		    Liquid::Template.register_tag('inquiry', Spud::Inquiries::InquiryForm) if defined?(Liquid::Template)
 			end
 		 end
 	end

data/lib/spud_inquiries/liquid_form.rb

@@ -0,0 +1,42 @@
+require 'liquid'
+module Spud
+  module Inquiries
+    class FormActionView < ActionView::Base
+       include ActionView::Helpers
+       def protect_against_forgery?
+        return false
+       end
+    end
+
+    class InquiryForm < Liquid::Tag
+      def initialize(tag_name, form_name, tokens)
+        @form_name = form_name
+
+        @inquiry_form = SpudInquiryForm.where(:name => form_name).includes(:spud_inquiry_form_fields).first
+        @view = FormActionView.new([Rails.application.config.paths["app/views"].first,Spud::Inquiries::Engine.config.paths["app/views"].first])
+
+      end
+
+      def tag_name
+        return "inquiry"
+      end
+      def tag_value
+        return @form_name
+      end
+
+      def render(context)
+
+        if !@inquiry_form.blank?
+          @inquiry = SpudInquiry.new(:spud_inquiry_form_id => @inquiry_form.id)
+          @view.render(
+            :partial => "/contacts/show",
+            :locals => {:inquiry => @inquiry, :inquiry_form => @inquiry_form}
+          )
+        else
+          return ''
+        end
+
+      end
+    end
+  end
+end