rack-user-locale 0.0.2 → 0.0.3

data/README.md

@@ -1,7 +1,7 @@
 rack-user-locale
 ----------------
 
-[![Build Status](https://secure.travis-ci.org/sleepingstu/rack-user-locale.png)](http://travis-ci.org/sleepingstu/rack-user-locale)
+[![Gem Version](https://badge.fury.io/rb/rack-user-locale.png)](http://badge.fury.io/rb/rack-user-locale) [![Build Status](https://secure.travis-ci.org/sleepingstu/rack-user-locale.png)](http://travis-ci.org/sleepingstu/rack-user-locale)
 
 A Rack module for getting and setting a user's locale via a cookie or browser default language.
 
@@ -44,7 +44,7 @@ Your application will now attempt to set the I18n.locale value based on the foll
 There is the option to pass in an accepted array of locales, like so:
 
 ```
-use Rack::UserLocale, :accepted_locales => [:en, :es, :fr, :de, :jp, (whatever codes you support)]
+use Rack::UserLocale, :accepted_locales => [:de, :en, :es, :fr, :ja, :pt, :zh, (whatever codes you support)]
 ```
 
 If this option is supplied the the users locale will either be set to one of the accepted locales in the array, otherwise it will be set to the I18n.default_locale value.

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/rack-user-locale.rb

@@ -9,12 +9,21 @@ module Rack
         }.merge(options)
     end
 
+    # The "non_ruby_request" variable denotes a request which doesn't call a Ruby script.
+    # This might be a CSS, static HTML, image, media, or JavaScript request.
+    #
+    # This check is in place so that if you're using this gem with multiple Rack
+    # apps running in the same application context, you won't have static resources
+    # resetting the currency selection due to requests going into the main app
+    # instead of a sub-app.
+    #
     def call(env)
       @env = env
       @request = Rack::Request.new(@env)
       set_locale
 
-      if @request.post? || @request.put? || @request.delete?
+      non_ruby_request = (@env["SCRIPT_NAME"] == nil || @env["SCRIPT_NAME"] == "")
+      if @request.post? || @request.put? || @request.delete? || non_ruby_request
         @app.call(env)
       else
         status, headers, body = @app.call(@env)

data/rack-user-locale.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rack-user-locale"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stuart Chinery", "Dave Hrycyszyn"]
-  s.date = "2013-02-05"
+  s.date = "2013-03-20"
   s.description = "A Rack module for getting and setting a user's locale via a cookie or browser default language."
   s.email = "stuart.chinery@headlondon.com"
   s.extra_rdoc_files = [
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
-    ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",

data/test/test_rack-user-locale.rb

@@ -35,7 +35,7 @@ describe "RackUserLocale" do
     describe "when from HTTP_ACCEPT_LANGUAGE headers" do
       describe "with a single locale" do
         before do
-          get "http://example.com/", {}, "HTTP_ACCEPT_LANGUAGE" => "fr-be"
+          get "http://example.com/", {}, { "HTTP_ACCEPT_LANGUAGE" => "fr-be", "SCRIPT_NAME" => "/" }
         end
 
         it "should have I18n.locale set to :fr" do
@@ -49,8 +49,9 @@ describe "RackUserLocale" do
 
       describe "with an multiple locales" do
         before do
-          get "http://example.com/", {},
-            "HTTP_ACCEPT_LANGUAGE" => "de-DE;q=0.8,de;q=0.8,no-NO;q=1.0,no;q=0.7,ru-RU;q=0.7,sv-SE;q=0.4,sv;q=0.3,nl-BE;q=0.9"
+          get "http://example.com/", {}, {
+            "HTTP_ACCEPT_LANGUAGE" => "de-DE;q=0.8,de;q=0.8,no-NO;q=1.0,no;q=0.7,ru-RU;q=0.7,sv-SE;q=0.4,sv;q=0.3,nl-BE;q=0.9",
+            "SCRIPT_NAME" => "/" }
         end
 
         it "should have I18n.locale set to :no" do
@@ -65,7 +66,8 @@ describe "RackUserLocale" do
 
     describe "when both a cooke and HTTP_ACCEPT_LANGUAGE headers are set" do
       before do
-        get "http://example.com/", {}, "HTTP_COOKIE" => "user-locale=af", "HTTP_ACCEPT_LANGUAGE" => "ar-sa"
+        get "http://example.com/", {}, { "HTTP_COOKIE" => "user-locale=af",
+          "HTTP_ACCEPT_LANGUAGE" => "ar-sa", "SCRIPT_NAME" => "/" }
       end
 
       it "should have I18n.locale set to :af" do
@@ -79,7 +81,7 @@ describe "RackUserLocale" do
 
     describe "when nothing is changed" do
       before do
-        get "http://example.com/"
+        get "http://example.com/", {}, { "SCRIPT_NAME" => "/" }
       end
 
       it "should have I18n.locale set to :en" do
@@ -90,13 +92,41 @@ describe "RackUserLocale" do
         assert_equal "user-locale=en; domain=example.com; path=/", last_response["Set-Cookie"]
       end
     end
+
+    describe "when SCRIPT_NAME is nil" do
+      before do
+        get "http://example.com/", {}
+      end
+
+      it "should have I18n.locale set to :en" do
+        assert_equal :en, I18n.locale
+      end
+
+      it "should set a cookie in the response" do
+        refute_equal "user-locale=en; domain=example.com; path=/", last_response["Set-Cookie"]
+      end
+    end
+
+    describe "when SCRIPT_NAME is blank" do
+      before do
+        get "http://example.com/", {}, { "SCRIPT_NAME" => "" }
+      end
+
+      it "should have I18n.locale set to :en" do
+        assert_equal :en, I18n.locale
+      end
+
+      it "should set a cookie in the response" do
+        refute_equal "user-locale=en; domain=example.com; path=/", last_response["Set-Cookie"]
+      end
+    end
   end
 
   describe "with accepted_locales set" do
     before do
       def app
         app = Rack::Builder.new {
-          use Rack::UserLocale, :accepted_locales => [:en, :es, :fr, :de, :jp, :nl]
+          use Rack::UserLocale, :accepted_locales => [:en, :es, :fr, :de, :ja, :nl]
 
           run BasicRackApp.new
         }
@@ -111,7 +141,7 @@ describe "RackUserLocale" do
 
     describe "when a locale cookie is set" do
       before do
-        get "http://example.com/", {}, "HTTP_COOKIE" => "user-locale=es"
+        get "http://example.com/", {}, { "HTTP_COOKIE" => "user-locale=es", "SCRIPT_NAME" => "/" }
       end
 
       it "should have I18n.locale set to :es" do
@@ -126,7 +156,7 @@ describe "RackUserLocale" do
     describe "when from HTTP_ACCEPT_LANGUAGE headers" do
       describe "with an accepted locale" do
         before do
-          get "http://example.com/", {}, "HTTP_ACCEPT_LANGUAGE" => "fr-be"
+          get "http://example.com/", {}, { "HTTP_ACCEPT_LANGUAGE" => "fr-be", "SCRIPT_NAME" => "/" }
         end
 
         it "should have I18n.locale set to :fr" do
@@ -139,24 +169,41 @@ describe "RackUserLocale" do
       end
 
       describe "with an multiple locales" do
-        before do
-          get "http://example.com/", {},
-            "HTTP_ACCEPT_LANGUAGE" => "de-DE;q=0.8,de;q=0.8,no-NO;q=0.7,no;q=0.7,ru-RU;q=0.7,sv-SE;q=0.4,sv;q=0.3,nl-BE;q=0.9"
+        describe "at different weights" do
+          before do
+            get "http://example.com/", {}, {
+              "HTTP_ACCEPT_LANGUAGE" => "de-DE;q=0.8,de;q=0.8,no-NO;q=0.7,no;q=0.7,ru-RU;q=0.7,sv-SE;q=0.4,sv;q=0.3,nl-BE;q=0.9",
+              "SCRIPT_NAME" => "/" }
+          end
+
+          it "should have I18n.locale set to :nl" do
+            assert_equal :nl, I18n.locale
+          end
+
+          it "should set a cookie in the response" do
+            assert_equal "user-locale=nl; domain=example.com; path=/", last_response["Set-Cookie"]
+          end
         end
 
-        it "should have I18n.locale set to :nl" do
-          assert_equal :nl, I18n.locale
-        end
+        describe "at the same weight" do
+          before do
+            get "http://example.com/", {}, {
+              "HTTP_ACCEPT_LANGUAGE" => "fr,en,ja", "SCRIPT_NAME" => "/" }
+          end
 
-        it "should set a cookie in the response" do
-          assert_equal "user-locale=nl; domain=example.com; path=/", last_response["Set-Cookie"]
+          it "should have I18n.locale set to :fr" do
+            assert_equal :fr, I18n.locale
+          end
+
+          it "should set a cookie in the response" do
+            assert_equal "user-locale=fr; domain=example.com; path=/", last_response["Set-Cookie"]
+          end
         end
       end
 
-
       describe "without an accepted locale" do
         before do
-          get "http://example.com/", {}, "HTTP_ACCEPT_LANGUAGE" => "ar-sa"
+          get "http://example.com/", {}, { "HTTP_ACCEPT_LANGUAGE" => "ar-sa", "SCRIPT_NAME" => "/" }
         end
 
         it "should have I18n.locale set to :en" do
@@ -171,11 +218,12 @@ describe "RackUserLocale" do
 
     describe "when both a cooke and HTTP_ACCEPT_LANGUAGE headers are set" do
       before do
-        get "http://example.com/", {}, "HTTP_COOKIE" => "user-locale=jp", "HTTP_ACCEPT_LANGUAGE" => "fr-be"
+        get "http://example.com/", {}, { "HTTP_COOKIE" => "user-locale=ja",
+          "HTTP_ACCEPT_LANGUAGE" => "fr-be", "SCRIPT_NAME" => "/" }
       end
 
-      it "should have I18n.locale set to :jp" do
-        assert_equal :jp, I18n.locale
+      it "should have I18n.locale set to :ja" do
+        assert_equal :ja, I18n.locale
       end
 
       it "should not set a cookie in the response" do
@@ -185,7 +233,7 @@ describe "RackUserLocale" do
 
     describe "when nothing is changed" do
       before do
-        get "http://example.com/"
+        get "http://example.com/", {}, { "SCRIPT_NAME" => "/" }
       end
 
       it "should have I18n.locale set to :en" do
@@ -196,5 +244,33 @@ describe "RackUserLocale" do
         assert_equal "user-locale=en; domain=example.com; path=/", last_response["Set-Cookie"]
       end
     end
+
+    describe "when SCRIPT_NAME is nil" do
+      before do
+        get "http://example.com/", {}
+      end
+
+      it "should have I18n.locale set to :en" do
+        assert_equal :en, I18n.locale
+      end
+
+      it "should set a cookie in the response" do
+        refute_equal "user-locale=en; domain=example.com; path=/", last_response["Set-Cookie"]
+      end
+    end
+
+    describe "when SCRIPT_NAME is blank" do
+      before do
+        get "http://example.com/", {}, { "SCRIPT_NAME" => "" }
+      end
+
+      it "should have I18n.locale set to :en" do
+        assert_equal :en, I18n.locale
+      end
+
+      it "should set a cookie in the response" do
+        refute_equal "user-locale=en; domain=example.com; path=/", last_response["Set-Cookie"]
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-user-locale
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -166,7 +166,6 @@ extra_rdoc_files:
 - README.md
 files:
 - .document
-- .rvmrc
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -192,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1318168900759359089
+      hash: -4120119021776085754
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3-p362@rack-user-locale