subdomain_locale 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58e47382709b64c4b6cad31a6b18ed1aecb877cd
-  data.tar.gz: aab6515f887fd395b12fcc0f92f5b9f880194206
+  metadata.gz: 89b4a08096b05551117c0cd44f1fcf1efb0fbf45
+  data.tar.gz: 74466f490964eaa00a1151cd151ce32cbf608c47
 SHA512:
-  metadata.gz: 389de7c0409e09ced5edfd2677a14c2367fa4cc0e789a8f2764783c80d421659feecf2f6b0f06e00556b4a437cb10c3158e5f7a755e090e1fd42836793fa1b88
-  data.tar.gz: 7a20a72a24742d04ecb3a81dcaf7c487a446bf9b090a8d1a23ba6040e7b8b2dc132231ea7a4de4476c41492b28cc05472c97a696001ff8f4efebae902126197b
+  metadata.gz: a79dfd3d19011a1201596ea65ab6681c577e75f28a16951accd081f8ae32006244f22a51608e251eb0d1047705ef27c568035077ed9883e0bc878b98b6b58358
+  data.tar.gz: 58b66f01b130c27d72659af4fa54d6d456dfa5c8f559f86229612a20973de3af916d2aa956547de2c3e491a7bfb7b77307cdb78055b207f5fea65f789f99708b

data/Isolate

@@ -1,25 +1,26 @@
 options system: false, cleanup: false
 
 gem 'bundler', '~> 1.5.0'
-gem 'i18n', '~> 0.6.9'
+gem 'i18n', '~> 0.7.0'
+gem 'rack-test', '~> 0.6.2'
+gem 'mail', '~> 2.6.0'
 
 case ENV['RAILS']
-when '3.2'
-  version = '~> 3.2.16'
-  gem 'actionpack', version
-  gem 'actionmailer', version
-  gem 'railties', version
-  gem 'minitest', '~> 4.2'
 when '4.0'
   version = '~> 4.0.0'
   gem 'actionpack', version
   gem 'actionmailer', version
   gem 'railties', version
-when nil
+when '4.1'
   version = '~> 4.1.0'
   gem 'actionpack', version
   gem 'actionmailer', version
   gem 'railties', version
+when '4.2', nil
+  version = '~> 4.2.0'
+  gem 'actionpack', version
+  gem 'actionmailer', version
+  gem 'railties', version
 else
   raise "Unrecognized Rails version: #{ENV['RAILS']}"
 end

data/Rakefile

@@ -12,11 +12,11 @@ Rake::TestTask.new do |t|
 end
 
 task "test:all" do
-  sh "rake test"
+  sh({"RAILS" => "4.2"}, $0, "test")
   puts
-  sh "rake test RAILS=4.0"
+  sh({"RAILS" => "4.1"}, $0, "test")
   puts
-  sh "rake test RAILS=3.2"
+  sh({"RAILS" => "4.0"}, $0, "test")
 end
 
 task :default => :test

data/Readme.md

@@ -84,6 +84,16 @@ rake test:all
 
 ## Changelog
 
+1.2.0
+
+* Support Rails 4.2 and I18n 0.7; drop Rails 3.2.
+* Note: Rails 4.2 is more strict about `_path/_url` helpers. Make sure to use `_url` helper whenever you specify locale parameter:
+
+  ```ruby
+  root_path(locale: :ru) # bad, will raise deprecation warning
+  root_url(locale: :ru)  # good
+  ```
+
 1.1.0
 
 * Custom subdomain provided in your default_url_options now has precedence over the default subdomain-locale.

data/lib/subdomain_locale/url_for.rb

@@ -7,7 +7,7 @@ module SubdomainLocale
     #   url_for params.merge(locale: 'ru') # => /ru/current_path
     # After including this module:
     #   url_for params.merge(locale: 'ru') # => http://ru.example.com/current_path
-    def url_for(options)
+    def url_for(options, *other)
       options = options.dup
       if options.key?(:locale)
         # Locale specified, force full URL
@@ -16,7 +16,7 @@ module SubdomainLocale
         options[:only_path] = false
       end
 
-      super
+      super(options, *other)
     end
 
     def default_url_options
@@ -25,6 +25,8 @@ module SubdomainLocale
       })
     end
 
+    private
+
     def current_locale
       I18n.locale
     end

data/subdomain_locale.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "subdomain_locale"
-  spec.version       = "1.1.0"
+  spec.version       = "1.2.0"
   spec.authors       = ["Semyon Perepelitsa"]
   spec.email         = ["sema@sema.in"]
   spec.summary       = "Set I18n locale based on subdomain (Rails plugin)."
@@ -12,5 +12,6 @@ Gem::Specification.new do |spec|
   spec.files         = File.read("Manifest.txt").split("\n")
   spec.test_files    = spec.files.grep(%r{^test/})
 
-  spec.add_dependency "i18n", "~> 0.6.9"
+  spec.add_dependency "i18n", ">= 0.7.0", "< 0.8"
+  spec.add_dependency "railties", ">= 4.0", "< 5.0"
 end

data/test/dummy/app/mailers/hello_mailer.rb

@@ -1,7 +1,9 @@
 class HelloMailer < ActionMailer::Base
-  def world
-    mail from: "app@example.com", to: "world@example.com", subject: "Hello, world!" do |f|
-      f.text
+  def world(locale)
+    I18n.with_locale(locale) do
+      mail from: "app@example.com", to: "world@example.com", subject: "Hello, world!" do |f|
+        f.text
+      end
     end
   end
 end

data/test/dummy/app/views/hello/world.html.erb

@@ -1,8 +1,8 @@
 <menu>
-<%= link_to "Home", root_path %>
-<%= link_to "English", root_path(locale: "en") %>
-<%= link_to "Russian", root_path(locale: "ru") %>
-<%= link_to "Ukrainian", root_path(locale: "uk") %>
+<%= link_to "Home", root_url %>
+<%= link_to "English", root_url(locale: "en") %>
+<%= link_to "Russian", root_url(locale: "ru") %>
+<%= link_to "Ukrainian", root_url(locale: "uk") %>
 <%= link_to "Beta", root_url(subdomain: "beta") %>
 </menu>
 

data/test/dummy/config/environments/test.rb

@@ -1,7 +1,6 @@
 Dummy::Application.configure do
   config.eager_load = false
   config.cache_classes = true
-  config.serve_static_assets = true
   config.consider_all_requests_local = true
   config.action_controller.perform_caching = false
   config.action_dispatch.show_exceptions = false
@@ -9,4 +8,5 @@ Dummy::Application.configure do
   config.active_support.deprecation = :stderr
   config.action_mailer.delivery_method = :test
   config.action_mailer.default_url_options = { host: "example.com" }
+  config.active_support.test_order = :random
 end

data/test/rails_test.rb

@@ -6,7 +6,7 @@ class HelloControllerTest < ActionController::TestCase
     @request.host = "ru.example.com"
     get :world
     menu = css_select("menu a")
-    assert_equal "/", menu[0]["href"]
+    assert_equal "http://example.com/", menu[0]["href"]
     assert_equal "http://en.example.com/", menu[1]["href"]
     assert_equal "http://example.com/",  menu[2]["href"]
     assert_equal "http://ua.example.com/",  menu[3]["href"]
@@ -49,13 +49,13 @@ end
 
 class HelloMailerTest < ActionController::TestCase
   def test_locale_domain
-    mail = I18n.with_locale(:uk) { HelloMailer.world }
+    mail = HelloMailer.world(:uk)
     assert_equal "http://ua.example.com/", mail.body.to_s.lines[3].chomp
   end
 
   # BetaMailer overrides default_url_options
   def test_custom_domain
-    mail = I18n.with_locale(:uk) { BetaMailer.world }
+    mail = BetaMailer.world(:uk)
     assert_equal "http://beta.example.com/", mail.body.to_s.lines[3].chomp
   end
 end

data/test/test_helper.rb

@@ -6,9 +6,4 @@ require "minitest/autorun"
 require "rails/test_help"
 Rails.backtrace_cleaner.remove_silencers!
 
-# Mail 2.5 gives warnings, fixed in 2.6
-require "mail"
-Mail::Sendmail
-##
-
 $VERBOSE = true

metadata

@@ -1,29 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: subdomain_locale
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Semyon Perepelitsa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: 0.7.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: '5.0'
 description: 
 email:
 - sema@sema.in