contact_us 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba36fc9da764d196d589ccd4fb72823e5ec51cba
-  data.tar.gz: 6431ccbdf97fc5753f0d066c308d6968fdb93482
+  metadata.gz: 25ce3fc3f61176e4316093a69ae09512d69e4a99
+  data.tar.gz: d0928b97ea89efb8689f0701b0e36cb7e95a6749
 SHA512:
-  metadata.gz: ccdec238e8ac1e598643d3762e77f0340e8afa01e1991747d1f32a7e08ec395525dd5cad424c08af20e46788a99d946d68a68fba76b1f1fc7dc3dd71b97a0ba7
-  data.tar.gz: 074cf4a5486906b27c5cdfdb327b44ca66254db49175c475401204b6620b2dc072d9f14f4e9d6ff3b5812503eefd07929883bd59ddeeb6f6a072b0c036a95cbc
+  metadata.gz: a7bcd8411ea722451e81c8358ef20ab0d32599747a3b2ea9c606286b32b4863faef3ec5728f24feb719017137039f3805965b1c3165e6faf0beef59efae38db2
+  data.tar.gz: 8cb4ef14ed3f465becd3271acdb2da7c3a0d19f44fd49996ef45be716476ace326d872cdecac5cf6d1edf1bec319744e51752e8c6f9873124b5059288460d072

data/.rspec

@@ -1,5 +1,5 @@
 --color
---format=nested
+--format=documentation
 --backtrace
 --profile
 --order random

data/.travis.yml

@@ -1,8 +1,8 @@
 script: "bundle exec rspec spec"
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
+  - 2.0
+  - 2.1
+  - 2.2
   - ruby-head
 language: ruby
 matrix:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## ContactUs 1.0.1 (April 6th 2015)
+
+* Add Traditional Chinese zh-TW translations. [yuchunc]
+
 ## ContactUs 1.0.0 (Jan 15th 2015)
 
 * Fix Rails 4.2 deliver_later deprecation.

data/README.md

@@ -1,4 +1,4 @@
-# Contact Us [![Build Status](https://secure.travis-ci.org/jdutil/contact_us.png)](http://travis-ci.org/jdutil/contact_us) [![Dependency Status](https://gemnasium.com/jdutil/contact_us.png?travis)](https://gemnasium.com/jdutil/contact_us) [![Click here to lend your support to: ContactUs and make a donation at www.pledgie.com !](http://www.pledgie.com/campaigns/16807.png?skin_name=chrome)][pledgie]
+# Contact Us [![Build Status](https://secure.travis-ci.org/JDutil/contact_us.png)](http://travis-ci.org/JDutil/contact_us) [![Dependency Status](https://gemnasium.com/jdutil/contact_us.png?travis)](https://gemnasium.com/jdutil/contact_us) [![Click here to lend your support to: ContactUs and make a donation at www.pledgie.com !](http://www.pledgie.com/campaigns/16807.png?skin_name=chrome)][pledgie]
 A Rails 3+ Engine providing a basic contact form.  
 
 [travis]: http://travis-ci.org/jdutil/contact_us
@@ -7,7 +7,7 @@ A Rails 3+ Engine providing a basic contact form.
 
 There is also a demo application showing how the ContactUs form works:
 
-* [View Demo Form In Action](http://contact-us-demo.heroku.com)
+* [View Demo Form In Action](http://contact-us-demo.herokuapp.com)
 * [View Demo Applications Source Code](http://github.com/jdutil/contact_us_demo)
 
 ## REQUIREMENTS
@@ -24,7 +24,7 @@ It is also recommended to use Formtastic or SimpleForm (see configuration) in or
 In your `Gemfile`, add the following dependencies:
 
 ```ruby
-gem 'contact_us', '~> 0.5.1'
+gem 'contact_us', '~> 1.0.1'
 ```
 
 From `Rails.root` in your Terminal run:
@@ -127,7 +127,7 @@ Visit your website and navigate to `/contact-us` to see the form in action.
 
 Contact Us has 100% test coverage, and provides simple integration specs you can drop directly into your apps test suite if you use RSpec & Capybara.
 
-Simply copy the `spec/integration/contact_us_lint_spec.rb` file, and add it to your integration specs. 
+Simply copy the `spec/integration/contact_us_lint_spec.rb` file, and add it to your integration specs.
 
 ## ISSUES
 

data/config/locales/contact_us.zh-TW.yml

@@ -0,0 +1,22 @@
+zh:
+  contact_us:
+    contact_mailer:
+      contact_email:
+        sent_by_contact_form: "由【聯絡我們】頁發送 %{email}"
+        sent_by_name: "由 %{name} 寄出 從 %{email}"
+        subject: "由 %{email} 寄出的訊息"
+    contacts:
+      new: &new
+        contact_us: "聯絡我們"
+        email: "電子郵件"
+        message: "訊息"
+        name: "姓名"
+        subject: "主題"
+        submit: "發送"
+      new_formtastic:
+        <<: *new
+      new_simple_form:
+        <<: *new
+    notices:
+      error: "請檢查是否正確填寫所有欄位。"
+      success: "訊息已成功送出。"

data/contact_us.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency "capybara",         "~> 2.0"
-  s.add_development_dependency "rspec-rails",      "~> 2.99"
+  s.add_development_dependency "rspec-rails",      "~> 3.1"
   s.add_development_dependency "shoulda-matchers", ">= 1.5.4"
   s.add_development_dependency "simplecov",        "~> 0.7"
   s.add_development_dependency "sqlite3",          "~> 1.3.5"

data/lib/contact_us/version.rb

@@ -1,3 +1,3 @@
 module ContactUs
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/controllers/contact_us/contact_controller_spec.rb

@@ -11,25 +11,25 @@ describe ContactUs::ContactsController do
     it 'should redirect with success message if valid contact' do
       ContactUs.success_redirect = nil
       post :create, :contact_us_contact => { :email => 'test@test.com', :message => 'test' }
-      assigns(:contact).valid?.should eql(true)
-      flash[:notice].should eql('Contact email was successfully sent.')
-      response.should redirect_to('/')
+      expect(assigns(:contact).valid?).to eql(true)
+      expect(flash[:notice]).to eql('Contact email was successfully sent.')
+      expect(response).to redirect_to('/')
     end
 
     it 'should redirect to custom URL with success message if valid contact' do
       ContactUs.success_redirect = '/success'
       post :create, :contact_us_contact => { :email => 'test@test.com', :message => 'test' }
-      assigns(:contact).valid?.should eql(true)
-      flash[:notice].should eql('Contact email was successfully sent.')
-      response.should redirect_to('/success')
+      expect(assigns(:contact).valid?).to eql(true)
+      expect(flash[:notice]).to eql('Contact email was successfully sent.')
+      expect(response).to redirect_to('/success')
       ContactUs.success_redirect = '/'
     end
 
     it 'should render new with error message if invalid contact' do
       post :create, :contact_us_contact => { :email => 'test@test.com', :message => '' }
-      assigns(:contact).valid?.should eql(false)
-      flash[:error].should eql('You must enter both fields.')
-      response.should render_template('new')
+      expect(assigns(:contact).valid?).to eql(false)
+      expect(flash[:error]).to eql('You must enter both fields.')
+      expect(response).to render_template('new')
     end
 
   end
@@ -38,8 +38,8 @@ describe ContactUs::ContactsController do
 
     it 'should assign contact for form and render page successfully' do
       get :new
-      assigns(:contact).should be_an_instance_of(ContactUs::Contact)
-      response.should be_success
+      expect(assigns(:contact)).to be_an_instance_of(ContactUs::Contact)
+      expect(response).to be_success
     end
 
   end

data/spec/lib/contact_us_spec.rb

@@ -11,13 +11,13 @@ describe ContactUs do
   end
 
   it "should be valid" do
-    ContactUs.should be_a(Module)
+    expect(ContactUs).to be_a(Module)
   end
 
   describe 'setup block' do
     it 'should yield self' do
       ContactUs.setup do |config|
-        ContactUs.should eql(config)
+        expect(ContactUs).to eql(config)
       end
     end
   end
@@ -25,28 +25,28 @@ describe ContactUs do
   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")
+      expect(ContactUs.mailer_from).to 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")
+      expect(ContactUs.mailer_to).to 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)
+      expect(ContactUs.require_name).to eql(true)
     end
   end
 
   describe 'require_subject' do
     it 'should be configurable' do
       ContactUs.require_subject = true
-      ContactUs.require_subject.should eql(true)
+      expect(ContactUs.require_subject).to eql(true)
     end
   end
 

data/spec/lib/install_spec.rb

@@ -13,11 +13,11 @@ describe "Rake tasks" do
 
   before(:each) do
     @destination_root = File.expand_path("../../dummy", __FILE__)
-    File.exists?(@destination_root + "/config/initializers/contact_us.rb").should eql(false)
-    File.exists?(@destination_root + "/config/locales/contact_us.en.yml").should eql(false)
-    File.directory?(@destination_root + "/app/views/contact_us").should eql(false)
-    File.directory?(@destination_root + "/app/views/contact_us/contact_mailer").should eql(false)
-    File.directory?(@destination_root + "/app/views/contact_us/contacts").should eql(false)
+    expect(File.exists?(@destination_root + "/config/initializers/contact_us.rb")).to eql(false)
+    expect(File.exists?(@destination_root + "/config/locales/contact_us.en.yml")).to eql(false)
+    expect(File.directory?(@destination_root + "/app/views/contact_us")).to eql(false)
+    expect(File.directory?(@destination_root + "/app/views/contact_us/contact_mailer")).to eql(false)
+    expect(File.directory?(@destination_root + "/app/views/contact_us/contacts")).to eql(false)
   end
 
   describe "contact_us:install" do
@@ -27,7 +27,7 @@ describe "Rake tasks" do
     end
 
     it "creates initializer file" do
-      File.exists?(File.join(@destination_root + "/config/initializers/contact_us.rb")).should eql(true)
+      expect(File.exists?(File.join(@destination_root + "/config/initializers/contact_us.rb"))).to eql(true)
     end
 
   end
@@ -38,7 +38,7 @@ describe "Rake tasks" do
     end
 
     it "creates locales files" do
-      File.exists?(File.join(@destination_root + "/config/locales/contact_us.en.yml")).should eql(true)
+      expect(File.exists?(File.join(@destination_root + "/config/locales/contact_us.en.yml"))).to eql(true)
     end
   end
 
@@ -49,9 +49,9 @@ describe "Rake tasks" do
     end
 
     it "creates view files" do
-      File.directory?(@destination_root + "/app/views/contact_us").should eql(true)
-      File.directory?(@destination_root + "/app/views/contact_us/contact_mailer").should eql(true)
-      File.directory?(@destination_root + "/app/views/contact_us/contacts").should eql(true)
+      expect(File.directory?(@destination_root + "/app/views/contact_us")).to eql(true)
+      expect(File.directory?(@destination_root + "/app/views/contact_us/contact_mailer")).to eql(true)
+      expect(File.directory?(@destination_root + "/app/views/contact_us/contacts")).to eql(true)
     end
 
   end

data/spec/mailers/contact_us/contact_mailer_spec.rb

@@ -10,13 +10,13 @@ describe ContactUs::ContactMailer do
     end
 
     it "should render successfully" do
-      lambda { ContactUs::ContactMailer.contact_email(@contact) }.should_not raise_error
+      expect { ContactUs::ContactMailer.contact_email(@contact) }.not_to 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])
+      expect(@mailer.from).to eql([ContactUs.mailer_from])
       ContactUs.mailer_from = nil
     end
 
@@ -27,33 +27,33 @@ describe ContactUs::ContactMailer do
       end
 
       it "should have the initializers to address" do
-        @mailer.to.should eql([ContactUs.mailer_to])
+        expect(@mailer.to).to eql([ContactUs.mailer_to])
       end
 
       it "should use the users email in the from field when ContactUs.mailer_from is not set" do
-        @mailer.from.should eql([@contact.email])
+        expect(@mailer.from).to eql([@contact.email])
       end
 
       it "should use the users email in the reply_to field" do
-        @mailer.reply_to.should eql([@contact.email])
+        expect(@mailer.reply_to).to eql([@contact.email])
       end
 
       it "should have users email in the subject line" do
-        @mailer.subject.should eql("Contact Us message from #{@contact.email}")
+        expect(@mailer.subject).to eql("Contact Us message from #{@contact.email}")
       end
 
       it "should have the message in the body" do
-        @mailer.body.should match("<p>Thanks!</p>")
+        expect(@mailer.body).to match("<p>Thanks!</p>")
       end
 
       it "should deliver successfully" do
-        lambda { ContactUs::ContactMailer.contact_email(@contact).deliver_now }.should_not raise_error
+        expect { ContactUs::ContactMailer.contact_email(@contact).deliver_now }.not_to raise_error
       end
 
       describe "and delivered" do
 
         it "should be added to the delivery queue" do
-          lambda { ContactUs::ContactMailer.contact_email(@contact).deliver_now }.should change(ActionMailer::Base.deliveries,:size).by(1)
+          expect { ContactUs::ContactMailer.contact_email(@contact).deliver_now }.to change(ActionMailer::Base.deliveries,:size).by(1)
         end
 
       end

data/spec/models/contact_us/contact_spec.rb

@@ -5,10 +5,10 @@ describe ContactUs::Contact do
 
   describe "Validations" do
 
-    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 {is_expected.to validate_presence_of(:email)}
+    it {is_expected.to validate_presence_of(:message)}
+    it {is_expected.not_to validate_presence_of(:name)}
+    it {is_expected.not_to validate_presence_of(:subject)}
 
     context 'with name and subject settings' do
 
@@ -22,8 +22,8 @@ describe ContactUs::Contact do
         ContactUs.require_subject =true
       end
 
-      it {should validate_presence_of(:name)}
-      it {should validate_presence_of(:subject)}
+      it {is_expected.to validate_presence_of(:name)}
+      it {is_expected.to validate_presence_of(:subject)}
 
     end
 
@@ -34,8 +34,8 @@ describe ContactUs::Contact do
     describe '#read_attribute_for_validation' do
       it 'should return attributes set during initialization' do
         contact = ContactUs::Contact.new(:email => "Valid@Email.com", :message => "Test")
-        contact.read_attribute_for_validation(:email).should eql("Valid@Email.com")
-        contact.read_attribute_for_validation(:message).should eql("Test")
+        expect(contact.read_attribute_for_validation(:email)).to eql("Valid@Email.com")
+        expect(contact.read_attribute_for_validation(:message)).to eql("Test")
       end
     end
 
@@ -43,21 +43,21 @@ describe ContactUs::Contact do
 
       it 'should return false if records invalid' do
         contact = ContactUs::Contact.new(:email => "Valid@Email.com", :message => "")
-        contact.save.should eql(false)
+        expect(contact.save).to eql(false)
       end
 
       it 'should send email and return true if records valid' do
         mail = Mail.new(:from=>"Valid@Email.com", :to => "test@test.com")
-        mail.stub(:deliver_now).and_return(true)
+        allow(mail).to receive(:deliver_now).and_return(true)
         contact = ContactUs::Contact.new(:email => "Valid@Email.com", :message => "Test")
-        ContactUs::ContactMailer.should_receive(:contact_email).with(contact).and_return(mail)
-        contact.save.should eql(true)
+        expect(ContactUs::ContactMailer).to receive(:contact_email).with(contact).and_return(mail)
+        expect(contact.save).to eql(true)
       end
 
     end
 
     describe '#to_key' do
-      it { subject.should respond_to(:to_key) }
+      it { expect(subject).to respond_to(:to_key) }
     end
 
   end

data/spec/spec_helper.rb

@@ -42,4 +42,5 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 RSpec.configure do |config|
   config.include RSpec::Matchers
   config.infer_spec_type_from_file_location!
+  config.raise_errors_for_deprecations!
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contact_us
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jeff Dutil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +159,7 @@ files:
 - config/locales/contact_us.pt-BR.yml
 - config/locales/contact_us.pt-PT.yml
 - config/locales/contact_us.ru.yml
+- config/locales/contact_us.zh-TW.yml
 - config/locales/contact_us.zh.yml
 - config/routes.rb
 - contact_us.gemspec