subdomain_locale 1.0.beta2 → 1.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d876d5f0c2e358943ce4c36ddfcf32540ada100
-  data.tar.gz: a10f6871505cada6b31b354d97622fc8935e0b8f
+  metadata.gz: 7e922108abe3424f50377edcecfb7e50859500e0
+  data.tar.gz: 398d5cc593c29b115b2d64f60e9ae910e5edda8f
 SHA512:
-  metadata.gz: 58f34c367ab4da79d17af2146b902af133eda0724701216dad5cb62d077d51d333b177b1a13754a844ccd26ea859e09a9b9b9219d987323ad0577fc532deb435
-  data.tar.gz: 0987bcc9054604098dd5e15590679508f6b098bf6e41baac7d34004fadec25193e09a6846c5dac6dccaf35831b31298265d12188753a3b966f61229cc2249ce8
+  metadata.gz: bce28543d5379b27d6e86b050a642dd331d804f0b310e0986f89f166490f6fb49274481ba0db02bf9730d02a86be91eb507f834fc4e9541b8bdaaaf5527f2ad4
+  data.tar.gz: 8b763460ecc07a8f1aa178c656a8e2a81ffc3e2fad73beea839a669390ba68754a6cb9ff287d985d3f5a3d69a1faa34b0fb296eb794b564002030357f5bcea61

data/lib/subdomain_locale/controller.rb

@@ -1,13 +1,15 @@
 module SubdomainLocale
   module Controller
     def self.included(base)
-      base.before_filter :set_locale
+      base.around_filter :set_locale
     end
 
     private
 
     def set_locale
-      I18n.locale = SubdomainLocale.mapping.locale_for(request.subdomain)
+      locale = SubdomainLocale.mapping.locale_for(request.subdomain)
+      locale = SubdomainLocale.default_fallback(locale)
+      I18n.with_locale(locale) { yield }
     end
   end
 end

data/lib/subdomain_locale/mapping.rb

@@ -3,6 +3,14 @@ module SubdomainLocale
     attr_accessor :mapping
   end
 
+  def self.default_fallback(locale)
+    if I18n.locale_available?(locale)
+      locale
+    else
+      I18n.default_locale
+    end
+  end
+
   class Mapping
     def initialize(mapping)
       @repository = {}

data/lib/subdomain_locale/railtie.rb

@@ -3,11 +3,12 @@ require "rails/railtie"
 module SubdomainLocale
   class Railtie < ::Rails::Railtie
     config.subdomain_locale = {}
+    config.subdomain_default = "" # or "www"
 
     # Execute after all application initializers, I18n is often configured there.
     config.after_initialize do |app|
       require "subdomain_locale/mapping"
-      default = { "" => I18n.default_locale, "www" => I18n.default_locale }
+      default = { app.config.subdomain_default => I18n.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.beta2"
+  spec.version       = "1.0.beta3"
   spec.authors       = ["Semyon Perepelitsa"]
   spec.email         = ["sema@sema.in"]
   spec.summary       = "Set I18n locale based on subdomain"

data/test/dummy/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Dummy::Application

data/test/mapping_test.rb

@@ -1,7 +1,4 @@
-require "isolate/now"
-require "minitest/autorun"
-require "subdomain_locale/mapping"
-require "active_support/core_ext"
+require_relative "test_helper"
 
 class MappingTest < MiniTest::Unit::TestCase
   include SubdomainLocale

data/test/rails_test.rb

@@ -1,11 +1,5 @@
 # encoding: UTF-8
-ENV["RAILS_ENV"] = "test"
-
-require "isolate/now"
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-require "minitest/autorun"
-require "rails/test_help"
-Rails.backtrace_cleaner.remove_silencers!
+require_relative "test_helper"
 
 class HelloControllerTest < ActionController::TestCase
   def test_links
@@ -13,13 +7,13 @@ class HelloControllerTest < ActionController::TestCase
     get :world
     menu = css_select("menu a")
     assert_equal "/", menu[0]["href"]
-    assert_equal "http://www.example.com/", menu[1]["href"]
+    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"]
   end
 
   def test_default
-    @request.host = "www.example.com"
+    @request.host = "example.com"
     get :world
     assert_response :ok
     assert_select "p", "Hello"
@@ -39,11 +33,16 @@ class HelloControllerTest < ActionController::TestCase
     assert_select "p", "Привіт"
   end
 
+  def test_locale_after_action
+    @request.host = "ru.example.com"
+    get :world
+    assert_equal :en, I18n.locale
+  end
+
   def test_other
     @request.host = "wtf.example.com"
-    assert_raise(I18n::InvalidLocale) do
-      get :world
-    end
+    get :world
+    assert_select "p", "Hello"
   end
 end
 

data/test/test_helper.rb

@@ -0,0 +1,7 @@
+ENV["RAILS_ENV"] = "test"
+
+require "isolate/now"
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require "minitest/autorun"
+require "rails/test_help"
+Rails.backtrace_cleaner.remove_silencers!

data/test/url_for_test.rb

@@ -1,7 +1,4 @@
-require "isolate/now"
-require "minitest/autorun"
-require "subdomain_locale"
-require "subdomain_locale/url_for"
+require_relative "test_helper"
 
 class UrlForTest < MiniTest::Unit::TestCase
   module UrlFor

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subdomain_locale
 version: !ruby/object:Gem::Version
-  version: 1.0.beta2
+  version: 1.0.beta3
 platform: ruby
 authors:
 - Semyon Perepelitsa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -47,6 +47,7 @@ files:
 - 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
 - test/dummy/config/environments/test.rb
@@ -55,6 +56,7 @@ files:
 - test/dummy/config/routes.rb
 - test/mapping_test.rb
 - test/rails_test.rb
+- test/test_helper.rb
 - test/url_for_test.rb
 homepage: https://github.com/semaperepelitsa/subdomain_locale
 licenses:
@@ -76,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Set I18n locale based on subdomain
@@ -87,6 +89,7 @@ test_files:
 - 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
 - test/dummy/config/environments/test.rb
@@ -95,4 +98,5 @@ test_files:
 - test/dummy/config/routes.rb
 - test/mapping_test.rb
 - test/rails_test.rb
+- test/test_helper.rb
 - test/url_for_test.rb