rails_locale_detection 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8c27829347e137b07d2ac81252de1d6bed5d84b
-  data.tar.gz: 2e16e6f84ec0cca5254e0d867dfa980f12ba4133
+  metadata.gz: c4ef48a5c499b6e9a8da66926f5d9cca930e4d24
+  data.tar.gz: 37bcb6e85096e563494c3d022c7485247365501c
 SHA512:
-  metadata.gz: 0253574fbf32ae79988c5f1a1ffac47944049b9f8a077b675adbb27768ed142c2af2950806a6dfc3a4fba2483c4f96496fa1a07ecea9c8f614b8c444fd9260dc
-  data.tar.gz: 50894ac1a4a91059133f8ef04c9cd1ee2d25f1ffff9612526847548c2aee82f10020474c8f2383abf17332c0c85c6cf66cb67c0aac1c5e99454246f8cb7459b7
+  metadata.gz: d7f1a95d8eeb1aa084e5f672bd886e3fc32797b2d8caeb984a15dbfef60a09c4e2d401187742945fb4183406cee690ae2c5c78d4855de40dc86b423cc988d295
+  data.tar.gz: c3374a4b12d24be47e3528152fd34fa2eda2b693d721ada42c683241074e8de8a3f63a472b4869101bd3db430d61de5e0b08aa6bf0a5fb2f79d1d16e99acc928

data/.travis.yml

@@ -1,4 +1,4 @@
-before_install: gem install bundler --version '1.10.6'
+before_install: gem install bundler --version '1.12.5'
 
 sudo: false
 
@@ -7,6 +7,7 @@ gemfile:
   - gemfiles/rails4.0.gemfile
   - gemfiles/rails4.1.gemfile
   - gemfiles/rails4.2.gemfile
+  - gemfiles/rails5.0.gemfile
 
 rvm:
-  - "2.2.0"
+  - "2.3.0"

data/Appraisals

@@ -12,4 +12,8 @@ end
 
 appraise "rails4.2" do
   gem "rails", "4.2.4"
-end
+end
+
+appraise "rails5.0" do
+  gem "rails", "5.0.0"
+end

data/Gemfile.lock

@@ -8,47 +8,50 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
+    actioncable (5.0.0)
+      actionpack (= 5.0.0)
+      nio4r (~> 1.2)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.0)
+      actionpack (= 5.0.0)
+      actionview (= 5.0.0)
+      activejob (= 5.0.0)
       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-dom-testing (~> 2.0)
+    actionpack (5.0.0)
+      actionview (= 5.0.0)
+      activesupport (= 5.0.0)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.4)
-      activesupport (= 4.2.4)
+    actionview (5.0.0)
+      activesupport (= 5.0.0)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
       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)
+    activejob (5.0.0)
+      activesupport (= 5.0.0)
+      globalid (>= 0.3.6)
+    activemodel (5.0.0)
+      activesupport (= 5.0.0)
+    activerecord (5.0.0)
+      activemodel (= 5.0.0)
+      activesupport (= 5.0.0)
+      arel (~> 7.0)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       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
       thor (>= 0.14.0)
-    arel (6.0.3)
+    arel (7.1.0)
     builder (3.2.2)
+    concurrent-ruby (1.0.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     gem-release (0.5.5)
@@ -56,89 +59,97 @@ GEM
       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)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    nio4r (1.2.1)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
+    power_assert (0.3.0)
+    rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    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)
+    rails (5.0.0)
+      actioncable (= 5.0.0)
+      actionmailer (= 5.0.0)
+      actionpack (= 5.0.0)
+      actionview (= 5.0.0)
+      activejob (= 5.0.0)
+      activemodel (= 5.0.0)
+      activerecord (= 5.0.0)
+      activesupport (= 5.0.0)
       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)
+      railties (= 5.0.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.4)
-      actionpack (= 4.2.4)
-      activesupport (= 4.2.4)
+    railties (5.0.0)
+      actionpack (= 5.0.0)
+      activesupport (= 5.0.0)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.0.4)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    rake (11.2.2)
+    rspec-core (3.5.1)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       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)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    test-unit (3.1.5)
+      railties (>= 3.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    sprockets (3.7.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.1.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    test-unit (3.2.1)
       power_assert
     thor (0.19.1)
     thread_safe (0.3.5)
     timecop (0.6.3)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    websocket-driver (0.6.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   appraisal (~> 2.1.0)
-  bundler (~> 1.10.6)
+  bundler (~> 1.12.5)
   gem-release (~> 0.5.3)
   i18n (~> 0.7.0)
   rails_locale_detection!
-  rake (~> 10.0.4)
+  rake (~> 11.2.2)
   rspec-rails (~> 3.0)
   test-unit (~> 3.0)
   timecop (~> 0.6.1)
 
 BUNDLED WITH
-   1.10.6
+   1.12.5

data/gemfiles/rails5.0.gemfile

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

data/lib/rails_locale_detection/controller_methods.rb

@@ -8,8 +8,14 @@ module RailsLocaleDetection
     end
 
     module ClassMethods
-      def detect_locale
-        append_before_filter LocaleDetector
+      if ::Rails.version.to_s < "4.0"
+        def detect_locale
+          append_before_filter LocaleDetector
+        end
+      else
+        def detect_locale
+          append_before_action LocaleDetector
+        end
       end
     end
 
@@ -17,4 +23,4 @@ module RailsLocaleDetection
       nil
     end
   end
-end
+end

data/lib/rails_locale_detection/version.rb

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

data/rails_locale_detection.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
   gem.authors       = ["Mateo Murphy"]
   gem.email         = ["mateo.murphy@gmail.com"]
   gem.description   = "Sets the current locale of a request using a combination of params, cookies, and http headers"
-  gem.summary       = "Locale setting for rails project"
+  gem.summary       = "Locale setting for rails projects"
   gem.homepage      = "https://github.com/mateomurphy/rails_locale_detection"
   gem.license       = 'MIT'
 
@@ -22,10 +22,10 @@ Gem::Specification.new do |gem|
   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('bundler', '~> 1.12.5')
   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('rake', '~> 11.2.2')
   gem.add_development_dependency('rspec-rails', '~> 3.0')
   gem.add_development_dependency('timecop', '~> 0.6.1')
   gem.add_development_dependency('test-unit', '~> 3.0')

data/spec/rails_locale_detection/controller_methods_spec.rb

@@ -12,8 +12,23 @@ describe RailsLocaleDetection::ControllerMethods do
     expect(controller.class).to respond_to(:detect_locale)
   end
 
-  it 'should add a before filter' do
-    expect(controller.class.before_filters).to eq([[RailsLocaleDetection::LocaleDetector]])
+  context 'when the rails is 4.0 or later' do
+    before do
+      skip "Rails version is #{::Rails.version.to_s}" unless ::Rails.version.to_s >= '4.0'
+    end
+
+    it 'adds the detector as a before action' do
+      expect(controller.class.before_actions).to eq([[RailsLocaleDetection::LocaleDetector]])
+    end
   end
 
+  context 'when the rails is less than 4.0' do
+    before do
+      skip "Rails version is #{::Rails.version.to_s}" unless ::Rails.version.to_s < '4.0'
+    end
+
+    it 'adds the detector as a before filter' do
+      expect(controller.class.before_filters).to eq([[RailsLocaleDetection::LocaleDetector]])
+    end
+  end
 end

data/spec/support/mocks.rb

@@ -6,7 +6,11 @@ class MockRequest
   def initialize
     @env = {'HTTP_ACCEPT_LANGUAGE' => ''}
     @cookies = {}
-    @cookie_jar = ActionDispatch::Cookies::CookieJar.build(self)
+    @cookie_jar = if ::Rails.version.to_s < "5.0"
+      ActionDispatch::Cookies::CookieJar.build(self)
+    else
+      ActionDispatch::Cookies::CookieJar.build(self, @cookies)
+    end
   end
 
   def host
@@ -16,7 +20,6 @@ class MockRequest
   def ssl?
     false
   end
-
 end
 
 class MockUser
@@ -42,6 +45,7 @@ class MockController
 
   class << self
     attr_reader :before_filters
+    attr_reader :before_actions
   end
 
   def self.before_filter(*args)
@@ -54,6 +58,11 @@ class MockController
     @before_filters << args
   end
 
+  def self.append_before_action(*args)
+    @before_actions ||= []
+    @before_actions << args
+  end
+
   include RailsLocaleDetection::ControllerMethods
   include HttpAcceptLanguage::EasyAccess
-end
+end

data/spec/support/rails.rb

@@ -2,7 +2,7 @@ class MockApplication
   def self.env_config
     {}
   end
-  
+
   def self.routes
     @routes ||= ActionDispatch::Routing::RouteSet.new
   end
@@ -15,16 +15,21 @@ end
 ::Rails.application = MockApplication
 
 ActionController::Base.send :include, RailsLocaleDetection::ControllerMethods
-ActionController::Base.send :include, Rails.application.routes.url_helpers  
+ActionController::Base.send :include, Rails.application.routes.url_helpers
 
 class CallbackTestsController < ActionController::Base
 
   def user_locale
     :fr
   end
-  
+
   def show
-    render :text => current_locale
+    if ::Rails.version.to_s < "4.1"
+      render text: current_locale
+    else
+      render plain: current_locale
+    end
+
   end
-  
-end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_locale_detection
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Mateo Murphy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_accept_language
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.6
+        version: 1.12.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.6
+        version: 1.12.5
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.4
+        version: 11.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.4
+        version: 11.2.2
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +172,7 @@ files:
 - gemfiles/rails4.0.gemfile
 - gemfiles/rails4.1.gemfile
 - gemfiles/rails4.2.gemfile
+- gemfiles/rails5.0.gemfile
 - lib/rails_locale_detection.rb
 - lib/rails_locale_detection/controller_methods.rb
 - lib/rails_locale_detection/detection_methods.rb
@@ -208,10 +209,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
-summary: Locale setting for rails project
+summary: Locale setting for rails projects
 test_files:
 - spec/controllers/callback_tests_controller_spec.rb
 - spec/rails_locale_detection/config_spec.rb