contact_us 0.1.5 → 0.2.0

data/spec/integration/contact_us_lint_spec.rb

@@ -2,32 +2,38 @@ require 'spec_helper'
 
 describe 'Contact Us page' do
 
-  before do
-    visit contact_us_path
-  end
-
-  it 'displays contact form' do
-    page.should have_selector "form#new_contact_us_contact"
-  end
-
-  it "displays an input for email" do
-    page.should have_selector "input#contact_us_contact_email"
+  after do
+    ActionMailer::Base.deliveries = []
+    ContactUs.mailer_from = nil
+    ContactUs.mailer_to = nil
+    ContactUs.require_name = false
+    ContactUs.require_subject = false
   end
 
-  it "displays a textarea for message" do
-    page.should have_selector "textarea#contact_us_contact_message"
+  before do
+    ActionMailer::Base.deliveries = []
+    ContactUs.mailer_to = 'test@test.com'
   end
 
-  it "displays a submit button" do
-    page.should have_selector "input#contact_us_contact_submit"
+  it 'displays default contact form properly' do
+    visit contact_us_path
+    within "form#new_contact_us_contact" do
+      page.should have_selector "input#contact_us_contact_email"
+      page.should have_selector "textarea#contact_us_contact_message"
+      page.should_not have_selector "input#contact_us_contact_name"
+      page.should_not have_selector "input#contact_us_contact_subject"
+      page.should have_selector "input#contact_us_contact_submit"
+    end
   end
 
   context "Submitting the form" do
-    after { ActionMailer::Base.deliveries = [] }
+
+    before do
+      visit contact_us_path
+    end
 
     context "when valid" do
       before do
-        ContactUs.mailer_to = 'test@test.com'
         fill_in 'Email', :with => 'test@example.com'
         fill_in 'Message', :with => 'howdy'
         click_button 'Submit'
@@ -58,8 +64,12 @@ describe 'Contact Us page' do
         end
 
         it "I should see two error messages" do
-          page.should have_content "is invalid"
-          page.should have_content "can't be blank"
+          within '#contact_us_contact_email_input' do
+            page.should have_content "is invalid"
+          end
+          within '#contact_us_contact_message_input' do
+            page.should have_content "can't be blank"
+          end
         end
 
         it "An email should not have been sent" do
@@ -68,4 +78,67 @@ describe 'Contact Us page' do
       end
     end
   end
+
+  context 'with name and subject configuration' do
+
+    before do
+      ContactUs.require_name = true
+      ContactUs.require_subject = true
+      visit contact_us_path
+    end
+
+    it "displays an input for name and subject" do
+      page.should have_selector "input#contact_us_contact_name"
+      page.should have_selector "input#contact_us_contact_subject"
+    end
+
+    context "Submitting the form" do
+      context "when valid" do
+        before do
+          fill_in 'Email', :with => 'test@example.com'
+          fill_in 'Message', :with => 'howdy'
+          fill_in 'contact_us_contact[name]', :with => 'Jeff'
+          fill_in 'contact_us_contact[subject]', :with => 'Testing contact form.'
+          click_button 'Submit'
+        end
+
+        it "I should be redirected to the homepage" do
+          current_path.should == "/"
+        end
+
+        it "An email should have been sent" do
+          ActionMailer::Base.deliveries.size.should == 1
+        end
+
+        it "The email should have the correct attributes" do
+          mail = ActionMailer::Base.deliveries.last
+          mail.body.should match 'howdy'
+          mail.body.should match 'Jeff'
+          mail.from.should == ['test@example.com']
+          mail.subject.should match 'Testing contact form.'
+          mail.to.should == ['test@test.com']
+        end
+      end
+
+      context "when name and subject are blank" do
+        before do
+          click_button 'Submit'
+        end
+
+        it "I should see error messages" do
+          within '#contact_us_contact_name_input' do
+            page.should have_content "can't be blank"
+          end
+          within '#contact_us_contact_subject_input' do
+            page.should have_content "can't be blank"
+          end
+        end
+
+        it "An email should not have been sent" do
+          ActionMailer::Base.deliveries.size.should == 0
+        end
+      end
+    end
+  end
+
 end

data/spec/lib/contact_us_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe ContactUs do
+
+  after do
+    ContactUs.mailer_from = nil
+    ContactUs.mailer_to = nil
+    ContactUs.require_name = false
+    ContactUs.require_subject = false
+  end
+
+  it "should be valid" do
+    ContactUs.should be_a(Module)
+  end
+
+  describe 'setup block' do
+    it 'should yield self' do
+      ContactUs.setup do |config|
+        ContactUs.should eql(config)
+      end
+    end
+  end
+
+  describe 'mailer_from' do
+    it 'should be configurable' do
+      ContactUs.mailer_from = "contact@please-change-me.com"
+      ContactUs.mailer_from.should eql("contact@please-change-me.com")
+    end
+  end
+
+  describe 'mailer_to' do
+    it 'should be configurable' do
+      ContactUs.mailer_to = "contact@please-change-me.com"
+      ContactUs.mailer_to.should eql("contact@please-change-me.com")
+    end
+  end
+
+  describe 'require_name' do
+    it 'should be configurable' do
+      ContactUs.require_name = true
+      ContactUs.require_name.should eql(true)
+    end
+  end
+
+  describe 'require_subject' do
+    it 'should be configurable' do
+      ContactUs.require_subject = true
+      ContactUs.require_subject.should eql(true)
+    end
+  end
+
+end

data/spec/mailers/contact_us/contact_mailer_spec.rb

@@ -4,7 +4,7 @@ describe ContactUs::ContactMailer do
 
   describe "#contact_email" do
 
-    before(:each) do
+    before do
       ContactUs.mailer_to = "contact@please-change-me.com"
       @contact = ContactUs::Contact.new(:email => 'test@email.com', :message => 'Thanks!')
     end
@@ -13,9 +13,16 @@ describe ContactUs::ContactMailer do
       lambda { ContactUs::ContactMailer.contact_email(@contact) }.should_not raise_error
     end
 
+    it "should use the ContactUs.mailer_from setting when it is set" do
+      ContactUs.mailer_from = "contact@please-change-me.com"
+      @mailer = ContactUs::ContactMailer.contact_email(@contact)
+      @mailer.from.should eql([ContactUs.mailer_from])
+      ContactUs.mailer_from = nil
+    end
+
     describe "rendered without error" do
 
-      before(:each) do
+      before do
         @mailer = ContactUs::ContactMailer.contact_email(@contact)
       end
 
@@ -23,7 +30,7 @@ describe ContactUs::ContactMailer do
         @mailer.to.should eql([ContactUs.mailer_to])
       end
 
-      it "should have users email in the from field" do
+      it "should use the users email in the from field when ContactUs.mailer_from is not set" do
         @mailer.from.should eql([@contact.email])
       end
 

data/spec/models/contact_us/contact_spec.rb

@@ -5,25 +5,26 @@ describe ContactUs::Contact do
 
   describe "Validations" do
 
-    it 'should validate email presence' do
-      contact = ContactUs::Contact.new(:email => "", :message => "Test")
-      contact.valid?.should eql(false)
-      contact = ContactUs::Contact.new(:email => "Valid@Email.com", :message => "Test")
-      contact.valid?.should eql(true)
-    end
+    it {should validate_presence_of(:email)}
+    it {should validate_presence_of(:message)}
+    it {should_not validate_presence_of(:name)}
+    it {should_not validate_presence_of(:subject)}
 
-    it 'should validate email format' do
-      contact = ContactUs::Contact.new(:email => "Invalid", :message => "Test")
-      contact.valid?.should eql(false)
-      contact = ContactUs::Contact.new(:email => "Valid@Email.com", :message => "Test")
-      contact.valid?.should eql(true)
-    end
+    context 'with name and subject settings' do
+
+      after do
+        ContactUs.require_name = false
+        ContactUs.require_subject = false
+      end
+
+      before do
+        ContactUs.require_name = true
+        ContactUs.require_subject =true
+      end
+
+      it {should validate_presence_of(:name)}
+      it {should validate_presence_of(:subject)}
 
-    it 'should validate message presence' do
-      contact = ContactUs::Contact.new(:email => "Valid@Email.com", :message => "")
-      contact.valid?.should eql(false)
-      contact = ContactUs::Contact.new(:email => "Valid@Email.com", :message => "Test")
-      contact.valid?.should eql(true)
     end
 
   end

data/spec/spec_helper.rb

@@ -3,20 +3,23 @@ require File.dirname(__FILE__) + '/../lib/contact_us/tasks/install'
 # Configure Rails Envinronment
 ENV["RAILS_ENV"] = "test"
 
-require 'simplecov'
-SimpleCov.start do
-  add_filter '/config/'
-  add_group 'Controllers', 'app/controllers'
-  add_group 'Helpers', 'app/helpers'
-  add_group 'Mailers', 'app/mailers'
-  add_group 'Models', 'app/models'
-  add_group 'Libraries', 'lib'
-  add_group 'Specs', 'spec'
-end
-
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 require "rspec/rails"
+require 'shoulda-matchers'
+
+unless defined?(Rubinius).present? or RUBY_VERSION == '1.8.7'
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter '/config/'
+    add_group 'Controllers', 'app/controllers'
+    add_group 'Helpers', 'app/helpers'
+    add_group 'Mailers', 'app/mailers'
+    add_group 'Models', 'app/models'
+    add_group 'Libraries', 'lib'
+    add_group 'Specs', 'spec'
+  end
+end
 
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true
@@ -37,10 +40,5 @@ ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
-  # Remove this line if you don't want RSpec's should and should_not methods or matchers
-  require 'rspec/expectations'
   config.include RSpec::Matchers
-
-  # == Mock Framework
-  config.mock_with :rspec
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contact_us
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,66 +9,77 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-07 00:00:00.000000000Z
+date: 2012-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70229800315020 !ruby/object:Gem::Requirement
+  requirement: &70153597745960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70229800315020
+  version_requirements: *70153597745960
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70229800313760 !ruby/object:Gem::Requirement
+  requirement: &70153597754040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70229800313760
+  version_requirements: *70153597754040
+- !ruby/object:Gem::Dependency
+  name: shoulda-matchers
+  requirement: &70153597748460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: *70153597748460
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70229800312700 !ruby/object:Gem::Requirement
+  requirement: &70153605750260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70229800312700
+  version_requirements: *70153605750260
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70229800311600 !ruby/object:Gem::Requirement
+  requirement: &70153605745840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *70229800311600
+  version_requirements: *70153605745840
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &70229800310700 !ruby/object:Gem::Requirement
+  requirement: &70153605757220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70229800310700
+  version_requirements: *70153605757220
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70229800309860 !ruby/object:Gem::Requirement
+  requirement: &70153605752140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70229800309860
+  version_requirements: *70153605752140
 description: A Rails 3+ Engine providing a basic contact form.  I used Formtastic
   to keep things simple, and to hook into your apps custom Formtastic stylesheets.
 email:
@@ -109,7 +120,6 @@ files:
 - lib/contact_us.rb
 - lib/tasks/install.rake
 - lib/templates/contact_us.rb
-- spec/contact_us_spec.rb
 - spec/controllers/contact_us/contact_controller_spec.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
@@ -130,6 +140,7 @@ files:
 - spec/dummy/config/locales/contact_us.es.yml
 - spec/dummy/config/locales/contact_us.it.yml
 - spec/dummy/config/locales/contact_us.pt-BR.yml
+- spec/dummy/config/locales/contact_us.zh.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
 - spec/dummy/Gemfile
@@ -147,6 +158,7 @@ files:
 - spec/dummy/Rakefile
 - spec/dummy/script/rails
 - spec/integration/contact_us_lint_spec.rb
+- spec/lib/contact_us_spec.rb
 - spec/lib/install_spec.rb
 - spec/mailers/contact_us/contact_mailer_spec.rb
 - spec/models/contact_us/contact_spec.rb
@@ -166,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3895995026617364093
+      hash: -3617187140453130010
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -175,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3895995026617364093
+      hash: -3617187140453130010
 requirements: []
 rubyforge_project: contact_us
 rubygems_version: 1.8.10
@@ -183,7 +195,6 @@ signing_key:
 specification_version: 3
 summary: Gem providing simple Contact Us functionality with a Rails 3+ Engine.
 test_files:
-- spec/contact_us_spec.rb
 - spec/controllers/contact_us/contact_controller_spec.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
@@ -204,6 +215,7 @@ test_files:
 - spec/dummy/config/locales/contact_us.es.yml
 - spec/dummy/config/locales/contact_us.it.yml
 - spec/dummy/config/locales/contact_us.pt-BR.yml
+- spec/dummy/config/locales/contact_us.zh.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
 - spec/dummy/Gemfile
@@ -221,6 +233,7 @@ test_files:
 - spec/dummy/Rakefile
 - spec/dummy/script/rails
 - spec/integration/contact_us_lint_spec.rb
+- spec/lib/contact_us_spec.rb
 - spec/lib/install_spec.rb
 - spec/mailers/contact_us/contact_mailer_spec.rb
 - spec/models/contact_us/contact_spec.rb