rails_locale_detection 2.0.0.pre4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdb3b948bbed5917988dec654d1f8772090111d9
-  data.tar.gz: 6acebc0ba0c2efc4fe06e06cd9caa0307f9f3009
+  metadata.gz: b8c27829347e137b07d2ac81252de1d6bed5d84b
+  data.tar.gz: 2e16e6f84ec0cca5254e0d867dfa980f12ba4133
 SHA512:
-  metadata.gz: be1f305e9d8d64f19d66709b80b4d478591fc9a3aec1c21d453fd11b7c8932d9f9f12d19e62ef2f1f1cf5864be302b61bef457c4c2853193923b7969537c98d8
-  data.tar.gz: a5aaebfca2edca369aeeb4cfafd3354235457808bb71626483ac7299c87b918fe678b6f37c071acc618737d1121c8b9fb6a1b81930277e866a7b9591a6422205
+  metadata.gz: 0253574fbf32ae79988c5f1a1ffac47944049b9f8a077b675adbb27768ed142c2af2950806a6dfc3a4fba2483c4f96496fa1a07ecea9c8f614b8c444fd9260dc
+  data.tar.gz: 50894ac1a4a91059133f8ef04c9cd1ee2d25f1ffff9612526847548c2aee82f10020474c8f2383abf17332c0c85c6cf66cb67c0aac1c5e99454246f8cb7459b7

data/.gitignore

@@ -16,4 +16,7 @@ pkg
 
 # rvm
 .rvmrc
-.ruby-*
+.ruby-*
+
+# appraisals
+*.gemfile.lock

data/.travis.yml

@@ -1,7 +1,12 @@
+before_install: gem install bundler --version '1.10.6'
+
+sudo: false
+
 gemfile:
-  - gemfiles/rails3.gemfile
-  - gemfiles/rails4.gemfile
-  
+  - gemfiles/rails3.2.gemfile
+  - gemfiles/rails4.0.gemfile
+  - gemfiles/rails4.1.gemfile
+  - gemfiles/rails4.2.gemfile
+
 rvm:
-  - "2.0.0"
-  - "1.9.3"
+  - "2.2.0"

data/Appraisals

@@ -1,7 +1,15 @@
-appraise "rails3" do
-  gem "rails", "3.2.14"
+appraise "rails3.2" do
+  gem "rails", "3.2.22"
 end
 
-appraise "rails4" do
-  gem "rails", "4.0.0"
+appraise "rails4.0" do
+  gem "rails", "4.0.13"
+end
+
+appraise "rails4.1" do
+  gem "rails", "4.1.13"
+end
+
+appraise "rails4.2" do
+  gem "rails", "4.2.4"
 end

data/Gemfile.lock

@@ -1,117 +1,144 @@
 PATH
   remote: .
   specs:
-    rails_locale_detection (2.0.0.pre4)
-      http_accept_language (~> 1.0.2)
+    rails_locale_detection (2.0.0)
+      http_accept_language (~> 2.0.5)
       rails (>= 3.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
+    actionmailer (4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.4)
+      actionview (= 4.2.4)
+      activesupport (= 4.2.4)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.4)
+      activesupport (= 4.2.4)
+      builder (~> 3.1)
       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.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    appraisal (0.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.4)
+      activesupport (= 4.2.4)
+      globalid (>= 0.3.0)
+    activemodel (4.2.4)
+      activesupport (= 4.2.4)
+      builder (~> 3.1)
+    activerecord (4.2.4)
+      activemodel (= 4.2.4)
+      activesupport (= 4.2.4)
+      arel (~> 6.0)
+    activesupport (4.2.4)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
       bundler
       rake
-    arel (3.0.2)
-    builder (3.0.4)
-    diff-lcs (1.2.1)
+      thor (>= 0.14.0)
+    arel (6.0.3)
+    builder (3.2.2)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
-    gem-release (0.5.3)
-    hike (1.2.1)
-    http_accept_language (1.0.2)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.7.7)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.23)
-    multi_json (1.7.2)
-    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)
+    gem-release (0.5.5)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    http_accept_language (2.0.5)
+    i18n (0.7.0)
+    json (1.8.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.6.2)
+    mini_portile (0.6.2)
+    minitest (5.8.1)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    power_assert (0.2.4)
+    rack (1.6.4)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
+    rails (4.2.4)
+      actionmailer (= 4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
+      activemodel (= 4.2.4)
+      activerecord (= 4.2.4)
+      activesupport (= 4.2.4)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.4)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.4)
+      actionpack (= 4.2.4)
+      activesupport (= 4.2.4)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
+      thor (>= 0.18.1, < 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.0)
-    rspec-rails (2.13.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-rails (3.3.3)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    sprockets (3.4.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
       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.3.6)
-    timecop (0.6.1)
-    treetop (1.4.14)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
+      sprockets (>= 2.8, < 4.0)
+    test-unit (3.1.5)
+      power_assert
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    timecop (0.6.3)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal (~> 0.5.2)
-  bundler (~> 1.3.4)
+  appraisal (~> 2.1.0)
+  bundler (~> 1.10.6)
   gem-release (~> 0.5.3)
-  i18n (~> 0.6.1)
+  i18n (~> 0.7.0)
   rails_locale_detection!
   rake (~> 10.0.4)
-  rspec-rails (~> 2.13.0)
+  rspec-rails (~> 3.0)
+  test-unit (~> 3.0)
   timecop (~> 0.6.1)
+
+BUNDLED WITH
+   1.10.6

data/gemfiles/{rails4.gemfile → rails3.2.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "4.0.0"
+gem "rails", "3.2.22"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails4.0.gemfile

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

data/gemfiles/rails4.1.gemfile

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

data/gemfiles/{rails3.gemfile → rails4.2.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "3.2.14"
+gem "rails", "4.2.4"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/lib/rails_locale_detection/detection_methods.rb

@@ -14,7 +14,7 @@ module RailsLocaleDetection
     end
 
     def locale_from_request
-      validate_locale(request.preferred_language_from(available_locales))
+      validate_locale(http_accept_language.preferred_language_from(available_locales))
     end
 
     def locale_from_user
@@ -40,6 +40,6 @@ module RailsLocaleDetection
     # returns true if the default url option should be set for this request
     def set_default_url_option_for_request?
       RailsLocaleDetection.set_default_url_option === true || RailsLocaleDetection.set_default_url_option == :always || RailsLocaleDetection.set_default_url_option == :explicitly && params[locale_key].present?
-    end 
+    end
   end
-end    
+end

data/lib/rails_locale_detection/locale_detector.rb

@@ -2,23 +2,23 @@ module RailsLocaleDetection
   class LocaleDetector
     include DetectionMethods
     include LocaleAccessors
-    
+
     attr_reader :controller
-    
-    delegate :params, :request, :default_url_options, :user_locale, :to => :controller
-    
+
+    delegate :params, :request, :default_url_options, :user_locale, :http_accept_language, :to => :controller
+
     def initialize(controller = nil)
       @controller = controller
     end
-    
+
     def cookies
       request.cookie_jar
     end
-    
+
     def locale_key
       RailsLocaleDetection.locale_key
     end
-    
+
     def self.before(controller)
       new(controller).set_locale
     end

data/lib/rails_locale_detection/version.rb

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

data/rails_locale_detection.gemspec

@@ -12,20 +12,21 @@ Gem::Specification.new do |gem|
   gem.summary       = "Locale setting for rails project"
   gem.homepage      = "https://github.com/mateomurphy/rails_locale_detection"
   gem.license       = 'MIT'
-  
+
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
-  
-  gem.add_dependency('http_accept_language', '~> 1.0.2')
-  gem.add_dependency('rails', '>= 3.2.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_dependency('http_accept_language', '~> 2.0.5')
+  gem.add_dependency('rails', '>= 3.2.0')
+
+  gem.add_development_dependency('appraisal', '~> 2.1.0')
+  gem.add_development_dependency('bundler', '~> 1.10.6')
+  gem.add_development_dependency('i18n', '~> 0.7.0')
+  gem.add_development_dependency('gem-release', '~> 0.5.3')
+  gem.add_development_dependency('rake', '~> 10.0.4')
+  gem.add_development_dependency('rspec-rails', '~> 3.0')
   gem.add_development_dependency('timecop', '~> 0.6.1')
+  gem.add_development_dependency('test-unit', '~> 3.0')
 end

data/spec/controllers/callback_tests_controller_spec.rb

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
-describe CallbackTestsController do
-  
+describe CallbackTestsController, type: :controller do
+
   it "should automatically include the callback" do
-    subject.class.ancestors.should include(RailsLocaleDetection::ControllerMethods)
+    expect(subject.class.ancestors).to include(RailsLocaleDetection::ControllerMethods)
   end
-  
+
   it "should correctly detect the user locale" do
     get :show
-    
-    response.body.should eq('fr')
+
+    expect(response.body).to eq('fr')
   end
-  
+
 end