rack-locale-root-redirect 0.3.1 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d2d5a0277e85cb40191e22c43805c04c61686b6
-  data.tar.gz: ff459afe51d1e6f138e6b8b993b1278afdd2b6d6
+  metadata.gz: 3eccc6e9e67d15de692433b015ef649127cbfc37
+  data.tar.gz: d3212f53bbbed10b42b7aaf4e394c2ec32f43beb
 SHA512:
-  metadata.gz: 5917d7929baaa7ba25c09cd9d23a06f4b09bb03cdb355f5c0283f9745cde0614484693c7547f2b6ef487e2a7e18933d2de53273654feab94b94befbb6bd02737
-  data.tar.gz: c94307202a975a43d1dc18573700573cbdad25e1c36640ca1a6d7e7bf51e4538ef1f9bb133584d501f94432df48dd8aff29deb53ab549ed9cedce8a44a8680a3
+  metadata.gz: 9a8ddc372ab7d393c2ba1cc0db021bff0757a9207bdabbaaec7fee6106adbb1c49d041d8081fa73d4a3180dce7bc0a4092fa807a84f72473d5a0afc5691ba0cf
+  data.tar.gz: a37684489115c88e8dcf76601f026dea4b579fcd8864e3508f9a104f308b8c19dc74fc42fd4b54e0a77df1f3ab8b28376c1c7548d856746c69f9748f8a5e5ea2

data/.rubocop.yml

@@ -0,0 +1,65 @@
+AllCops:
+  Exclude:
+    - rack-locale-root-redirect.gemspec
+
+Documentation:
+  Enabled: false
+
+Encoding:
+  Enabled: false
+
+LineLength:
+  Max: 200
+
+AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+IfUnlessModifier:
+  Enabled: false
+
+CaseIndentation:
+  IndentWhenRelativeTo: case
+  IndentOneStep: true
+
+MethodLength:
+  CountComments: false
+  Max: 20
+
+SignalException:
+  Enabled: false
+
+ColonMethodCall:
+  Enabled: false
+
+AsciiComments:
+  Enabled: false
+
+RegexpLiteral:
+  Enabled: false
+
+AssignmentInCondition:
+  Enabled: false
+
+ParameterLists:
+  CountKeywordArgs: false
+
+SingleLineBlockParams:
+  Methods:
+    - reduce:
+      - memo
+      - item
+
+Metrics/AbcSize:
+  Enabled: false
+
+Style/CollectionMethods:
+  Enabled: true
+
+Style/SymbolArray:
+  Enabled: true
+
+Style/ExtraSpacing:
+  Enabled: true
+
+Style/FileName:
+  Enabled: false

data/.travis.yml

@@ -7,7 +7,9 @@ rvm:
 
 sudo: false
 
-script: "echo 'DO IT' && bundle exec rake spec"
+script:
+  - 'echo "Checking code style" && bundle exec phare'
+  - 'echo "Running tests" && bundle exec rake spec'
 
 notifications:
   hipchat:

data/README.md

@@ -1,7 +1,7 @@
 # Rack::LocaleRootRedirect
 
-[![Build Status](https://travis-ci.org/mirego/rack-locale-root-redirect.png?branch=master)](https://travis-ci.org/mirego/rack-locale-root-redirect)
-[![Ruby Gem](https://badge.fury.io/rb/rack-locale-root-redirect.png)](https://rubygems.org/gems/microscope)
+<a href="https://rubygems.org/gems/rack-locale-root-redirect"><img src="http://img.shields.io/gem/v/rack-locale-root-redirect.svg" /></a>
+<a href="https://travis-ci.org/mirego/rack-locale-root-redirect"><img src="http://img.shields.io/travis/mirego/rack-locale-root-redirect.svg" /></a>
 
 `Rack::LocaleRootRedirect` redirects requests to `"/"` based on the `Accept-Language` HTTP header.
 

data/lib/rack/locale_root_redirect/middleware.rb

@@ -1,8 +1,9 @@
 module Rack
   class LocaleRootRedirect
     STATUS = 302
-    REGEX = %r[\A/(?<query_string>\?.*|\Z)]
+    ROOT_REQUEST_REGEX = %r{\A/(?<query_string>\?.*|\Z)}
     RACK_ACCEPT_MISSING = 'Rack::LocaleRootRedirect must be used after Rack::Accept. Please make your application use Rack::Accept before Rack::LocaleRootRedirect.'
+    REDIRECTED_RESPONSE_REGEX = %r{\A3\d\d\Z}
 
     # @private
     def initialize(app, locales = {})
@@ -17,7 +18,7 @@ module Rack
     def call(env)
       status, headers, response = @app.call(env)
 
-      if root_request?(env)
+      if should_redirect?(env, status)
         locale = best_locale(env)
 
         status = STATUS
@@ -32,20 +33,27 @@ module Rack
   protected
 
     # Return whether we must act on this request
+    def should_redirect?(env, status)
+      !redirected_response?(status) && root_request?(env)
+    end
+
+    # Return whether the request was on the root endpoint (`/`)
     def root_request?(env)
-      REGEX.match(env['PATH_INFO'])
+      ROOT_REQUEST_REGEX.match(env['PATH_INFO'])
+    end
+
+    # Return whether the response we’re altering is already a redirection
+    def redirected_response?(status)
+      REDIRECTED_RESPONSE_REGEX.match(status.to_s)
     end
 
     # Return the best locale to redirect to based on the request enviroment
     def best_locale(env)
       if accept = env['rack-accept.request']
-        matcher = accept.language.tap do |matcher|
-          matcher.first_level_match = true
-        end
-
+        matcher = accept.language.tap { |m| m.first_level_match = true }
         matcher.best_of(@available_locales) || @default_locale
       else
-        raise StandardError.new(RACK_ACCEPT_MISSING)
+        raise StandardError, RACK_ACCEPT_MISSING
       end
     end
   end

data/lib/rack/locale_root_redirect/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class LocaleRootRedirect
-    VERSION = '0.3.1'
+    VERSION = '0.4'
   end
 end

data/rack-locale-root-redirect.gemspec

@@ -22,4 +22,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rspec', '~> 3.1'
   gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rubocop', '0.29'
+  gem.add_development_dependency 'phare'
 end

data/spec/rack/locale_root_redirect_spec.rb

@@ -1,38 +1,50 @@
 require 'spec_helper'
 
 describe Rack::LocaleRootRedirect do
-  let(:app) { proc{[200,{},['Hello, world.']]} }
   let(:request) { Rack::MockRequest.new(stack) }
+  let(:locales) { { fr: '/fr', en: '/en' } }
 
   context 'with stack using Rack::Accept' do
     let(:stack) { Rack::LocaleRootRedirect.new(Rack::Accept.new(app), locales) }
+    let(:response) { request.get('/?foo=bar', 'HTTP_ACCEPT_LANGUAGE' => accept_language.join(',')) }
 
-    describe 'response' do
-      let(:locales) { { fr: '/fr', en: '/en' } }
-      let(:response) { request.get('/?foo=bar', 'HTTP_ACCEPT_LANGUAGE' => accept_language.join(',')) }
+    context 'with response already being redirected' do
+      let(:app) { proc { [301, { 'Location' => '/new-place' }, ['You are being redirected...']] } }
 
-      context 'with first matching language' do
-        let(:accept_language) { %w{en es;q=0.9} }
-        it { expect(response.headers['Location']).to eq '/en?foo=bar' }
-        it { expect(response.headers['Vary']).to eq 'Accept-Language'}
-      end
-
-      context 'with second matching language' do
-        let(:accept_language) { %w{es en;q=0.8} }
-        it { expect(response.headers['Location']).to eq '/en?foo=bar' }
-        it { expect(response.headers['Vary']).to eq 'Accept-Language'}
+      describe 'response headers' do
+        let(:accept_language) { %w() }
+        it { expect(response.headers['Location']).to eq '/new-place' }
+        it { expect(response.headers['Vary']).to be_nil }
       end
+    end
 
-      context 'with default matching language' do
-        let(:accept_language) { %w{es jp;q=0.8} }
-        it { expect(response.headers['Location']).to eq '/fr?foo=bar' }
-        it { expect(response.headers['Vary']).to eq 'Accept-Language'}
+    context 'with response not already being redirected' do
+      let(:app) { proc { [200, {}, ['Hello, world.']] } }
+
+      describe 'response headers' do
+        context 'with first matching language' do
+          let(:accept_language) { %w(en es;q=0.9) }
+          it { expect(response.headers['Location']).to eq '/en?foo=bar' }
+          it { expect(response.headers['Vary']).to eq 'Accept-Language' }
+        end
+
+        context 'with second matching language' do
+          let(:accept_language) { %w(es en;q=0.8) }
+          it { expect(response.headers['Location']).to eq '/en?foo=bar' }
+          it { expect(response.headers['Vary']).to eq 'Accept-Language' }
+        end
+
+        context 'with default matching language' do
+          let(:accept_language) { %w(es jp;q=0.8) }
+          it { expect(response.headers['Location']).to eq '/fr?foo=bar' }
+          it { expect(response.headers['Vary']).to eq 'Accept-Language' }
+        end
       end
     end
   end
 
   context 'with stack without Rack::Accept' do
-    let(:locales) { { fr: '/fr', en: '/en' } }
+    let(:app) { proc { [200, {}, ['Hello, world.']] } }
     let(:stack) { Rack::LocaleRootRedirect.new(app, locales) }
 
     specify do

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-$:.unshift File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 
 # We test using RSpec
 require 'rspec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-locale-root-redirect
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: '0.4'
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-accept
@@ -52,6 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.29'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.29'
+- !ruby/object:Gem::Dependency
+  name: phare
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rack::LocaleRootRedirect uses Rack:Accept to map '/' to a path based
   on the `Accept-Language` HTTP header.
 email:
@@ -62,6 +90,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.md
@@ -93,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rack::LocaleRootRedirect uses Rack:Accept to map '/' to a path based on the