rack-i18n_locale_switcher 0.4.0 → 0.5.0

data/CHANGELOG

@@ -1,5 +1,9 @@
+= 0.5.0 / 2011-11-29
+  Added option to redirect to a given URL scheme.
+  Added support for canonical URLs with the default locale.
+
 = 0.4.0 / 2011-11-26
-  Added support configuration of sources from which to determine the locale
+  Added support for configuring of sources from which to determine the locale
   as well as the name of the query parameter.
   Drop support for TLD since locale can't be reliably inferred from it
   Code refactoring and better test coverage.

data/Manifest

@@ -5,4 +5,4 @@ README.md
 Rakefile
 lib/rack/i18n_locale_switcher.rb
 rack-i18n_locale_switcher.gemspec
-spec/i18n_locale_switcher_spec.rb
+spec/rack/i18n_locale_switcher_spec.rb

data/Rakefile

@@ -2,7 +2,7 @@
 require 'rake'
 require 'echoe'
 
-Echoe.new('rack-i18n_locale_switcher', '0.4.0') do |p|
+Echoe.new('rack-i18n_locale_switcher', '0.5.0') 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"
@@ -20,7 +20,7 @@ Echoe.new('rack-i18n_locale_switcher', '0.4.0') do |p|
    *.tmproj
  }
 
- p.runtime_dependencies     = [ "rack", "i18n", "domainatrix" ]
+ p.runtime_dependencies     = [ "rack", "i18n" ]
  p.development_dependencies = [ "echoe", "rspec", "rack-test" ]
 end
 

data/lib/rack/i18n_locale_switcher.rb

@@ -1,12 +1,18 @@
 require 'i18n'
-# require 'domainatrix'
 
 module Rack
   class I18nLocaleSwitcher
     
+    LOCALE_PATTERN = '([a-z]{1,8})(-[a-zA-Z]{1,8})?'.freeze
+    
+    SOURCES   = [ :param, :path, :host, :header ].freeze
+    REDIRECTS = [ :param, :path, :host ].freeze
+    
     DEFAULT_OPTIONS = {
-      :param  => 'locale',
-      :source => [ :param, :path, :host, :header ]
+      :param     => 'locale',
+      :source    => SOURCES,
+      :redirect  => nil,
+      :canonical => false
     }.freeze
 
     def initialize(app, options = {})
@@ -18,54 +24,120 @@ module Rack
         raise ArgumentError, "Invalid option(s) #{ invalid_options.map(&:inspect).join(', ') }" 
       end
       
-      @options = DEFAULT_OPTIONS.merge(options)
-      @options[:source] = Array(@options[:source]) unless @options[:source].is_a?(Array)
+      options = DEFAULT_OPTIONS.merge(options)
+
+      @param     = options[:param]
+      @canonical = options[:canonical]
+
+      @sources = options[:source]      
+      @sources = Array(@sources) unless @sources.is_a?(Array)
+      
+      invalid_sources = @sources - SOURCES
+
+      if invalid_sources.any?
+        raise ArgumentError, "Invalid source(s) #{ invalid_sources.map(&:inspect).join(', ') }" 
+      end
+
+      @redirect = options[:redirect]
+
+      unless @redirect.nil? || REDIRECTS.include?(@redirect)
+        raise ArgumentError, "Invalid redirect option #{ @redirect.inspect }" 
+      end
     end
 
     def call(env)
       I18n.locale = I18n.default_locale
       
-      @options[:source].each do |source|
-        if locale = send(:"get_locale_from_#{source}", env)
+      env['PATH_INFO'].gsub!(/([^\/])\/$/, '\1')
+      
+      request = Rack::Request.new(env)
+      request_url = request.url
+
+      source = nil
+      @sources.each do |src|
+        locale = send(:"extract_locale_from_#{src}", env)
+        if locale && source.nil?
+          source = src
           I18n.locale = locale
-          break
         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"]]
+        end
+      end
+      
       @app.call(env)
     end
 
     private
+    
+    def extract_locale_from_param(env)
+      query_string = env['QUERY_STRING'].gsub(/\b#{ @param }=#{ LOCALE_PATTERN }(?:&|$)/, '')
 
-    def get_locale_from_param(env)
-      env['QUERY_STRING'] =~ /\b#{ @options[:param] }=([^&]+)\b/
-      to_available_locale($1)
+      if locale = available_locale($1, $2)
+        env['QUERY_STRING'] = query_string.gsub(/&$/, '')        
+      end
+      locale
     end
 
-    def get_locale_from_path(env)
-      env['PATH_INFO'] =~ /^\/([^\/]+)/
-      to_available_locale($1)
+    def extract_locale_from_path(env)
+      path_info = env['PATH_INFO'].gsub(/^\/#{ LOCALE_PATTERN }\b/, '')
+
+      if locale = available_locale($1, $2)
+        env['PATH_INFO'] = path_info
+      end
+      locale
     end
 
-    def get_locale_from_host(env)
-      env['SERVER_NAME'] =~ /^([^.]+)\.[^.]+\.[^.]+/i
-      to_available_locale($1)
+    def extract_locale_from_host(env)
+      env['HTTP_HOST'] ||= "#{ env['SERVER_NAME'] }:#{ env['SERVER_PORT'] }"            
+
+      http_host = env['HTTP_HOST'].gsub(/^#{ LOCALE_PATTERN }\./, '')
+
+      if locale = available_locale($1, $2)
+        env['HTTP_HOST']   = http_host
+        env['SERVER_NAME'] = http_host.gsub(/:\d+$/, '')
+      end
+      locale
     end
 
-    def get_locale_from_header(env)
-      locale = nil
+    def extract_locale_from_header(env)
+      locale = nil            
       if accept = env['HTTP_ACCEPT_LANGUAGE']
-        locales = accept.scan(/([^;,]+)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i)
+        locales = accept.scan(/#{ LOCALE_PATTERN }\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i)
         locales.sort_by{ |loc| 1 - (loc.last || 1).to_f }.each do |loc|
-          break if locale = to_available_locale(loc.first)
+          break if locale = available_locale(*loc[0,2])
         end
-      end
+      end      
       locale
     end
+
+    def set_locale_in_param(env)
+      env['QUERY_STRING'] << '&' unless env['QUERY_STRING'].empty?
+      env['QUERY_STRING'] << "#{ @param }=#{ I18n.locale }"
+    end
+
+    def set_locale_in_path(env)
+      env['PATH_INFO'] = "/#{ I18n.locale }#{ env['PATH_INFO'] }"
+      env['PATH_INFO'].gsub!(/\/$/, '')
+    end
+
+    def set_locale_in_host(env)
+      ['HTTP_HOST', 'SERVER_NAME'].each do |key|
+        env[ key ] = "#{ I18n.locale }.#{ env[ key ] }"
+      end
+    end
     
-    def to_available_locale(locale)
-      if locale =~ /^([a-z]{1,8})(-[a-z]{1,8})?$/i
-        locale = :"#{ $1.downcase }#{ ($2 || '').upcase }"
+    def available_locale(language, region)
+      if language
+        locale = :"#{ language.downcase }#{ (region || '').upcase }"
         locale if I18n.available_locales.include?(locale)
       end
     end

data/rack-i18n_locale_switcher.gemspec

@@ -1,22 +1,22 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "rack-i18n_locale_switcher"
-  s.version = "0.4.0"
+  s.name = %q{rack-i18n_locale_switcher}
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Christoph B\u{fc}nte, Andreas Korth"]
-  s.date = "2011-11-26"
-  s.description = "Detects the current locale from query parameter, path prefix, host or accept header."
+  s.authors = ["Christoph B\303\274nte, Andreas Korth"]
+  s.date = %q{2011-11-29}
+  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"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.md", "Rakefile", "lib/rack/i18n_locale_switcher.rb", "rack-i18n_locale_switcher.gemspec", "spec/i18n_locale_switcher_spec.rb"]
-  s.homepage = "http://github.com/christoph-buente/rack-i18n_locale_switcher"
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.md", "Rakefile", "lib/rack/i18n_locale_switcher.rb", "rack-i18n_locale_switcher.gemspec", "spec/rack/i18n_locale_switcher_spec.rb"]
+  s.homepage = %q{http://github.com/christoph-buente/rack-i18n_locale_switcher}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rack-i18n_locale_switcher", "--main", "README.md"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = "rack-i18n_locale_switcher"
-  s.rubygems_version = "1.8.11"
-  s.summary = "Detects the current locale from query parameter, path prefix, host or accept header."
+  s.rubyforge_project = %q{rack-i18n_locale_switcher}
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{Detects the current locale from query parameter, path prefix, host or accept header.}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -24,14 +24,12 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, [">= 0"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
-      s.add_runtime_dependency(%q<domainatrix>, [">= 0"])
       s.add_development_dependency(%q<echoe>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rack-test>, [">= 0"])
     else
       s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<domainatrix>, [">= 0"])
       s.add_dependency(%q<echoe>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rack-test>, [">= 0"])
@@ -39,7 +37,6 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<domainatrix>, [">= 0"])
     s.add_dependency(%q<echoe>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rack-test>, [">= 0"])

data/spec/rack/i18n_locale_switcher_spec.rb

@@ -0,0 +1,298 @@
+require 'rack/i18n_locale_switcher'
+require 'rack/test'
+
+describe Rack::I18nLocaleSwitcher do
+
+  include Rack::Test::Methods
+
+  let :options do
+    {}
+  end
+  
+  let :app do
+    opts = options
+    rack = Rack::Builder.new do
+      map "/" do
+        use Rack::I18nLocaleSwitcher, opts
+        run lambda { |env| [200, {}, "Coolness"] }
+      end
+    end
+    rack.to_app
+  end
+
+  before do
+    I18n.available_locales = [:en, :'en-US', :de, :'de-DE', :es]
+    I18n.default_locale = :en
+  end
+
+  it "should fall back to the locale to default locale" do
+    get "http://example.com/some/path"
+    I18n.locale.should eql(I18n.default_locale)
+
+    get "http://www.example.com/"
+    I18n.locale.should eql(I18n.default_locale)
+  end
+  
+  it "should not accept invalid options" do
+    expect { 
+      Rack::I18nLocaleSwitcher.new("app", :not_an_option => "foo") 
+    }.to raise_error(ArgumentError, "Invalid option(s) :not_an_option")
+
+    expect { 
+      Rack::I18nLocaleSwitcher.new("app", :source => [ :not_a_source ]) 
+    }.to raise_error(ArgumentError, "Invalid source(s) :not_a_source")
+
+    expect { 
+      Rack::I18nLocaleSwitcher.new("app", :redirect => :not_a_source) 
+    }.to raise_error(ArgumentError, "Invalid redirect option :not_a_source")
+  end
+  
+  context "with custom sources" do
+    
+    let :options do
+      { :source => [ :header, :host ] }
+    end
+    
+    it "should honor the sequence" do
+      get "http://de.example.com" , nil, {"HTTP_ACCEPT_LANGUAGE" => "es"}
+      I18n.locale.should eql(:es)
+
+      get "http://de.example.com" , nil, {"HTTP_ACCEPT_LANGUAGE" => "foo"}
+      I18n.locale.should eql(:de)
+
+      get "http://de.example.com"
+      I18n.locale.should eql(:de)
+    end
+
+    it "should ignore other sources" do
+      get "http://example.com?locale=de"
+      I18n.locale.should eql(:en)
+
+      get "http://example.com/de"
+      I18n.locale.should eql(:en)
+    end
+  end
+
+  context "request param" do
+
+    it "should set the locale" do
+      get "http://example.com?locale=de"
+      I18n.locale.should eql(:de)
+
+      get "http://example.com?locale=en-US"
+      I18n.locale.should eql(:'en-US')
+
+      get "http://example.com/some/path?foo=bar&locale=es&param=value"
+      I18n.locale.should eql(:es)
+    end
+
+    it "should not set an unavailable locale" do
+      get "http://example.com?locale=xx"
+      I18n.locale.should eql(I18n.default_locale)
+    end
+    
+    context "name" do
+      
+      let :options do
+        { :param => "lang" }
+      end
+      
+      it "should be configurable" do
+        get "http://example.com?lang=de"
+        I18n.locale.should eql(:de)
+      end
+    end
+  end
+
+  context "from path prefix " do
+
+    it "should set the I18n locale" do
+      get "http://example.com/de/some/path/"
+      I18n.locale.should eql(:de)
+
+      get "http://example.com/en-us"
+      I18n.locale.should eql(:'en-US')
+    end
+  end
+
+  context "from host" do
+
+    it "should set the I18n locale" do
+      get "http://de.example.com/"
+      I18n.locale.should eql(:de)
+
+      get "http://de-de.example.com/"
+      I18n.locale.should eql(:'de-DE')
+    end
+  end
+
+  context "from accept-language header" do
+
+    it "should override the client requested locale" do
+      get "http://example.com" , nil, {"HTTP_ACCEPT_LANGUAGE" => "de-de,de,en;q=0.5"}
+      I18n.locale.should eql(:'de-DE')
+
+      get "http://example.com" , nil, {"HTTP_ACCEPT_LANGUAGE" => "en;q=0.5,en-US;q=0.8,es;q=0.7"}
+      I18n.locale.should eql(:'en-US')
+    end
+  end
+  
+  shared_examples_for "a redirect with the default locale" do
+
+    it "should redirect to the canonical URL" do
+      %w{ 
+        http://en.example.com
+        http://example.com/en
+        http://example.com?locale=en
+      }.each do |url|
+        get url
+        last_response.should be_redirect
+        last_response.location.should eql("http://example.com")
+      end
+    end
+
+    it "should not redirect if the locale was set in the accept header" do
+      get "http://example.com" , nil, {"HTTP_ACCEPT_LANGUAGE" => "en"}
+      last_response.should_not be_redirect
+    end
+  end
+  
+  context "redirect to path" do
+
+    let :options do
+      { :redirect => :path }
+    end
+    
+    it "should not redirect if the locale was set with the path" do
+      %w{ 
+        http://example.com/de
+        http://example.com/en
+        http://example.com/en/
+        http://example.com/en/foo/bar
+      }.each do |url|
+        get url
+        last_response.should_not be_redirect
+      end
+    end
+    
+    it "should redirect if the locale was set by other means" do
+      {
+        "http://en.example.com"        => "http://example.com/en",
+        "http://en.example.com/de"     => "http://example.com/de",
+        "http://de.example.com"        => "http://example.com/de",
+        "http://example.com?locale=de" => "http://example.com/de"
+      }.each do |url, redirect_url|
+        get url
+        last_response.should be_redirect
+        last_response.location.should eql(redirect_url)
+      end
+    end
+    
+    it "should redirect if the locale was set with an accept header" do
+      get "http://example.com" , nil, {"HTTP_ACCEPT_LANGUAGE" => "de"}
+      last_response.should be_redirect
+      last_response.location.should eql("http://example.com/de")
+    end
+    
+    context "canonical" do
+
+      let :options do
+        { :redirect => :path, :canonical => true }
+      end
+
+      it_should_behave_like "a redirect with the default locale"
+    end
+  end
+
+  context "host" do
+
+    let :options do
+      { :redirect => :host }
+    end
+    
+    it "should not redirect if the locale was set with the host" do
+      %w{ 
+        http://de.example.com
+        http://en.example.com/
+        http://en.example.com/foo/bar
+      }.each do |url|
+        get url
+        last_response.should_not be_redirect
+      end
+    end
+    
+    it "should redirect if the locale was set by other means" do
+      {
+        "http://example.com/en"        => "http://en.example.com",
+        "http://en.example.com/de"     => "http://de.example.com",
+        "http://example.com/de"        => "http://de.example.com",
+        "http://example.com?locale=de" => "http://de.example.com"
+      }.each do |url, redirect_url|
+        get url
+        last_response.should be_redirect
+        last_response.location.should eql(redirect_url)
+      end
+    end
+
+    it "should redirect if the locale was set with an accept header" do
+      get "http://example.com" , nil, {"HTTP_ACCEPT_LANGUAGE" => "de"}
+      last_response.should be_redirect
+      last_response.location.should eql("http://de.example.com")
+    end
+
+    context "canonical" do
+
+      let :options do
+        { :redirect => :host, :canonical => true }
+      end
+
+      it_should_behave_like "a redirect with the default locale"
+    end
+  end
+
+  context "param" do
+
+    let :options do
+      { :redirect => :param }
+    end
+
+    it "should not redirect if the locale was set with a param" do
+      %w{ 
+        http://example.com?locale=de
+        http://example.com/?locale=en
+        http://example.com/foo/bar?locale=en
+      }.each do |url|
+        get url
+        last_response.should_not be_redirect
+      end
+    end
+    
+    it "should redirect if the locale was set by other means" do
+      {
+        "http://example.com/en"           => "http://example.com?locale=en",
+        "http://de.example.com/foo/bar"   => "http://example.com/foo/bar?locale=de",
+        "http://example.com/de"           => "http://example.com?locale=de",
+        "http://en.example.com?locale=de" => "http://example.com?locale=de"
+      }.each do |url, redirect_url|
+        get url
+        last_response.should be_redirect
+        last_response.location.should eql(redirect_url)
+      end
+    end
+
+    it "should redirect if the locale was set with an accept header" do
+      get "http://example.com" , nil, {"HTTP_ACCEPT_LANGUAGE" => "de"}
+      last_response.should be_redirect
+      last_response.location.should eql("http://example.com?locale=de")
+    end
+          
+    context "canonical" do
+
+      let :options do
+        { :redirect => :param, :canonical => true }
+      end
+
+      it_should_behave_like "a redirect with the default locale"
+    end
+  end
+end

metadata

@@ -1,95 +1,107 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rack-i18n_locale_switcher
-version: !ruby/object:Gem::Version
-  version: 0.4.0
+version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
+  segments: 
+  - 0
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
-authors:
-- Christoph Bünte, Andreas Korth
+authors: 
+- "Christoph B\xC3\xBCnte, Andreas Korth"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: &2158734100 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+
+date: 2011-11-29 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *2158734100
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: &2158733640 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  name: rack
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *2158733640
-- !ruby/object:Gem::Dependency
-  name: domainatrix
-  requirement: &2158733180 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  name: i18n
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *2158733180
-- !ruby/object:Gem::Dependency
-  name: echoe
-  requirement: &2158732720 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  name: echoe
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *2158732720
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2158732260 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  name: rspec
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *2158732260
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: &2158731800 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2158731800
-description: Detects the current locale from query parameter, path prefix, host or
-  accept header.
-email:
+  name: rack-test
+  version_requirements: *id005
+description: Detects the current locale from query parameter, path prefix, host or accept header.
+email: 
 - info@christophbuente.de
 - andreas.korth@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - CHANGELOG
 - LICENSE
 - README.md
 - lib/rack/i18n_locale_switcher.rb
-files:
+files: 
 - CHANGELOG
 - LICENSE
 - Manifest
@@ -97,36 +109,46 @@ files:
 - Rakefile
 - lib/rack/i18n_locale_switcher.rb
 - rack-i18n_locale_switcher.gemspec
-- spec/i18n_locale_switcher_spec.rb
+- spec/rack/i18n_locale_switcher_spec.rb
+has_rdoc: true
 homepage: http://github.com/christoph-buente/rack-i18n_locale_switcher
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --line-numbers
 - --inline-source
 - --title
 - Rack-i18n_locale_switcher
 - --main
 - README.md
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '1.2'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 11
+      segments: 
+      - 1
+      - 2
+      version: "1.2"
 requirements: []
+
 rubyforge_project: rack-i18n_locale_switcher
-rubygems_version: 1.8.11
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Detects the current locale from query parameter, path prefix, host or accept
-  header.
+summary: Detects the current locale from query parameter, path prefix, host or accept header.
 test_files: []
+

data/spec/i18n_locale_switcher_spec.rb

@@ -1,131 +0,0 @@
-require 'rack/i18n_locale_switcher'
-require 'rack/test'
-
-describe Rack::I18nLocaleSwitcher do
-
-  include Rack::Test::Methods
-
-  let :options do
-    {}
-  end
-  
-  let :app do
-    opts = options
-    rack = Rack::Builder.new do
-      map "/" do
-        use Rack::I18nLocaleSwitcher, opts
-        run lambda { |env| [200, {}, "Coolness"] }
-      end
-    end
-    rack.to_app
-  end
-
-  before do
-    I18n.available_locales = [:en, :'en-US', :de, :'de-DE', :es]
-    I18n.default_locale = :en
-  end
-
-  it "should fall back to the locale to default locale" do
-    get 'http://example.com/some/path'
-    I18n.locale.should eql(I18n.default_locale)
-
-    get 'http://www.example.com/'
-    I18n.locale.should eql(I18n.default_locale)
-  end
-  
-  it "should not accept invalid options" do
-    expect { 
-      Rack::I18nLocaleSwitcher.new('app', :not_an_option => 'foo') 
-    }.to raise_error(ArgumentError, "Invalid option(s) :not_an_option")
-  end
-  
-  context 'with custom sources' do
-    
-    let :options do
-      { :source => [ :header, :host ] }
-    end
-    
-    it "should honor the sequence" do
-      get 'http://de.example.com' , {}, {'HTTP_ACCEPT_LANGUAGE' => "es"}
-      I18n.locale.should eql(:es)
-
-      get 'http://de.example.com' , {}, {'HTTP_ACCEPT_LANGUAGE' => "foo"}
-      I18n.locale.should eql(:de)
-
-      get 'http://de.example.com'
-      I18n.locale.should eql(:de)
-    end
-
-    it "should ignore other sources" do
-      get 'http://example.com?locale=de'
-      I18n.locale.should eql(:en)
-
-      get 'http://example.com/de'
-      I18n.locale.should eql(:en)
-    end
-  end
-
-  context 'request param' do
-
-    it "should set the locale" do
-      get 'http://example.com?locale=de'
-      I18n.locale.should eql(:de)
-
-      get 'http://example.com?locale=en-US'
-      I18n.locale.should eql(:'en-US')
-
-      get 'http://example.com/some/path?foo=bar&locale=es&param=value'
-      I18n.locale.should eql(:es)
-    end
-
-    it "should not set an unavailable locale" do
-      get 'http://example.com?locale=xx'
-      I18n.locale.should eql(I18n.default_locale)
-    end
-    
-    context 'name' do
-      
-      let :options do
-        { :param => 'lang' }
-      end
-      
-      it "should be configurable" do
-        get 'http://example.com?lang=de'
-        I18n.locale.should eql(:de)
-      end
-    end
-  end
-
-  context 'from path prefix ' do
-
-    it "should set the I18n locale" do
-      get 'http://example.com/de/some/path/'
-      I18n.locale.should eql(:de)
-
-      get 'http://example.com/en-us'
-      I18n.locale.should eql(:'en-US')
-    end
-  end
-
-  context 'from host' do
-
-    it "should set the I18n locale" do
-      get 'http://de.example.com/'
-      I18n.locale.should eql(:de)
-
-      get 'http://de-de.example.com/'
-      I18n.locale.should eql(:'de-DE')
-    end
-  end
-
-  context 'from accept-language header' do
-
-    it "should override the client requested locale" do
-      get 'http://example.com' , {}, {'HTTP_ACCEPT_LANGUAGE' => "de-de,de,en;q=0.5"}
-      I18n.locale.should eql(:'de-DE')
-
-      get 'http://example.com' , {}, {'HTTP_ACCEPT_LANGUAGE' => "en;q=0.5,en-US;q=0.8,es;q=0.7"}
-      I18n.locale.should eql(:'en-US')
-    end
-  end
-end