locomotivecms_steam 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1ba03522ffec4babbb05d6004c31c84c62e0f3a
-  data.tar.gz: da65c72a028f4a36315f2d2357f56326ca29a063
+  metadata.gz: 5f9df68e43afc27c2b1791937e36cc3755b31516
+  data.tar.gz: bfea5634abf89f91ebd523b01dd58f51ce6a7d65
 SHA512:
-  metadata.gz: 8df426e03dfa68fedbe3d95ad107351002c3f8e8e571fe1a24efde56e8dd2204f9a503edb4d898afe031b4274c412ae4316cc28883057fb3150cd37bb99ded6d
-  data.tar.gz: 141433218d50b6d023ce4fc39f06aa5dfeb1a63d9b97e74f397462fe625b007c425183de1a25826e8a7ab385878654bcd6465ec9ebfc27c5751ff1455289f01a
+  metadata.gz: b7fd99e9a39fd88391391d55345cff0e13537cb8b504dd6af0b4c7c8b043ffc6a47c30d9491b18f4e5aee4b78ea8d8ccfabd1cf596356ee727d053d381b361da
+  data.tar.gz: e62db05b922358598d8841a86a76910e32a2dc7fc3879e034246e2c0aaf1bdbe4bd3a4984e5165c5e0a43a0bc8317d8e373da2da0a495cca1ddca8003c33a7e9

data/Gemfile

@@ -29,8 +29,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.1.1)
+    locomotivecms_steam (1.1.2)
       RedCloth (~> 4.2.9)
       autoprefixer-rails (~> 6.3.3.1)
       chronic (~> 0.10.2)
@@ -29,28 +29,28 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    activesupport (4.2.6)
+    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)
-    addressable (2.4.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     attr_extras (4.4.0)
     autoprefixer-rails (6.3.3.1)
       execjs
     bson (4.0.2)
     byebug (8.2.1)
     chronic (0.10.2)
-    chunky_png (1.3.5)
+    chunky_png (1.3.8)
     codeclimate-test-reporter (0.4.8)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.10.0)
-    colorize (0.7.7)
+    coffee-script-source (1.12.2)
+    colorize (0.8.1)
     compass (1.0.3)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -63,7 +63,7 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    concurrent-ruby (1.0.1)
+    concurrent-ruby (1.0.5)
     coveralls (0.8.10)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
@@ -80,11 +80,11 @@ GEM
       addressable (~> 2.3)
       multi_json (~> 1.0)
       rack (>= 1.3.0)
-    execjs (2.6.0)
+    execjs (2.7.0)
     fast_stack (0.1.0)
       rake
       rake-compiler
-    ffi (1.9.10)
+    ffi (1.9.18)
     flamegraph (0.1.0)
       fast_stack
     haml (4.0.7)
@@ -117,17 +117,17 @@ GEM
     mime-types (2.6.2)
     mimetype-fu (0.1.2)
     mini_portile2 (2.0.0)
-    minitest (5.8.4)
-    moneta (0.8.0)
+    minitest (5.10.1)
+    moneta (0.8.1)
     mongo (2.2.3)
       bson (~> 4.0)
     morphine (0.1.1)
     multi_json (1.11.2)
-    multi_xml (0.5.5)
+    multi_xml (0.6.0)
     netrc (0.11.0)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
-    nokogumbo (1.4.7)
+    nokogumbo (1.4.10)
       nokogiri
     origin (2.1.1)
     pry (0.10.3)
@@ -137,6 +137,7 @@ GEM
     pry-byebug (3.3.0)
       byebug (~> 8.0)
       pry (~> 0.10)
+    public_suffix (2.0.5)
     puma (2.15.3)
     rack (1.6.4)
     rack-cache (1.6.1)
@@ -151,8 +152,8 @@ GEM
     rake (10.4.2)
     rake-compiler (0.9.5)
       rake
-    rb-fsevent (0.9.7)
-    rb-inotify (0.9.7)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.8)
       ffi (>= 0.5.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -175,7 +176,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)
-    sass (3.4.22)
+    sass (3.4.23)
     simplecov (0.11.1)
       docile (~> 1.1.0)
       json (~> 1.8)
@@ -186,12 +187,12 @@ GEM
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     stackprof (0.2.7)
-    stringex (2.6.0)
+    stringex (2.6.1)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (2.0.2)
+    thread_safe (0.3.6)
+    tilt (2.0.6)
     timecop (0.8.0)
     tins (1.6.0)
     tzinfo (1.2.2)

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.1.1'
+    VERSION = '1.1.2'
   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.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -773,6 +773,7 @@ files:
 - spec/unit/middlewares/dynamic_assets_spec.rb
 - spec/unit/middlewares/helpers_spec.rb
 - spec/unit/middlewares/locale_redirection_spec.rb
+- spec/unit/middlewares/locale_spec.rb
 - spec/unit/middlewares/private_access_spec.rb
 - spec/unit/middlewares/renderer_spec.rb
 - spec/unit/middlewares/site_spec.rb
@@ -1025,6 +1026,7 @@ test_files:
 - spec/unit/middlewares/dynamic_assets_spec.rb
 - spec/unit/middlewares/helpers_spec.rb
 - spec/unit/middlewares/locale_redirection_spec.rb
+- spec/unit/middlewares/locale_spec.rb
 - spec/unit/middlewares/private_access_spec.rb
 - spec/unit/middlewares/renderer_spec.rb
 - spec/unit/middlewares/site_spec.rb