rails_locale_detection 2.0.0.pre2 → 2.0.0.pre3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f86d31c9f62322933b0d6b1ab2aeb773b53a8cb8
+  data.tar.gz: 70d94b42812d83072538b2204a16fd59c58e88c7
+SHA512:
+  metadata.gz: 70d52d1836f9d832c55ff04a048a0bde90eb778a6aaf6e520c42a6bf49ead73ecab98e0bf23725e2510496b161e22ef18b5013c56bc67bc4f1d05ec2348f00c5
+  data.tar.gz: 33a312f812e637293de1c83d4b0cfc0bd320332b8cd08e93aeee830a654c166fb438efb2faf986601422f8fa1bb118a3c4306c5c431e8eba80811138385cb4f4

data/.gitignore

@@ -14,37 +14,6 @@ doc
 # jeweler generated
 pkg
 
-# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
-#
-# * Create a file at ~/.gitignore
-# * Include files you want ignored
-# * Run: git config --global core.excludesfile ~/.gitignore
-#
-# After doing this, these files will be ignored in all your git projects,
-# saving you from having to 'pollute' every project you touch with them
-#
-# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
-#
-# For MacOS:
-#
-#.DS_Store
-
-# For TextMate
-#*.tmproj
-#tmtags
-
-# For emacs:
-#*~
-#\#*
-#.\#*
-
-# For vim:
-#*.swp
-
-# For redcar:
-#.redcar
-
-# For rubinius:
-#*.rbc
-
-/.rvmrc
+# rvm
+.rvmrc
+.ruby-*

data/Appraisals

@@ -0,0 +1,7 @@
+appraise "rails3" do
+  gem "rails", "3.2.14"
+end
+
+appraise "rails4" do
+  gem "rails", "4.0.0"
+end

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    rails_locale_detection (2.0.0.pre1)
+    rails_locale_detection (2.0.0.pre2)
       http_accept_language (~> 1.0.2)
-      rails (>= 3.2.13)
+      rails (>= 3.2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -35,6 +35,9 @@ GEM
     activesupport (3.2.13)
       i18n (= 0.6.1)
       multi_json (~> 1.0)
+    appraisal (0.5.2)
+      bundler
+      rake
     arel (3.0.2)
     builder (3.0.4)
     diff-lcs (1.2.1)
@@ -45,11 +48,10 @@ GEM
     i18n (0.6.1)
     journey (1.0.4)
     json (1.7.7)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.21)
+    mime-types (1.23)
     multi_json (1.7.2)
     polyglot (0.3.3)
     rack (1.4.5)
@@ -96,7 +98,7 @@ GEM
     thor (0.18.1)
     tilt (1.3.6)
     timecop (0.6.1)
-    treetop (1.4.12)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
@@ -105,6 +107,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  appraisal (~> 0.5.2)
   bundler (~> 1.3.4)
   gem-release (~> 0.5.3)
   i18n (~> 0.6.1)

data/Rakefile

@@ -1,3 +1,4 @@
+require 'appraisal'
 require 'bundler/gem_tasks'
 
 require 'rspec/core/rake_task'

data/gemfiles/rails3.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "3.2.14"
+
+gemspec :path=>"../"

data/gemfiles/rails3.gemfile.lock

@@ -0,0 +1,118 @@
+PATH
+  remote: /Users/mateo/Code/rails_locale_detection
+  specs:
+    rails_locale_detection (2.0.0.pre2)
+      http_accept_language (~> 1.0.2)
+      rails (>= 3.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (3.2.14)
+      actionpack (= 3.2.14)
+      mail (~> 2.5.4)
+    actionpack (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.14)
+      activesupport (= 3.2.14)
+      builder (~> 3.0.0)
+    activerecord (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (3.0.2)
+    builder (3.0.4)
+    diff-lcs (1.2.4)
+    erubis (2.7.0)
+    gem-release (0.5.5)
+    hike (1.2.3)
+    http_accept_language (1.0.2)
+    i18n (0.6.4)
+    journey (1.0.4)
+    json (1.8.0)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.23)
+    multi_json (1.7.7)
+    polyglot (0.3.3)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.14)
+      actionmailer (= 3.2.14)
+      actionpack (= 3.2.14)
+      activerecord (= 3.2.14)
+      activeresource (= 3.2.14)
+      activesupport (= 3.2.14)
+      bundler (~> 1.0)
+      railties (= 3.2.14)
+    railties (3.2.14)
+      actionpack (= 3.2.14)
+      activesupport (= 3.2.14)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.4)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    rspec-rails (2.13.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.18.1)
+    tilt (1.4.1)
+    timecop (0.6.2.2)
+    treetop (1.4.14)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.5.2)
+  bundler (~> 1.3.4)
+  gem-release (~> 0.5.3)
+  i18n (~> 0.6.1)
+  rails (= 3.2.14)
+  rails_locale_detection!
+  rake (~> 10.0.4)
+  rspec-rails (~> 2.13.0)
+  timecop (~> 0.6.1)

data/gemfiles/rails4.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "4.0.0"
+
+gemspec :path=>"../"

data/gemfiles/rails4.gemfile.lock

@@ -0,0 +1,113 @@
+PATH
+  remote: /Users/mateo/Code/rails_locale_detection
+  specs:
+    rails_locale_detection (2.0.0.pre2)
+      http_accept_language (~> 1.0.2)
+      rails (>= 3.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
+      mail (~> 2.5.3)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (4.0.0)
+    atomic (1.1.10)
+    builder (3.1.4)
+    diff-lcs (1.2.4)
+    erubis (2.7.0)
+    gem-release (0.5.5)
+    hike (1.2.3)
+    http_accept_language (1.0.2)
+    i18n (0.6.4)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.23)
+    minitest (4.7.5)
+    multi_json (1.7.7)
+    polyglot (0.3.3)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.0.4)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    rspec-rails (2.13.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    sprockets (2.10.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    thor (0.18.1)
+    thread_safe (0.1.2)
+      atomic
+    tilt (1.4.1)
+    timecop (0.6.2.2)
+    treetop (1.4.14)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.5.2)
+  bundler (~> 1.3.4)
+  gem-release (~> 0.5.3)
+  i18n (~> 0.6.1)
+  rails (= 4.0.0)
+  rails_locale_detection!
+  rake (~> 10.0.4)
+  rspec-rails (~> 2.13.0)
+  timecop (~> 0.6.1)

data/lib/rails_locale_detection/locale_detector.rb

@@ -5,12 +5,16 @@ module RailsLocaleDetection
     
     attr_reader :controller
     
-    delegate :cookies, :params, :request, :default_url_options, :user_locale, :to => :controller
+    delegate :params, :request, :default_url_options, :user_locale, :to => :controller
     
     def initialize(controller = nil)
       @controller = controller
     end
     
+    def cookies
+      request.cookie_jar
+    end
+    
     def locale_key
       RailsLocaleDetection.locale_key
     end

data/lib/rails_locale_detection/version.rb

@@ -1,3 +1,3 @@
 module RailsLocaleDetection
-  VERSION = "2.0.0.pre2"
+  VERSION = "2.0.0.pre3"
 end

data/rails_locale_detection.gemspec

@@ -17,13 +17,14 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
   
-  gem.add_dependency('rails', '>= 3.2.13')  
   gem.add_dependency('http_accept_language', '~> 1.0.2')
+  gem.add_dependency('rails', '>= 3.2.0')  
   
-  gem.add_development_dependency('i18n', '~> 0.6.1')
-  gem.add_development_dependency('timecop', '~> 0.6.1')
-  gem.add_development_dependency('rspec-rails', '~> 2.13.0')
+  gem.add_development_dependency('appraisal', '~> 0.5.2')
   gem.add_development_dependency('bundler', '~> 1.3.4')
+  gem.add_development_dependency('i18n', '~> 0.6.1')
   gem.add_development_dependency('gem-release', '~> 0.5.3')  
   gem.add_development_dependency('rake', '~> 10.0.4')  
+  gem.add_development_dependency('rspec-rails', '~> 2.13.0')
+  gem.add_development_dependency('timecop', '~> 0.6.1')
 end

data/spec/rails_locale_detection/locale_detector_spec.rb

@@ -57,12 +57,12 @@ describe RailsLocaleDetection::LocaleDetector do
 
   describe '#locale_from_cookie' do
     it "returns en if the param set was valid" do
-      controller.cookies[:locale] = 'en'
+      controller.request.cookie_jar[:locale] = 'en'
       locale_detector.locale_from_cookie.should eq(:en)
     end
 
     it "returns nil if the param set was not" do
-      controller.cookies[:locale] = 'es'
+      controller.request.cookie_jar[:locale] = 'es'
       locale_detector.locale_from_cookie.should be_nil
     end
 
@@ -102,7 +102,7 @@ describe RailsLocaleDetection::LocaleDetector do
   describe '#locale_from' do
     before :each do
       controller.params[:locale] = 'en'
-      controller.cookies[:locale] = 'fr'
+      controller.request.cookie_jar[:locale] = 'fr'
     end
 
     it "returns the locale set in the param" do
@@ -130,7 +130,7 @@ describe RailsLocaleDetection::LocaleDetector do
       end
 
       it "returns fr if the cookie is set to fr" do
-        controller.cookies[:locale] = "fr"
+        controller.request.cookie_jar[:locale] = "fr"
         locale_detector.detect_locale.should eq(:fr)
       end
 
@@ -161,7 +161,7 @@ describe RailsLocaleDetection::LocaleDetector do
       end
 
       it "skips cookie" do
-        controller.cookies[:locale] = "fr"
+        controller.request.cookie_jar[:locale] = "fr"
         locale_detector.detect_locale.should eq(:en)
       end
 
@@ -252,7 +252,7 @@ describe RailsLocaleDetection::LocaleDetector do
       end
 
       it "sets the language" do
-        controller.cookies[:locale].should eq(:fr)
+        controller.request.cookie_jar[:locale].should eq(:fr)
       end
 
       it "sets the default_url_options" do
@@ -273,7 +273,7 @@ describe RailsLocaleDetection::LocaleDetector do
       end
 
       it "sets the cookier locale" do
-        controller.cookies[:locale].should eq(:fr)
+        controller.request.cookie_jar[:locale].should eq(:fr)
       end
 
       it "doesn't set the default_url_options" do
@@ -294,7 +294,7 @@ describe RailsLocaleDetection::LocaleDetector do
       end
 
       it "sets the cookie locale" do
-        controller.cookies[:locale].should eq(:en)
+        controller.request.cookie_jar[:locale].should eq(:en)
       end
 
       it "doesn't set the default_url_options" do
@@ -315,7 +315,7 @@ describe RailsLocaleDetection::LocaleDetector do
       end
 
       it "sets the cookie locale" do
-        controller.cookies[:locale].should eq(:fr)
+        controller.request.cookie_jar[:locale].should eq(:fr)
       end
 
       it "doesn't set the default_url_options" do

data/spec/support/mocks.rb

@@ -1,10 +1,12 @@
 class MockRequest
   include HttpAcceptLanguage
 
-  attr_accessor :env
+  attr_accessor :env, :cookies, :cookie_jar
 
   def initialize
     @env = {'HTTP_ACCEPT_LANGUAGE' => ''}
+    @cookies = {}
+    @cookie_jar = ActionDispatch::Cookies::CookieJar.build(self)
   end
   
   def host
@@ -14,10 +16,7 @@ class MockRequest
   def ssl?
     false
   end
-    
-  def cookies
-    {}
-  end  
+  
 end
 
 class MockUser
@@ -30,11 +29,10 @@ end
 
 class MockController
 
-  attr_accessor :request, :params, :cookies, :default_url_options, :user
+  attr_accessor :request, :params, :default_url_options, :user
 
   def initialize(request)
     @request = request
-    @cookies = ActionDispatch::Cookies::CookieJar.build(request)
     @default_url_options = @params = {}
   end
 

metadata

@@ -1,68 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: rails_locale_detection
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre2
-  prerelease: 6
+  version: 2.0.0.pre3
 platform: ruby
 authors:
 - Mateo Murphy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-07-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: http_accept_language
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: http_accept_language
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
+        version: 0.5.2
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 1.3.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,75 +76,66 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: gem-release
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 0.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 10.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 10.0.4
 - !ruby/object:Gem::Dependency
-  name: gem-release
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.4
+        version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.4
+        version: 0.6.1
 description: Sets the current locale of a request using a combination of params, cookies,
   and http headers
 email:
@@ -150,12 +147,16 @@ files:
 - .document
 - .gitignore
 - .rspec
-- .rvmrc
+- Appraisals
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/rails3.gemfile
+- gemfiles/rails3.gemfile.lock
+- gemfiles/rails4.gemfile
+- gemfiles/rails4.gemfile.lock
 - lib/rails_locale_detection.rb
 - lib/rails_locale_detection/controller_methods.rb
 - lib/rails_locale_detection/detection_methods.rb
@@ -174,27 +175,26 @@ files:
 - spec/support/rails.rb
 homepage: https://github.com/mateomurphy/rails_locale_detection
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Locale setting for rails project
 test_files:
 - spec/controllers/callback_tests_controller_spec.rb

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 2.0.0@rails_locale_detection --create