contact_us 0.4.0.beta → 0.4.0

data/.gitignore

@@ -0,0 +1,11 @@
+*.gem
+.bundle
+.rbx
+Gemfile.lock
+pkg/*
+coverage
+spec/dummy/config/locales/*
+spec/dummy/db/*.sqlite3
+spec/dummy/log/*.log
+spec/dummy/tmp/
+spec/dummy/Gemfile.lock

data/.rspec

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

data/.rvmrc

@@ -0,0 +1 @@
+rvm 1.9.3-p125@contact_us

data/.travis.yml

@@ -0,0 +1,11 @@
+script: "bundle exec rspec spec"
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ree
+  # - ruby-head
+language: ruby
+notifications:
+  recipients:
+    - JDutil@BurlingtonWebApps.com

data/CHANGELOG

@@ -0,0 +1,51 @@
+*ContactUs 0.4.0 (Oct 29th 2012)*
+
+* Add default rails form helper support and remove Formtastic dependency. [Jeff Dutil]
+
+* Added support for SimpleForm. [flyerhzm]
+
+* Added Japanese locale. [yosiyuki]
+
+* Added French locale. [bgantaume]
+
+* No longer copy default views & locales during installation.  Copy manually with rake tasks when wanting to customize now. [Jeff Dutil]
+
+*ContactUs 0.3.0 (May 15th 2012)*
+
+* Changed route to /contact-us from /contract_us for seo. [Jeff Dutil]
+
+*ContactUs 0.2.1 (May 4th 2012)*
+
+* Use the users provided email address in the email notifications reply_to field. [Jeff Dutil]
+
+*ContactUs 0.2.0 (February 25th 2012)*
+
+* Added ContactUs.mailer_from setting in order to send from verified address, which is better practice than pretending the email is from the user. [Jeff Dutil]
+
+* Added ContactUs.require_name setting in order to ask for the name with the contact form. [Jeff Dutil]
+
+* Added ContactUs.require_subject setting in order to for the subject with the contact form. [Jeff Dutil]
+
+* Formtastic dependency updated to >= 2.1.0 in order to fix commit_button deprecation. [Jeff Dutil]
+
+*ContactUs 0.1.5 (January 6th, 2012)*
+
+* Added Chinese zh locale [kinopyo]
+
+*ContactUs 0.1.4 (September 26th, 2011)*
+
+* Added German locale
+
+* Email subject is now included in i18n
+
+*ContactUs 0.1.3 (September 2, 2011)*
+
+* Added Brazilian Portuguese locale [brunoarueira]
+
+* Added Spanish locale [igmarin]
+
+* Added Italian locale [igmarin]
+
+*ContactUs 0.1.2 (August 18, 2011)*
+
+* 100% Test Coverage under Ruby 1.8.7, 1.9.2, 1.9.3, REE, ruby-head, rbx-2.0 [Jeff Dutil]

data/README.md

@@ -23,7 +23,7 @@ It is also recommended to use Formtastic or SimpleForm (see configuration) in or
 
 In your `Gemfile`, add the following dependencies:
 
-    gem 'contact_us', '~> 0.4.0.beta'
+    gem 'contact_us', '~> 0.4.0'
 
 From `Rails.root` run:
 
@@ -45,13 +45,25 @@ You may also specify an email address for the notification emails from field:
 
 ## CONFIGURATION
 
-The generator copies the view files to `app/views/contact_us`, and you can customize them to suit your needs.  If you would like to add a name or subject field to the form you may simply
+If you would like to add a name or subject field to the form you may simply
 set the options to true within the contact_us initializer located at `config/initializers/contact_us.rb`:
 
     config.require_name = true
     config.require_subject = true
 
-You may also update your locales under `config/locales/contact_us.en.yml` or create your own.  Please feel free to submit your own locales so that other users will hopefully find this gem more useful.
+### Views
+
+To copy the view files to `app/views/contact_us`, and customize them to suit your needs run:
+
+    bundle exec rake contact_us:copy_views
+
+### Locales
+
+To copy the locale files to `config/locales/contact_us.*.yml`, and customize them to suit your needs run:
+
+    bundle exec rake contact_us:copy_locales
+
+Please feel free to submit your own locales so that other users will hopefully find this gem more useful in your language.
 
 ### Formtastic
 
@@ -112,6 +124,5 @@ Here are some ways *you* can contribute:
 ## TODO
 
 * Add new language translations.
-* Stop copying views/locales by default.
 
 Copyright (c) 2011 Jeff Dutil, released under the [MIT license](https://github.com/jdutil/contact_us/tree/master/MIT-LICENSE).

data/config/locales/contact_us.fr.yml

@@ -0,0 +1,25 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+fr:
+  contact_us:
+    contact_mailer:
+      contact_email:
+        sent_by_contact_form: "Envoyé depuis le fomulaire de contact par %{email}"
+        sent_by_name: "Envoyé par %{name} depuis %{email}"
+        subject: "Message 'Contactez nous' de %{email}"
+    contacts:
+      new: &new
+        contact_us: "Contactez Nous"
+        email: "Email"
+        message: "Message"
+        name: "Nom"
+        subject: "Sujet"
+        submit: "Envoyer"
+      new_formtastic:
+        <<: *new
+      new_simple_form:
+        <<: *new
+    notices:
+      error: "Merci de saisir les deux champs."
+      success: "Votre message a bien été envoyé."

data/config/locales/contact_us.ja.yml

@@ -0,0 +1,25 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+ja:
+  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

@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "contact_us/version"
+
+Gem::Specification.new do |s|
+  s.name        = "contact_us"
+  s.version     = ContactUs::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Jeff Dutil"]
+  s.email       = ["JDutil@BurlingtonWebApps.com"]
+  s.homepage    = "https://github.com/jdutil/contact_us"
+  s.summary     = %q{Gem providing simple Contact Us functionality with a Rails 3+ Engine.}
+  s.description = %q{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.}
+
+  s.rubyforge_project = "contact_us"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths = ["lib"]
+
+  s.add_development_dependency "capybara", "~> 1.1"
+  s.add_development_dependency "rspec-rails", "~> 2.11"
+  s.add_development_dependency "shoulda-matchers", "~> 1.1"
+  s.add_development_dependency "simplecov", "~> 0.7"
+  s.add_development_dependency "sqlite3", "~> 1.3.5"
+  s.add_development_dependency "formtastic", ">= 2.1.0"
+  s.add_development_dependency "simple_form"
+
+  s.add_runtime_dependency "rails", ">= 3.0.0"
+end

data/lib/contact_us/tasks/install.rb

@@ -7,8 +7,6 @@ module ContactUs
 
         def run
           copy_initializer_file
-          copy_locales_files
-          copy_view_files
           puts "Done!"
         end
 

data/lib/contact_us/version.rb

@@ -1,3 +1,3 @@
 module ContactUs
-  VERSION = "0.4.0.beta"
+  VERSION = "0.4.0"
 end

data/spec/lib/install_spec.rb

@@ -2,24 +2,27 @@ require 'spec_helper'
 
 describe "Rake tasks" do
 
-  describe "contact_us:install" do
+  after(:each) do
+    @destination_root = File.expand_path("../../dummy", __FILE__)
+    FileUtils.rm_rf(@destination_root + "/config/initializers/contact_us.rb")
+    FileUtils.rm_rf(@destination_root + "/config/locales/contact_us.en.yml")
+    FileUtils.rm_rf(@destination_root + "/app/views/contact_us")
+    FileUtils.rm_rf(@destination_root + "/app/views/contact_us/contact_mailer")
+    FileUtils.rm_rf(@destination_root + "/app/views/contact_us/contacts")
+  end
 
-    after(:each) do
-      @destination_root = File.expand_path("../../dummy", __FILE__)
-      FileUtils.rm_rf(@destination_root + "/config/initializers/contact_us.rb")
-      FileUtils.rm_rf(@destination_root + "/config/locales/contact_us.en.yml")
-      FileUtils.rm_rf(@destination_root + "/app/views/contact_us")
-      FileUtils.rm_rf(@destination_root + "/app/views/contact_us/contact_mailer")
-      FileUtils.rm_rf(@destination_root + "/app/views/contact_us/contacts")
-    end
+  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)
+  end
 
-    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)
+  describe "contact_us:install" do
+
+    before do
       ContactUs::Tasks::Install.run
     end
 
@@ -27,9 +30,23 @@ describe "Rake tasks" do
       File.exists?(File.join(@destination_root + "/config/initializers/contact_us.rb")).should eql(true)
     end
 
+  end
+
+  describe 'contact_us:copy_locales' do
+    before do
+      ContactUs::Tasks::Install.copy_locales_files
+    end
+
     it "creates locales files" do
       File.exists?(File.join(@destination_root + "/config/locales/contact_us.en.yml")).should eql(true)
     end
+  end
+
+  describe "contact_us:install" do
+
+    before do
+      ContactUs::Tasks::Install.copy_view_files
+    end
 
     it "creates view files" do
       File.directory?(@destination_root + "/app/views/contact_us").should eql(true)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: contact_us
 version: !ruby/object:Gem::Version
-  version: 0.4.0.beta
-  prerelease: 6
+  version: 0.4.0
+  prerelease: 
 platform: ruby
 authors:
 - Jeff Dutil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +147,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- .rspec
+- .rvmrc
+- .travis.yml
+- CHANGELOG
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -163,20 +168,26 @@ files:
 - config/locales/contact_us.de.yml
 - config/locales/contact_us.en.yml
 - config/locales/contact_us.es.yml
+- config/locales/contact_us.fr.yml
 - config/locales/contact_us.it.yml
+- config/locales/contact_us.ja.yml
 - config/locales/contact_us.pt-BR.yml
 - config/locales/contact_us.zh.yml
 - config/routes.rb
+- contact_us.gemspec
+- lib/contact_us.rb
 - lib/contact_us/engine.rb
 - lib/contact_us/tasks/install.rb
 - lib/contact_us/version.rb
-- lib/contact_us.rb
 - lib/tasks/install.rake
 - lib/templates/contact_us.rb
 - spec/controllers/contact_us/contact_controller_spec.rb
+- spec/dummy/Gemfile
+- spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
@@ -189,15 +200,7 @@ files:
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/locales/contact_us.de.yml
-- 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
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -208,7 +211,7 @@ files:
 - spec/dummy/public/javascripts/effects.js
 - spec/dummy/public/javascripts/prototype.js
 - spec/dummy/public/javascripts/rails.js
-- spec/dummy/Rakefile
+- spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/integration/contact_us_lint_spec.rb
 - spec/lib/contact_us_spec.rb
@@ -229,26 +232,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2120348152043544289
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: contact_us
-rubygems_version: 1.8.19
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Gem providing simple Contact Us functionality with a Rails 3+ Engine.
 test_files:
 - spec/controllers/contact_us/contact_controller_spec.rb
+- spec/dummy/Gemfile
+- spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
@@ -261,15 +264,7 @@ test_files:
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/locales/contact_us.de.yml
-- 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
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -280,7 +275,7 @@ test_files:
 - spec/dummy/public/javascripts/effects.js
 - spec/dummy/public/javascripts/prototype.js
 - spec/dummy/public/javascripts/rails.js
-- spec/dummy/Rakefile
+- spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/integration/contact_us_lint_spec.rb
 - spec/lib/contact_us_spec.rb

data/spec/dummy/config/locales/contact_us.de.yml

@@ -1,25 +0,0 @@
-# Sample localization file for German. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
-de:
-  contact_us:
-    contact_mailer:
-      contact_email:
-        sent_by_contact_form: "Gesendet durch das Kontaktformular. %{email}"
-        sent_by_name: "Sent by %{name} from %{email}"
-        subject: "Contact Us message from %{email}"
-    contacts:
-      new: &new
-        contact_us: "Kontaktiere Uns"
-        email: "Email"
-        message: "Nachricht"
-        name: "Name"
-        subject: "Subject"
-        submit: "Abschicken"
-      new_formtastic:
-        <<: *new
-      new_simple_form:
-        <<: *new
-    notices:
-      error: "Beide Felder müssen ausgefüllt werden."
-      success: "Die Nachricht wurde erfolgreich versendet."

data/spec/dummy/config/locales/contact_us.es.yml

@@ -1,25 +0,0 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
-es:
-  contact_us:
-    contact_mailer:
-      contact_email:
-        sent_by_contact_form: "Enviado por el formulario de contacto. %{email}"
-        sent_by_name: "Sent by %{name} from %{email}"
-        subject: "Contact Us message from %{email}"
-    contacts:
-      new: &new
-        contact_us: "Contactanos"
-        email: "Email"
-        message: "Mensaje"
-        name: "Name"
-        subject: "Subject"
-        submit: "Enviar"
-      new_formtastic:
-        <<: *new
-      new_simple_form:
-        <<: *new
-    notices:
-      error: "Debes de ingresar ambos campos."
-      success: "El correo electrónico de contacto fue enviado con éxito."

data/spec/dummy/config/locales/contact_us.it.yml

@@ -1,25 +0,0 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
-it:
-  contact_us:
-    contact_mailer:
-      contact_email:
-        sent_by_contact_form: "Inviato dal formato di contatto. %{email}"
-        sent_by_name: "Sent by %{name} from %{email}"
-        subject: "Contact Us message from %{email}"
-    contacts:
-      new: &new
-        contact_us: "Contattaci"
-        email: "Email"
-        message: "Messaggio"
-        name: "Name"
-        subject: "Subject"
-        submit: "Inviare"
-      new_formtastic:
-        <<: *new
-      new_simple_form:
-        <<: *new
-    notices:
-      error: "Devi inserire entrambi i campi."
-      success: "La mail di contatto è stata inviata."

data/spec/dummy/config/locales/contact_us.pt-BR.yml

@@ -1,25 +0,0 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
-pt-BR:
-  contact_us:
-    contact_mailer:
-      contact_email:
-        sent_by_contact_form: "Enviado pelo formulário de contato. %{email}"
-        sent_by_name: "Sent by %{name} from %{email}"
-        subject: "Contact Us message from %{email}"
-    contacts:
-      new: &new
-        contact_us: "Contate-nos"
-        email: "Email"
-        message: "Messagem"
-        name: "Name"
-        subject: "Subject"
-        submit: "Enviar"
-      new_formtastic:
-        <<: *new
-      new_simple_form:
-        <<: *new
-    notices:
-      error: "Você deve preencher os campos."
-      success: "Email de contato foi enviado com sucesso."

data/spec/dummy/config/locales/contact_us.zh.yml

@@ -1,25 +0,0 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
-zh:
-  contact_us:
-    contact_mailer:
-      contact_email:
-        sent_by_contact_form: "由contact form发送。 %{email}"
-        sent_by_name: "Sent by %{name} from %{email}"
-        subject: "Contact Us message from %{email}"
-    contacts:
-      new: &new
-        contact_us: "联系我们"
-        email: "邮箱"
-        message: "消息"
-        name: "Name"
-        subject: "Subject"
-        submit: "发送"
-      new_formtastic:
-        <<: *new
-      new_simple_form:
-        <<: *new
-    notices:
-      error: "请正确输入邮箱与信息。"
-      success: "邮件已成功发送。"