subdomain_locale 1.0.beta4 → 1.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdc1524b2a958bfe398f7f91a1f6d1890008aab9
-  data.tar.gz: fac92758a062f7d198f9c474424be5742838abf9
+  metadata.gz: 749e76f7ece9b06223186583b7d207e557b37a40
+  data.tar.gz: 1b9cc4610f7e450943c8a06179855241a0cd0476
 SHA512:
-  metadata.gz: 85ba896d50772f6e452bfb6142eb71f6ecc0fe6ecae13e1e2fa474e3dddcc9df47840b57a2f1beb088c547d9d3f4aa7c3871ffb76adb2d30975facb6a94d8c6c
-  data.tar.gz: e84bfe39c6bc408828f14e186edde19a0c971588ef6b5af867a78639573bbb1d11d6f000b9e0be91d8558cca1fe03f941de81a52c1ee6631bcb282425e6a1dcc
+  metadata.gz: 9bab89ac779f0173ef5e41eb3ad49210cd849799fc72ace8a02bfa055f51148e1b06a175187773e28d6737c87a3047de69953f916b91ffadd5f81a24efa53f0c
+  data.tar.gz: 63c464a9cc6e82aa08892a4b7feba3535d046d6f8b8035d26e9bd5248cf9c6e6d289a97323a7de3b43ac74abf749b88fce8882df2b555a0502d65ff1b7cd2cdc

data/lib/subdomain_locale/url_for.rb

@@ -10,12 +10,12 @@ module SubdomainLocale
     def url_for(options=nil)
       if options.is_a?(Hash)
         options = options.dup
-        if options.has_key?(:locale)
+        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.has_key?(:only_path) && !options[:only_path]
+        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

data/subdomain_locale.gemspec

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

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

@@ -3,6 +3,7 @@
 <%= link_to "English", root_path(locale: "en") %>
 <%= link_to "Russian", root_path(locale: "ru") %>
 <%= link_to "Ukrainian", root_path(locale: "uk") %>
+<%= link_to "Beta", root_url(subdomain: "beta") %>
 </menu>
 
 <p><%= t "hello" %></p>

data/test/rails_test.rb

@@ -10,6 +10,7 @@ class HelloControllerTest < ActionController::TestCase
     assert_equal "http://example.com/", menu[1]["href"]
     assert_equal "http://ru.example.com/",  menu[2]["href"]
     assert_equal "http://ua.example.com/",  menu[3]["href"]
+    assert_equal "http://beta.example.com/",  menu[4]["href"]
   end
 
   def test_default

metadata

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