spud_inquiries 0.9.1 → 0.9.2

data/spec/controllers/contacts_controller_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+describe ContactsController do
+  before(:each) do
+    Spud::Core.configure do |config|
+        config.site_name = "Test Site"
+        config.multisite_mode_enabled = false
+        config.multisite_config = []
+    end
+  end
+
+  describe :show do
+    it "should return a form by url name" do
+      form = FactoryGirl.create(:spud_inquiry_form)
+      get :show, :id => form.url_name
+      assigns(:inquiry_form).should == form
+      assigns(:inquiry).should_not be_blank
+    end
+
+    it "should redirect to root if inquiry not found" do
+      get :show, :id => 1234
+      response.should redirect_to "/"
+    end
+  end
+
+  describe :inquire do
+    before(:each) do
+      @form = FactoryGirl.create(:spud_inquiry_form)
+      @field = FactoryGirl.create(:spud_inquiry_form_field,:spud_inquiry_form => @form,:name => "email",:field_type => '0', :required => true)
+    end
+
+    it "should fail if spam field assigned" do
+      post :inquire,:spud_inquiry => {:spud_inquiry_form_id => @form.id}, :other_email => "test@spamcastle.com"
+      flash[:error].should =~ /You must be a robot/i
+    end
+
+    it "should fail if inquiry not submitted" do
+      post :inquire
+      response.should redirect_to "/"
+    end
+
+    it "should fail if the inquiry form is invalid" do
+      post :inquire,:spud_inquiry => {:spud_inquiry_form_id => @form.id + 2}
+      response.should redirect_to "/"
+    end
+
+    it "should fail if required field is blank" do
+      post :inquire,:spud_inquiry => {:spud_inquiry_form_id => @form.id}
+      response.should be_success
+      response.should_not redirect_to contact_thankyou_url
+    end
+
+    # it "should succed if fields are valid" do
+      # post :inquire,:spud_inquiry => {:spud_inquiry_form_id => @form.id, "email" => "test@test.com"}
+      # assigns(:inquiry).should be_valid
+      # response.should be_success
+      # response.should redirect_to contact_thankyou_url
+
+    # end
+
+  end
+
+  describe :thankyou do
+    it "should render successfully" do
+      get :thankyou
+      response.should be_success
+    end
+  end
+end

data/spec/controllers/spud/admin/inquiries_controller_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe Spud::Admin::InquiriesController do
+  before(:each) do
+    activate_authlogic
+    u = SpudUser.new(:login => "testuser",:email => "test@testuser.com",:password => "test",:password_confirmation => "test")
+    u.super_admin = true
+    u.save
+    @user = SpudUserSession.create(u)
+    Spud::Core.configure do |config|
+        config.site_name = "Test Site"
+        config.multisite_mode_enabled = false
+        config.multisite_config = []
+    end
+  end
+
+  describe :index do
+    it "should return an array of menus" do
+      2.times {|x|  s = FactoryGirl.create(:spud_inquiry)}
+      get :index
+      assigns(:inquiries).count.should be > 1
+    end
+  end
+
+  describe :show do
+    it "should return a preview of an inquiry" do
+      s = FactoryGirl.create(:spud_inquiry)
+      get :show, :id => s.id
+      assigns(:inquiry).should == s
+    end
+
+    it "should redirect to index if inquiry not found" do
+      get :show, :id => 1234
+      response.should redirect_to spud_admin_inquiries_url
+    end
+  end
+
+  describe :destroy do
+    it "should destroy the menu" do
+      inquiry = FactoryGirl.create(:spud_inquiry)
+      lambda {
+        delete :destroy, :id => inquiry.id
+      }.should change(SpudInquiry,:count).by(-1)
+      response.should be_redirect
+    end
+
+    it "should not destroy the menu with a wrong id" do
+      inquiry = FactoryGirl.create(:spud_inquiry)
+      lambda {
+        delete :destroy,:id => "23532"
+      }.should_not change(SpudInquiry,:count)
+      response.should be_redirect
+    end
+  end
+end

data/spec/controllers/spud/admin/inquiry_forms_controller_spec.rb

@@ -0,0 +1,97 @@
+require 'spec_helper'
+
+describe Spud::Admin::InquiryFormsController do
+  before(:each) do
+    activate_authlogic
+    u = SpudUser.new(:login => "testuser",:email => "test@testuser.com",:password => "test",:password_confirmation => "test")
+    u.super_admin = true
+    u.save
+    @user = SpudUserSession.create(u)
+    Spud::Core.configure do |config|
+        config.site_name = "Test Site"
+        config.multisite_mode_enabled = false
+        config.multisite_config = []
+    end
+  end
+
+  describe :index do
+    it "should return an array of menus" do
+      2.times {|x|  s = FactoryGirl.create(:spud_inquiry_form)}
+      get :index
+      assigns(:inquiry_forms).count.should be > 1
+    end
+  end
+
+  describe :new do
+    it "should respond with a new form" do
+      get :new
+      assigns(:inquiry_form).should_not be_blank
+      response.should be_success
+    end
+  end
+
+  describe :create do
+    it "should create a new form with a valid form submission" do
+      lambda {
+        post :create, :spud_inquiry_form => FactoryGirl.attributes_for(:spud_inquiry_form).reject{|k,v| k == 'site_id' || k == 'id'}
+      }.should change(SpudInquiryForm,:count).by(1)
+      response.should be_redirect
+    end
+
+    it "should not create a form with an invalid form entry" do
+      lambda {
+        post :create, :spud_inquiry_form => FactoryGirl.attributes_for(:spud_inquiry_form,:name => nil).reject{|k,v| k == 'site_id' || k == 'id'}
+      }.should_not change(SpudInquiryForm,:count)
+    end
+  end
+
+  describe :edit do
+    it "should respond with form by id" do
+      form1 = FactoryGirl.create(:spud_inquiry_form)
+      form2 = FactoryGirl.create(:spud_inquiry_form)
+      get :edit,:id => form2.id
+      assigns(:inquiry_form).should == form2
+    end
+
+    it "should redirect to index if form not found" do
+      get :edit,:id => 1234
+      response.should redirect_to spud_admin_inquiry_forms_url
+    end
+  end
+
+  describe :update do
+    it "should update the name when the name attribute is changed" do
+      form = FactoryGirl.create(:spud_inquiry_form)
+      new_name = 'MyForm'
+      lambda {
+        put :update,:id => form.id, :spud_inquiry_form => form.attributes.merge!(:name => new_name).reject{|k,v| k == 'site_id' || k == 'id'}
+        form.reload
+      }.should change(form,:name).to(new_name)
+
+    end
+
+    it "should redirect to the admin forms after a successful update" do
+      form = FactoryGirl.create(:spud_inquiry_form)
+      put :update,:id => form.id,:spud_menu => form.attributes.merge!(:name => "MyMenu").reject{|k,v| k == 'site_id' || k == 'id'}
+      response.should redirect_to(spud_admin_inquiry_forms_url)
+    end
+  end
+
+  describe :destroy do
+    it "should destroy the form" do
+      form = FactoryGirl.create(:spud_inquiry_form)
+      lambda {
+        delete :destroy, :id => form.id
+      }.should change(SpudInquiryForm,:count).by(-1)
+      response.should be_redirect
+    end
+
+    it "should not destroy the form with a wrong id" do
+      menu = FactoryGirl.create(:spud_inquiry_form)
+      lambda {
+        delete :destroy,:id => "23532"
+      }.should_not change(SpudInquiryForm,:count)
+      response.should be_redirect
+    end
+  end
+end

data/spec/controllers/spud/inquiries/sitemaps_controller_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Spud::Inquiries::SitemapsController do
+  describe :show do
+    before(:each) do
+      Spud::Core.configure do |config|
+        config.site_name = "Test Site"
+        config.multisite_mode_enabled = false
+        config.multisite_config = []
+      end
+    end
+
+    it "should return the sitemap urls" do
+      get :show, :format => :xml
+      assigns(:forms).should == SpudInquiryForm.all
+    end
+
+    it "should only respond to an XML format" do
+      get :show
+      response.response_code.should == 406
+    end
+  end
+end

data/spec/dummy/config/database.yml

@@ -1,37 +1,9 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
 development:
   adapter: mysql2
-  encoding: utf8
-  reconnect: true
   database: spud_inquiries_development
-  pool: 5
   username: root
-  password:
-  socket: /tmp/mysql.sock
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
   adapter: mysql2
-  encoding: utf8
-  reconnect: true
   database: spud_inquiries_test
-  pool: 5
   username: root
-  password:
-  socket: /tmp/mysql.sock
-
-production:
-  adapter: mysql2
-  encoding: utf8
-  reconnect: true
-  database: spud_inquiries_production
-  pool: 5
-  username: root
-  password:
-  socket: /tmp/mysql.sock

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120610131541) do
+ActiveRecord::Schema.define(:version => 20130627121030) do
 
   create_table "spud_admin_permissions", :force => true do |t|
     t.integer  "user_id"
@@ -32,8 +32,8 @@ ActiveRecord::Schema.define(:version => 20120610131541) do
     t.boolean  "marked_as_read",       :default => false
   end
 
-  add_index "spud_inquiries", ["marked_as_read"], :name => "index_spud_inquiries_on_marked_as_read"
-  add_index "spud_inquiries", ["spud_inquiry_form_id"], :name => "index_spud_inquiries_on_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"
 
   create_table "spud_inquiry_fields", :force => true do |t|
     t.string   "name"
@@ -43,7 +43,7 @@ ActiveRecord::Schema.define(:version => 20120610131541) do
     t.datetime "updated_at",      :null => false
   end
 
-  add_index "spud_inquiry_fields", ["spud_inquiry_id"], :name => "index_spud_inquiry_fields_on_spud_inquiry_id"
+  add_index "spud_inquiry_fields", ["spud_inquiry_id"], :name => "inquiry_field_parent_id"
 
   create_table "spud_inquiry_form_fields", :force => true do |t|
     t.integer  "spud_inquiry_form_id"
@@ -55,21 +55,23 @@ ActiveRecord::Schema.define(:version => 20120610131541) do
     t.datetime "updated_at",           :null => false
     t.integer  "field_order"
     t.boolean  "required"
+    t.string   "placeholder"
   end
 
-  add_index "spud_inquiry_form_fields", ["field_order"], :name => "index_spud_inquiry_form_fields_on_field_order"
+  add_index "spud_inquiry_form_fields", ["field_order"], :name => "form_field_order"
 
   create_table "spud_inquiry_forms", :force => true do |t|
     t.string   "name"
     t.text     "content"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
     t.text     "recipients"
     t.string   "subject"
     t.string   "url_name"
+    t.text     "thank_you_content"
   end
 
-  add_index "spud_inquiry_forms", ["url_name"], :name => "index_spud_inquiry_forms_on_url_name"
+  add_index "spud_inquiry_forms", ["url_name"], :name => "idx_form_url_name"
 
   create_table "spud_user_settings", :force => true do |t|
     t.integer  "spud_user_id"

data/spec/dummy/log/development.log

@@ -1,88 +1,103 @@
-   (337.0ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
-   (275.8ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
-   (0.3ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+   (15.1ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
+   (7.4ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
+   (1.5ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
 Migrating to CreateSpudInquiries (20120117133405)
-   (80.2ms)  CREATE TABLE `spud_inquiries` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `email` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
-   (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120117133405')
+   (17.2ms)  CREATE TABLE `spud_inquiries` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `email` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120117133405')
 Migrating to CreateSpudInquiryFields (20120117133412)
-   (185.5ms)  CREATE TABLE `spud_inquiry_fields` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `value` text, `spud_inquiry_id` int(11), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
-   (296.6ms)  CREATE INDEX `index_spud_inquiry_fields_on_spud_inquiry_id` ON `spud_inquiry_fields` (`spud_inquiry_id`)
-   (22.3ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120117133412')
+   (6.3ms)  CREATE TABLE `spud_inquiry_fields` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `value` text, `spud_inquiry_id` int(11), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (7.5ms)  CREATE INDEX `inquiry_field_parent_id` ON `spud_inquiry_fields` (`spud_inquiry_id`)
+   (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120117133412')
 Migrating to CreateSpudInquiryForms (20120121194439)
-   (66.2ms)  CREATE TABLE `spud_inquiry_forms` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `content` text, `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
-   (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120121194439')
+   (10.7ms)  CREATE TABLE `spud_inquiry_forms` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `content` text, `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120121194439')
 Migrating to CreateSpudInquiryFormFields (20120121194447)
-   (174.4ms)  CREATE TABLE `spud_inquiry_form_fields` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_inquiry_form_id` int(11), `field_type` varchar(255), `name` varchar(255), `options` varchar(255), `default_value` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
-   (0.8ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120121194447')
+   (6.3ms)  CREATE TABLE `spud_inquiry_form_fields` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_inquiry_form_id` int(11), `field_type` varchar(255), `name` varchar(255), `options` varchar(255), `default_value` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120121194447')
 Migrating to AddFieldOrderToSpudInquiryFormFields (20120122173829)
-   (166.0ms)  ALTER TABLE `spud_inquiry_form_fields` ADD `field_order` int(11)
-   (166.9ms)  ALTER TABLE `spud_inquiry_form_fields` ADD `required` tinyint(1)
-   (168.7ms)  CREATE INDEX `index_spud_inquiry_form_fields_on_field_order` ON `spud_inquiry_form_fields` (`field_order`)
-   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120122173829')
+   (6.9ms)  ALTER TABLE `spud_inquiry_form_fields` ADD `field_order` int(11)
+   (8.7ms)  ALTER TABLE `spud_inquiry_form_fields` ADD `required` tinyint(1)
+   (19.6ms)  CREATE INDEX `form_field_order` ON `spud_inquiry_form_fields` (`field_order`)
+   (1.1ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120122173829')
 Migrating to AddSpudInquiryFormIdToSpudInquiries (20120126132407)
-   (174.5ms)  ALTER TABLE `spud_inquiries` ADD `spud_inquiry_form_id` int(11)
-   (176.7ms)  ALTER TABLE `spud_inquiries` ADD `recipients` text
-   (166.3ms)  ALTER TABLE `spud_inquiries` ADD `subject` varchar(255)
-   (118.8ms)  ALTER TABLE `spud_inquiries` ADD `marked_as_read` tinyint(1) DEFAULT 0
-   (178.6ms)  CREATE INDEX `index_spud_inquiries_on_marked_as_read` ON `spud_inquiries` (`marked_as_read`)
-   (157.2ms)  CREATE INDEX `index_spud_inquiries_on_spud_inquiry_form_id` ON `spud_inquiries` (`spud_inquiry_form_id`)
-   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120126132407')
+   (10.7ms)  ALTER TABLE `spud_inquiries` ADD `spud_inquiry_form_id` int(11)
+   (8.5ms)  ALTER TABLE `spud_inquiries` ADD `recipients` text
+   (7.0ms)  ALTER TABLE `spud_inquiries` ADD `subject` varchar(255)
+   (18.2ms)  ALTER TABLE `spud_inquiries` ADD `marked_as_read` tinyint(1) DEFAULT 0
+   (8.8ms)  CREATE INDEX `idx_inquiry_read` ON `spud_inquiries` (`marked_as_read`)
+   (10.4ms)  CREATE INDEX `idx_inquiry_form` ON `spud_inquiries` (`spud_inquiry_form_id`)
+   (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120126132407')
 Migrating to AddRecipientsToSpudInquiryForms (20120126132522)
-   (163.0ms)  ALTER TABLE `spud_inquiry_forms` ADD `recipients` text
-   (166.1ms)  ALTER TABLE `spud_inquiry_forms` ADD `subject` varchar(255)
-   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120126132522')
+   (17.3ms)  ALTER TABLE `spud_inquiry_forms` ADD `recipients` text
+   (15.7ms)  ALTER TABLE `spud_inquiry_forms` ADD `subject` varchar(255)
+   (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120126132522')
 Migrating to AddUrlNameToSpudInquiryForms (20120127023335)
-   (153.6ms)  ALTER TABLE `spud_inquiry_forms` ADD `url_name` varchar(255)
-   (157.2ms)  CREATE INDEX `index_spud_inquiry_forms_on_url_name` ON `spud_inquiry_forms` (`url_name`)
-   (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120127023335')
+   (23.9ms)  ALTER TABLE `spud_inquiry_forms` ADD `url_name` varchar(255)
+   (8.2ms)  CREATE INDEX `idx_form_url_name` ON `spud_inquiry_forms` (`url_name`)
+   (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120127023335')
 Migrating to ChangeInquiryFormFieldsColumn (20120413124900)
-   (149.4ms)  ALTER TABLE `spud_inquiry_form_fields` CHANGE `options` `options` text DEFAULT NULL
-   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120413124900')
+   (15.6ms)  ALTER TABLE `spud_inquiry_form_fields` CHANGE `options` `options` text DEFAULT NULL
+   (0.3ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120413124900')
 Migrating to CreateSpudAdminPermissions (20120610131537)
-   (182.7ms)  CREATE TABLE `spud_admin_permissions` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `user_id` int(11), `name` varchar(255), `access` tinyint(1), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (7.3ms)  CREATE TABLE `spud_admin_permissions` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `user_id` int(11), `name` varchar(255), `access` tinyint(1), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
    (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120610131537')
 Migrating to CreateSpudUsers (20120610131538)
-   (153.7ms)  CREATE TABLE `spud_users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `first_name` varchar(255), `last_name` varchar(255), `super_admin` tinyint(1), `login` varchar(255) NOT NULL, `email` varchar(255) NOT NULL, `crypted_password` varchar(255) NOT NULL, `password_salt` varchar(255) NOT NULL, `persistence_token` varchar(255) NOT NULL, `single_access_token` varchar(255) NOT NULL, `perishable_token` varchar(255) NOT NULL, `login_count` int(11) DEFAULT 0 NOT NULL, `failed_login_count` int(11) DEFAULT 0 NOT NULL, `last_request_at` datetime, `current_login_at` datetime, `last_login_at` datetime, `current_login_ip` varchar(255), `last_login_ip` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
-   (171.1ms)  CREATE INDEX `index_spud_users_on_login` ON `spud_users` (`login`)
-   (166.4ms)  CREATE INDEX `index_spud_users_on_email` ON `spud_users` (`email`)
-   (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120610131538')
+   (5.5ms)  CREATE TABLE `spud_users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `first_name` varchar(255), `last_name` varchar(255), `super_admin` tinyint(1), `login` varchar(255) NOT NULL, `email` varchar(255) NOT NULL, `crypted_password` varchar(255) NOT NULL, `password_salt` varchar(255) NOT NULL, `persistence_token` varchar(255) NOT NULL, `single_access_token` varchar(255) NOT NULL, `perishable_token` varchar(255) NOT NULL, `login_count` int(11) DEFAULT 0 NOT NULL, `failed_login_count` int(11) DEFAULT 0 NOT NULL, `last_request_at` datetime, `current_login_at` datetime, `last_login_at` datetime, `current_login_ip` varchar(255), `last_login_ip` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (13.8ms)  CREATE INDEX `index_spud_users_on_login` ON `spud_users` (`login`)
+   (18.0ms)  CREATE INDEX `index_spud_users_on_email` ON `spud_users` (`email`)
+   (0.3ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120610131538')
 Migrating to AddTimeZoneToSpudUser (20120610131539)
-   (162.8ms)  ALTER TABLE `spud_users` ADD `time_zone` varchar(255)
-   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120610131539')
+   (20.1ms)  ALTER TABLE `spud_users` ADD `time_zone` varchar(255)
+   (0.3ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120610131539')
 Migrating to AddScopeToSpudAdminPermissions (20120610131540)
-   (165.1ms)  ALTER TABLE `spud_admin_permissions` ADD `scope` varchar(255)
-   (0.8ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120610131540')
+   (17.3ms)  ALTER TABLE `spud_admin_permissions` ADD `scope` varchar(255)
+   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120610131540')
 Migrating to CreateSpudUserSettings (20120610131541)
-   (149.9ms)  CREATE TABLE `spud_user_settings` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_user_id` int(11), `key` varchar(255), `value` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
-   (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120610131541')
-   (0.1ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
-   (0.4ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
-   (0.5ms)  DROP DATABASE IF EXISTS `spud_inquiries_test`
-   (0.3ms)  CREATE DATABASE `spud_inquiries_test` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
-   (70.3ms)  CREATE TABLE `spud_admin_permissions` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `user_id` int(11), `name` varchar(255), `access` tinyint(1), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `scope` varchar(255)) ENGINE=InnoDB
-   (162.7ms)  CREATE TABLE `spud_inquiries` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `email` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `spud_inquiry_form_id` int(11), `recipients` text, `subject` varchar(255), `marked_as_read` tinyint(1) DEFAULT 0) ENGINE=InnoDB
-   (181.8ms)  CREATE INDEX `index_spud_inquiries_on_marked_as_read` ON `spud_inquiries` (`marked_as_read`)
-   (166.4ms)  CREATE INDEX `index_spud_inquiries_on_spud_inquiry_form_id` ON `spud_inquiries` (`spud_inquiry_form_id`)
-   (172.1ms)  CREATE TABLE `spud_inquiry_fields` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `value` text, `spud_inquiry_id` int(11), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
-   (181.0ms)  CREATE INDEX `index_spud_inquiry_fields_on_spud_inquiry_id` ON `spud_inquiry_fields` (`spud_inquiry_id`)
-   (161.7ms)  CREATE TABLE `spud_inquiry_form_fields` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_inquiry_form_id` int(11), `field_type` varchar(255), `name` varchar(255), `options` text, `default_value` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `field_order` int(11), `required` tinyint(1)) ENGINE=InnoDB
-   (169.9ms)  CREATE INDEX `index_spud_inquiry_form_fields_on_field_order` ON `spud_inquiry_form_fields` (`field_order`)
-   (150.3ms)  CREATE TABLE `spud_inquiry_forms` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `content` text, `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `recipients` text, `subject` varchar(255), `url_name` varchar(255)) ENGINE=InnoDB
-   (170.4ms)  CREATE INDEX `index_spud_inquiry_forms_on_url_name` ON `spud_inquiry_forms` (`url_name`)
-   (149.4ms)  CREATE TABLE `spud_user_settings` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_user_id` int(11), `key` varchar(255), `value` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
-   (164.5ms)  CREATE TABLE `spud_users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `first_name` varchar(255), `last_name` varchar(255), `super_admin` tinyint(1), `login` varchar(255) NOT NULL, `email` varchar(255) NOT NULL, `crypted_password` varchar(255) NOT NULL, `password_salt` varchar(255) NOT NULL, `persistence_token` varchar(255) NOT NULL, `single_access_token` varchar(255) NOT NULL, `perishable_token` varchar(255) NOT NULL, `login_count` int(11) DEFAULT 0 NOT NULL, `failed_login_count` int(11) DEFAULT 0 NOT NULL, `last_request_at` datetime, `current_login_at` datetime, `last_login_at` datetime, `current_login_ip` varchar(255), `last_login_ip` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `time_zone` varchar(255)) ENGINE=InnoDB
-   (159.1ms)  CREATE INDEX `index_spud_users_on_email` ON `spud_users` (`email`)
-   (155.5ms)  CREATE INDEX `index_spud_users_on_login` ON `spud_users` (`login`)
-   (161.0ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
-   (172.6ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
+   (17.5ms)  CREATE TABLE `spud_user_settings` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_user_id` int(11), `key` varchar(255), `value` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120610131541')
+Migrating to AddThankYouContentToSpudInquiryForm (20121228145215)
+   (7.4ms)  ALTER TABLE `spud_inquiry_forms` ADD `thank_you_content` text
+   (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20121228145215')
+Migrating to AddPlaceholderToSpudInquiryFormFields (20130627121030)
+   (21.0ms)  ALTER TABLE `spud_inquiry_form_fields` ADD `placeholder` varchar(255)
+   (0.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20130627121030')
+   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+Connecting to database specified by database.yml
+   (1.5ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+   (5.3ms)  DROP DATABASE IF EXISTS `spud_inquiries_test`
+   (0.6ms)  CREATE DATABASE `spud_inquiries_test` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
+   (40.1ms)  CREATE TABLE `spud_admin_permissions` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `user_id` int(11), `name` varchar(255), `access` tinyint(1), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `scope` varchar(255)) ENGINE=InnoDB
+   (5.5ms)  CREATE TABLE `spud_inquiries` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `email` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `spud_inquiry_form_id` int(11), `recipients` text, `subject` varchar(255), `marked_as_read` tinyint(1) DEFAULT 0) ENGINE=InnoDB
+   (7.8ms)  CREATE INDEX `idx_inquiry_read` ON `spud_inquiries` (`marked_as_read`)
+   (10.5ms)  CREATE INDEX `idx_inquiry_form` ON `spud_inquiries` (`spud_inquiry_form_id`)
+   (8.6ms)  CREATE TABLE `spud_inquiry_fields` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `value` text, `spud_inquiry_id` int(11), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (6.7ms)  CREATE INDEX `inquiry_field_parent_id` ON `spud_inquiry_fields` (`spud_inquiry_id`)
+   (21.2ms)  CREATE TABLE `spud_inquiry_form_fields` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_inquiry_form_id` int(11), `field_type` varchar(255), `name` varchar(255), `options` text, `default_value` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `field_order` int(11), `required` tinyint(1), `placeholder` varchar(255)) ENGINE=InnoDB
+   (10.8ms)  CREATE INDEX `form_field_order` ON `spud_inquiry_form_fields` (`field_order`)
+   (17.0ms)  CREATE TABLE `spud_inquiry_forms` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `content` text, `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `recipients` text, `subject` varchar(255), `url_name` varchar(255), `thank_you_content` text) ENGINE=InnoDB
+   (7.0ms)  CREATE INDEX `idx_form_url_name` ON `spud_inquiry_forms` (`url_name`)
+   (20.8ms)  CREATE TABLE `spud_user_settings` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_user_id` int(11), `key` varchar(255), `value` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (6.0ms)  CREATE TABLE `spud_users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `first_name` varchar(255), `last_name` varchar(255), `super_admin` tinyint(1), `login` varchar(255) NOT NULL, `email` varchar(255) NOT NULL, `crypted_password` varchar(255) NOT NULL, `password_salt` varchar(255) NOT NULL, `persistence_token` varchar(255) NOT NULL, `single_access_token` varchar(255) NOT NULL, `perishable_token` varchar(255) NOT NULL, `login_count` int(11) DEFAULT 0 NOT NULL, `failed_login_count` int(11) DEFAULT 0 NOT NULL, `last_request_at` datetime, `current_login_at` datetime, `last_login_at` datetime, `current_login_ip` varchar(255), `last_login_ip` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `time_zone` varchar(255)) ENGINE=InnoDB
+   (15.1ms)  CREATE INDEX `index_spud_users_on_email` ON `spud_users` (`email`)
+   (20.2ms)  CREATE INDEX `index_spud_users_on_login` ON `spud_users` (`login`)
+   (16.0ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
+   (10.8ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
    (0.1ms)  SELECT version FROM `schema_migrations`
-   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120610131541')
-   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120117133405')
-   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120117133412')
-   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120121194439')
-   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120121194447')
-   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120122173829')
-   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120126132407')
-   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120126132522')
-   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120127023335')
-   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120413124900')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20130627121030')
+   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120610131537')
+   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120610131538')
+   (0.1ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120610131539')
+   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120610131540')
+   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120610131541')
+   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120117133405')
+   (0.1ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120117133412')
+   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120121194439')
+   (0.5ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120121194447')
+   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120122173829')
+   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120126132407')
+   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120126132522')
+   (1.0ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120127023335')
+   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120413124900')
+   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20121228145215')