http_accept_language 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8f322e914fee571f93b3f8c009a4132f9263f21
-  data.tar.gz: 50a48cb1200a9120866d829d812d91a3d407bb34
+  metadata.gz: 08549bc678f764b0ee83c4520257c29165e16cab
+  data.tar.gz: 840fc4179bd28f157fd4eaf2d5feb4b0da2a2789
 SHA512:
-  metadata.gz: 89a7c19b3a2df5f32995ee264df668fca0e98865be74e74441b5882e096f4e9862f0e2f4266c3d4fd199a78a0a68afcd54dfbeddc7253a3f1fe35deaea03b2da
-  data.tar.gz: 0f3be427948e4b2a74a1727b70d84a6b51b025e6c0cef8360df8a9ccaab9cd429aceed6d65e93b20dd3c0a6efc539ddf46c70ee4c927f7064e185c1b64047cb1
+  metadata.gz: 53ce0048473fcee968b6fca1f832b7422281a0cfabdedacfdab8abb081674049e17c9c04f784e649bc78bc4d93f72a26dc5362d78379367b61e7937e9208358d
+  data.tar.gz: 2cc635241d1980aee9ef20e6997a6a235c9f674470e5b2c6f2b93a585fb9cd1e360e1fedc072fd1183fb40d5e72f31cc3adc2989f3dbc2e92cf1d12789b70720

data/README.md

@@ -43,10 +43,14 @@ 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):
+If you want to enable this behavior by default in your controllers, you can just include the provided concern:
 
 ```ruby
-HttpAcceptLanguage.automatically_set_locale = true
+class ApplicationController < ActionController::Base
+  include HttpAcceptLanguage::AutoLocale
+
+#...
+end
 ```
 
 To use the middleware in any Rack application, simply add the middleware:

data/lib/http_accept_language.rb

@@ -1,15 +1,4 @@
-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/auto_locale'
 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

@@ -1,5 +1,4 @@
-require "active_support/concern"
-require "i18n"
+require 'active_support/concern'
 
 module HttpAcceptLanguage
   module AutoLocale
@@ -9,8 +8,10 @@ module HttpAcceptLanguage
       before_filter :set_locale
     end
 
+    private
+
     def set_locale
       I18n.locale = http_accept_language.compatible_language_from(I18n.available_locales)
     end
   end
-end
+end

data/lib/http_accept_language/railtie.rb

@@ -1,15 +1,10 @@
 module HttpAcceptLanguage
   class Railtie < ::Rails::Railtie
-    initializer "http_accept_language.setup" do |app|
+    initializer "http_accept_language.add_middleware" 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.4'
+  VERSION = '2.0.5'
 end

data/spec/auto_locale_spec.rb

@@ -1,10 +1,13 @@
+require 'i18n'
 require 'http_accept_language/auto_locale'
+require 'http_accept_language/parser'
+require 'http_accept_language/middleware'
 
 describe HttpAcceptLanguage::AutoLocale do
   let(:controller_class) do
     Class.new do
-      def self.before_filter(dummy) 
-
+      def self.before_filter(dummy)
+        # dummy method
       end
 
       def http_accept_language
@@ -23,22 +26,9 @@ describe HttpAcceptLanguage::AutoLocale do
     end
 
     it "take a suitable locale" do
-      controller.set_locale
+      controller.send(: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
+end

data/spec/middleware_spec.rb

@@ -33,20 +33,20 @@ describe "Rack integration" do
     app = lambda { |env| env }
     middleware = HttpAcceptLanguage::Middleware.new(app)
     middleware.call(env)
-    env.http_accept_language.user_preferred_languages.should eq %w{en}
+    expect(env.http_accept_language.user_preferred_languages).to eq %w{en}
     env["HTTP_ACCEPT_LANGUAGE"] = "de"
     middleware.call(env)
-    env.http_accept_language.user_preferred_languages.should eq %w{de}
+    expect(env.http_accept_language.user_preferred_languages).to eq %w{de}
   end
 
   it "decodes the HTTP_ACCEPT_LANGUAGE header" do
     request_with_header 'en-us,en-gb;q=0.8,en;q=0.6,es-419'
-    r['user_preferred_languages'].should eq %w{en-US es-419 en-GB en}
+    expect(r['user_preferred_languages']).to eq %w{en-US es-419 en-GB en}
   end
 
   it "finds the first available language" do
     request_with_header 'en-us,en-gb;q=0.8,en;q=0.6,es-419', :preferred => %w(en en-GB)
-    r['preferred_language_from'].should eq 'en-GB'
+    expect(r['preferred_language_from']).to eq 'en-GB'
   end
 
   def request_with_header(header, params = {})

data/spec/parser_spec.rb

@@ -8,58 +8,58 @@ describe HttpAcceptLanguage::Parser do
 
   it "should return empty array" do
     parser.header = nil
-    parser.user_preferred_languages.should eq []
+    expect(parser.user_preferred_languages).to eq []
   end
 
   it "should properly split" do
-    parser.user_preferred_languages.should eq %w{en-US es-419 en-GB en}
+    expect(parser.user_preferred_languages).to eq %w{en-US es-419 en-GB en}
   end
 
   it "should ignore jambled header" do
     parser.header = 'odkhjf89fioma098jq .,.,'
-    parser.user_preferred_languages.should eq []
+    expect(parser.user_preferred_languages).to eq []
   end
 
   it "should properly respect whitespace" do
     parser.header = 'en-us, en-gb; q=0.8,en;q = 0.6,es-419'
-    parser.user_preferred_languages.should eq %w{en-US es-419 en-GB en}
+    expect(parser.user_preferred_languages).to eq %w{en-US es-419 en-GB en}
   end
 
   it "should find first available language" do
-    parser.preferred_language_from(%w{en en-GB}).should eq "en-GB"
+    expect(parser.preferred_language_from(%w{en en-GB})).to eq "en-GB"
   end
 
   it "should find first compatible language" do
-    parser.compatible_language_from(%w{en-hk}).should eq "en-hk"
-    parser.compatible_language_from(%w{en}).should eq "en"
+    expect(parser.compatible_language_from(%w{en-hk})).to eq "en-hk"
+    expect(parser.compatible_language_from(%w{en})).to eq "en"
   end
 
   it "should find first compatible from user preferred" do
     parser.header = 'en-us,de-de'
-    parser.compatible_language_from(%w{de en}).should eq 'en'
+    expect(parser.compatible_language_from(%w{de en})).to eq 'en'
   end
 
   it "should accept symbols as available languages" do
     parser.header = 'en-us'
-    parser.compatible_language_from([:"en-HK"]).should eq :"en-HK"
+    expect(parser.compatible_language_from([:"en-HK"])).to eq :"en-HK"
   end
 
   it "should accept and ignore wildcards" do
     parser.header = 'en-US,en,*'
-    parser.compatible_language_from([:"en-US"]).should eq :"en-US"
+    expect(parser.compatible_language_from([:"en-US"])).to eq :"en-US"
   end
 
   it "should sanitize available language names" do
-    parser.sanitize_available_locales(%w{en_UK-x3 en-US-x1 ja_JP-x2 pt-BR-x5 es-419-x4}).should eq ["en-UK", "en-US", "ja-JP", "pt-BR", "es-419"]
+    expect(parser.sanitize_available_locales(%w{en_UK-x3 en-US-x1 ja_JP-x2 pt-BR-x5 es-419-x4})).to eq ["en-UK", "en-US", "ja-JP", "pt-BR", "es-419"]
   end
 
   it "should accept available language names as symbols and return them as strings" do
-    parser.sanitize_available_locales([:en, :"en-US", :ca, :"ca-ES"]).should eq ["en", "en-US", "ca", "ca-ES"]
+    expect(parser.sanitize_available_locales([:en, :"en-US", :ca, :"ca-ES"])).to eq ["en", "en-US", "ca", "ca-ES"]
   end
 
   it "should find most compatible language from user preferred" do
     parser.header = 'ja,en-gb,en-us,fr-fr'
-    parser.language_region_compatible_from(%w{en-UK en-US ja-JP}).should eq "ja-JP"
+    expect(parser.language_region_compatible_from(%w{en-UK en-US ja-JP})).to eq "ja-JP"
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http_accept_language
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - iain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake