locomotivecms_steam 1.1.2 → 1.2.0.beta1

data/lib/locomotive/steam/services/url_builder_service.rb

@@ -14,8 +14,11 @@ module Locomotive
           locale ||= current_locale
           same_locale = locale.to_sym == site.default_locale.to_sym
 
-          # locale
-          segments << locale unless same_locale
+          # if the prefix_default_locale is enabled, we need to
+          # add the locale no matter if the locale is the same as the default one
+          if site.prefix_default_locale || !same_locale
+            segments << locale
+          end
 
           # fullpath
           segments << sanitized_fullpath(page, same_locale)

data/lib/locomotive/steam/services.rb

@@ -62,8 +62,16 @@ module Locomotive
           Steam::SnippetFinderService.new(repositories.snippet)
         end
 
+        register :action do
+          Steam::ActionService.new(current_site, email, content_entry)
+        end
+
+        register :content_entry do
+          Steam::ContentEntryService.new(repositories.content_type, repositories.content_entry, locale)
+        end
+
         register :entry_submission do
-          Steam::EntrySubmissionService.new(repositories.content_type, repositories.content_entry, locale)
+          Steam::EntrySubmissionService.new(content_entry)
         end
 
         register :liquid_parser do
@@ -106,6 +114,10 @@ module Locomotive
           Steam::TextileService.new
         end
 
+        register :email do
+          Steam::EmailService.new(page_finder, liquid_parser, asset_host, configuration.mode == :test)
+        end
+
         register :cache do
           Steam::NoCacheService.new
         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.2'
+    VERSION = '1.2.0.beta1'
   end
 end

data/lib/locomotive/steam.rb

@@ -13,13 +13,15 @@ require_relative      'steam/services'
 module Locomotive
   module Steam
 
-    FRONTMATTER_REGEXP = /^(?<yaml>(---\s*\n.*?\n?)^(---\s*$\n?))?(?<template>.*)/mo
+    FRONTMATTER_REGEXP = /^(?<yaml>(---\s*\n.*?\n?)^(---\s*$\n?))?(?<template>.*)/mo.freeze
 
     WILDCARD = 'content_type_template'.freeze
 
-    CONTENT_ENTRY_ENGINE_CLASS_NAME = /^Locomotive::ContentEntry(.*)$/o
+    CONTENT_ENTRY_ENGINE_CLASS_NAME = /^Locomotive::ContentEntry(.*)$/o.freeze
 
-    IsHTTP = /\Ahttps?:\/\//o
+    IsHTTP = /\Ahttps?:\/\//o.freeze
+
+    IsLAYOUT = /\Alayouts(\/|\z)/o.freeze
 
     class << self
       attr_writer   :configuration

data/locomotivecms_steam.gemspec

@@ -44,6 +44,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'haml',                   '~> 4.0.6'
   spec.add_dependency 'mimetype-fu',            '~> 0.1.2'
   spec.add_dependency 'mime-types',             '~> 2.6.1'
+  spec.add_dependency 'duktape',                '~> 1.3.0.6'
+  spec.add_dependency 'pony',                   '~> 1.11'
 
   spec.add_dependency 'locomotivecms-solid',      '~> 4.0.1'
   spec.add_dependency 'locomotivecms_common',     '~> 0.2.0'

data/spec/integration/services/content_entry_service_spec.rb

@@ -0,0 +1,110 @@
+require 'spec_helper'
+
+require_relative '../../../lib/locomotive/steam/adapters/filesystem.rb'
+require_relative '../../../lib/locomotive/steam/adapters/mongodb.rb'
+
+describe Locomotive::Steam::ContentEntryService do
+
+  shared_examples_for 'a content entry service' do
+
+    let(:site)              { Locomotive::Steam::Site.new(_id: site_id, locales: %w(en fr nb)) }
+    let(:locale)            { :en }
+    let(:type_repository)   { Locomotive::Steam::ContentTypeRepository.new(adapter, site, locale) }
+    let(:entry_repository)  { Locomotive::Steam::ContentEntryRepository.new(adapter, site, locale, type_repository) }
+    let(:service)           { described_class.new(type_repository, entry_repository, locale) }
+    let(:type)              { 'bands' }
+
+    describe '#all' do
+      subject { service.all(type) }
+      it { expect(subject.size).to eq 3 }
+      context 'with conditions' do
+        subject { service.all(type, kind: 'grunge') }
+        it { expect(subject.size).to eq 2 }
+      end
+      context 'as_json enabled' do
+        subject { service.all(type, { kind: 'grunge' }, true) }
+        it { expect(subject.first.slice('name', 'leader')).to eq('name' => 'Alice in Chains', 'leader' => 'Layne') }
+      end
+    end
+
+    describe '#find' do
+      let(:id_or_slug) { 'alice-in-chains'}
+      subject { service.find(type, id_or_slug) }
+      it { expect(subject.name).to eq 'Alice in Chains' }
+      context 'with an id' do
+        let(:id_or_slug) { entry_id }
+        it { expect(subject.name).to eq 'Pearl Jam' }
+      end
+    end
+
+  end
+
+  context 'MongoDB' do
+
+    it_should_behave_like 'a content entry service' do
+
+      let(:site_id)   { mongodb_site_id }
+      let(:adapter)   { Locomotive::Steam::MongoDBAdapter.new(database: 'steam_test', hosts: ['127.0.0.1:27017']) }
+      let(:entry_id)  { BSON::ObjectId.from_string('5610310b87f6431588000029') }
+
+      describe '#create' do
+        subject { service.create('messages', { name: 'John', email: 'john@doe.net', message: 'Hello world!' }) }
+        it { expect { subject }.to change { service.all('messages').size } }
+        it { expect(subject.name).to eq 'John' }
+        after { service.delete('messages', subject._id) }
+      end
+
+      describe '#update' do
+        let!(:message) { service.create('messages', { name: 'John', email: 'john@doe.net', message: 'Hello world!' }) }
+        subject { service.update('messages', message._id, { name: 'Jane' }) }
+        it { expect { subject }.not_to change { service.all('messages').size } }
+        it { expect(subject.name).to eq 'Jane' }
+        after { service.delete('messages', message._id) }
+      end
+
+    end
+
+  end
+
+  context 'Filesystem' do
+
+    it_should_behave_like 'a content entry service' do
+
+      let(:site_id)   { 1 }
+      let(:adapter)   { Locomotive::Steam::FilesystemAdapter.new(default_fixture_site_path) }
+      let(:entry_id)  { 'pearl-jam' }
+
+      after(:all) { Locomotive::Steam::Adapters::Filesystem::SimpleCacheStore.new.clear }
+
+      describe '#create' do
+
+        let(:attributes) { { name: 'John', email: 'john@doe.net', message: 'Hello world!' } }
+
+        subject { service.create('messages', attributes, true) }
+
+        it { expect { subject }.to change { service.all('messages').size } }
+        it { expect(subject['name']).to eq 'John' }
+        it { expect(subject['errors'].blank?).to eq true }
+
+        context 'missing attributes' do
+
+          let(:attributes) { {} }
+
+          it { expect { subject }.not_to change { service.all('messages').size } }
+          it { expect(subject['errors']).to eq({ 'name' => ["can't be blank"], 'email' => ["can't be blank"], 'message' => ["can't be blank"] }) }
+
+        end
+      end
+
+      describe '#update' do
+        let!(:message) { service.create('messages', { name: 'John', email: 'john@doe.net', message: 'Hello world!' }) }
+        subject { service.update('messages', message._id, { name: 'Jane' }, true) }
+        it { expect { subject }.not_to change { service.all('messages').size } }
+        it { expect(subject['name']).to eq 'Jane' }
+      end
+
+    end
+
+  end
+
+end

data/spec/unit/adapters/filesystem_adapter_spec.rb

@@ -68,4 +68,14 @@ describe Locomotive::Steam::FilesystemAdapter do
 
   end
 
+  describe '#make_id' do
+
+    let(:id) { '42' }
+
+    subject { adapter.make_id(id) }
+
+    it { is_expected.to eq('42') }
+
+  end
+
 end

data/spec/unit/adapters/mongodb_adapter_spec.rb

@@ -14,4 +14,22 @@ describe Locomotive::Steam::MongoDBAdapter do
 
   end
 
+  describe '#make_id' do
+
+    let(:id) { '56fd9f48a2f42217744a85d7' }
+
+    subject { adapter.make_id(id) }
+
+    it { is_expected.to eq(BSON::ObjectId.from_string('56fd9f48a2f42217744a85d7')) }
+
+    context 'passing a BSON::ObjectId' do
+
+      let(:id) { BSON::ObjectId.from_string('56fd9f48a2f42217744a85d7') }
+
+      it { is_expected.to eq(BSON::ObjectId.from_string('56fd9f48a2f42217744a85d7')) }
+
+    end
+
+  end
+
 end

data/spec/unit/entities/content_entry_spec.rb

@@ -10,6 +10,21 @@ describe Locomotive::Steam::ContentEntry do
 
   before { content_entry.content_type = type }
 
+  describe '#change' do
+
+    let(:fields) { [instance_double('Field', name: :title, type: :string, required: true)] }
+
+    before do
+      allow(type).to receive(:fields_by_name).and_return({ title: fields.first })
+    end
+
+    subject { content_entry.change('title' => 'Hello world!') }
+
+    it { expect(subject.title).to eq('Hello world!') }
+    it { expect(subject._slug).to eq('hello-world') }
+
+  end
+
   describe '#valid?' do
 
     let(:fields) { [instance_double('Field', name: :title, type: :string, required: true)] }
@@ -84,6 +99,25 @@ describe Locomotive::Steam::ContentEntry do
 
   end
 
+  describe '#as_json' do
+
+    let(:fields)      { [instance_double('TitleField', name: :title, type: :string), instance_double('PictureField', name: :picture, type: :file, localized: true)] }
+    let(:attributes)  { { id: 42, title: 'Hello world', _slug: 'hello-world', picture: Locomotive::Steam::Models::I18nField.new(:picture, fr: 'foo.png', en: 'bar.png'), custom_fields_recipe: ['hello', 'world'], _type: 'Entry' } }
+    let(:decorated)   { Locomotive::Steam::Decorators::I18nDecorator.new(content_entry, :fr, :en) }
+
+    before do
+      allow(type).to receive(:fields_by_name).and_return({ title: fields.first, picture: fields.last })
+      allow(type).to receive(:persisted_field_names).and_return([:title, :picture])
+      allow(content_entry).to receive(:localized_attributes).and_return({ picture: true })
+      allow(content_entry).to receive(:base_url).and_return('/assets')
+    end
+
+    subject { decorated.as_json }
+
+    it { expect(subject['picture']['url']).to eq '/assets/foo.png' }
+
+  end
+
   describe 'dynamic attributes' do
 
     let(:field_type)  { :string }

data/spec/unit/entities/editable_element_spec.rb

@@ -7,4 +7,23 @@ describe Locomotive::Steam::EditableElement do
 
   it { expect(page.block).to eq nil }
 
+  describe '#source' do
+
+    let(:source)      { 'Hello world' }
+    let(:attributes)  { { content: 'Lorem ipsum', source: source } }
+
+    subject { page.source }
+
+    it { is_expected.to eq 'Hello world' }
+
+    context 'no source attribute' do
+
+      let(:source) { nil }
+
+      it { is_expected.to eq 'Lorem ipsum' }
+
+    end
+
+  end
+
 end

data/spec/unit/entities/page_spec.rb

@@ -33,6 +33,25 @@ describe Locomotive::Steam::Page do
 
   end
 
+  describe '#layout?' do
+
+    let(:attributes) { { fullpath: { en: 'foo/layouts' } } }
+
+    subject { page.layout? }
+    it { is_expected.to eq false }
+
+    context 'true if starting by layouts' do
+      let(:attributes) { { fullpath: { en: 'layouts/base' } } }
+      it { is_expected.to eq true }
+    end
+
+    context 'true if the root layouts page' do
+      let(:attributes) { { fullpath: { en: 'layouts' } } }
+      it { is_expected.to eq true }
+    end
+
+  end
+
   describe '#valid?' do
 
     subject { page.valid? }
@@ -77,4 +96,14 @@ describe Locomotive::Steam::Page do
 
   end
 
+  describe '#source' do
+
+    let(:attributes) { { 'raw_template' => 'template code here' } }
+
+    subject { page.source }
+
+    it { is_expected.to eq 'template code here'}
+
+  end
+
 end

data/spec/unit/liquid/drops/content_entry_collection_spec.rb

@@ -32,6 +32,10 @@ describe Locomotive::Steam::Liquid::Drops::ContentEntryCollection do
       it { expect(drop.last).to eq('b') }
     end
 
+    describe '#last' do
+      it { expect(drop.map(&:to_s)).to eq(['a', 'b']) }
+    end
+
     context 'with a scope' do
 
       let(:assigns) { { 'with_scope' => { 'visible' => true } } }

data/spec/unit/liquid/drops/content_entry_spec.rb

@@ -100,7 +100,10 @@ describe Locomotive::Steam::Liquid::Drops::ContentEntry do
 
   describe '#as_json' do
 
-    let(:type) { instance_double('Type', fields_by_name: { title: instance_double('StringField', type: :string ), picture: instance_double('FileField', type: :file), category: instance_double('SelectField', type: :select) }) }
+    let(:entry)       { instance_double('Article', _id: 42, localized_attributes: {}, content_type: type, title: 'Hello world', _label: 'Hello world', _slug: 'hello-world', _translated: false, seo_title: 'seo title', meta_keywords: 'keywords', meta_description: 'description', created_at: 0, updated_at: 1, author: author, authors: authors) }
+    let(:type)        { instance_double('Type', fields_by_name: { title: instance_double('StringField', type: :string ), author: instance_double('Author', type: :belongs_to), authors: instance_double('Author', type: :many_to_many), picture: instance_double('FileField', type: :file), category: instance_double('SelectField', type: :select) }) }
+    let(:author)      { instance_double('Author', _slug: 'john-doe', localized_attributes: {}) }
+    let(:authors)     { instance_double('Authors', all: [author]) }
     let(:picture_field) { Locomotive::Steam::ContentEntry::FileField.new('foo.png', 'http://assets.dev', 0, 42) }
 
     before do
@@ -110,7 +113,7 @@ describe Locomotive::Steam::Liquid::Drops::ContentEntry do
 
     subject { drop.as_json }
 
-    it { is_expected.to eq('id' => 1, '_id' => 1, 'title' => 'Hello world', 'picture' => 'http://assets.dev/foo.png?42', 'picture_url' => 'http://assets.dev/foo.png?42', 'category_id' => 42, 'category' => 'Test') }
+    it { is_expected.to eq('id' => 1, '_id' => 1, 'title' => 'Hello world', 'picture' => 'http://assets.dev/foo.png?42', 'picture_url' => 'http://assets.dev/foo.png?42', 'category_id' => 42, 'category' => 'Test', 'author' => 'john-doe', 'authors' => ['john-doe']) }
 
   end
 

data/spec/unit/liquid/tags/action_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Locomotive::Steam::Liquid::Tags::Action do
+
+  let(:site)      { instance_double('Site', default_locale: 'en') }
+  let(:source)    { '{% action "random Javascript action" %}var foo = 42; setProp("foo", foo);{% endaction %}' }
+  let(:assigns)   { {} }
+  let(:services)  { Locomotive::Steam::Services.build_instance }
+  let(:context)   { ::Liquid::Context.new(assigns, {}, { services: services }) }
+
+  before { allow(services).to receive(:current_site).and_return(site) }
+
+  subject { render_template(source, context) }
+
+  describe 'rendering' do
+
+    it { is_expected.to eq '' }
+
+    it { subject; expect(context['foo']).to eq 42.0 }
+
+  end
+
+end

data/spec/unit/liquid/tags/link_to_spec.rb

@@ -2,10 +2,11 @@ require 'spec_helper'
 
 describe Locomotive::Steam::Liquid::Tags::PathTo do
 
-  let(:assigns)   { {} }
-  let(:services)  { Locomotive::Steam::Services.build_instance }
-  let(:site)      { instance_double('Site', default_locale: 'en') }
-  let(:context)   { ::Liquid::Context.new(assigns, {}, { services: services, site: site, locale: 'en' }) }
+  let(:prefix_default)  { false }
+  let(:assigns)         { {} }
+  let(:services)        { Locomotive::Steam::Services.build_instance }
+  let(:site)            { instance_double('Site', default_locale: 'en', prefix_default_locale: prefix_default) }
+  let(:context)         { ::Liquid::Context.new(assigns, {}, { services: services, site: site, locale: 'en' }) }
 
   subject { render_template(source, context) }
 
@@ -67,6 +68,13 @@ describe Locomotive::Steam::Liquid::Tags::PathTo do
 
       end
 
+      context 'prefix_default_locale is true' do
+
+        let(:prefix_default) { true }
+        it { is_expected.to eq 'My link: <a href="/en/">Home</a>!' }
+
+      end
+
     end
 
     describe 'used as a block' do

data/spec/unit/liquid/tags/locale_switcher_spec.rb

@@ -2,13 +2,14 @@ require 'spec_helper'
 
 describe Locomotive::Steam::Liquid::Tags::LocaleSwitcher do
 
-  let(:locale)      { 'en' }
-  let(:assigns)     { { 'page' => drop } }
-  let(:services)    { Locomotive::Steam::Services.build_instance }
-  let(:site)        { instance_double('Site', locales: %w(en fr), default_locale: 'en') }
-  let(:drop)        { Locomotive::Steam::Liquid::Drops::Page.new(page) }
-  let(:page)        { liquid_instance_double('Index', localized_attributes: { title: true, fullpath: true }, title: { en: 'Home', fr: 'Accueil' }, fullpath: { en: 'index', fr: 'index' }, templatized?: false) }
-  let(:context)     { ::Liquid::Context.new(assigns, {}, { services: services, site: site, locale: locale }) }
+  let(:locale)          { 'en' }
+  let(:assigns)         { { 'page' => drop } }
+  let(:prefix_default)  { false }
+  let(:services)        { Locomotive::Steam::Services.build_instance }
+  let(:site)            { instance_double('Site', locales: %w(en fr), default_locale: 'en', prefix_default_locale: prefix_default) }
+  let(:drop)            { Locomotive::Steam::Liquid::Drops::Page.new(page) }
+  let(:page)            { liquid_instance_double('Index', localized_attributes: { title: true, fullpath: true }, title: { en: 'Home', fr: 'Accueil' }, fullpath: { en: 'index', fr: 'index' }, templatized?: false) }
+  let(:context)         { ::Liquid::Context.new(assigns, {}, { services: services, site: site, locale: locale }) }
 
   subject { render_template(source, context) }
 
@@ -26,6 +27,13 @@ describe Locomotive::Steam::Liquid::Tags::LocaleSwitcher do
 
     end
 
+    context 'prefix_default_locale is true' do
+
+      let(:prefix_default) { true }
+      it { is_expected.to eq '<div id="locale-switcher"><a href="/en/" class="en current">en</a> | <a href="/fr" class="fr">fr</a></div>' }
+
+    end
+
   end
 
   describe 'using the locale to display the links' do

data/spec/unit/liquid/tags/nav_spec.rb

@@ -19,17 +19,18 @@ describe 'Locomotive::Steam::Liquid::Tags::Nav' do
     ]
   end
 
-  let(:source)      { '{% nav site %}' }
-  let(:site)        { instance_double('Site', name: 'My portfolio', default_locale: 'en') }
-  let(:page)        { index }
-  let(:services)    { Locomotive::Steam::Services.build_instance }
-  let(:repository)  { services.repositories.page }
-  let(:assigns)     { {} }
-  let(:registers)   { { services: services, site: site, page: page } }
-  let(:context)     { ::Liquid::Context.new(assigns, {}, registers) }
-  let(:options)     { { services: services } }
-
-  let(:output) { render_template(source, context, options) }
+  let(:prefix_default)  { false }
+  let(:source)          { '{% nav site %}' }
+  let(:site)            { instance_double('Site', name: 'My portfolio', default_locale: 'en', prefix_default_locale: prefix_default) }
+  let(:page)            { index }
+  let(:services)        { Locomotive::Steam::Services.build_instance }
+  let(:repository)      { services.repositories.page }
+  let(:assigns)         { {} }
+  let(:registers)       { { services: services, site: site, page: page } }
+  let(:context)         { ::Liquid::Context.new(assigns, {}, registers) }
+  let(:options)         { { services: services } }
+
+  let(:output)          { render_template(source, context, options) }
 
   before { allow(services).to receive(:current_site).and_return(site) }
 
@@ -46,6 +47,13 @@ describe 'Locomotive::Steam::Liquid::Tags::Nav' do
 
       it { is_expected.to eq %{<nav id="nav"><ul><li id="child-1-link" class="link first"><a href="/child-1">Child #1</a></li>\n<li id="child-2-link" class="link last"><a href="/child-2">Child #2</a></li></ul></nav>} }
 
+      context 'prefix_default_locale is true' do
+
+        let(:prefix_default) { true }
+        it { is_expected.to eq %{<nav id="nav"><ul><li id="child-1-link" class="link first"><a href="/en/child-1">Child #1</a></li>\n<li id="child-2-link" class="link last"><a href="/en/child-2">Child #2</a></li></ul></nav>} }
+
+      end
+
     end
 
     describe 'from a page' do

data/spec/unit/liquid/tags/path_to_spec.rb

@@ -2,10 +2,11 @@ require 'spec_helper'
 
 describe Locomotive::Steam::Liquid::Tags::PathTo do
 
-  let(:assigns)   { {} }
-  let(:services)  { Locomotive::Steam::Services.build_instance }
-  let(:site)      { instance_double('Site', locales: ['en'], default_locale: 'en') }
-  let(:context)   { ::Liquid::Context.new(assigns, {}, { services: services, site: site, locale: 'en' }) }
+  let(:prefix_default)  { false }
+  let(:assigns)         { {} }
+  let(:services)        { Locomotive::Steam::Services.build_instance }
+  let(:site)            { instance_double('Site', locales: ['en'], default_locale: 'en', prefix_default_locale: prefix_default) }
+  let(:context)         { ::Liquid::Context.new(assigns, {}, { services: services, site: site, locale: 'en' }) }
 
   subject { render_template(source, context) }
 
@@ -51,6 +52,13 @@ describe Locomotive::Steam::Liquid::Tags::PathTo do
 
     end
 
+    context 'prefix_default_locale is true' do
+
+      let(:prefix_default) { true }
+      it { is_expected.to eq '/en/' }
+
+    end
+
   end
 
   describe 'from a page (drop) itself' do

data/spec/unit/middlewares/helpers_spec.rb

@@ -7,6 +7,35 @@ describe Locomotive::Steam::Middlewares::Helpers do
   let(:middleware)  { Class.new { include Locomotive::Steam::Middlewares::Helpers } }
   let(:instance)    { middleware.new }
 
+  describe '#make_local_path' do
+
+    let(:mounted_on) { nil }
+    let(:location) { '/foo/bar' }
+
+    before { allow(instance).to receive(:mounted_on).and_return(mounted_on) }
+
+    subject { instance.make_local_path(location) }
+
+    it { is_expected.to eq '/foo/bar' }
+
+    context 'mounted_on is not blank' do
+
+      let(:mounted_on) { '/my_app' }
+
+      it { is_expected.to eq '/foo/bar' }
+
+      context 'path including mounted_on' do
+
+        let(:location) { '/my_app/foo/bar' }
+
+        it { is_expected.to eq '/foo/bar' }
+
+      end
+
+    end
+
+  end
+
   describe '#redirect_to' do
 
     subject { instance.redirect_to(location)[1]['Location'] }

data/spec/unit/middlewares/locale_redirection_spec.rb

@@ -6,7 +6,6 @@ require_relative '../../../lib/locomotive/steam/middlewares/locale_redirection'
 
 describe Locomotive::Steam::Middlewares::LocaleRedirection do
 
-  let(:prefixed)        { false }
   let(:site)            { instance_double('Site', prefix_default_locale: prefixed, default_locale: :de, locales: %w(de fr)) }
   let(:url)             { 'http://models.example.com' }
   let(:app)             { ->(env) { [200, env, 'app'] } }
@@ -19,49 +18,32 @@ describe Locomotive::Steam::Middlewares::LocaleRedirection do
     env = env_for(url, 'steam.site' => site, 'steam.locale' => locale, 'steam.locale_in_path' => locale_in_path)
     env['steam.mounted_on'] = mounted_on
     env['steam.request']    = Rack::Request.new(env)
-    env['steam.path']       = env['steam.request'].path_info.gsub(/\A#{mounted_on}/, '')
+    env['steam.path']       = env['steam.request'].path_info.gsub(/\A#{mounted_on}/, '').gsub(/\A\/#{locale}/, '')
     code, env = middleware.call(env)
     [code, env['Location']]
   end
 
-  describe 'not prefixed by locale' do
+  describe 'prefix_default_locale is false' do
 
-    describe 'strip default locale from root path' do
-      let(:url) { 'http://models.example.com/de' }
-      it { is_expected.to eq [301, '/'] }
-    end
+    let(:prefixed) { false }
 
-    describe 'strip default locale' do
-      let(:url) { 'http://models.example.com/de/hello' }
-      it { is_expected.to eq [301, '/hello'] }
-    end
+    describe 'locale is not part of the path' do
 
-    describe 'strip default locale from root path with query' do
-      let(:url) { 'http://models.example.com/de?this=is_a_param' }
-      it { is_expected.to eq [301, '/?this=is_a_param'] }
-    end
+      let(:locale_in_path)  { false }
+      it { is_expected.to eq [200, nil] }
 
-    describe 'strip default locale from path with query' do
-      let(:url) { 'http://models.example.com/de/hello?this=is_a_param' }
-      it { is_expected.to eq [301, '/hello?this=is_a_param'] }
     end
 
-    describe 'dont strip a non-default locale' do
-      let(:locale)  { 'fr' }
-      let(:url)     { 'http://models.example.com/fr/hello' }
-      it { is_expected.to eq [200, nil] }
-    end
+    describe 'for seo purpose redirect to the path without the locale' do
+
+      let(:url) { 'http://models.example.com/de/hello' }
+      it { is_expected.to eq [301, '/hello'] }
 
-    describe 'dont redirect URL without locale' do
-      let(:locale)          { :de }
-      let(:locale_in_path)  { false }
-      let(:url) { 'http://models.example.com/hello' }
-      it { is_expected.to eq [200, nil] }
     end
 
   end
 
-  describe 'prefixed by locale' do
+  describe 'prefix_default_locale is true' do
 
     let(:prefixed) { true }