contact_us 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 362c93f82604c1bb0719a60e7daf0fc6990e377d
-  data.tar.gz: db544e80c7e02e6815be8a16a793486e39eda772
+  metadata.gz: 5232acabb9853f22ccef705dbc5b2c03f294c12a
+  data.tar.gz: cbf76855a7227d6b414533c9ce8bd9cd63940c92
 SHA512:
-  metadata.gz: 8efd0645c12998ace526c17d544d680c1e31ca8420410758ce79809e9551d52937b72d7a668b1c673bd0d739f292821c3acd3c1e403fdf3439338efa464ec46a
-  data.tar.gz: f27629db4982f646d0a7bffe5506beba108ff1d8705825b279f655c2d857c54a327088153b918670f54e3a0677deecc82fcd3d5f60cd9a0ac21833a149d18d72
+  metadata.gz: d86121cc8a852535869f44764695eac63ff98dc6dbc579bc84d6698cb43d2568ffe54711d4156ca1fe4553a993fcea14c3f8054f4081b6089d2ed7d0c10b312a
+  data.tar.gz: 0b422d2fb6941fc8f2e21863baaa54e42bf39e8a6b91df633d7f880aa1b02abf70e1051bb89878ccb126c5b8b6ee536b083a3c010bba27100e97c0f7b0b76ca3

data/.travis.yml

@@ -1,8 +1,7 @@
 script: "bundle exec rspec spec"
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
+  - 2.2.2
+  - 2.3.1
   - ruby-head
 language: ruby
 matrix:

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## ContactUs 1.2.0 (?)
+
+* Bump required Ruby to 2.2.2
+* Add Arabic translation. [https://github.com/JDutil/contact_us/pull/59]
+* Add optional I18n locale routing [https://github.com/JDutil/contact_us/pull/58]
+
 ## ContactUs 1.1.0 (May 1st 2015)
 
 * Configurable mailer inheritance. [https://github.com/JDutil/contact_us/pull/53]

data/README.md

@@ -68,6 +68,12 @@ To redirect to a specific URL after a successful form submission:
 config.success_redirect = '/contact-success'
 ```
 
+If you're using I18n localization and would like to have the locale be a part of your paths 
+For example: /en/contact-us OR /fr/contact-us OR /en-UK/contact-us
+```ruby
+config.localize_routes = true
+```
+
 ### Views
 
 To copy the view files to `app/views/contact_us`, and customize them to suit your needs run:
@@ -86,6 +92,9 @@ 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.
 
+If you would like to include the locale in your paths (e.g. /en/contact-us), set the localize_routes
+parameter to true in your initializer (see the configuration section above)
+
 ### Formtastic
 
 In order to use a Formtastic compatible template to hook into your custom form styles configure `config/initializers/contact_us.rb`:

data/app/views/contact_us/contacts/new.html.erb

@@ -33,6 +33,6 @@
     <% end %>
   </div>
   <div class='commit'>
-    <%= f.submit :submit, :class => 'submit create', :title => t('.submit') %>
+    <%= f.submit :submit, :class => 'submit create', :title => t('.submit'), :value => t('.submit') %>
   </div>
 <% end %>

data/config/locales/contact_us.ar.yml

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

@@ -1,20 +1,20 @@
-# Sample localization file for English. Add more files in this directory for other locales.
+# Sample localization file for Spanish. 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}"
+        sent_by_contact_form: "Enviado por el formulario de contacto desde %{email}"
+        sent_by_name: "Enviado por %{name} con la dirección %{email}"
+        subject: "Mensaje de contacto de %{email}"
     contacts:
       new: &new
         contact_us: "Contactanos"
-        email: "Email"
+        email: "Correo electrónico"
         message: "Mensaje"
-        name: "Name"
-        subject: "Subject"
+        name: "Nombre"
+        subject: "Tema"
         submit: "Enviar"
       new_formtastic:
         <<: *new

data/config/routes.rb

@@ -1,6 +1,21 @@
 Rails.application.routes.draw do
-  resources :contacts,
-    :controller => 'contact_us/contacts',
-    :only       => [:new, :create]
-  get 'contact-us' => 'contact_us/contacts#new', :as => :contact_us
+  # Place the contact_us routes within the optional locale scope
+  # If the I18n gem is installed and the localize_routes variable has
+  # been set to true in the application's initializer file
+  if defined?(I18n) && ContactUs.localize_routes
+    scope "(:locale)", locale: /#{I18n.available_locales.join("|")}/ do
+      resources :contacts,
+                controller: "contact_us/contacts",
+                only:       [:new, :create]
+
+      get "contact-us" => "contact_us/contacts#new", as: :contact_us
+    end
+
+  else
+    resources :contacts,
+              controller: "contact_us/contacts",
+              only:       [:new, :create]
+
+    get "contact-us" => "contact_us/contacts#new", as: :contact_us
+  end
 end

data/contact_us.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   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.required_ruby_version = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.2.2'
   s.rubyforge_project = "contact_us"
 
   s.files         = `git ls-files`.split("\n")
@@ -21,11 +21,11 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "capybara",         "~> 2.0"
   s.add_development_dependency "rspec-rails",      "~> 3.1"
-  s.add_development_dependency "shoulda-matchers", ">= 1.5.4"
+  s.add_development_dependency "shoulda-matchers", "~> 2.6"
   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_development_dependency 'rails-controller-testing'
   s.add_runtime_dependency "rails", ">= 4.2.0"
 end

data/lib/contact_us.rb

@@ -23,6 +23,10 @@ module ContactUs
   mattr_accessor :parent_mailer
   @@parent_mailer = "ActionMailer::Base"
 
+  # allows for a locale to appear in the path
+  #   (e.g. /fr/contact-us OR /en/contact-us)
+  mattr_accessor :localize_routes
+
   # Default way to setup ContactUs. Run rake contact_us:install to create
   # a fresh initializer with all configuration values.
   def self.setup

data/lib/contact_us/version.rb

@@ -1,3 +1,3 @@
 module ContactUs
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 require "rspec/rails"
+require 'rails-controller-testing'
 require 'shoulda-matchers'
 
 unless defined?(Rubinius).present? or RUBY_VERSION == '1.8.7'
@@ -43,4 +44,10 @@ RSpec.configure do |config|
   config.include RSpec::Matchers
   config.infer_spec_type_from_file_location!
   config.raise_errors_for_deprecations!
+
+  [:controller, :view, :request].each do |type|
+    config.include ::Rails::Controller::Testing::TestProcess, type: type
+    config.include ::Rails::Controller::Testing::TemplateAssertions, type: type
+    config.include ::Rails::Controller::Testing::Integration, type: type
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contact_us
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jeff Dutil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -42,16 +42,16 @@ dependencies:
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails-controller-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +161,7 @@ files:
 - app/views/contact_us/contacts/new.html.erb
 - app/views/contact_us/contacts/new_formtastic.html.erb
 - app/views/contact_us/contacts/new_simple_form.html.erb
+- config/locales/contact_us.ar.yml
 - config/locales/contact_us.de.yml
 - config/locales/contact_us.el.yml
 - config/locales/contact_us.en.yml
@@ -219,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -227,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: contact_us
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Gem providing simple Contact Us functionality with a Rails 3+ Engine.