rack-i18n_locale_switcher 0.5.1 → 0.5.2

data/CHANGELOG

@@ -1,3 +1,6 @@
+= 0.5.2 / 2011-11-29
+  Added support for path exceptions.
+
 = 0.5.0 / 2011-11-29
   Added option to redirect to a given URL scheme.
   Added support for canonical URLs with the default locale.

data/README.md

@@ -28,6 +28,10 @@ as will the following request:
 
     require  'rack/i18n_locale_switcher'
     config.middleware.use Rack::I18nLocaleSwitcher
+    
+If you use Rails 3.1 with the asset pipeline, make sure you exclude the path to assets:
+
+    config.middleware.use Rack::I18nLocaleSwitcher, :except => /^\/assets/
 
 ### Using it with Sinatra
 
@@ -70,6 +74,12 @@ To avoid this, you can set the `canonical` option resulting in requests to be re
 
 In this configuration, requests to `http://en.example.org` will be redirected to `http://example.org` (provided you have set `I18n.default_locale` to `:en`).
 
+### Exceptions
+
+If you would like to exclude certain paths from locale switcher, just pass a regex matching these paths in the `except` option.
+
+    use Rack::I18nLocaleSwitcher, :redirect => :path, :except => /^\/(assets|static)\b/
+
 
 ## Configuring I18n
 
@@ -81,6 +91,7 @@ You should also set the default locale to which Locale Switcher will fall back i
 
     I18n.default_locale = :de
 
+
 ## Feedback and Contributions
 
 We appreciate your feedback and contributions. If you find a bug, feel free to to open a GitHub issue. Better yet, add a test that exposes the bug, fix it and send us a pull request.

data/Rakefile

@@ -2,7 +2,7 @@
 require 'rake'
 require 'echoe'
 
-Echoe.new('rack-i18n_locale_switcher', '0.5.1') do |p|
+Echoe.new('rack-i18n_locale_switcher', '0.5.2') do |p|
 
  p.description = "Detects the current locale from query parameter, path prefix, host or accept header."
  p.url         = "http://github.com/christoph-buente/rack-i18n_locale_switcher"

data/lib/rack/i18n_locale_switcher.rb

@@ -12,7 +12,8 @@ module Rack
       :param     => 'locale',
       :source    => SOURCES,
       :redirect  => nil,
-      :canonical => false
+      :canonical => false,
+      :except    => nil
     }.freeze
 
     def initialize(app, options = {})
@@ -28,6 +29,7 @@ module Rack
 
       @param     = options[:param]
       @canonical = options[:canonical]
+      @except    = options[:except]
 
       @sources = options[:source]      
       @sources = Array(@sources) unless @sources.is_a?(Array)
@@ -46,10 +48,12 @@ module Rack
     end
 
     def call(env)
-      I18n.locale = I18n.default_locale
+      return @app.call(env) if env['PATH_INFO'] =~ @except
       
+      I18n.locale = I18n.default_locale
+    
       env['PATH_INFO'].gsub!(/([^\/])\/$/, '\1')
-      
+    
       request = Rack::Request.new(env)
       request_url = request.url
 
@@ -61,12 +65,12 @@ module Rack
           I18n.locale = locale
         end
       end
-      
+    
       if @redirect
         unless @canonical && I18n.locale == I18n.default_locale
           send(:"set_locale_in_#@redirect", env)
         end
-        
+      
         if request.url != request_url
           env['PATH_INFO'] = '' if env['PATH_INFO'] == '/'
           return [ 301, { 'Location' => request.url }, ["Redirecting"]]

data/rack-i18n_locale_switcher.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-i18n_locale_switcher}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christoph B\303\274nte, Andreas Korth"]
-  s.date = %q{2011-11-29}
+  s.date = %q{2011-11-30}
   s.description = %q{Detects the current locale from query parameter, path prefix, host or accept header.}
   s.email = ["info@christophbuente.de", "andreas.korth@gmail.com"]
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.md", "lib/rack/i18n_locale_switcher.rb"]

data/spec/rack/i18n_locale_switcher_spec.rb

@@ -294,5 +294,22 @@ describe Rack::I18nLocaleSwitcher do
 
       it_should_behave_like "a redirect with the default locale"
     end
+    
+    context "exceptions" do
+
+      let :options do
+        { :redirect => :path, :except => /^\/assets/ }
+      end
+      
+      it "should not redirect if the path is exempt" do
+        [ "http://example.com/assets",   
+          "http://de.example.com/assets/foo/bar",
+          "http://example.com/assets/"
+        ].each do |url|
+          get url
+          last_response.should_not be_redirect
+        end
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-i18n_locale_switcher
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - "Christoph B\xC3\xBCnte, Andreas Korth"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-29 00:00:00 +01:00
+date: 2011-11-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency