rack-locale-root-redirect 0.1 → 0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1881606ef44a9609f795c8e3d56e11baa446910e
+  data.tar.gz: 53e0b9a8c5a57afffff1751fd9f34d1e8b353164
+SHA512:
+  metadata.gz: bf52f7c8c5eb66f40d073953fea0ae499d48477b7e707a46fc324480e5e15945e89b969dd50e10fe6082c935beb41b9c4485310622b92cb9eba798772d932dfc
+  data.tar.gz: 327c039d77f5666750c6a0eb39e8caf6396d918fbfbe6fdbb6cf5e3639c2de8e8eed4b53ca48316dc50cf1544775fcdee4ec8cf5e2bfa53c5e601240da0a15d2

data/.rspec

@@ -0,0 +1 @@
+--colour

data/LICENSE.md

@@ -0,0 +1,26 @@
+Copyright (c) 2013, Mirego
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+- Neither the name of the Mirego nor the names of its contributors may
+  be used to endorse or promote products derived from this software without
+  specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -7,7 +7,7 @@
 Add this line to your application’s Gemfile:
 
 ```ruby
-gem 'rack-locale-root-redirect'
+gem 'rack-locale-root-redirect', require: 'rack/locale-root-redirect'
 ```
 
 And then execute:
@@ -22,9 +22,9 @@ With Sinatra:
 
 ```ruby
 # Gemfile
-gem "sinatra"
-gem "rack-accept", :require => "rack/accept"
-gem "rack-locale-root-redirect", :require => "rack/locale-root-redirect"
+gem 'sinatra'
+gem 'rack-accept', require: 'rack/accept'
+gem 'rack-locale-root-redirect', require: 'rack/locale-root-redirect'
 
 # config.ru
 require 'bundler'
@@ -32,10 +32,10 @@ Bundler.require
 
 class MyApp < Sinatra::Base
   use Rack::Accept
-  use Rack::LocaleRootRedirect, :fr => "/fr", :en => "/en"
+  use Rack::LocaleRootRedirect, fr: "/fr", en: "/en"
 
-  get("/fr") { "Français!" }
-  get("/en") { "English!" }
+  get('/fr') { 'Français!' }
+  get('/en') { 'English!' }
 end
 
 run MyApp
@@ -46,11 +46,21 @@ Then, test it:
 ```shell
 $ rackup &
 
-$ curl -sI "http://0.0.0.0:9292" -H "Accept-Language: fr;q=1, en;q=0.8" | grep "301\|Location"
-HTTP/1.1 301 Moved Permanently
+$ curl -sI "http://0.0.0.0:9292" -H "Accept-Language: fr;q=1, en;q=0.8" | grep "302\|Location"
+HTTP/1.1 302 Moved Permanently
 Location: /fr
 
-$ curl -sI "http://0.0.0.0:9292" -H "Accept-Language: fr;q=0.4, en;q=0.8" | grep "301\|Location"
-HTTP/1.1 301 Moved Permanently
+$ curl -sI "http://0.0.0.0:9292" -H "Accept-Language: fr;q=0.4, en;q=0.8" | grep "302\|Location"
+HTTP/1.1 302 Moved Permanently
 Location: /en
 ```
+
+## License
+
+`Rack::LocaleRootRedirect` is © 2013 [Mirego](http://www.mirego.com) and may be freely distributed under the [New BSD license](http://opensource.org/licenses/BSD-3-Clause).  See the [`LICENSE.md`](https://github.com/mirego/rack-locale-root-redirect/blob/master/LICENSE.md) file.
+
+## About Mirego
+
+Mirego is a team of passionate people who believe that work is a place where you can innovate and have fun. We proudly build mobile applications for [iPhone](http://mirego.com/en/iphone-app-development/ "iPhone application development"), [iPad](http://mirego.com/en/ipad-app-development/ "iPad application development"), [Android](http://mirego.com/en/android-app-development/ "Android application development"), [Blackberry](http://mirego.com/en/blackberry-app-development/ "Blackberry application development"), [Windows Phone](http://mirego.com/en/windows-phone-app-development/ "Windows Phone application development") and [Windows 8](http://mirego.com/en/windows-8-app-development/ "Windows 8 application development") in beautiful Quebec City.
+
+We also love [open-source software](http://open.mirego.com/) and we try to extract as much code as possible from our projects to give back to the community.

data/Rakefile

@@ -1 +1,11 @@
-require "bundler/gem_tasks"
+require 'bundler'
+require 'rake'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+task default: :spec
+
+desc 'Run all specs'
+RSpec::Core::RakeTask.new(:spec) do |task|
+  task.pattern = 'spec/**/*_spec.rb'
+end

data/lib/rack/locale-root-redirect.rb

@@ -1,29 +1 @@
-require "rack/accept"
-
-module Rack
-  class LocaleRootRedirect
-    VERSION = "0.1"
-
-    def initialize(app, locales = {})
-      @locales = locales
-      @available_locales = locales.keys.map(&:to_s)
-      @default_locale = @available_locales.first
-      @app = app
-    end
-
-    def call(env)
-      status, headers, response = @app.call(env)
-
-      if match_data = %r[\A/(?<query_string>\?.*|\Z)].match(env["REQUEST_URI"])
-        language_matcher = env['rack-accept.request'].language
-        language_matcher.first_level_match = true
-        redirect_lang = language_matcher.best_of(@available_locales) || @default_locale
-
-        status = 302
-        headers["Location"] = @locales[redirect_lang.to_sym] + match_data[:query_string]
-      end
-
-      [status, headers, response]
-    end
-  end
-end
+require 'rack/locale_root_redirect'

data/lib/rack/locale_root_redirect.rb

@@ -0,0 +1,35 @@
+require 'rack/accept'
+
+module Rack
+  class LocaleRootRedirect
+    VERSION = '0.2'
+
+    def initialize(app, locales = {})
+      @locales = locales
+      @available_locales = locales.keys.map(&:to_s)
+      @default_locale = @available_locales.first
+      @app = app
+    end
+
+    def call(env)
+      status, headers, response = @app.call(env)
+
+      if root_request?(env)
+        language_matcher = env['rack-accept.request'].language.tap { |m| m.first_level_match = true }
+        redirect_lang = language_matcher.best_of(@available_locales) || @default_locale
+
+        status = 302
+        query_string = env['QUERY_STRING'] ? "?#{env['QUERY_STRING']}" : ''
+        headers['Location'] = @locales[redirect_lang.to_sym] + query_string
+      end
+
+      [status, headers, response]
+    end
+
+  protected
+
+    def root_request?(env)
+      %r[\A/(?<query_string>\?.*|\Z)].match(env['PATH_INFO'])
+    end
+  end
+end

data/rack-locale-root-redirect.gemspec

@@ -4,18 +4,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rack/locale-root-redirect'
 
 Gem::Specification.new do |gem|
-  gem.name          = "rack-locale-root-redirect"
+  gem.name          = 'rack-locale-root-redirect'
   gem.version       = Rack::LocaleRootRedirect::VERSION
-  gem.authors       = ["Rémi Prévost"]
-  gem.email         = ["remi@exomel.com"]
+  gem.authors       = ['Rémi Prévost']
+  gem.email         = ['rprevost@mirego.com']
   gem.description   = %q{Rack::LocaleRootRedirect uses Rack:Accept to map '/' to a path based on the `Accept-Language` HTTP header.}
   gem.summary       = gem.description
-  gem.homepage      = "https://github.com/remiprev/rack-locale-root-redirect"
+  gem.homepage      = 'https://github.com/mirego/rack-locale-root-redirect'
+  gem.license       = 'BSD 3-Clause'
 
   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_runtime_dependency "rack-accept", ">= 0.4.5"
+  gem.add_runtime_dependency 'rack-accept', '>= 0.4.5'
+
+  gem.add_development_dependency 'rspec', '~> 2.14'
+  gem.add_development_dependency 'coveralls'
+  gem.add_development_dependency 'rake'
 end

data/spec/rack/locale_root_redirect_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Rack::LocaleRootRedirect do
+  let(:app) { proc{[200,{},['Hello, world.']]} }
+  let(:stack) { Rack::LocaleRootRedirect.new(Rack::Accept.new(app), locales) }
+  let(:request) { Rack::MockRequest.new(stack) }
+
+  describe 'response' do
+    let(:locales) { { fr: '/fr', en: '/en' } }
+    let(:response) { request.get('/?foo=bar', 'HTTP_ACCEPT_LANGUAGE' => accept_language.join(',')) }
+
+    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' }
+    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' }
+    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' }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+$:.unshift File.expand_path('../lib', __FILE__)
+
+require 'coveralls'
+Coveralls.wear!
+
+require 'rspec'
+require 'rack/locale-root-redirect'
+
+RSpec.configure do |config|
+end

metadata

@@ -1,70 +1,115 @@
 --- !ruby/object:Gem::Specification
 name: rack-locale-root-redirect
 version: !ruby/object:Gem::Version
-  version: '0.1'
-  prerelease: 
+  version: '0.2'
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-accept
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.5
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  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'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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:
-- remi@exomel.com
+- rprevost@mirego.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
-- LICENSE.txt
+- LICENSE.md
 - README.md
 - Rakefile
 - lib/rack/locale-root-redirect.rb
+- lib/rack/locale_root_redirect.rb
 - rack-locale-root-redirect.gemspec
-homepage: https://github.com/remiprev/rack-locale-root-redirect
-licenses: []
+- spec/rack/locale_root_redirect_spec.rb
+- spec/spec_helper.rb
+homepage: https://github.com/mirego/rack-locale-root-redirect
+licenses:
+- BSD 3-Clause
+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: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rack::LocaleRootRedirect uses Rack:Accept to map '/' to a path based on the
   `Accept-Language` HTTP header.
-test_files: []
+test_files:
+- spec/rack/locale_root_redirect_spec.rb
+- spec/spec_helper.rb

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2012 Rémi Prévost
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.