i18n_strategy 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0610e8edc1c6552d8556bf0b54885ec77e8606c
-  data.tar.gz: c03f6f08627db8d606ebf08f823f00b8d30fedb8
+  metadata.gz: b9fc1d2a94f64ccd3870735db85194c5f9e5a8a3
+  data.tar.gz: 7df0d69f52325135fb136c69293c932a249032b6
 SHA512:
-  metadata.gz: 5e76b93fe160582906aa17b487ecf6bd72b4d8b3a17c72568dabcd9e6a6d1ab5f3693f3080cce3130d209f96337cfd3c3a29eaad7c68fec07e5afc7ddebf65ce
-  data.tar.gz: 66cc05e927d31f48a1856c63c9d9a3fe489c42abccefba2143379bfd429481f0caa90d039a47ab373e669ec6939edc0de062ea1a3eadffb39d40fb254625dfe0
+  metadata.gz: cebe8451beb95867607626687ff5c5c97c1cc6b6985d3e6b3ae0fac6af432c473670fe92bef5ab0147eb60cd0bb5d2a80c833afbf889f6f05e80c31d1a5151e4
+  data.tar.gz: ceda354a65cec73626d7f62cf85e50949bc750c11b0e5b07df8744b142a8147dcf7bffeafb422f9b62769ac4cf1b742ac00945d5cfabfa72765fc3d7ee0cd1da

data/lib/i18n_strategy/initializer.rb

@@ -3,7 +3,7 @@ module I18nStrategy
 
   class Initializer
     def self.init(app)
-      I18nStrategy.strategy ||= I18nStrategy::Strategy::Default
+      I18nStrategy.strategy ||= I18nStrategy::Strategy
 
       ActiveSupport.on_load(:action_controller) do
         ActionController::Base.send(:include, Filter)

data/lib/i18n_strategy/strategy.rb

@@ -2,20 +2,18 @@ require 'http_accept_language/parser'
 
 module I18nStrategy
   module Strategy
-    module Default
-      def detect_locale
-        lang      = nil
-        available = I18nStrategy.available_languages || []
+    def detect_locale
+      lang      = nil
+      available = I18nStrategy.available_languages || []
 
-        if params[:locale] && available.include?(params[:locale])
-          lang = params[:locale]
-        else
-          parser = HttpAcceptLanguage::Parser.new(request.env['HTTP_ACCEPT_LANGUAGE'])
-          lang   = parser.preferred_language_from(available)
-        end
-
-        lang || I18n.default_locale
+      if params[:locale] && available.include?(params[:locale])
+        lang = params[:locale]
+      else
+        parser = HttpAcceptLanguage::Parser.new(request.env['HTTP_ACCEPT_LANGUAGE'])
+        lang   = parser.preferred_language_from(available)
       end
+
+      lang || I18n.default_locale
     end
   end
 end

data/lib/i18n_strategy/version.rb

@@ -1,3 +1,3 @@
 module I18nStrategy
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/controllers/locale_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe RootController do
   before {
-    I18nStrategy.strategy = I18nStrategy::Strategy::Default
+    I18nStrategy.strategy = I18nStrategy::Strategy
     I18nStrategy.available_languages = %w[en ja fr]
   }
 
@@ -15,43 +15,69 @@ describe RootController do
       }
     end
 
-    context 'with preferred language' do
-      context 'en' do
-        before {
-          request.env['HTTP_ACCEPT_LANGUAGE'] = 'en'
-          get :index
-        }
+    context 'with preferred language from HTTP header' do
+      context 'and it is valid' do
+        context 'en (default language)' do
+          before {
+            request.env['HTTP_ACCEPT_LANGUAGE'] = 'en'
+            get :index
+          }
+
+          it {
+            expect(response.body).to be == 'en'
+          }
+        end
 
-        it {
-          expect(response.body).to be == 'en'
-        }
+        context 'ja' do
+          before {
+            request.env['HTTP_ACCEPT_LANGUAGE'] = 'ja'
+            get :index
+          }
+
+          it {
+            expect(response.body).to be == 'ja'
+          }
+        end
       end
 
-      context 'ja' do
-        before {
-          request.env['HTTP_ACCEPT_LANGUAGE'] = 'ja'
-          get :index
-        }
+      context 'and it is valid' do
+          before {
+            request.env['HTTP_ACCEPT_LANGUAGE'] = 'no_such_language'
+            get :index
+          }
 
-        it {
-          expect(response.body).to be == 'ja'
-        }
+          it {
+            expect(response.body).to be == 'en'
+          }
       end
     end
 
     context 'with preferred language from query param' do
-      context 'with valid language' do
-        before {
-          request.env['HTTP_ACCEPT_LANGUAGE'] = 'ja'
-          get :index, :locale => 'fr'
-        }
+      context 'and it is valid' do
+        context 'en (default language)' do
+          before {
+            request.env['HTTP_ACCEPT_LANGUAGE'] = 'ja'
+            get :index, :locale => 'en'
+          }
+
+          it {
+            expect(response.body).to be == 'en'
+          }
+        end
 
-        it {
-          expect(response.body).to be == 'fr'
-        }
+        context 'fr' do
+          before {
+            request.env['HTTP_ACCEPT_LANGUAGE'] = 'ja'
+            get :index, :locale => 'fr'
+          }
+
+          it {
+            expect(response.body).to be == 'fr'
+          }
+        end
       end
 
-      context 'with invalid language' do
+      context 'and it is invalid' do
         before {
           request.env['HTTP_ACCEPT_LANGUAGE'] = 'ja'
           get :index, :locale => 'no_such_language'
@@ -74,9 +100,12 @@ describe RootController do
         end
       end
 
+      before {
+        I18nStrategy.strategy = MyStrategy
+      }
+
       context 'with no preferred method' do
         before {
-          I18nStrategy.strategy = MyStrategy
           get :index
         }
 
@@ -87,7 +116,6 @@ describe RootController do
 
       context 'with preferred method' do
         before {
-          I18nStrategy.strategy = MyStrategy
           I18nStrategy.method_to_detect_locale = :another_detect_locale
           get :index
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n_strategy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kentaro Kuribayashi