subdomain_locale 1.0.beta5 → 1.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 749e76f7ece9b06223186583b7d207e557b37a40
-  data.tar.gz: 1b9cc4610f7e450943c8a06179855241a0cd0476
+  metadata.gz: 451e8afface6f75567cd9c4057f06dece6963bb5
+  data.tar.gz: a3f9bb42af3d2e191da53ab0b0c938d6361135ca
 SHA512:
-  metadata.gz: 9bab89ac779f0173ef5e41eb3ad49210cd849799fc72ace8a02bfa055f51148e1b06a175187773e28d6737c87a3047de69953f916b91ffadd5f81a24efa53f0c
-  data.tar.gz: 63c464a9cc6e82aa08892a4b7feba3535d046d6f8b8035d26e9bd5248cf9c6e6d289a97323a7de3b43ac74abf749b88fce8882df2b555a0502d65ff1b7cd2cdc
+  metadata.gz: e51dfa3412c056bb4f037440758b8be1cfaa45ebccd02cbd178ce770b76ebccee944569e0b54bab7a8adf12e2ad541d6ad60327c6be5ede32dd5cbf47938b3e8
+  data.tar.gz: 1d36125d9dc0a122e0dbb90efa24ef61f7395f569464b770f291d84f4ada319b7ab4f63a709ccfc4a5b54aa01700eb56df755d93d7830870b9eeafdfdbc431ea

data/lib/subdomain_locale/mapping.rb

@@ -1,13 +1,13 @@
 module SubdomainLocale
   class << self
-    attr_accessor :mapping
+    attr_accessor :mapping, :default_locale
   end
 
   def self.default_fallback(locale)
     if I18n.locale_available?(locale)
       locale
     else
-      I18n.default_locale
+      default_locale
     end
   end
 

data/lib/subdomain_locale/railtie.rb

@@ -3,12 +3,15 @@ require "rails/railtie"
 module SubdomainLocale
   class Railtie < ::Rails::Railtie
     config.subdomain_locale = {}
-    config.subdomain_default = "" # or "www"
+    config.default_subdomain = "" # or "www"
+    config.default_locale = nil
 
     # Execute after all application initializers, I18n is often configured there.
     config.after_initialize do |app|
       require "subdomain_locale/mapping"
-      default = { app.config.subdomain_default => I18n.default_locale }
+      SubdomainLocale.default_locale = app.config.default_locale || I18n.default_locale
+
+      default = { app.config.default_subdomain => SubdomainLocale.default_locale }
       mapping = default.merge(app.config.subdomain_locale)
       SubdomainLocale.mapping = Mapping.new(mapping)
     end

data/subdomain_locale.gemspec

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

data/test/dummy/config/application.rb

@@ -5,8 +5,9 @@ require "subdomain_locale/railtie"
 module Dummy
   class Application < Rails::Application
     config.i18n.enforce_available_locales = true
-    config.i18n.default_locale = :en
     config.i18n.available_locales = :en, :ru, :uk
+
+    config.default_locale = :ru
     config.subdomain_locale["ua"] = :uk
 
     config.secret_key_base = '-'

data/test/rails_test.rb

@@ -7,8 +7,8 @@ class HelloControllerTest < ActionController::TestCase
     get :world
     menu = css_select("menu a")
     assert_equal "/", menu[0]["href"]
-    assert_equal "http://example.com/", menu[1]["href"]
-    assert_equal "http://ru.example.com/",  menu[2]["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"]
     assert_equal "http://beta.example.com/",  menu[4]["href"]
   end
@@ -17,14 +17,14 @@ class HelloControllerTest < ActionController::TestCase
     @request.host = "example.com"
     get :world
     assert_response :ok
-    assert_select "p", "Hello"
+    assert_select "p", "Привет"
   end
 
   def test_direct
-    @request.host = "ru.example.com"
+    @request.host = "en.example.com"
     get :world
     assert_response :ok
-    assert_select "p", "Привет"
+    assert_select "p", "Hello"
   end
 
   def test_custom
@@ -43,13 +43,13 @@ class HelloControllerTest < ActionController::TestCase
   def test_other
     @request.host = "wtf.example.com"
     get :world
-    assert_select "p", "Hello"
+    assert_select "p", "Привет"
   end
 end
 
 class HelloMailerTest < ActionController::TestCase
   def test
-    mail = I18n.with_locale(:ru) { HelloMailer.world }
-    assert_equal "http://ru.example.com/", mail.body.to_s.lines[3].chomp
+    mail = I18n.with_locale(:uk) { HelloMailer.world }
+    assert_equal "http://ua.example.com/", mail.body.to_s.lines[3].chomp
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subdomain_locale
 version: !ruby/object:Gem::Version
-  version: 1.0.beta5
+  version: 1.0.beta6
 platform: ruby
 authors:
 - Semyon Perepelitsa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Set I18n locale based on subdomain