rack-i18n_locale_switcher 0.3.0 → 0.3.1

data/CHANGELOG

@@ -1,4 +1,8 @@
-= 0.3.0
+= 0.3.1 / 2011-11-25
+  Code refactoring
+  Don't "clean" then Rack environment
+  
+= 0.3.0 / 2011-11-25
   Removed support for storing the locale in the session
 
 = 0.2.0 / 2011-11-24

data/Manifest

@@ -6,4 +6,3 @@ Rakefile
 lib/rack/i18n_locale_switcher.rb
 rack-i18n_locale_switcher.gemspec
 spec/i18n_locale_switcher_spec.rb
-spec/spec_helper.rb

data/Rakefile

@@ -2,9 +2,9 @@
 require 'rake'
 require 'echoe'
 
-Echoe.new('rack-i18n_locale_switcher', '0.3.0') do |p|
+Echoe.new('rack-i18n_locale_switcher', '0.3.1') do |p|
 
- p.description     = "Detects the current locale from url, domain, parameter or accept header."
+ p.description     = "Detects the current locale from host, top level domain, query parameter or Accept-Language header."
  p.url             = "http://github.com/christoph-buente/rack-i18n_locale_switcher"
  p.author          = ["Christoph Bünte", "Andreas Korth"]
  p.email           = ["info@christophbuente.de", "andreas.korth@gmail.com"]

data/lib/rack/i18n_locale_switcher.rb

@@ -3,85 +3,56 @@ require 'domainatrix'
 
 module Rack
   class I18nLocaleSwitcher
+    
     def initialize(app, options = {})
       @app = app
     end
 
     def call(env)
-      request = Rack::Request.new(env)
-      locale = extract_locale(request)
-      I18n.locale = (is_present?(locale) ? locale : I18n.default_locale)
-      @app.call cleanup_env(env)
+      I18n.locale = extract_locale(env)
+      @app.call(env)
     end
 
     private
 
-    def is_available?(locale)
-      not locale.to_s.empty? and I18n.available_locales.include?(locale.to_sym)
+    def extract_locale(env)
+      request = Rack::Request.new(env)
+      uses = [ :param, :path, :subdomain, :tld, :client ]
+      uses.each do |use|
+        if locale = send(:"extract_locale_from_#{ use }", request)
+          unless locale.empty?
+            locale = locale.to_sym
+            return locale if I18n.available_locales.include?(locale)
+          end
+        end
+      end
+      I18n.default_locale
     end
 
-    def extract_locale_from_params(request)
-      locale = request.params["locale"]
-      locale if is_available?(locale)
+    def extract_locale_from_param(request)
+      request.params["locale"]
     end
 
     def extract_locale_from_path(request)
-      if request.path_info =~ /^\/(\w{2,3})\b/
-        $1 if is_available?($1)
-      end
+      request.path_info =~ /^\/(\w{2,3})\b/ && $1
     end
 
     def extract_locale_from_tld(request)
-      locale = Domainatrix.parse(request.url).public_suffix rescue nil
-      locale if is_available?(locale)
+      Domainatrix.parse(request.url).public_suffix rescue nil
     end
 
     def extract_locale_from_subdomain(request)
-      locale = Domainatrix.parse(request.url).subdomain rescue nil
-      locale if is_available?(locale)
+      Domainatrix.parse(request.url).subdomain rescue nil
     end
 
-    def extract_locale_from_accept_language(request)
+    def extract_locale_from_client(request)
       if lang = request.env["HTTP_ACCEPT_LANGUAGE"]
         lang = lang.split(",").map { |l|
           l += ';q=1.0' unless l =~ /;q=\d+\.\d+$/
           l.split(';q=')
         }.first
-        locale = symbolize_locale(lang.first.split("-").first)
-      else
-        locale = I18n.default_locale
-      end
-      is_available?(locale) ? locale : I18n.default_locale
-    end
-
-
-    def extract_locale(request)
-      locale = (  extract_locale_from_params(request)           ||
-                  extract_locale_from_path(request)             ||
-                  extract_locale_from_subdomain(request)        ||
-                  extract_locale_from_tld(request)              ||
-                  extract_locale_from_accept_language(request))
-      symbolize_locale(locale)
-    end
-
-    def cleanup_env env
-      %w{REQUEST_URI REQUEST_PATH PATH_INFO}.each do |key|
-        if is_present?(env[key]) && env[key].length > 1 && tmp = env[key].split("/")
-          tmp.delete_at(1) if tmp[1] =~ %r{^([a-zA-Z]{2})$}
-          env[key] = tmp.join("/")
-        end
+        lang.first.split("-").first
       end
-      env
     end
-
-
-    def is_present?(value)
-      !value.to_s.empty?
-    end
-
-    def symbolize_locale(locale)
-      (is_present?(locale) ?  locale.to_s.downcase.to_sym : nil)
-    end
-
   end
 end

data/rack-i18n_locale_switcher.gemspec

@@ -2,21 +2,21 @@
 
 Gem::Specification.new do |s|
   s.name = "rack-i18n_locale_switcher"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   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-25"
-  s.description = "Detects the current locale from url, domain, parameter or accept header."
+  s.description = "Detects the current locale from host, top level domain, query parameter or Accept-Language 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", "spec/spec_helper.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.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 url, domain, parameter or accept header."
+  s.summary = "Detects the current locale from host, top level domain, query parameter or Accept-Language header."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/i18n_locale_switcher_spec.rb

@@ -1,11 +1,9 @@
-require "spec_helper"
+require 'rack/i18n_locale_switcher'
+require 'rack/test'
 
-describe "Rack::I18nLocaleSwitcher" do
+describe Rack::I18nLocaleSwitcher do
 
-  before do
-    I18n.available_locales = [:en, :'en-US', :de, :'de-DE', :es]
-    I18n.default_locale = :en
-  end
+  include Rack::Test::Methods
 
   def app
     Rack::Builder.new {
@@ -16,12 +14,17 @@ describe "Rack::I18nLocaleSwitcher" do
     }.to_app
   end
 
-  it "should set the locate to default locale" do
+  before do
+    I18n.available_locales = [:en, :'en-US', :de, :'de-DE', :es]
+    I18n.default_locale = :en
+  end
+
+  it "should set the locale to default locale" do
     get '/'
     I18n.locale.should eql(I18n.default_locale)
   end
 
-  context 'from request params' do
+  context 'request param' do
 
     it "should set the I18n locale" do
       get '/', :locale => 'de'
@@ -29,13 +32,14 @@ describe "Rack::I18nLocaleSwitcher" do
       I18n.locale.should eql(:de)
     end
 
-    it "should disallow other locales than the available locales" do
+    it "should only allow available locales" do
       get '/', :locale => 'xx'
       I18n.locale.should eql(I18n.default_locale)
     end
   end
 
   context 'from path prefix ' do
+
     it "should set the I18n locale" do
       get '/de/'
       I18n.locale.should eql(:de)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-i18n_locale_switcher
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2154406440 !ruby/object:Gem::Requirement
+  requirement: &2154168640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154406440
+  version_requirements: *2154168640
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2154405980 !ruby/object:Gem::Requirement
+  requirement: &2154168180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154405980
+  version_requirements: *2154168180
 - !ruby/object:Gem::Dependency
   name: domainatrix
-  requirement: &2154405520 !ruby/object:Gem::Requirement
+  requirement: &2154167720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154405520
+  version_requirements: *2154167720
 - !ruby/object:Gem::Dependency
   name: echoe
-  requirement: &2154405060 !ruby/object:Gem::Requirement
+  requirement: &2154167260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154405060
+  version_requirements: *2154167260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154404600 !ruby/object:Gem::Requirement
+  requirement: &2154166800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154404600
+  version_requirements: *2154166800
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2154404140 !ruby/object:Gem::Requirement
+  requirement: &2154166340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,8 +76,9 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154404140
-description: Detects the current locale from url, domain, parameter or accept header.
+  version_requirements: *2154166340
+description: Detects the current locale from host, top level domain, query parameter
+  or Accept-Language header.
 email:
 - info@christophbuente.de
 - andreas.korth@gmail.com
@@ -97,7 +98,6 @@ files:
 - lib/rack/i18n_locale_switcher.rb
 - rack-i18n_locale_switcher.gemspec
 - spec/i18n_locale_switcher_spec.rb
-- spec/spec_helper.rb
 homepage: http://github.com/christoph-buente/rack-i18n_locale_switcher
 licenses: []
 post_install_message: 
@@ -127,5 +127,6 @@ rubyforge_project: rack-i18n_locale_switcher
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Detects the current locale from url, domain, parameter or accept header.
+summary: Detects the current locale from host, top level domain, query parameter or
+  Accept-Language header.
 test_files: []

data/spec/spec_helper.rb

@@ -1,7 +0,0 @@
-require 'rack/i18n_locale_switcher'
-require 'rack/test'
-
-RSpec.configure do |config|
-  config.mock_with :rspec
-  config.include Rack::Test::Methods
-end