subdomain_locale 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5da9fa1546e807d5b21bf511496257ef32741596
-  data.tar.gz: e15c64020a71c4dee2f4a001a1c90b5f25735f51
+  metadata.gz: 58e47382709b64c4b6cad31a6b18ed1aecb877cd
+  data.tar.gz: aab6515f887fd395b12fcc0f92f5b9f880194206
 SHA512:
-  metadata.gz: 22ae781fa5583463102c0b25f942a65f9c5ebcae46409e8ed281efef0640394ca972bb8eadb76926df0f29e08825f3c380233d575e17c6122f46516cdea13528
-  data.tar.gz: 42a64ecad75d68ba195b611c82e74493f1b96e9622dcb40e9ccf270a26a3be23bd3a42f35af769ec589c36b271bcb4cc1f21b3bc27df39f96adbc01cc6d024d6
+  metadata.gz: 389de7c0409e09ced5edfd2677a14c2367fa4cc0e789a8f2764783c80d421659feecf2f6b0f06e00556b4a437cb10c3158e5f7a755e090e1fd42836793fa1b88
+  data.tar.gz: 7a20a72a24742d04ecb3a81dcaf7c487a446bf9b090a8d1a23ba6040e7b8b2dc132231ea7a4de4476c41492b28cc05472c97a696001ff8f4efebae902126197b

data/Isolate

@@ -4,16 +4,22 @@ gem 'bundler', '~> 1.5.0'
 gem 'i18n', '~> 0.6.9'
 
 case ENV['RAILS']
-when '3'
+when '3.2'
   version = '~> 3.2.16'
   gem 'actionpack', version
   gem 'actionmailer', version
   gem 'railties', version
-when nil
+  gem 'minitest', '~> 4.2'
+when '4.0'
   version = '~> 4.0.0'
   gem 'actionpack', version
   gem 'actionmailer', version
   gem 'railties', version
+when nil
+  version = '~> 4.1.0'
+  gem 'actionpack', version
+  gem 'actionmailer', version
+  gem 'railties', version
 else
   raise "Unrecognized Rails version: #{ENV['RAILS']}"
 end

data/Rakefile

@@ -3,15 +3,20 @@ require "isolate/now"
 require "bundler/gem_tasks"
 
 Rake::TestTask.new do |t|
-  t.libs << "test"
   t.test_files = Dir['test/**/*_test.rb']
   t.verbose = true
+
+  # The default rake test loader is messing up $LOAD_PATH
+  t.loader = :direct
+  t.libs << '.'
 end
 
 task "test:all" do
   sh "rake test"
   puts
-  sh "rake test RAILS=3"
+  sh "rake test RAILS=4.0"
+  puts
+  sh "rake test RAILS=3.2"
 end
 
 task :default => :test

data/Readme.md

@@ -75,7 +75,7 @@ end
 
 ## Testing
 
-This gem is tested against Rails 3.2 and 4.0.
+This gem is tested against Rails 3.2, 4.0 and 4.1.
 
 ```
 gem install isolate
@@ -84,8 +84,13 @@ rake test:all
 
 ## Changelog
 
+1.1.0
+
+* Custom subdomain provided in your default_url_options now has precedence over the default subdomain-locale.
+
 1.0.0
 
+* Links outside controllers now also point to the current locale. For example, in mailers.
 * Now compatible with the new I18n.enforce\_available\_locales.
 * No subdomain is now deafult instead of "www". Can be reverted by setting config.default\_domain.
 * Separate website's default locale (config.default\_locale) from the global default locale (config.i18n.default\_locale).

data/lib/subdomain_locale/railtie.rb

@@ -18,7 +18,7 @@ module SubdomainLocale
 
     initializer "subdomain_locale.url_helpers" do
       require "subdomain_locale/url_for"
-      Rails.application.routes.url_helpers.send :include, SubdomainLocale::UrlFor
+      Rails.application.routes.extend SubdomainLocale::UrlFor
     end
 
     initializer "subdomain_locale.controller" do

data/lib/subdomain_locale/url_for.rb

@@ -7,23 +7,24 @@ 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=nil)
-      if options.is_a?(Hash)
-        options = options.dup
-        if options.key?(:locale)
-          # Locale specified, force full URL
-          locale = options.delete(:locale)
-          options[:subdomain] = subdomain_locales.subdomain_for(locale)
-          options[:only_path] = false
-        elsif options.key?(:only_path) && !options[:only_path] && !options.key?(:subdomain)
-          # Requested full URL, use current locale
-          options[:subdomain] = subdomain_locales.subdomain_for(current_locale)
-        end
+    def url_for(options)
+      options = options.dup
+      if options.key?(:locale)
+        # Locale specified, force full URL
+        locale = options.delete(:locale)
+        options[:subdomain] = subdomain_locales.subdomain_for(locale)
+        options[:only_path] = false
       end
 
       super
     end
 
+    def default_url_options
+      super.merge({
+        subdomain: subdomain_locales.subdomain_for(current_locale)
+      })
+    end
+
     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.0.0"
+  spec.version       = "1.1.0"
   spec.authors       = ["Semyon Perepelitsa"]
   spec.email         = ["sema@sema.in"]
   spec.summary       = "Set I18n locale based on subdomain (Rails plugin)."

data/test/dummy/app/controllers/hello_controller.rb

@@ -1,2 +1,2 @@
-class HelloController < ApplicationController
+class HelloController < ActionController::Base
 end

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

@@ -0,0 +1,5 @@
+class BetaMailer < HelloMailer
+  def default_url_options
+    super.merge(subdomain: "beta")
+  end
+end

data/test/mapping_test.rb

@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class MappingTest < MiniTest::Unit::TestCase
+class MappingTest < ActiveSupport::TestCase
   include SubdomainLocale
 
   def setup

data/test/rails_test.rb

@@ -48,8 +48,14 @@ class HelloControllerTest < ActionController::TestCase
 end
 
 class HelloMailerTest < ActionController::TestCase
-  def test
+  def test_locale_domain
     mail = I18n.with_locale(:uk) { HelloMailer.world }
     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 }
+    assert_equal "http://beta.example.com/", mail.body.to_s.lines[3].chomp
+  end
 end

data/test/test_helper.rb

@@ -5,3 +5,10 @@ require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 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

data/test/url_for_test.rb

@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class UrlForTest < MiniTest::Unit::TestCase
+class UrlForTest < ActiveSupport::TestCase
   module UrlFor
     def url_for(*args)
       args
@@ -27,26 +27,11 @@ class UrlForTest < MiniTest::Unit::TestCase
     assert_equal [{foo: 'bar'}], @actual
   end
 
-  def test_string_argument
-    @actual = url_for('/bar')
-    assert_equal ['/bar'], @actual
-  end
-
   def test_locale
     @actual = url_for(foo: 'bar', locale: :ru)
     assert_equal [{foo: 'bar', subdomain: 'ru', only_path: false}], @actual
   end
 
-  def test_only_path
-    @actual = url_for(foo: 'bar', locale: :ru, only_path: true)
-    assert_equal [{foo: 'bar', subdomain: 'ru', only_path: false}], @actual
-  end
-
-  def test_implicit_locale
-    @actual = url_for(foo: 'bar', only_path: false)
-    assert_equal [{foo: 'bar', subdomain: 'ru', only_path: false}], @actual
-  end
-
   def test_hash_immutable
     orig_params = { foo: 'bar', locale: :ru }
     params = orig_params.dup.freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subdomain_locale
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Semyon Perepelitsa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -41,12 +41,11 @@ files:
 - lib/subdomain_locale/railtie.rb
 - lib/subdomain_locale/url_for.rb
 - subdomain_locale.gemspec
-- test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/hello_controller.rb
+- test/dummy/app/mailers/beta_mailer.rb
 - test/dummy/app/mailers/hello_mailer.rb
 - test/dummy/app/views/hello/world.html.erb
 - test/dummy/app/views/hello_mailer/world.text.erb
-- test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/environment.rb
@@ -83,12 +82,11 @@ signing_key:
 specification_version: 4
 summary: Set I18n locale based on subdomain (Rails plugin).
 test_files:
-- test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/hello_controller.rb
+- test/dummy/app/mailers/beta_mailer.rb
 - test/dummy/app/mailers/hello_mailer.rb
 - test/dummy/app/views/hello/world.html.erb
 - test/dummy/app/views/hello_mailer/world.text.erb
-- test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/environment.rb

data/test/dummy/app/controllers/application_controller.rb

@@ -1,3 +0,0 @@
-class ApplicationController < ActionController::Base
-  protect_from_forgery
-end

data/test/dummy/app/views/layouts/application.html.erb

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Dummy</title>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>