rails_locale_detection 1.0.0 → 1.1.0

data/Gemfile

@@ -9,8 +9,8 @@ gem 'http_accept_language'
 group :development do
   gem 'i18n'
   gem 'timecop'
-  gem 'actionpack', '~> 3.1.1'
-  gem 'activesupport', '~> 3.1.1'
+  gem 'actionpack', '~> 3.2.2'
+  gem 'activesupport', '~> 3.2.2'
   gem "rspec", "~> 2.3.0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"

data/Gemfile.lock

@@ -1,22 +1,21 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
+    activesupport (3.2.3)
       i18n (~> 0.6)
-    activesupport (3.1.3)
       multi_json (~> 1.0)
     builder (3.0.0)
     diff-lcs (1.1.3)
@@ -29,12 +28,11 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    multi_json (1.0.3)
-    rack (1.3.5)
-    rack-cache (1.1)
+    journey (1.0.3)
+    multi_json (1.3.5)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.9.2.2)
@@ -47,10 +45,10 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
-    sprockets (2.0.3)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+      tilt (!= 1.3.0, ~> 1.1)
     tilt (1.3.3)
     timecop (0.3.5)
 
@@ -58,8 +56,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (~> 3.1.1)
-  activesupport (~> 3.1.1)
+  actionpack (~> 3.2.2)
+  activesupport (~> 3.2.2)
   bundler (~> 1.0.0)
   http_accept_language
   i18n

data/README.rdoc

@@ -23,6 +23,15 @@ Call set_locale as a filter in your controllers
     
   end
 
+== Configuration
+
+There are two configuration options:
+
+  Rails::LocaleDetection.config do |config|
+    config.locale_expiry = 3.months # This sets how long the locale cookie lasts.
+    config.set_default_url_option = true # sets the default_url_options[:locale] to the current locale when set_locale is called
+  end
+
 == Contributing to rails_locale_detection
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
@@ -35,6 +44,6 @@ Call set_locale as a filter in your controllers
 
 == Copyright
 
-Copyright (c) 2011 Mateo Murphy. See LICENSE.txt for
+Copyright (c) 2012 Mateo Murphy. See LICENSE.txt for
 further details.
 

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/rails/locale_detection.rb

@@ -3,6 +3,13 @@ module Rails
     mattr_accessor :locale_expiry
     @@locale_expiry = 3.months
     
+    mattr_accessor :set_default_url_option
+    @@set_default_url_option = true
+    
+    def self.config
+      yield self
+    end
+    
     def available_locales
       I18n.available_locales
     end
@@ -35,7 +42,9 @@ module Rails
     # set I18n.locale, default_url_options[:locale] and cookies[:locale] to the value returned by
     # get_locale
     def set_locale
-      default_url_options[:locale] = I18n.locale = get_locale
+      I18n.locale = get_locale
+      
+      default_url_options[:locale] = I18n.locale if set_default_url_option
       
       cookies[:locale] = { :value => I18n.locale, :expires => locale_expiry.from_now }
       

data/rails_locale_detection.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{rails_locale_detection}
-  s.version = "1.0.0"
+  s.name = "rails_locale_detection"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mateo Murphy"]
-  s.date = %q{2011-12-16}
-  s.description = %q{Sets the current locale of a request using a combination of params, cookies, and http headers}
-  s.email = %q{mateo.murphy@gmail.com}
+  s.date = "2012-05-26"
+  s.description = "Sets the current locale of a request using a combination of params, cookies, and http headers"
+  s.email = "mateo.murphy@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -32,11 +32,11 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/support/mock.rb"
   ]
-  s.homepage = %q{http://github.com/mateomurphy/rails_locale_detection}
+  s.homepage = "http://github.com/mateomurphy/rails_locale_detection"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{locale setting for rails project}
+  s.rubygems_version = "1.8.21"
+  s.summary = "locale setting for rails project"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -45,8 +45,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<http_accept_language>, [">= 0"])
       s.add_development_dependency(%q<i18n>, [">= 0"])
       s.add_development_dependency(%q<timecop>, [">= 0"])
-      s.add_development_dependency(%q<actionpack>, ["~> 3.1.1"])
-      s.add_development_dependency(%q<activesupport>, ["~> 3.1.1"])
+      s.add_development_dependency(%q<actionpack>, ["~> 3.2.2"])
+      s.add_development_dependency(%q<activesupport>, ["~> 3.2.2"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -55,8 +55,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<http_accept_language>, [">= 0"])
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<timecop>, [">= 0"])
-      s.add_dependency(%q<actionpack>, ["~> 3.1.1"])
-      s.add_dependency(%q<activesupport>, ["~> 3.1.1"])
+      s.add_dependency(%q<actionpack>, ["~> 3.2.2"])
+      s.add_dependency(%q<activesupport>, ["~> 3.2.2"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -66,8 +66,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<http_accept_language>, [">= 0"])
     s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<timecop>, [">= 0"])
-    s.add_dependency(%q<actionpack>, ["~> 3.1.1"])
-    s.add_dependency(%q<activesupport>, ["~> 3.1.1"])
+    s.add_dependency(%q<actionpack>, ["~> 3.2.2"])
+    s.add_dependency(%q<activesupport>, ["~> 3.2.2"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

data/spec/rails_locale_detection_spec.rb

@@ -1,5 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+I18n.default_locale = :en
 I18n.available_locales = [:en, :fr]
 Timecop.freeze
 
@@ -8,119 +9,145 @@ describe Rails::LocaleDetection do
   let(:controller) { MockController.new(request) }
   
   describe '.locale_expiry' do
-    it "should be set to 3 months be default" do
-      Rails::LocaleDetection.locale_expiry.should eq(3.months)
+    it "is set to 3 months by default" do
+      Rails::LocaleDetection.config do |c|
+        c.locale_expiry.should eq(3.months)
+      end
     end
   end
   
   describe '#available_locales' do
-    it "should shadow I18n available_locales" do
+    it "shadows I18n.available_locales" do
       controller.available_locales.should eq([:en, :fr])
     end
   end
   
   describe '#default_locale' do
-    it "should shadow I18n default locale"  do
-      I18n.default_locale = :en
+    it "shadows I18n.default locale"  do
       controller.default_locale.should eq(:en)
     end
   end
   
   describe '#validate_locale' do
-    it "should return the passed locale if it's valid" do
+    it "returns the passed locale if it's valid" do
       controller.validate_locale(:en).should eq(:en)
     end
     
-    it "should return nil if the passed locale isn't valid" do
+    it "returns nil if the passed locale isn't valid" do
       controller.validate_locale(:es).should be_nil
     end
   end
   
   describe '#locale_from_param' do
-    it "should return en if the param set was valid" do
+    it "returns en if the param set was valid" do
       controller.params[:locale] = 'en'
       controller.locale_from_param.should eq(:en)
     end
     
-    it "should return nil if the param set was not" do
+    it "returns nil if the param set was not" do
       controller.params[:locale] = 'es'
       controller.locale_from_param.should be_nil
     end
 
-    it "should return nil if not locale was set" do
+    it "returns nil if not locale was set" do
       controller.locale_from_param.should be_nil
     end
   end
   
   describe '#locale_from_cookie' do
-    it "should return en if the param set was valid" do
+    it "returns en if the param set was valid" do
       controller.cookies[:locale] = 'en'
       controller.locale_from_cookies.should eq(:en)
     end
     
-    it "should return nil if the param set was not" do
+    it "returns nil if the param set was not" do
       controller.cookies[:locale] = 'es'
       controller.locale_from_cookies.should be_nil
     end
 
-    it "should return nil if not locale was set" do
+    it "returns nil if not locale was set" do
       controller.locale_from_cookies.should be_nil
     end
   end  
   
   describe '#locale_from_request' do
-    it "should return en if the param set was valid" do
+    it "returns en if the param set was valid" do
       request.env['HTTP_ACCEPT_LANGUAGE'] = 'en-us,en-gb;q=0.8,en;q=0.6'
       controller.locale_from_request.should eq(:en)
     end
     
-    it "should return nil if the param set was not" do
+    it "returns nil if the param set was not" do
       request.env['HTTP_ACCEPT_LANGUAGE'] = 'es'
       controller.locale_from_request.should be_nil
     end
 
-    it "should return nil if not locale was set" do
+    it "returns nil if not locale was set" do
       controller.locale_from_request.should be_nil
     end
   end  
   
   describe '#get_locale' do
-    it "should return nil if nothing is set" do
+    it "returns nil if nothing is set" do
       controller.get_locale.should eq(:en)
     end
 
-    it "should return en if the params is set to en" do
+    it "returns en if the params is set to en" do
       controller.params[:locale] = "en"
       controller.get_locale.should eq(:en)
     end
 
-    it "should return fr if the cookie is set to fr" do
+    it "returns fr if the cookie is set to fr" do
       controller.cookies[:locale] = "fr"
       controller.get_locale.should eq(:fr)
     end
 
-    it "should return en if the request is set to en" do
+    it "returns en if the request is set to en" do
       request.env['HTTP_ACCEPT_LANGUAGE'] = 'en-us,en-gb;q=0.8,en;q=0.6'
       controller.get_locale.should eq(:en)
     end
   end
 
   describe '#set_locale' do
-    before :all do
-      controller.params[:locale] = "fr"
-      controller.set_locale
-    end
+    context "with set default_url_option true" do
+      before :all do
+        Rails::LocaleDetection.set_default_url_option = true
+        controller.params[:locale] = "fr"
+        controller.set_locale
+      end
     
-    it "should set the current locale to the locale param" do
-      I18n.locale.should eq(:fr)
-    end
+      it "sets the current locale to the locale param" do
+        I18n.locale.should eq(:fr)
+      end
     
-    it "should set the language" do
-      controller.cookies[:locale].should eq(:fr)
-    end
+      it "sets the language" do
+        controller.cookies[:locale].should eq(:fr)
+      end
     
-    it "should set the default_url_options" do
-      controller.default_url_options[:locale].should eq(:fr)
+      it "sets the default_url_options" do
+        controller.default_url_options[:locale].to_s.should eq('fr')
+      end
     end
+    
+    context "with set default_url_option false" do
+      before :all do
+        Rails::LocaleDetection.set_default_url_option = false
+        controller.default_url_options = {}
+        controller.params[:locale] = "fr"
+        controller.set_locale
+      end
+    
+      it "sets the current locale to the locale param" do
+        I18n.locale.should eq(:fr)
+      end
+    
+      it "sets the language" do
+        controller.cookies[:locale].should eq(:fr)
+      end
+    
+      it "doesn't set the default_url_options" do
+        controller.default_url_options[:locale].should be_nil
+      end
+    end    
   end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails_locale_detection
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Mateo Murphy
@@ -15,12 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-16 00:00:00 -05:00
-default_executable: 
+date: 2012-05-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: http_accept_language
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +28,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id001
+  name: http_accept_language
   prerelease: false
-  type: :runtime
-  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: i18n
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -43,12 +42,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id002
+  name: i18n
   prerelease: false
-  type: :development
-  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: timecop
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -57,44 +56,44 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id003
+  name: timecop
   prerelease: false
-  type: :development
-  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: actionpack
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 11
         segments: 
         - 3
-        - 1
-        - 1
-        version: 3.1.1
+        - 2
+        - 2
+        version: 3.2.2
+  version_requirements: *id004
+  name: actionpack
   prerelease: false
-  type: :development
-  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 11
         segments: 
         - 3
-        - 1
-        - 1
-        version: 3.1.1
+        - 2
+        - 2
+        version: 3.2.2
+  version_requirements: *id005
+  name: activesupport
   prerelease: false
-  type: :development
-  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -105,12 +104,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
+  version_requirements: *id006
+  name: rspec
   prerelease: false
-  type: :development
-  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -121,12 +120,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  version_requirements: *id007
+  name: bundler
   prerelease: false
-  type: :development
-  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -137,12 +136,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
+  version_requirements: *id008
+  name: jeweler
   prerelease: false
-  type: :development
-  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: rcov
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -151,9 +150,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id009
+  name: rcov
   prerelease: false
-  type: :development
-  requirement: *id009
 description: Sets the current locale of a request using a combination of params, cookies, and http headers
 email: mateo.murphy@gmail.com
 executables: []
@@ -178,7 +177,6 @@ files:
 - spec/rails_locale_detection_spec.rb
 - spec/spec_helper.rb
 - spec/support/mock.rb
-has_rdoc: true
 homepage: http://github.com/mateomurphy/rails_locale_detection
 licenses: 
 - MIT
@@ -208,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: locale setting for rails project