locomotivecms_steam 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55dc6e31d1bf0a7b9713eec9c4e60a825afe2803
-  data.tar.gz: c541108e250a7c1b9d4d052bc852d5cac4c9d8f4
+  metadata.gz: b0638993657ef4d9c1daeacceaf92343dced8b62
+  data.tar.gz: 88c03d05c185a8e33de76a7c83f0414d9c463ec0
 SHA512:
-  metadata.gz: ad6e4a7821c20f1c4029f5dcbcb234fda822d0f65f2f8e2d68c49510a7603933643730224854b35ea9d955c760526a25ed1c3ab5f70524cc2a38d2a889fb8d69
-  data.tar.gz: 604e238795bcba4e957f6b662c4aec28a9d6b4c325e0070f2da3bf1a862795b9ff92a1578dbf504ef7fc1293166d54ad51e05d56b423b70561f2edfca3ee0782
+  metadata.gz: 81a06d2a759297e8177148cba1d9a00bf1baf925d4335465f82e03541362259855056a68b6656a6be41d140713fd4cd1755fc9890985b4ba2d698a30e9904ac5
+  data.tar.gz: 008df971169a7c5c267bf2eb521276ca35814006e038b90b4ac57723971d00ab270824f7a9517e78743b91d80e5639ef0d7c192486494916103a509245791c8e

data/Gemfile

@@ -30,8 +30,8 @@ group :test do
 
   gem 'rack-test',          '~> 0.6.3'
 
-  gem 'codeclimate-test-reporter',  '~> 0.4.7',  require: false
-  gem 'coveralls',                  '~> 0.8.1', require: false
+  gem 'codeclimate-test-reporter',  '~> 0.4.7',   require: false
+  gem 'coveralls',                  '~> 0.8.1',   require: false
 end
 
 platform :ruby do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.2.0)
+    locomotivecms_steam (1.2.1)
       RedCloth (~> 4.3.2)
       autoprefixer-rails (~> 6.3.3.1)
       chronic (~> 0.10.2)
@@ -30,9 +30,8 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    activesupport (4.2.7.1)
+    activesupport (4.2.8)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
@@ -44,14 +43,14 @@ GEM
     bson (4.1.1)
     byebug (8.2.5)
     chronic (0.10.2)
-    chunky_png (1.3.7)
+    chunky_png (1.3.8)
     codeclimate-test-reporter (0.4.8)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.1)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.10.0)
+    coffee-script-source (1.12.2)
     colorize (0.8.1)
     compass (1.0.3)
       chunky_png (~> 1.2)
@@ -65,7 +64,7 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.5)
     coveralls (0.8.15)
       json (>= 1.8, < 3)
       simplecov (~> 0.12.0)
@@ -81,7 +80,7 @@ GEM
       rack (>= 1.3.0)
     duktape (1.3.0.6)
     execjs (2.7.0)
-    ffi (1.9.14)
+    ffi (1.9.18)
     flamegraph (0.9.5)
     haml (4.0.7)
       tilt
@@ -113,13 +112,13 @@ GEM
     mime-types (2.6.2)
     mimetype-fu (0.1.2)
     mini_portile2 (2.1.0)
-    minitest (5.9.1)
-    moneta (0.8.0)
+    minitest (5.10.1)
+    moneta (0.8.1)
     mongo (2.2.7)
       bson (~> 4.0)
     morphine (0.1.1)
     multi_json (1.12.1)
-    multi_xml (0.5.5)
+    multi_xml (0.6.0)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
     nokogumbo (1.4.10)
@@ -134,7 +133,7 @@ GEM
     pry-byebug (3.3.0)
       byebug (~> 8.0)
       pry (~> 0.10)
-    public_suffix (2.0.4)
+    public_suffix (2.0.5)
     puma (3.6.0)
     rack (2.0.1)
     rack-cache (1.6.1)
@@ -148,7 +147,7 @@ GEM
       rack (>= 1.1.0)
     rake (10.4.2)
     rb-fsevent (0.9.8)
-    rb-inotify (0.9.7)
+    rb-inotify (0.9.8)
       ffi (>= 0.5.0)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
@@ -167,7 +166,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)
-    sass (3.4.22)
+    sass (3.4.23)
     simplecov (0.12.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
@@ -182,7 +181,7 @@ GEM
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
-    thread_safe (0.3.5)
+    thread_safe (0.3.6)
     tilt (2.0.5)
     timecop (0.8.1)
     tins (1.12.0)

data/lib/locomotive/steam/middlewares/locale.rb

@@ -28,7 +28,7 @@ module Locomotive::Steam
       protected
 
       def extract_locale
-        _locale = params[:locale] || default_locale
+        _locale = locale_from_params || default_locale
         _path   = request.path_info
 
         if _path =~ /^\/(#{site.locales.join('|')})+(\/|$)/
@@ -44,6 +44,10 @@ module Locomotive::Steam
         env['steam.locale'] = services.locale = _locale
       end
 
+      def locale_from_params
+        locales.include?(params[:locale]) ? params[:locale] : nil
+      end
+
     end
   end
 end

data/lib/locomotive/steam/middlewares/renderer.rb

@@ -20,7 +20,7 @@ module Locomotive::Steam
           redirect_to(page.redirect_url, page.redirect_type)
         else
           content = parse_and_render_liquid
-          render_response(content, page.not_found? ? 404: 200, page.response_type)
+          render_response(content, page.not_found? ? 404 : 200, page.response_type)
         end
       end
 

data/lib/locomotive/steam/middlewares/thread_safe.rb

@@ -53,6 +53,10 @@ module Locomotive::Steam::Middlewares
       @liquid_assigns ||= env.fetch('steam.liquid_assigns')
     end
 
+    def locales
+      site.locales
+    end
+
     def default_locale
       site.default_locale
     end

data/lib/locomotive/steam/version.rb

@@ -3,6 +3,6 @@
 # 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
 module Locomotive
   module Steam
-    VERSION = '1.2.0'
+    VERSION = '1.2.1'
   end
 end

data/spec/unit/middlewares/locale_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+require_relative '../../../lib/locomotive/steam/middlewares/thread_safe'
+require_relative '../../../lib/locomotive/steam/middlewares/helpers'
+require_relative '../../../lib/locomotive/steam/middlewares/locale'
+
+describe Locomotive::Steam::Middlewares::Locale do
+
+  let(:site)            { instance_double('Site', default_locale: :de, locales: %w(de fr)) }
+  let(:url)             { 'http://models.example.com' }
+  let(:app)             { ->(env) { [200, env, 'app'] } }
+  let(:services)        { instance_double('Services', :locale= => 'en') }
+  let(:middleware)      { Locomotive::Steam::Middlewares::Locale.new(app) }
+
+  subject do
+    env = env_for(url, 'steam.site' => site)
+    env['steam.request']  = Rack::Request.new(env)
+    env['steam.services'] = services
+    code, env = middleware.call(env)
+    env['steam.locale']
+  end
+
+  describe 'locale asked in the request params' do
+
+    context 'the locale is blank' do
+
+      let(:url) { 'http://models.example.com?locale=' }
+
+      it { is_expected.to eq :de }
+
+    end
+
+    context 'the locale exists' do
+
+      let(:url) { 'http://models.example.com?locale=fr' }
+
+      it { is_expected.to eq 'fr' }
+
+    end
+
+    context 'the locale is unknown' do
+
+      let(:url) { 'http://models.example.com?locale=onload' }
+
+      it { is_expected.to eq :de }
+
+    end
+
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -797,6 +797,7 @@ files:
 - spec/unit/middlewares/entry_submission_spec.rb
 - spec/unit/middlewares/helpers_spec.rb
 - spec/unit/middlewares/locale_redirection_spec.rb
+- spec/unit/middlewares/locale_spec.rb
 - spec/unit/middlewares/page_spec.rb
 - spec/unit/middlewares/private_access_spec.rb
 - spec/unit/middlewares/renderer_spec.rb
@@ -1059,6 +1060,7 @@ test_files:
 - spec/unit/middlewares/entry_submission_spec.rb
 - spec/unit/middlewares/helpers_spec.rb
 - spec/unit/middlewares/locale_redirection_spec.rb
+- spec/unit/middlewares/locale_spec.rb
 - spec/unit/middlewares/page_spec.rb
 - spec/unit/middlewares/private_access_spec.rb
 - spec/unit/middlewares/renderer_spec.rb