rack-user-locale 0.0.3 → 0.0.4

data/README.md

@@ -49,9 +49,23 @@ use Rack::UserLocale, :accepted_locales => [:de, :en, :es, :fr, :ja, :pt, :zh, (
 
 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.
 
-
 Should you wish to overwrite a users locale value at any point in your application, like for changing language prefs, then simple rewrite the "user-locale" cookie with a new value.
 
+**Note:**
+
+The user locale detection is done on every Rack::Request, which would include all of the non Ruby/Rack actions like .css or .js files.
+
+If you don't want this happen then you can use Rack::Static in your application and filter out which files Rack should serve up statically.
+
+Something like this:
+
+```
+use Rack::Static, :urls => ["/*"], :root => "public"
+```
+would serve anything in your public folder statically and wouldn't create a Rack::Request.
+
+See the [Rack::Static docs](http://rack.rubyforge.org/doc/classes/Rack/Static.html) for more info.
+
 Contributing to rack-user-locale
 =======================
 

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/rack-user-locale.rb

@@ -9,21 +9,12 @@ 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
 
-      non_ruby_request = (@env["SCRIPT_NAME"] == nil || @env["SCRIPT_NAME"] == "")
-      if @request.post? || @request.put? || @request.delete? || non_ruby_request
+      if @request.post? || @request.put? || @request.delete?
         @app.call(env)
       else
         status, headers, body = @app.call(@env)

data/rack-user-locale.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rack-user-locale"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stuart Chinery", "Dave Hrycyszyn"]

data/test/test_rack-user-locale.rb

@@ -92,34 +92,6 @@ 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
@@ -244,33 +216,5 @@ 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.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -191,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4120119021776085754
+      hash: -2671842135263773507
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: