subdomain_locale 1.0.beta → 1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faeaa8c630da1a8aaea5ec82125d459d60cc026f
-  data.tar.gz: c2d984aaa1f3027ea35641ff757913b694c6242f
+  metadata.gz: 1d876d5f0c2e358943ce4c36ddfcf32540ada100
+  data.tar.gz: a10f6871505cada6b31b354d97622fc8935e0b8f
 SHA512:
-  metadata.gz: 20f97bd6745d902651120fbcc8dfb2bc44b21ee7e10a9e5b939071d9a84c8457f6ddd28ccd9b1d433e4f02bfab0cb521bfd20b89d2a2e2e500bfcba684d516ef
-  data.tar.gz: 8847cd159a0b90131bebf98ff93bfbd042b9beedfdf082ca93e912a5d0a0bbb4c895cd37e28fc8e31525e4ac40b5f6854ee41cd9b1430ffd37050fc31191c799
+  metadata.gz: 58f34c367ab4da79d17af2146b902af133eda0724701216dad5cb62d077d51d333b177b1a13754a844ccd26ea859e09a9b9b9219d987323ad0577fc532deb435
+  data.tar.gz: 0987bcc9054604098dd5e15590679508f6b098bf6e41baac7d34004fadec25193e09a6846c5dac6dccaf35831b31298265d12188753a3b966f61229cc2249ce8

data/Isolate

@@ -1,6 +1,7 @@
 options system: false, cleanup: false
 
 gem 'bundler', '~> 1.5.0'
+gem 'i18n', '~> 0.6.9'
 
 case ENV['RAILS']
 when '3'
@@ -8,13 +9,11 @@ when '3'
   gem 'actionpack', version
   gem 'actionmailer', version
   gem 'railties', version
-  gem 'i18n', '0.6.5'
 when nil
   version = '~> 4.0.0'
   gem 'actionpack', version
   gem 'actionmailer', version
   gem 'railties', version
-  gem 'i18n', '~> 0.6.9'
 else
   raise "Unrecognized Rails version: #{ENV['RAILS']}"
 end

data/lib/subdomain_locale/mapping.rb

@@ -16,7 +16,7 @@ module SubdomainLocale
     end
 
     def subdomain_for(locale)
-      locale and @repository.invert[locale.to_s] || locale.to_s
+      locale and @repository.invert.fetch(locale.to_s, locale.to_s).presence
     end
   end
 end

data/subdomain_locale.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "subdomain_locale"
-  spec.version       = "1.0.beta"
+  spec.version       = "1.0.beta2"
   spec.authors       = ["Semyon Perepelitsa"]
   spec.email         = ["sema@sema.in"]
   spec.summary       = "Set I18n locale based on subdomain"
@@ -12,5 +12,5 @@ Gem::Specification.new do |spec|
   spec.files         = File.read("Manifest.txt").split("\n")
   spec.test_files    = spec.files.grep(%r{^test/})
 
-  spec.add_dependency "i18n", "~> 0.2"
+  spec.add_dependency "i18n", "~> 0.6.9"
 end

data/test/mapping_test.rb

@@ -1,12 +1,13 @@
 require "isolate/now"
 require "minitest/autorun"
 require "subdomain_locale/mapping"
+require "active_support/core_ext"
 
 class MappingTest < MiniTest::Unit::TestCase
   include SubdomainLocale
 
   def setup
-    @mapping = Mapping.new("ua" => :uk)
+    @mapping = Mapping.new("ua" => :uk, "" => :en)
   end
 
   def test_custom
@@ -19,6 +20,14 @@ class MappingTest < MiniTest::Unit::TestCase
     assert_equal "ru", @mapping.subdomain_for(:ru)
   end
 
+  def test_no_subdomain
+    # 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)
+  end
+
   def test_nil
     assert_nil @mapping.subdomain_for(nil)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subdomain_locale
 version: !ruby/object:Gem::Version
-  version: 1.0.beta
+  version: 1.0.beta2
 platform: ruby
 authors:
 - Semyon Perepelitsa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.6.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.6.9
 description: 
 email:
 - sema@sema.in