rails_locale_detection 1.2.0 → 1.3.0

data/Gemfile

@@ -9,10 +9,9 @@ gem 'http_accept_language'
 group :development do
   gem 'i18n'
   gem 'timecop'
-  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"
-  gem "rcov", ">= 0"
+  gem 'actionpack', '~> 3.2.9'
+  gem 'activesupport', '~> 3.2.9'
+  gem "rspec", "~> 2.12.0"
+  gem "bundler", "~> 1.2.3"
+  gem "jeweler", "~> 1.8.4"
 end

data/Gemfile.lock

@@ -1,67 +1,70 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activesupport (3.2.3)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    builder (3.0.0)
+    builder (3.0.4)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     git (1.2.5)
     hike (1.2.1)
     http_accept_language (1.0.2)
-    i18n (0.6.0)
-    jeweler (1.6.4)
+    i18n (0.6.1)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    journey (1.0.3)
-    multi_json (1.3.5)
+      rdoc
+    journey (1.0.4)
+    json (1.7.5)
+    multi_json (1.5.0)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rake (0.9.2.2)
-    rcov (0.9.11)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    sprockets (2.1.3)
+    rake (10.0.3)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.1)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     tilt (1.3.3)
-    timecop (0.3.5)
+    timecop (0.5.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (~> 3.2.2)
-  activesupport (~> 3.2.2)
-  bundler (~> 1.0.0)
+  actionpack (~> 3.2.9)
+  activesupport (~> 3.2.9)
+  bundler (~> 1.2.3)
   http_accept_language
   i18n
-  jeweler (~> 1.6.4)
-  rcov
-  rspec (~> 2.3.0)
+  jeweler (~> 1.8.4)
+  rspec (~> 2.12.0)
   timecop

data/README.md

@@ -0,0 +1,75 @@
+# rails_locale_detection
+
+[![Build Status](https://travis-ci.org/mateomurphy/rails_locale_detection.png?branch=master)](https://travis-ci.org/mateomurphy/rails_locale_detection)
+[![Dependency Status](https://gemnasium.com/mateomurphy/rails_locale_detection.png)](https://gemnasium.com/mateomurphy/rails_locale_detection)
+
+Sets the current locale of a request using a combination of params, cookies, http headers, and an optional user object. 
+
+In turn, it checks the value of params[:locale], cookies[:locale] and HTTP_ACCEPT_LANGUAGE headers to find a locale that
+corresponds to the available locales, then stores the set locale in a cookie for future requests. If a user_locale method
+is provided, the return value will be used, with preference over the other locale detection methods.
+
+## Usage
+
+Include the gem in your Gemfile 
+
+    gem 'rails_locale_detection'
+  
+Set your default and available locales
+
+    I18n.default_locale = :en
+    I18n.available_locales = [:en, :fr]
+  
+Call `set_locale` as a filter in your controllers
+
+    class ApplicationController < ActionController::Base
+      before_filter :set_locale
+    
+    end
+
+To support user locales, add a `user_locale` method
+
+    class ApplicationController < ActionController::Base
+      before_filter :set_locale
+
+      def user_locale
+        current_user.locale if current_user
+      end
+    
+    end
+
+
+## Configuration
+
+Configuration is done via a block that can be added as an initializer:
+
+    Rails::LocaleDetection.config do |config|
+      config.locale_expiry = 3.months 
+      config.set_default_url_option = :always # valid values are true, false, :always, :never and :explicity
+      config.detection_order = [:user, :param, :cookie, :request] 
+    end
+
+The configuration options:
+
+* `locale_expiry` sets how long the locale cookie lasts.
+* `set_default_url_option` determines under which conditions the `default_url_option` is set
+  * `true` or `:always` sets the option on all requests
+  * `false` or `:never` never sets the option
+  * `:explicity` sets the option only when a param[:locale] is present
+* `detection_order` set the order in which locale detection occurs. Omit values to skip those sources
+
+## 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
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+## Copyright
+
+Copyright (c) 2012 Mateo Murphy. See LICENSE.txt for
+further details.
+

data/Rakefile

@@ -38,8 +38,8 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/lib/rails/locale_detection.rb

@@ -4,7 +4,7 @@ module Rails
     @@locale_expiry = 3.months
     
     mattr_accessor :set_default_url_option
-    @@set_default_url_option = true
+    @@set_default_url_option = :always
     
     mattr_accessor :detection_order
     @@detection_order = [:user, :param, :cookie, :request]
@@ -54,12 +54,17 @@ module Rails
       detection_order.inject(nil) { |result, source| result || locale_from(source) } || default_locale
     end
     
+    # returns true if the default url option should be set for this request
+    def set_default_url_option_for_request?
+      set_default_url_option === true || set_default_url_option == :always || set_default_url_option == :explicitly && params[:locale].present?
+    end
+    
     # set I18n.locale, default_url_options[:locale] and cookies[:locale] to the value returned by
     # get_locale
     def set_locale
       I18n.locale = get_locale
       
-      default_url_options[:locale] = I18n.locale if set_default_url_option
+      default_url_options[:locale] = I18n.locale if set_default_url_option_for_request?
       
       cookies[:locale] = { :value => I18n.locale, :expires => locale_expiry.from_now }
       

data/rails_locale_detection.gemspec

@@ -5,16 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = "rails_locale_detection"
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mateo Murphy"]
-  s.date = "2012-06-05"
+  s.date = "2012-12-24"
   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"
+    "README.md"
   ]
   s.files = [
     ".document",
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
     "lib/rails/locale_detection.rb",
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/mateomurphy/rails_locale_detection"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.21"
+  s.rubygems_version = "1.8.23"
   s.summary = "locale setting for rails project"
 
   if s.respond_to? :specification_version then
@@ -45,33 +45,30 @@ 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.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"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<actionpack>, ["~> 3.2.9"])
+      s.add_development_dependency(%q<activesupport>, ["~> 3.2.9"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.12.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.2.3"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
     else
       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.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"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<actionpack>, ["~> 3.2.9"])
+      s.add_dependency(%q<activesupport>, ["~> 3.2.9"])
+      s.add_dependency(%q<rspec>, ["~> 2.12.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.2.3"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     end
   else
     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.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"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<actionpack>, ["~> 3.2.9"])
+    s.add_dependency(%q<activesupport>, ["~> 3.2.9"])
+    s.add_dependency(%q<rspec>, ["~> 2.12.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.2.3"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
   end
 end
 

data/spec/rails_locale_detection_spec.rb

@@ -177,10 +177,75 @@ describe Rails::LocaleDetection do
     
   end
 
-  describe '#set_locale' do
-    context "with set default_url_option true" do
+  describe '#set_default_url_option_for_request?' do
+    context 'with a locale param' do
+      before :all do
+        controller.params[:locale] = "fr"      
+      end
+      
+      it 'return true when set_default_url_option is true' do
+        Rails::LocaleDetection.set_default_url_option = true
+        controller.should be_set_default_url_option_for_request
+      end
+      
+      it 'return false when set_default_url_option is fale' do
+        Rails::LocaleDetection.set_default_url_option = false
+        controller.should_not be_set_default_url_option_for_request
+      end
+      
+      it 'return false when set_default_url_option is :never' do
+        Rails::LocaleDetection.set_default_url_option = :never
+        controller.should_not be_set_default_url_option_for_request
+      end
+      
+      it 'return true when set_default_url_option is :always' do
+        Rails::LocaleDetection.set_default_url_option = :always
+        controller.should be_set_default_url_option_for_request
+      end
+      
+      it 'return true when set_default_url_option is :explicitly' do
+        Rails::LocaleDetection.set_default_url_option = :explicitly
+        controller.should be_set_default_url_option_for_request
+      end                        
+    end
+    
+    context 'without a locale param' do
       before :all do
+        controller.params[:locale] = nil
+      end      
+      
+      it 'return true when set_default_url_option is true' do
         Rails::LocaleDetection.set_default_url_option = true
+        controller.should be_set_default_url_option_for_request
+      end
+      
+      it 'return false when set_default_url_option is false' do
+        Rails::LocaleDetection.set_default_url_option = false
+        controller.should_not be_set_default_url_option_for_request
+      end
+      
+      it 'return false when set_default_url_option is :never' do
+        Rails::LocaleDetection.set_default_url_option = :never
+        controller.should_not be_set_default_url_option_for_request
+      end
+      
+      it 'return true when set_default_url_option is :always' do
+        Rails::LocaleDetection.set_default_url_option = :always
+        controller.should be_set_default_url_option_for_request
+      end
+      
+      it 'return false when set_default_url_option is :explicitly' do
+        Rails::LocaleDetection.set_default_url_option = :explicitly
+        controller.should_not be_set_default_url_option_for_request
+      end      
+    end
+    
+  end
+
+  describe '#set_locale' do
+    context "with set default_url_option :always" do
+      before :all do
+        Rails::LocaleDetection.set_default_url_option = :always
         controller.params[:locale] = "fr"
         controller.set_locale
       end
@@ -198,9 +263,9 @@ describe Rails::LocaleDetection do
       end
     end
     
-    context "with set default_url_option false" do
+    context "with set default_url_option :never" do
       before :all do
-        Rails::LocaleDetection.set_default_url_option = false
+        Rails::LocaleDetection.set_default_url_option = :never
         controller.default_url_options = {}
         controller.params[:locale] = "fr"
         controller.set_locale
@@ -210,14 +275,57 @@ describe Rails::LocaleDetection do
         I18n.locale.should eq(:fr)
       end
     
-      it "sets the language" do
+      it "sets the cookier locale" 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  
+    
+    context "with set default_url_option :explicit and no locale param" do
+      before :all do
+        Rails::LocaleDetection.set_default_url_option = :explicitly
+        controller.default_url_options = {}
+        controller.params[:locale] = nil
+        controller.set_locale
+      end
+    
+      it "sets the current locale to the default param" do
+        I18n.locale.should eq(:en)
+      end
+    
+      it "sets the cookie locale" do
+        controller.cookies[:locale].should eq(:en)
+      end
+    
       it "doesn't set the default_url_options" do
         controller.default_url_options[:locale].should be_nil
       end
     end    
+      
+    context "with set default_url_option :explicit and a locale param" do
+      before :all do
+        Rails::LocaleDetection.set_default_url_option = :explicitly
+        controller.default_url_options = {}
+        controller.params[:locale] = :fr
+        controller.set_locale
+      end
+    
+      it "sets the current locale to the default param" do
+        I18n.locale.should eq(:fr)
+      end
+    
+      it "sets the cookie locale" do
+        controller.cookies[:locale].should eq(:fr)
+      end
+    
+      it "doesn't set the default_url_options" do
+        controller.default_url_options[:locale].should eq(:fr)
+      end
+    end       
+      
   end
 
 end

metadata

@@ -1,174 +1,159 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rails_locale_detection
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 1.3.0
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
 platform: ruby
-authors: 
+authors:
 - Mateo Murphy
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
+date: 2012-12-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: http_accept_language
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: i18n
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id003
-  name: timecop
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 3
-        - 2
-        - 2
-        version: 3.2.2
-  version_requirements: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: actionpack
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.9
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 3
-        - 2
-        - 2
-        version: 3.2.2
-  version_requirements: *id005
+      - !ruby/object:Gem::Version
+        version: 3.2.9
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.9
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
-        version: 2.3.0
-  version_requirements: *id006
+      - !ruby/object:Gem::Version
+        version: 3.2.9
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  version_requirements: *id007
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.3
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
-        version: 1.6.4
-  version_requirements: *id008
+      - !ruby/object:Gem::Version
+        version: 1.2.3
+- !ruby/object:Gem::Dependency
   name: jeweler
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id009
-  name: rcov
   prerelease: false
-description: Sets the current locale of a request using a combination of params, cookies, and http headers
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+description: Sets the current locale of a request using a combination of params, cookies,
+  and http headers
 email: mateo.murphy@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
-files: 
+- README.md
+files:
 - .document
 - .rspec
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - lib/rails/locale_detection.rb
@@ -178,37 +163,31 @@ files:
 - spec/spec_helper.rb
 - spec/support/mock.rb
 homepage: http://github.com/mateomurphy/rails_locale_detection
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3366422370482279398
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: locale setting for rails project
 test_files: []
-

data/README.rdoc

@@ -1,63 +0,0 @@
-= rails_locale_detection
-
-Sets the current locale of a request using a combination of params, cookies, http headers, and an optional user object. 
-
-In turn, it checks the value of params[:locale], cookies[:locale] and HTTP_ACCEPT_LANGUAGE headers to find a locale that
-corresponds to the available locales, then stores the set locale in a cookie for future requests. If a user_locale method
-is provided, the return value will be used, with preference over the other locale detection methods.
-
-== Usage
-
-Include the gem in your Gemfile 
-
-  gem 'rails_locale_detection'
-  
-Set your default and available locales
-
-  I18n.default_locale = :en
-  I18n.available_locales = [:en, :fr]
-  
-Call set_locale as a filter in your controllers
-
-  class ApplicationController < ActionController::Base
-    before_filter :set_locale
-    
-  end
-
-To support user locales, add a user_locale method
-
-  class ApplicationController < ActionController::Base
-    before_filter :set_locale
-
-    def user_locale
-      current_user.locale if current_user
-    end
-    
-  end
-
-
-== Configuration
-
-The 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
-    config.detection_order = [:user, :param, :cookie, :request] # set the order in which locale detection occurs. Omit values to skip those sources
-  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
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2012 Mateo Murphy. See LICENSE.txt for
-further details.
-