http_accept_language 2.0.2 → 2.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e8f322e914fee571f93b3f8c009a4132f9263f21
+  data.tar.gz: 50a48cb1200a9120866d829d812d91a3d407bb34
+SHA512:
+  metadata.gz: 89a7c19b3a2df5f32995ee264df668fca0e98865be74e74441b5882e096f4e9862f0e2f4266c3d4fd199a78a0a68afcd54dfbeddc7253a3f1fe35deaea03b2da
+  data.tar.gz: 0f3be427948e4b2a74a1727b70d84a6b51b025e6c0cef8360df8a9ccaab9cd429aceed6d65e93b20dd3c0a6efc539ddf46c70ee4c927f7064e185c1b64047cb1

data/README.md

@@ -2,8 +2,8 @@
 
 A gem which helps you detect the users preferred language, as sent by the "Accept-Language" HTTP header.
 
-The algorithm is based on [RFC 2616](http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html), with one exception: 
-when a user requests "en-US" and "en" is an available language, "en" is deemed compatible with "en-US". 
+The algorithm is based on [RFC 2616](http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html), with one exception:
+when a user requests "en-US" and "en" is an available language, "en" is deemed compatible with "en-US".
 The RFC specifies that the requested language must either exactly match the available language or must exactly match a prefix of the available language. This means that when the user requests "en" and "en-US" is available, "en-US" would be compatible, but not the other way around. This is usually not what you're looking for.
 
 Since version 2.0, this gem is Rack middleware.
@@ -43,6 +43,12 @@ class SomeController < ApplicationController
 end
 ```
 
+If you want to enable this behavior by default in all of your controllers, add the following in an initializer (`config/initializers/http_accept_language.rb`, for example):
+
+```ruby
+HttpAcceptLanguage.automatically_set_locale = true
+```
+
 To use the middleware in any Rack application, simply add the middleware:
 
 ``` ruby

data/lib/http_accept_language.rb

@@ -1,3 +1,15 @@
+module HttpAcceptLanguage
+  @@automatically_set_locale = false
+
+  def self.automatically_set_locale?
+    @@automatically_set_locale
+  end
+
+  def self.automatically_set_locale=(set_locale)
+    @@automatically_set_locale = set_locale
+  end
+end
+
 require 'http_accept_language/parser'
 require 'http_accept_language/middleware'
-require 'http_accept_language/railtie' if defined?(Rails::Railtie)
+require 'http_accept_language/railtie' if defined?(Rails::Railtie)

data/lib/http_accept_language/auto_locale.rb

@@ -0,0 +1,16 @@
+require "active_support/concern"
+require "i18n"
+
+module HttpAcceptLanguage
+  module AutoLocale
+    extend ActiveSupport::Concern
+
+    included do
+      before_filter :set_locale
+    end
+
+    def set_locale
+      I18n.locale = http_accept_language.compatible_language_from(I18n.available_locales)
+    end
+  end
+end

data/lib/http_accept_language/middleware.rb

@@ -6,6 +6,7 @@ module HttpAcceptLanguage
 
     def call(env)
       env["http_accept_language.parser"] = Parser.new(env["HTTP_ACCEPT_LANGUAGE"])
+      
       def env.http_accept_language
         self["http_accept_language.parser"]
       end

data/lib/http_accept_language/railtie.rb

@@ -1,10 +1,15 @@
 module HttpAcceptLanguage
   class Railtie < ::Rails::Railtie
-    initializer "http_accept_language.add_middleware" do |app|
+    initializer "http_accept_language.setup" do |app|
       app.middleware.use Middleware
-      
+
       ActiveSupport.on_load :action_controller do
         include EasyAccess
+
+        if HttpAcceptLanguage.automatically_set_locale?
+          require "http_accept_language/auto_locale"
+          include AutoLocale
+        end
       end
     end
   end

data/lib/http_accept_language/version.rb

@@ -1,3 +1,3 @@
 module HttpAcceptLanguage
-  VERSION = '2.0.2'
+  VERSION = '2.0.4'
 end

data/spec/auto_locale_spec.rb

@@ -0,0 +1,44 @@
+require 'http_accept_language/auto_locale'
+
+describe HttpAcceptLanguage::AutoLocale do
+  let(:controller_class) do
+    Class.new do
+      def self.before_filter(dummy) 
+
+      end
+
+      def http_accept_language
+        HttpAcceptLanguage::Parser.new("ja,en-us;q=0.7,en;q=0.3")
+      end
+
+      include HttpAcceptLanguage::AutoLocale
+    end
+  end
+
+  let(:controller) { controller_class.new }
+
+  context "available languages includes accept_languages" do
+    before do
+      I18n.available_locales = [:en, :ja]
+    end
+
+    it "take a suitable locale" do
+      controller.set_locale
+
+      expect(I18n.locale).to eq(:ja)
+    end
+  end
+
+  context "available languages not includes accept_languages" do
+    before do
+      I18n.available_locales = [:de]
+      I18n.default_locale = :fr
+    end
+
+    it "take default_locale" do
+      controller.set_locale
+
+      expect(I18n.locale).to eq(:fr)
+    end
+  end
+end

metadata

@@ -1,93 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: http_accept_language
 version: !ruby/object:Gem::Version
-  version: 2.0.2
-  prerelease: 
+  version: 2.0.4
 platform: ruby
 authors:
 - iain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70189984251240 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189984251240
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70189984250560 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189984250560
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70189984250020 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189984250020
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70189984249400 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189984249400
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70189984248760 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.6
   type: :development
   prerelease: false
-  version_requirements: *70189984248760
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70189984248160 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189984248160
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70189984247480 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189984247480
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Find out which locale the user preferes by reading the languages they
   specified in their browser
 email:
@@ -96,8 +116,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - Guardfile
 - README.md
@@ -108,47 +128,44 @@ files:
 - features/support/rails_driver.rb
 - http_accept_language.gemspec
 - lib/http_accept_language.rb
+- lib/http_accept_language/auto_locale.rb
 - lib/http_accept_language/middleware.rb
 - lib/http_accept_language/parser.rb
 - lib/http_accept_language/railtie.rb
 - lib/http_accept_language/version.rb
+- spec/auto_locale_spec.rb
 - spec/middleware_spec.rb
 - spec/parser_spec.rb
 homepage: https://github.com/iain/http_accept_language
 licenses:
 - MIT
+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'
-      segments:
-      - 0
-      hash: 3432813774343238940
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3432813774343238940
 requirements: []
 rubyforge_project: http_accept_language
-rubygems_version: 1.8.6
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Find out which locale the user preferes by reading the languages they specified
   in their browser
 test_files:
 - features/rails_integration.feature
 - features/steps/rails.rb
 - features/support/rails_driver.rb
+- spec/auto_locale_spec.rb
 - spec/middleware_spec.rb
 - spec/parser_spec.rb
+has_rdoc: