locomotive_cms 2.5.5 → 2.5.6.rc1

data/lib/generators/locomotive/install/templates/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 '<%= generate_secret %>'
 

data/lib/generators/locomotive/install/templates/locomotive.rb

@@ -23,11 +23,11 @@ Locomotive.configure do |config|
   #   per_page:           10
   # }
 
-  # default locale (for now, only en, de, fr, pl, pt-BR, it, nb, ja, zh-CN, cs, bg and sk are supported)
+  # default locale (for now, only en, de, fr, pl, pt, pt-BR, it, nb, ja, zh-CN, 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 zh-CN cs bg sk sr}
+  # config.site_locales = %w{en de fr pl pt pt-BR it nl nb es ru ja zh-CN cs bg sk sr}
 
   # tell if logs are enabled. Useful for debug purpose.
   config.enable_logs = true

data/lib/locomotive.rb

@@ -69,6 +69,9 @@ module Locomotive
     if ::Dragonfly::VERSION =~ /^0\.9\.([0-9]+)/
       Locomotive.log :error, "WARNING: Old Dragonfly config detected, image uploads might be broken. Use 'rails g locomotive:install' to get the latest configuration files."
     end
+
+    # avoid I18n warnings
+    I18n.enforce_available_locales = false
   end
 
   def self.add_middlewares
@@ -77,6 +80,12 @@ module Locomotive
     self.app_middleware.use '::Locomotive::Middlewares::SeoTrailingSlash'
 
     self.app_middleware.use '::Locomotive::Middlewares::InlineEditor'
+
+    self.app_middleware.use '::Locomotive::Middlewares::Site'
+
+    self.app_middleware.use '::Locomotive::Middlewares::Locale'
+
+    self.app_middleware.use '::Locomotive::Middlewares::LocaleRedirection'
   end
 
   def self.configure_multi_sites

data/lib/locomotive/action_controller/public_responder.rb

@@ -6,48 +6,65 @@ module Locomotive
         if get?
           raise error
         elsif has_errors? && default_action
-          # get the content entry from the controller
-          entry = self.controller.instance_variable_get :@entry
-
-          if navigation_location =~ %r(^http://)
-            # simple redirection for outside urls
-            redirect_to navigation_location
-          else
-            # render the locomotive page
-            self.controller.send :render_locomotive_page, navigation_location_for_locomotive, {
-              entry.content_type.slug.singularize => entry.to_presenter(include_errors: true).as_json
-            }
-          end
+          navigation_error_behavior
         else
-          entry = self.controller.instance_variable_get :@entry
+          navigation_success_behavior
+        end
+      end
 
-          self.controller.flash['submitted_entry_id'] = entry.try(:_id).try(:to_s)
+      def navigation_error_behavior
+        if error_location =~ %r(^http://)
+          # simple redirection for outside urls
+          redirect_to error_location
+        else
+          path = page_path ? page_path : extract_locale_and_path(error_location)
 
-          # redirect to a locomotive page
-          redirect_to navigation_location
+          # render the locomotive page
+          self.controller.send :render_locomotive_page, path, {
+            content_entry.content_type.slug.singularize => content_entry.to_presenter(include_errors: true).as_json
+          }
         end
       end
 
-      def navigation_location_for_locomotive
-        locale, location = self.extract_locale_and_location
+      def navigation_success_behavior
+        # store in session the newly created content entry
+        self.controller.flash['submitted_entry_id'] = self.content_entry.try(:_id).try(:to_s)
 
-        if locale
-          ::I18n.locale = ::Mongoid::Fields::I18n.locale = locale
-          location
-        else
-          navigation_location
-        end
+        # redirect to a locomotive page
+        redirect_to success_location
+      end
+
+      def error_location
+        callback_url(:error) || (page_path ? request.path : '/')
+      end
+
+      def success_location
+        callback_url(:success) || (page_path ? request.path : '/')
+      end
+
+      # get the content entry from the controller
+      def content_entry
+        self.controller.instance_variable_get :@entry
+      end
+
+      def page_path
+        self.controller.params[:path]
+      end
+
+      def callback_url(state)
+        self.controller.params[:"#{state}_callback"]
       end
 
       protected
 
-      def extract_locale_and_location
+      def extract_locale_and_path(path)
         locales = self.controller.send(:current_site).locales.join('|')
 
-        if navigation_location =~ /\/(#{locales})+\/(.+)/
-          [$1, $2]
+        if path =~ /\/(#{locales})+\/(.+)/
+          ::I18n.locale = ::Mongoid::Fields::I18n.locale = $1
+          $2
         else
-          nil
+          path
         end
       end
 

data/lib/locomotive/configuration.rb

@@ -7,8 +7,8 @@ module Locomotive
       reserved_subdomains:    %w{www admin email blog webmail mail support help site sites},
       # forbidden_paths:      %w{layouts snippets stylesheets javascripts assets admin system api},
       reserved_slugs:         %w{stylesheets javascripts assets admin locomotive images api pages edit},
-      locales:                %w{en de fr pl pt-BR it nl nb es ru et ja zh-CN cs bg sk sr},
-      site_locales:           %w{en de fr pl pt-BR it nl nb es ru et ja zh-CN cs bg sk sr},
+      locales:                %w{en de fr pl pt pt-BR it nl nb es ru et ja zh-CN cs bg sk sr},
+      site_locales:           %w{en de fr pl pt pt-BR it nl nb es ru et ja zh-CN cs bg sk sr},
       cookie_key:             '_locomotive_session',
       enable_logs:            false,
       enable_admin_ssl:       false,

data/lib/locomotive/liquid/drops/content_entry.rb

@@ -62,16 +62,14 @@ module Locomotive
         protected
 
         def filter_and_order_list(list)
-          # filter ?
-          if @context['with_scope']
-            conditions  = HashWithIndifferentAccess.new(@context['with_scope'])
-            order_by    = conditions.delete(:order_by).try(:split)
+          conditions, order_by = HashWithIndifferentAccess.new(_visible: true), nil
 
-            list.filtered(conditions, order_by)
-          else
-            # no filter, default order
-            list.ordered
+          if @context['with_scope']
+            conditions.merge!(@context['with_scope'])
+            order_by = conditions.delete(:order_by).try(:split)
           end
+
+          list.filtered(conditions, order_by)
         end
 
       end

data/lib/locomotive/liquid/drops/site.rb

@@ -20,11 +20,7 @@ module Locomotive
         protected
 
         def scoped_pages
-          if @context['with_scope']
-            @_source.pages.where(@context['with_scope'])
-          else
-            @_source.pages
-          end
+          @_source.ordered_pages(@context['with_scope'])
         end
 
       end

data/lib/locomotive/liquid/filters/translate.rb

@@ -15,7 +15,7 @@ module Locomotive
           locale ||= I18n.locale.to_s
 
           if scope.blank?
-            translation = Locomotive::Translation.where(key: input).first
+            translation = @context.registers[:site].translations.where(key: input).first
 
             # key not found
             return input if translation.nil?

data/lib/locomotive/liquid/tags/fetch_page.rb

@@ -1,10 +1,18 @@
 module Locomotive
   module Liquid
     module Tags
+
+      # Fetch a page from its handle and assign it to a liquid variable.
+      #
+      # Usage:
+      #
+      # {% fetch_page 'about_us' as a_page %}
+      # <p>{{ a_page.title }}</p>
+      #
       class FetchPage < ::Liquid::Tag
-        
+
         Syntax = /(#{::Liquid::VariableSignature}+)\s+as\s+(#{::Liquid::VariableSignature}+)/
-        
+
         def initialize(tag_name, markup, tokens, context)
           if markup =~ Syntax
             @handle = $1
@@ -12,16 +20,16 @@ module Locomotive
           else
             raise SyntaxError.new("Syntax Error in 'fetch_page' - Valid syntax: fetch_page page_handle as variable")
           end
-          
+
           super
-        end 
-        
+        end
+
         def render(context)
           context.scopes.last[@var] = context.registers[:site].pages.where(handle: @handle).first
           ''
         end
       end
-      
+
       ::Liquid::Template.register_tag('fetch_page', FetchPage)
     end
   end

data/lib/locomotive/liquid/tags/model_form.rb

@@ -0,0 +1,75 @@
+module Locomotive
+  module Liquid
+    module Tags
+
+      # Display the form html tag with the appropriate hidden fields in order to create
+      # a content entry from a public site.
+      # It handles callbacks, csrf and target url out of the box.
+      #
+      # Usage:
+      #
+      # {% model_form 'newsletter_addresses' %}
+      #    <input type='text' name='content[email]' />
+      #     <input type='submit' value='Add' />
+      # {% endform_form %}
+      #
+      # {% model_form 'newsletter_addresses', class: 'a-css-class', success: 'http://www.google.fr', error: '/error' %}...{% endform_form %}
+      #
+      class ModelForm < Solid::Block
+
+        tag_name :model_form
+
+        def display(*options, &block)
+          name    = options.shift
+          options = options.shift || {}
+
+          form_attributes = { method: 'POST', enctype: 'multipart/form-data' }.merge(options.slice(:id, :class))
+
+          html_content_tag :form,
+            content_type_html(name) + csrf_html + callbacks_html(options) + yield,
+            form_attributes
+        end
+
+        def content_type_html(name)
+          html_tag :input, type: 'hidden', name: 'content_type_slug', value: name
+        end
+
+        def csrf_html
+          name  = controller.send(:request_forgery_protection_token).to_s
+          value = controller.send(:form_authenticity_token)
+
+          html_tag :input, type: 'hidden', name: name, value: value
+        end
+
+        def callbacks_html(options)
+          options.slice(:success, :error).map do |(name, value)|
+            html_tag :input, type: 'hidden', name: "#{name}_callback", value: value
+          end.join('')
+        end
+
+        private
+
+        def controller
+          current_context.registers[:controller]
+        end
+
+        def html_content_tag(name, content, options = {})
+          "<#{name} #{inline_options(options)}>#{content}</#{name}>"
+        end
+
+        def html_tag(name, options = {})
+          "<#{name} #{inline_options(options)} />"
+        end
+
+        # Write options (Hash) into a string according to the following pattern:
+        # <key1>="<value1>", <key2>="<value2", ...etc
+        def inline_options(options = {})
+          return '' if options.empty?
+          (options.stringify_keys.to_a.collect { |a, b| "#{a}=\"#{b}\"" }).join(' ')
+        end
+
+      end
+
+    end
+  end
+end

data/lib/locomotive/middlewares.rb

@@ -1,5 +1,9 @@
 require 'rack/cache'
 
+require 'locomotive/middlewares/base'
 require 'locomotive/middlewares/seo_trailing_slash'
 require 'locomotive/middlewares/inline_editor'
-require 'locomotive/middlewares/permalink'
+require 'locomotive/middlewares/permalink'
+require 'locomotive/middlewares/site'
+require 'locomotive/middlewares/locale'
+require 'locomotive/middlewares/locale_redirection'

data/lib/locomotive/middlewares/base.rb

@@ -0,0 +1,45 @@
+module Locomotive
+  module Middlewares
+    class Base
+
+      protected
+
+      def is_backoffice?(request)
+        request.path.match(%r(^#{Locomotive.mounted_on}(/|$))) != nil
+      end
+
+      def is_assets?(request)
+        request.path.match(%r(^/assets(/|$))) != nil
+      end
+
+      # 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
+
+      # Modify the fullpath according to the regexp/replacement
+      # and return the updated url
+      #
+      # @params [ Rack::Request ] request The base request
+      # @params [ Regexp ] regexp The regexp to apply to the fullpath
+      # @params [ String ] replacement The replacement string for the fullpath 
+      #
+      # @return [ String ] The updated url
+      #
+      def modify_url(request, path)
+        url = "#{request.base_url}#{path}"
+        url += "?#{request.query_string}" unless request.query_string.empty?          
+        url
+      end
+
+    end
+  end
+end

data/lib/locomotive/middlewares/locale.rb

@@ -0,0 +1,32 @@
+module Locomotive
+  module Middlewares
+    class Locale
+
+      def initialize(app, opts = {})
+        @app = app
+      end
+
+      def call(env)
+        retrieve_and_set_locale(env)
+        @app.call(env)
+      end
+
+      def retrieve_and_set_locale(env)
+        site = env['locomotive.site']
+
+        if site.try(:localized?)
+          if env['PATH_INFO'] =~ %r{^/(#{site.locales.join('|')})+(\/|$)}
+            locale  = $1
+            path    = env['PATH_INFO'].gsub($1 + $2, '').gsub(/(\/_edit|\/_admin)$/, '')
+
+            Locomotive.log "[extract locale] locale = #{locale} / #{path}"
+
+            env['locomotive.locale']  = locale
+            env['locomotive.path']    = path
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/locomotive/middlewares/locale_redirection.rb

@@ -0,0 +1,46 @@
+module Locomotive
+  module Middlewares
+    class LocaleRedirection < Base
+
+      def initialize(app, opts = {})
+        @app = app
+      end
+
+      def call(env)
+        if url = redirect_url(env)
+          redirect_to url
+        else
+          @app.call(env)
+        end
+      end
+
+      protected
+
+      def redirect_url(env)
+        request = Rack::Request.new(env)
+
+        site, locale = env['locomotive.site'], env['locomotive.locale']
+
+        if apply_redirection?(site, request)
+          segments = request.path.split '/'
+
+          if !locale && site.prefix_default_locale
+            # force locale in path by redirecting
+            segments.insert(1, "#{site.default_locale}")
+            modify_url(request, segments.join('/'))
+
+          elsif locale == site.default_locale && !site.prefix_default_locale
+            # strip locale
+            segments.delete_at(1)
+            modify_url(request, segments.join('/'))
+          end
+        end
+      end
+
+      def apply_redirection?(site, request)
+        site.try(:localized?) && request.get? && !is_backoffice?(request) && !is_assets?(request)
+      end
+
+    end
+  end
+end