locomotive_cms 2.5.5 → 2.5.6.rc1

data/lib/locomotive/middlewares/seo_trailing_slash.rb

@@ -1,42 +1,21 @@
 module Locomotive
   module Middlewares
-    class SeoTrailingSlash
+    class SeoTrailingSlash < Base
 
       def initialize(app, opts = {})
         @app = app
       end
 
       def call(env)
-        path, query = env['PATH_INFO'], env['QUERY_STRING']
+        request = Rack::Request.new(env)
 
-        if !path.starts_with?("#{Locomotive.mounted_on}/") && (match = path.match(%r{(.+)/$}))
-          url = self.redirect_url(match[1], query)
-          self.redirect_to(url)
-        else
-          @app.call(env)
-        end
-      end
+        path = request.path
 
-      protected
-
-      # Create a 301 response and set it up accordingly.
-      #
-      # @params [ String ] url The url for the redirection
-      #
-      # @return [ Array ] It has the 3 parameters (status, header, body)
-      #
-      def redirect_to(url)
-        response = Rack::Response.new
-        response.redirect(url, 301) # moved permanently
-        response.finish
-        response.to_a
-      end
-
-      def redirect_url(base, query)
-        if query.blank?
-          base
+        if !is_backoffice?(request) && path.size > 1 && path.ends_with?('/')
+          url = modify_url(request, request.path.chop)
+          redirect_to(url)
         else
-          "#{base}?#{query}"
+          @app.call(env)
         end
       end
 

data/lib/locomotive/middlewares/site.rb

@@ -0,0 +1,26 @@
+module Locomotive
+  module Middlewares
+    class Site
+
+      def initialize(app, opts = {})
+        @app = app
+      end
+
+      def call(env)
+        env['locomotive.site'] = fetch_site(env)
+        @app.call(env)
+      end
+
+      def fetch_site(env)
+        request = Rack::Request.new(env)
+        Locomotive.log "[fetch site] host = #{request.host} / #{env['HTTP_HOST']}"
+        if Locomotive.config.multi_sites?
+          Locomotive::Site.match_domain(request.host).first
+        else
+          Locomotive::Site.first
+        end
+      end
+
+    end
+  end
+end

data/lib/locomotive/regexps.rb

@@ -3,7 +3,7 @@ module Locomotive
 
     SUBDOMAIN           = /^[a-z][a-z0-9_-]*[a-z0-9]{1}$/
 
-    DOMAIN              = /^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,}(:[0-9]{1,5})?(\/.*)?$/ix
+    DOMAIN              = /^(([a-z])([a-z\d-]){0,61}([a-z\d]))(\.([a-z])([a-z\d-]){0,61}([a-z\d]))*$/i
 
     URL                 = /((http|https|ftp):\/)?\/\S*/
 

data/lib/locomotive/render.rb

@@ -68,7 +68,7 @@ module Locomotive
       # Inputs which define the ETag for this response
       etag_inputs = {
         'page'   => @page.cache_key,
-        'locale' => params[:locale]
+        'locale' => request.env['locomotive.locale'] || params[:locale]
       }
 
       if @page.with_cache?
@@ -108,13 +108,33 @@ module Locomotive
     #
     def locomotive_page(path = nil)
       # TODO: params[:path] is more consistent
-      path ||= (params[:path] || params[:page_path] || request.fullpath).clone
+      path = self.locomotive_path(path)
 
       path = self.sanitize_locomotive_page_path(path)
 
       current_site.fetch_page path, current_locomotive_account.present?
     end
 
+    # Get the Locomotive path by testing different sources:
+    # - request.env['locomotive.path'] (set only for urls with the locale inside)
+    # - params[:path]
+    # - params[:page_path]
+    # - request.fullpath
+    #
+    # It performs a clone of the path before returning it.
+    #
+    # @param [ String ] path Nil by default. In case we force a path.
+    #
+    # @return [ STring ] The LocomotiveCMS path
+    #
+    def locomotive_path(path = nil)
+      (path ||
+      request.env['locomotive.path'] ||
+      params[:path] ||
+      params[:page_path] ||
+      request.fullpath).clone
+    end
+
     # Clean the path that can be understood by Locomotive in order to retrieve
     # the matching Locomotive page (see the locomotive_page method)
     #

data/lib/locomotive/routing.rb

@@ -1,2 +1,3 @@
 require 'locomotive/routing/default_constraint'
+require 'locomotive/routing/post_content_entry_constraint'
 require 'locomotive/routing/site_dispatcher'

data/lib/locomotive/routing/post_content_entry_constraint.rb

@@ -0,0 +1,11 @@
+module Locomotive
+  module Routing
+    class PostContentEntryConstraint
+
+      def matches?(request)
+        request.post? && request.params[:content_type_slug].present?
+      end
+
+    end
+  end
+end

data/lib/locomotive/routing/site_dispatcher.rb

@@ -6,7 +6,6 @@ module Locomotive
 
       included do
         if self.respond_to?(:before_filter)
-          before_filter :fetch_site
 
           helper_method :current_site
         end
@@ -14,18 +13,8 @@ module Locomotive
 
       protected
 
-      def fetch_site
-        Locomotive.log "[fetch site] host = #{request.host} / #{request.env['HTTP_HOST']}"
-
-        if Locomotive.config.multi_sites?
-          @current_site ||= Locomotive::Site.match_domain(request.host).first
-        else
-          @current_site ||= Locomotive::Site.first
-        end
-      end
-
       def current_site
-        @current_site || fetch_site
+        @current_site ||= request.env['locomotive.site']
       end
 
       def require_site

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = '2.5.5'
+  VERSION = '2.5.6.rc1'
 end

data/spec/dummy/config/boot.rb

@@ -9,7 +9,7 @@ gemfile = File.expand_path('../../../../Gemfile', __FILE__)
 # delayed job version is released?
 #
 require 'yaml'
-YAML::ENGINE.yamler = 'syck' if defined?(YAML::ENGINE)
+YAML::ENGINE.yamler = 'syck' if defined?(Delayed::Worker)
 
 if File.exist?(gemfile)
   ENV['BUNDLE_GEMFILE'] = gemfile

data/spec/dummy/config/initializers/dragonfly.rb

@@ -6,7 +6,7 @@ Dragonfly.app.configure do
     convert_command:  `which convert`.strip.presence || '/usr/local/bin/convert',
     identify_command: `which identify`.strip.presence || '/usr/local/bin/identify'
 
-  protect_from_dos_attacks true
+  verify_urls true
 
   secret 'a7d8613dc92256d0c0a3665a05d8af1b5efa5f66394ffca74da74eb41cc590e4'
 

data/spec/dummy/config/initializers/locomotive.rb

@@ -33,11 +33,11 @@ Locomotive.configure do |config|
     per_page:           10
   }
 
-  # default locale (for now, only en, de, fr, pl, pt-BR, it, nl, nb, ja, cs, bg and sk are supported)
+  # default locale (for now, only en, de, fr, pl, pt, pt-BR, it, nl, nb, ja, cs, bg and sk are supported)
   config.default_locale = :en
 
   # available locales suggested to "localize" a site. You will have to pick up at least one among that list.
-  # config.site_locales = %w{en de fr pl pt-BR it nl nb es ru ja cs bg sk}
+  # config.site_locales = %w{en de fr pl pt pt-BR it nl nb es ru ja cs bg sk}
 
   # tell if logs are enabled. Useful for debug purpose.
   config.enable_logs = true

data/spec/lib/locomotive/liquid/drops/content_entry_spec.rb

@@ -22,36 +22,41 @@ describe Locomotive::Liquid::Drops::ContentEntry do
 
   describe 'a list of entries' do
 
-    before(:each) do
-      @list = mock('list')
-      @list.stubs(:all).returns(true)
-      @category = Locomotive::Liquid::Drops::ContentEntry.new(mock('category', projects: @list))
-    end
+    let(:list) { stub('list', all: true, to_a: %w(a b)) }
+    let(:category) { Locomotive::Liquid::Drops::ContentEntry.new(mock('category', projects: list)) }
+
+    subject { render(template, { 'category' => category }) }
+
+    describe 'accessing a has_many relationship' do
+
+      describe 'looping through the list' do
 
-    context '#accessing a has_many relationship' do
+        let(:template) { %({% for project in category.projects %}{{ project }},{% endfor %}) }
 
-      it 'loops through the list' do
-        template = %({% for project in category.projects %}{{ project }},{% endfor %})
+        before { list.expects(:filtered).with({ '_visible' => true }, nil).returns(list.to_a) }
 
-        @list.expects(:ordered).returns(%w(a b))
+        it { should eq 'a,b,' }
 
-        render(template, { 'category' => @category }).should == 'a,b,'
       end
 
-      it 'filters the list' do
-        template = %({% with_scope order_by: 'name ASC', active: true %}{% for project in category.projects %}{{ project }},{% endfor %}{% endwith_scope %})
+      describe 'filtering the list' do
 
-        @list.expects(:filtered).with({ 'active' => true }, ['name', 'ASC']).returns(%w(a b))
+        let(:template) { %({% with_scope order_by: 'name ASC', active: true %}{% for project in category.projects %}{{ project }},{% endfor %}{% endwith_scope %}) }
+
+        before { list.expects(:filtered).with({ 'active' => true, '_visible' => true }, ['name', 'ASC']).returns(list.to_a) }
+
+        it { should eq 'a,b,' }
 
-        render(template, { 'category' => @category }).should == 'a,b,'
       end
 
-      it 'filters the list and uses the default order' do
-        template = %({% with_scope active: true %}{% for project in category.projects %}{{ project }},{% endfor %}{% endwith_scope %})
+      describe 'filtering the list with the default order' do
+
+        let(:template) { %({% with_scope active: true %}{% for project in category.projects %}{{ project }},{% endfor %}{% endwith_scope %}) }
+
+        before { list.expects(:filtered).with({ 'active' => true, '_visible' => true }, nil).returns(list.to_a) }
 
-        @list.expects(:filtered).with({ 'active' => true }, nil).returns(%w(a b))
+        it { should eq 'a,b,' }
 
-        render(template, { 'category' => @category }).should == 'a,b,'
       end
 
     end

data/spec/lib/locomotive/liquid/drops/site_spec.rb

@@ -2,31 +2,41 @@ require 'spec_helper'
 
 describe Locomotive::Liquid::Drops::Site do
 
-  before(:each) do
-    @site   = FactoryGirl.build(:site)
-    page_1  = FactoryGirl.build(:page, site: @site)
-    page_2  = FactoryGirl.build(:page, site: @site, title: 'About us', slug: 'about_us')
-    @site.stubs(:pages).returns([page_1, page_2])
-  end
+  let(:site)          { FactoryGirl.create(:site) }
+  let(:root_page)     { site.pages.root.first }
+  let(:about_us_page) { add_page('About us') }
+  let(:contact_page)  { add_page('Contact') }
+
+  before { about_us_page && contact_page }
+
+  describe '.pages' do
+
+    let(:template) { '' }
+    subject { render_template(template) }
 
-  context '#pages' do
+    describe 'display the number of pages' do
+
+      let(:template) { '{{ site.pages.size }}' }
+      it { should eq '4' }
 
-    it 'has access to all the pages' do
-      render_template('{{ site.pages.size }}').should == '2'
     end
 
-    it 'loops thru the pages' do
-      render_template('{% for page in site.pages %}{{ page.title }} {% endfor %}').should == 'Home page About us '
+    describe 'display the title of all the pages' do
+
+      let(:template) { '{% for page in site.pages %}{{ page.title }} {% endfor %}' }
+      it { should eq 'Home page Page not found About us Contact ' }
+
     end
 
   end
 
   def render_template(template = '', assigns = {})
-    assigns = {
-      'site' => @site
-    }.merge(assigns)
+    assigns = { 'site' => site }.merge(assigns)
+    Liquid::Template.parse(template).render(::Liquid::Context.new({}, assigns, { site: site }))
+  end
 
-    Liquid::Template.parse(template).render(::Liquid::Context.new({}, assigns, { site: @site }))
+  def add_page(title)
+    FactoryGirl.create(:page, site: site, parent: root_page, title: title, slug: nil)
   end
 
 end

data/spec/lib/locomotive/liquid/tags/model_form_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe Locomotive::Liquid::Tags::ModelForm do
+
+  let(:tag_class) { Locomotive::Liquid::Tags::ModelForm }
+
+  describe '#display' do
+
+    let(:tokens) { ['Hello world', '{% endmodel_form %}'] }
+    let(:options) { '"articles"' }
+    let(:assigns) { {} }
+    let(:controller) { stub(request_forgery_protection_token: 'token', form_authenticity_token: '42') }
+    let(:context) { Liquid::Context.new({}, assigns, { controller: controller }) }
+
+    subject { tag_class.new('model_form', options, tokens).render(context) }
+
+    it { should be == '<form method="POST" enctype="multipart/form-data"><input type="hidden" name="content_type_slug" value="articles" /><input type="hidden" name="token" value="42" />Hello world</form>' }
+
+    context 'with a css class' do
+
+      let(:options) { '"articles", class: "col-md-12"' }
+
+      it { should include '<form method="POST" enctype="multipart/form-data" class="col-md-12">' }
+
+    end
+
+    context 'with an id (dom)' do
+
+      let(:options) { '"articles", id: "my-form"' }
+
+      it { should include '<form method="POST" enctype="multipart/form-data" id="my-form">' }
+
+    end
+
+    context 'using callbacks' do
+
+      let(:options) { '"articles", success: "/success", error: "/error"' }
+
+      it { should include '<input type="hidden" name="success_callback" value="/success" />' }
+      it { should include '<input type="hidden" name="error_callback" value="/error" />' }
+
+    end
+
+  end
+
+end

data/spec/lib/locomotive/routing/site_dispatcher_spec.rb

@@ -24,47 +24,6 @@ describe Locomotive::Routing::SiteDispatcher do
 
   end
 
-  describe '#fetch_site' do
-
-    before :each do
-      @request    = Object.new
-      @site       = FactoryGirl.build(:site)
-
-      @controller.stubs(:request).returns(@request)
-      @request.stubs(:host).returns('host')
-      @request.stubs(:env).returns({})
-    end
-
-    it 'returns the current site instance if available' do
-      @controller.instance_variable_set(:@current_site, @site)
-      @controller.send(:fetch_site).should == @site
-    end
-
-    it 'returns the site with matching domain if there is no current site instance' do
-      Locomotive::Site.expects(:match_domain).with('host').returns([@site])
-      @controller.send(:fetch_site).should == @site
-    end
-
-  end
-
-  describe '#current_site' do
-
-    before :each do
-      @site = FactoryGirl.build(:site)
-    end
-
-    it 'returns the current site instance if available' do
-      @controller.instance_variable_set(:@current_site, @site)
-      @controller.send(:current_site).should == @site
-    end
-
-    it 'runs fetch site if no instance is available' do
-      @controller.stubs(:fetch_site).returns(@site)
-      @controller.send(:current_site).should == @site
-    end
-
-  end
-
   describe '#require_site' do
 
     context 'when there is a current site' do

data/spec/models/locomotive/site_spec.rb

@@ -59,7 +59,7 @@ describe Locomotive::Site do
   end
 
   it 'should validate format of domains' do
-    site = FactoryGirl.build(:site, domains: ['barformat.a', '-foo.net', 'goodformat.superlong'])
+    site = FactoryGirl.build(:site, domains: ['barformat.a', '-foo.net', 'goodformat.superlong', 'local.lb-service'])
     site.should_not be_valid
     site.errors[:domains].should == ['barformat.a is invalid', '-foo.net is invalid']
   end

data/spec/requests/locale_redirection_spec.rb

@@ -0,0 +1,109 @@
+require 'spec_helper'
+
+describe 'Locomotive::Middlewares::LocaleRedirection' do
+
+  let(:prefixed)    { false }
+  let(:site)        { FactoryGirl.create('existing site', prefix_default_locale: prefixed, locales: %w(de fr)) }
+  let(:url)         { 'http://models.example.com' }
+  let(:app)         { ->(env) { [200, env, "app"] } }
+  let(:middleware)  { Locomotive::Middlewares::LocaleRedirection.new(app) }
+  let(:locale)      { 'de' }
+
+  subject do 
+    code, env = middleware.call(env_for(url, 'locomotive.site' => site, 'locomotive.locale' => locale))
+    [code, env['Location']]
+  end
+
+  describe 'not prefixed by locale' do 
+
+    describe 'strip default locale from root path' do
+      let(:url) { 'http://models.example.com/de' }
+      it { should eq [301, 'http://models.example.com'] }
+    end
+
+    describe 'strip default locale' do
+      let(:url) { 'http://models.example.com/de/hello' }
+      it { should eq [301, 'http://models.example.com/hello'] }
+    end
+
+    describe 'strip default locale from root path with query' do
+      let(:url) { 'http://models.example.com/de?this=is_a_param' }
+      it { should eq [301, 'http://models.example.com?this=is_a_param'] }
+    end
+
+    describe 'strip default locale from path with query' do
+      let(:url) { 'http://models.example.com/de/hello?this=is_a_param' }
+      it { should eq [301, 'http://models.example.com/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 { should eq [200, nil] }
+    end
+
+    describe 'dont redirect URL without locale' do
+      let(:locale)  { nil }
+      let(:url)     { 'http://models.example.com/hello' }
+      it { should eq [200, nil] }
+    end
+
+  end
+
+
+
+
+  describe 'prefixed by locale' do 
+
+    let(:prefixed)    { true }
+
+    describe 'without locale' do
+
+      let(:locale)      { nil }
+
+      describe 'add default locale to root path' do
+        let(:url) { 'http://models.example.com/' }
+        it { should eq [301, 'http://models.example.com/de'] }
+      end
+
+      describe 'add default locale to long path' do
+        let(:url) { 'http://models.example.com/hello/world' }
+        it { should eq [301, 'http://models.example.com/de/hello/world'] }
+      end
+
+      describe 'add default locale to url with path and query' do
+        let(:url) { 'http://models.example.com/hello/world?this=is_me' }
+        it { should eq [301, 'http://models.example.com/de/hello/world?this=is_me'] }
+      end
+
+      describe 'dont add default locale to backoffice' do
+        let(:url) { 'http://models.example.com/locomotive' }
+        it { should eq [200, nil] }
+      end
+
+      describe 'dont add default locale to assets' do
+        let(:url) { 'http://models.example.com/assets/locomotive.css?body=1' }
+        it { should eq [200, nil] }
+      end
+
+    end
+
+    describe 'with locale' do
+      
+     describe 'dont add default locale if already present' do
+        let(:locale) { 'de' }
+        let(:url)    { 'http://models.example.com/de/hello/world' }
+        it { should eq [200, nil] }
+     end
+
+     describe 'dont add default locale to localized path' do
+        let(:locale) { 'fr' }
+        let(:url)    { 'http://models.example.com/fr/hello/world' }
+        it { should eq [200, nil] }
+     end
+
+    end
+
+  end
+
+end