rack-locale_chooser 0.0.13 → 0.0.14

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-locale_chooser (0.0.11)
+    rack-locale_chooser (0.0.13)
 
 GEM
   remote: http://rubygems.org/

data/lib/rack-locale_chooser/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module LocaleChooser
-    VERSION = "0.0.13"
+    VERSION = "0.0.14"
   end
 end

data/lib/rack-locale_chooser.rb

@@ -9,4 +9,4 @@ module Rack
       Chooser.new(app, options)
     end
   end
-end
+end

data/spec/rack-locale_chooser_spec.rb

@@ -1,10 +1,12 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'logger'
 
 describe Rack::LocaleChooser do
   def app
     app = Rack::Builder.new {
-      use Rack::LocaleChooser::Chooser, :host_mappings => { :en => 'us.example.com', 
-                                                            :es => 'es.example.com' }, 
+      use Rack::LocaleChooser::Chooser, :logger => Logger.new('log/locale.log'),
+                                        :host_mappings => { :es => 'es.example.com',
+                                                            :pt_BR => 'br.example.com' }, 
                                         :country_mappings => { 'VE' => :es }                                        
       run BasicRackApp.new
     }
@@ -19,10 +21,7 @@ describe Rack::LocaleChooser do
       get 'http://example.com/', {},  'HTTP_COOKIE' => 'locale=es'
       last_response.status.should == 301
       last_response.headers['Location'].should == 'http://es.example.com/'
-    end
-    
-    it "should be redirected folling geolocation" do
-      get 'http://example.com', {}
+      I18n.locale.should == :es
     end
     
     it "should be redirected following HTTP_ACCEPT_LANGUAGE headers" do
@@ -32,25 +31,22 @@ describe Rack::LocaleChooser do
       I18n.locale.should == :es
     end
     
-    it "should map locale to explicit domain mappings" do
-      get 'http://example.com/', {}, 'HTTP_ACCEPT_LANGUAGE' => 'en'
-      last_response.status.should == 301
-      last_response.headers['Location'].should == 'http://us.example.com/'
-      I18n.locale.should == :en
-    end
-
-
     it "should map locale to explicit location mappings by country level" do
-      get 'http://example.com/', {}, 'REMOTE_ADDR' => '200.1.1.2' # Cacacas VE
+      get 'http://example.com/', {}, 'REMOTE_ADDR' => '200.1.1.2' # VE
       last_response.status.should == 301  
       last_response.headers['Location'].should == 'http://es.example.com/'
+      I18n.locale.should == :es
     end
 
+    it "should map locale to default if location mappings by country level not found" do
+      get 'http://example.com/', {}, 'REMOTE_ADDR' => '174.141.155.106' # US
+      last_response.status.should == 200
+      I18n.locale.should == :en
+    end
 
     it "fall back to default if accept language headers not on mappings" do
       get 'http://example.com/', {}, 'HTTP_ACCEPT_LANGUAGE' => 'ru'
-      last_response.status.should == 301
-      last_response.headers['Location'].should == 'http://us.example.com/'
+      last_response.status.should == 200
       I18n.locale.should == :en
     end
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-locale_chooser
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - "Jefferson Jean Martins Gir\xC3\xA3o"