subdomain_locale 1.0.beta3 → 1.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e922108abe3424f50377edcecfb7e50859500e0
-  data.tar.gz: 398d5cc593c29b115b2d64f60e9ae910e5edda8f
+  metadata.gz: fdc1524b2a958bfe398f7f91a1f6d1890008aab9
+  data.tar.gz: fac92758a062f7d198f9c474424be5742838abf9
 SHA512:
-  metadata.gz: bce28543d5379b27d6e86b050a642dd331d804f0b310e0986f89f166490f6fb49274481ba0db02bf9730d02a86be91eb507f834fc4e9541b8bdaaaf5527f2ad4
-  data.tar.gz: 8b763460ecc07a8f1aa178c656a8e2a81ffc3e2fad73beea839a669390ba68754a6cb9ff287d985d3f5a3d69a1faa34b0fb296eb794b564002030357f5bcea61
+  metadata.gz: 85ba896d50772f6e452bfb6142eb71f6ecc0fe6ecae13e1e2fa474e3dddcc9df47840b57a2f1beb088c547d9d3f4aa7c3871ffb76adb2d30975facb6a94d8c6c
+  data.tar.gz: e84bfe39c6bc408828f14e186edde19a0c971588ef6b5af867a78639573bbb1d11d6f000b9e0be91d8558cca1fe03f941de81a52c1ee6631bcb282425e6a1dcc

data/lib/subdomain_locale/mapping.rb

@@ -24,7 +24,7 @@ module SubdomainLocale
     end
 
     def subdomain_for(locale)
-      locale and @repository.invert.fetch(locale.to_s, locale.to_s).presence
+      locale and @repository.invert.fetch(locale.to_s, locale.to_s).presence or false
     end
   end
 end

data/subdomain_locale.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "subdomain_locale"
-  spec.version       = "1.0.beta3"
+  spec.version       = "1.0.beta4"
   spec.authors       = ["Semyon Perepelitsa"]
   spec.email         = ["sema@sema.in"]
   spec.summary       = "Set I18n locale based on subdomain"

data/test/mapping_test.rb

@@ -21,11 +21,13 @@ class MappingTest < MiniTest::Unit::TestCase
     # request.subdomain returns "" for test.host
     assert_equal "en", @mapping.locale_for("")
 
-    # "" results in .test.host, nil produces correct test.host
-    assert_equal nil, @mapping.subdomain_for(:en)
+    # url_for(subdomain: "") => ".test.host"
+    # url_for(subdomain: nil) => "test.host" in Rails 4, "current.test.host" in Rails 3
+    # url_for(subdomain: false) => "test.host"
+    assert_equal false, @mapping.subdomain_for(:en)
   end
 
   def test_nil
-    assert_nil @mapping.subdomain_for(nil)
+    assert_equal false, @mapping.subdomain_for(nil)
   end
 end

data/test/rails_test.rb

@@ -3,7 +3,7 @@ require_relative "test_helper"
 
 class HelloControllerTest < ActionController::TestCase
   def test_links
-    @request.host = "example.com"
+    @request.host = "ru.example.com"
     get :world
     menu = css_select("menu a")
     assert_equal "/", menu[0]["href"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subdomain_locale
 version: !ruby/object:Gem::Version
-  version: 1.0.beta3
+  version: 1.0.beta4
 platform: ruby
 authors:
 - Semyon Perepelitsa