locomotivecms 3.0.0.pre.beta.1 → 3.0.0.rc1

data/app/views/locomotive/shared/_main_app_header.html.slim

@@ -1 +1 @@
-- # this partial can be overridden in the main app in order to include a search bar for instance
+- # this partial can be overridden in the main app in order to include a warning message for instance

data/app/views/locomotive/shared/_sidebar.html.slim

@@ -1,22 +1,26 @@
 = render 'locomotive/shared/sidebar/my_account'
 
-= render 'locomotive/shared/sidebar/link', icon: 'fa-dashboard', label: t('.dashboard'), url: dashboard_path(current_site)
+- cache(cache_key_for_sidebar) do
 
-= render_pages
+  = render 'locomotive/shared/sidebar/link', icon: 'fa-dashboard', label: t('.dashboard'), url: dashboard_path(current_site)
 
-= render 'locomotive/shared/sidebar/content_types'
+  - cache(cache_key_for_sidebar_pages) do
+    = render_pages
 
-= render 'locomotive/shared/sidebar/link', icon: 'fa-picture-o', label: t('.assets'), url: content_assets_path(current_site)
+  - cache(cache_key_for_sidebar_content_types) do
+    = render 'locomotive/shared/sidebar/content_types'
 
-- if current_site.localized?
-  = render 'locomotive/shared/sidebar/link', icon: 'fa-globe', label: t('.translations'), url: translations_path(current_site)
+  = render 'locomotive/shared/sidebar/link', icon: 'fa-picture-o', label: t('.assets'), url: content_assets_path(current_site)
 
-= render 'locomotive/shared/sidebar/link', icon: 'fa-gear', label: t('.settings'), url: edit_current_site_path(current_site)
+  - if current_site.localized?
+    = render 'locomotive/shared/sidebar/link', icon: 'fa-globe', label: t('.translations'), url: translations_path(current_site)
 
-- if policy(current_site).show_developers_documentation?
-  = render 'locomotive/shared/sidebar/link', icon: 'fa-book', label: t('.developers'), url: developers_documentation_path(current_site)
+  = render 'locomotive/shared/sidebar/link', icon: 'fa-gear', label: t('.settings'), url: edit_current_site_path(current_site)
 
-= render 'locomotive/shared/sidebar/link', icon: 'fa-suitcase', label: t(:sites, scope: 'locomotive.shared.header'), url: sites_path, section_class: 'visible-xs-block'
+  - if policy(current_site).show_developers_documentation?
+    = render 'locomotive/shared/sidebar/link', icon: 'fa-book', label: t('.developers'), url: developers_documentation_path(current_site)
 
-= render 'locomotive/shared/sidebar/link', icon: 'fa-sign-out', label: t(:logout, scope: 'locomotive.shared.header'), url: destroy_locomotive_account_session_path, data: { confirm: t('locomotive.messages.confirm') }, section_class: 'visible-xs-block'
+  = render 'locomotive/shared/sidebar/link', icon: 'fa-suitcase', label: t(:sites, scope: 'locomotive.shared.header'), url: sites_path, section_class: 'visible-xs-block'
+
+  = render 'locomotive/shared/sidebar/link', icon: 'fa-sign-out', label: t(:logout, scope: 'locomotive.shared.header'), url: destroy_locomotive_account_session_path, data: { confirm: t('locomotive.messages.confirm') }, section_class: 'visible-xs-block'
 

data/app/views/locomotive/shared/rte/_markdown_toolbar.html.slim

@@ -0,0 +1,42 @@
+.wysihtml5-toolbar id="markdown-toolbar-#{wysihtml5_prefix}"
+
+  span.wysihtml5-toolbar-group
+    a data-markdown-command='bold'
+      i.fa.fa-bold
+    a data-markdown-command='italic'
+      i.fa.fa-italic
+
+  span.wysihtml5-toolbar-group
+    / a data-markdown-command='insertUnorderedList'
+    /   i.fa.fa-list-ul
+    / a data-markdown-command='insertOrderedList'
+    /   i.fa.fa-list-ol
+    / a.style
+    /   i.fa.fa-paragraph
+
+    / .style-dialog-content style='display: none'
+    /   a data-markdown-command='formatBlock' data-markdown-command-value='h1' H1
+    /   br
+    /   a data-markdown-command='formatBlock' data-markdown-command-value='h2' H2
+    /   br
+    /   a data-markdown-command='formatBlock' data-markdown-command-value='h3' H3
+    /   br
+    /   a data-markdown-command='formatBlock' data-markdown-command-value='h3' H4
+    /   br
+    /   a data-markdown-command='formatBlock' data-markdown-command-value='h3' H5
+    /   br
+    /   a data-markdown-command='formatBlock' data-markdown-command-value='h3' H6
+    /   br
+    /   a data-markdown-command='formatBlock' data-markdown-command-value='blockquote'
+    /     i.fa.fa-quote-right
+    /   br
+
+    / a data-markdown-command='createLink'
+    /   i.fa.fa-chain
+    / = link_popover
+    / a data-markdown-command='removeLink'
+    /   i.fa.fa-chain-broken
+
+    a data-url=content_assets_path data-markdown-command='insertFile'
+      i.fa.fa-file-o
+    = image_popover

data/config/locales/admin_ui.en.yml

@@ -73,7 +73,7 @@ en:
         title: Site not found
         next: "Next →"
         message:
-          create_account: "Please create first an account and then create a site."
+          create_account: "Please create an account first and then create a site."
           add_domain: "Add the <strong>%{host}</strong> domain to the list of domains of one of your sites."
           sign_in: "Please sign in first. Then, add the <strong>%{host}</strong> domain to the list of domains of one of your sites."
 
@@ -164,7 +164,13 @@ en:
 
     dashboard:
       show:
-        title: 'Activity'
+        title: 'Dashboard'
+      url:
+        title: "URL of your site:"
+        visit: 'Visit'
+        change_domain: 'Use your own domain name'
+      activity:
+        title: Activity
         unknown_account: Someone
         load_more: Loading more
         loading_activity_feed: Loading...
@@ -192,8 +198,6 @@ en:
 
     pages:
       index:
-        title: Pages
-        help: "Pages are organized as a tree. You can order pages as well as folders"
         no_items: "There are no pages for now. Just click <a href=\"%{url}\">here</a> to create the first one."
         new: new page
         list_content_entries: "List %{name}"
@@ -219,6 +223,7 @@ en:
         title: "%{title} &mdash; <small>%{fullpath}</small>"
       edit:
         settings_link: 'Settings'
+        no_editable_elements: 'No editable elements found'
       form:
         model:
           buttons:

data/config/locales/default.en.yml

@@ -15,6 +15,10 @@ en:
       messages:
         blank_in_locale: "can't be blank"
       models:
+        locomotive/page:
+          attributes:
+            layout_id:
+              index_can_not_extend_parent: "The index page can't have its parent page as a layout"
         locomotive/membership:
           attributes:
             account:

data/config/locales/devise.en.yml

@@ -25,6 +25,7 @@ en:
       locomotive_account:
         send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
         updated: 'Your password was changed successfully. You are now signed in.'
+        invalid: 'You need to ask again for a new password.'
     confirmations:
       locomotive_account:
         send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'

data/config/locales/simple_form.en.yml

@@ -1,5 +1,7 @@
 en:
   simple_form:
+    blank_required_fields: "You haven't filled all the required inputs."
+
     titles:
       locomotive:
         account:
@@ -70,6 +72,7 @@ en:
         site:
           locales: Languages
           timezone_name: Timezone
+          cache_enabled: Cache
           new:
             locales: First language
         membership:
@@ -96,8 +99,8 @@ en:
         page:
           handle: "Unique identifier to retrieve this page within an external controller instance"
           published: "Only authenticated accounts can view unpublished pages."
-          cache_strategy: "Cache the page for better performance. The 'Simple' choice is a good compromise."
           templatized: "Use the page as a template for a model you defined."
+          cache_enabled: "When enabled, your page will be cached as long as the content doesn't change."
           listed: "Control whether to show the page from generated menus."
           target_klass_name: "The type of content this page will be a template for."
           seo_title: "Define a page title which should be used as the value for the title tag in the head section. Leave it empty if you want to use the default value from the site settings."
@@ -113,8 +116,9 @@ en:
           meta_keywords: "Meta keywords used within the head tag of the page. They are separated by a comma. Required for SEO."
           meta_description: "Meta description used within the head tag of the page. Required for SEO."
           robots_txt: "Content of the <span class='code'>/robots.txt</span> file. Check the following <a href='http://www.w3.org/TR/html4/appendix/notes.html#h-B.4.1.1'>url</a> for more information."
-          domains: "Simply add your domains just below. <b>Do not forget to upgrade your DNS.</b>"
+          domains: "Add your domains just below. Then, register a CNAME DNS record pointing to <b>%{domain}</b>."
           memberships: "You can invite other accounts to edit/manage the site."
+          cache_enabled: "When enabled, your pages will be cached as long as the content doesn't change. Disabling cache per page is allowed."
           new:
             locales: "You can add other languages once your site will be created."
         theme_asset:

data/lib/locomotive/action_controller/responder.rb

@@ -65,6 +65,11 @@ module Locomotive
       protected
 
       def with_flash_message(type = :notice, in_header = true)
+        unless set_flash_message?
+          yield if block_given?
+          return
+        end
+
         if in_header
           set_flash_message!
           message = URI::escape(controller.flash[type].to_str) if controller.flash[type]

data/lib/locomotive/engine.rb

@@ -31,6 +31,11 @@ module Locomotive
 
     initializer 'locomotive.precompile.hook', group: :all do |app|
       app.config.assets.precompile += %w(
+        locomotive/bootstrap-colorpicker/saturation.png
+        locomotive/bootstrap-colorpicker/alpha-horizontal.png
+        locomotive/bootstrap-colorpicker/alpha.png
+        locomotive/bootstrap-colorpicker/hue-horizontal.png
+        locomotive/bootstrap-colorpicker/hue.png
         locomotive/wysihtml5_reset.css
         locomotive/wysihtml5_editor.css
         locomotive.js

data/lib/locomotive/middlewares/site.rb

@@ -7,19 +7,30 @@ module Locomotive
       end
 
       def call(env)
-        env['locomotive.site'] = env['steam.site'] = fetch_site(env)
-        begin
+        request = Rack::Request.new(env)
+
+        # do not process "/assets"
+        # only in dev, since the assets are precompiled in production
+        if request_for_the_back_office_assets?(request)
           @app.call(env)
-        rescue ::Locomotive::Steam::NoSiteException => exception
-          # no_site!
-          Locomotive::ErrorsController.action(:no_site).call(env)
+        else
+          env['locomotive.site'] = site = fetch_site(request)
+
+          # deal with the Steam entity instead of a Mongoid document
+          env['steam.site'] = site.try(:to_steam)
+
+          begin
+            @app.call(env)
+          rescue ::Locomotive::Steam::NoSiteException => exception
+            # no_site!
+            Locomotive::ErrorsController.action(:no_site).call(env)
+          end
         end
       end
 
       private
 
-      def fetch_site(env)
-        request = Rack::Request.new(env)
+      def fetch_site(request)
         handle  = site_handle(request)
 
         return nil if handle == 'api'
@@ -27,40 +38,35 @@ module Locomotive
         Locomotive.log "[fetch site] host = #{request.host} / site_handle = #{handle.inspect}"
 
         if handle
-          fetch_from_handle(handle, env, request)
+          fetch_from_handle(handle, request)
         elsif !request_for_the_back_office_and_default_host?(request)
-          fetch_from_host(env, request)
+          fetch_from_host(request)
         else
           nil
         end
       end
 
-      # def no_site!(env)
-      #   Locomotive::ErrorsController.action(:no_site).call(env)
-      #   # [200, { 'Content-Type' => 'text/html' }, ['Hello world']]
-      # end
-
       # The site is not rendered from a domain but from the back-office
       # we need to get:
       # - the path of "mouting point" (basically: locomotive/:handle/preview)
       # - the real path of the page
       #
       # FIXME: move that in a different middleware
-      def fetch_from_handle(handle, env, request)
+      def fetch_from_handle(handle, request)
         mounted_on = "#{Locomotive.mounted_on}/#{handle}/preview"
 
-        env['locomotive.mounted_on']  = env['steam.mounted_on'] = mounted_on
-        env['locomotive.path']        = request.path_info.gsub(mounted_on, '')
+        request.env['locomotive.mounted_on']  = request.env['steam.mounted_on'] = mounted_on
+        request.env['locomotive.path']        = request.path_info.gsub(mounted_on, '')
 
-        env['steam.live_editing']     = true
+        request.env['steam.live_editing']     = true
 
         Locomotive::Site.where(handle: handle).first
       end
 
       # The request is for one of the domains registered in Locomotive.
       # Find the related site.
-      def fetch_from_host(env, request)
-        env['locomotive.path'] = request.path_info
+      def fetch_from_host(request)
+        request.env['locomotive.path'] = request.path_info
         Locomotive::Site.match_domain(request.host).first
       end
 
@@ -78,10 +84,22 @@ module Locomotive
         @regexp ||= /#{Locomotive.mounted_on}\/([^\/]+)/o
       end
 
+      def request_for_the_back_office_assets?(request)
+        default_host?(request) && request.path_info.starts_with?('/assets/')
+      end
+
       # Is it a request for the back-office AND the domain used to also
       # render the site of the Rails application?
       def request_for_the_back_office_and_default_host?(request)
-        default_host && request.host == default_host && request.path_info =~ /#{Locomotive.mounted_on}\//
+        default_host?(request) && request.path_info =~ /#{Locomotive.mounted_on}\//
+      end
+
+      def default_host?(request)
+        (default_host && request.host == default_host) || localhost?(request)
+      end
+
+      def localhost?(request)
+        request.host == '0.0.0.0' || request.host == 'localhost'
       end
 
       def default_host

data/lib/locomotive/simple_form.rb

@@ -1,5 +1,3 @@
-# require 'pry-byebug'
-
 module Locomotive
   module SimpleForm
     module BootstrapHelpers
@@ -110,14 +108,14 @@ module Locomotive
       template.link_to(label, url)
     end
 
-    def action(misc_class = '')
+    def action(options = {})
       action        = object.persisted? ? :update : :create
-      label         = translate_button(action)
+      label         = options[:label] || translate_button(action)
       loading_text  = translate_button(:loading_text)
 
       template.content_tag :button, label,
         type:   'submit',
-        class:  "btn btn-success btn-sm #{misc_class}",
+        class:  "btn btn-success btn-sm #{options[:class]}",
         data:   { loading_text: loading_text }
     end
 
@@ -125,28 +123,6 @@ module Locomotive
       translate_button(action)
     end
 
-    # # Translate text for the submits and titles namespace.
-    # # it differs from the simple_form translate_from_namespace method
-    # # in that this does not care about the attribute.
-    # #
-    # def translate_text(key, namespace, default = '')
-    #   model_names = lookup_model_names.dup
-    #   lookups     = []
-
-    #   while !model_names.empty?
-    #     joined_model_names = model_names.join(".")
-    #     model_names.shift
-
-    #     lookups << :"#{joined_model_names}.#{key}"
-    #   end
-    #   lookups << :"defaults.locomotive.#{key}"
-    #   lookups << default.to_s
-
-    #   puts "#{i18n_scope}.#{namespace}.#{lookups.first} - #{lookups.inspect}"
-
-    #   I18n.t(lookups.shift, scope: :"#{i18n_scope}.#{namespace}", default: lookups).presence
-    # end
-
     def translate_button(key)
       template.t("simple_form.buttons.defaults.locomotive.#{key}")
     end
@@ -171,9 +147,5 @@ module Locomotive
       end
     end
 
-    # def i18n_scope
-    #   ::SimpleForm.i18n_scope
-    # end
-
   end
 end

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

@@ -0,0 +1,62 @@
+module Locomotive
+  module Steam
+    module Middlewares
+
+      class Cache
+
+        attr_reader :app
+
+        CACHEABLE_REQUEST_METHODS = %w(GET HEAD).freeze
+
+        def initialize(app)
+          @app = app
+        end
+
+        def call(env)
+          if cacheable?(env)
+            fetch_cached_response(env)
+          else
+            app.call(env)
+          end
+        end
+
+        private
+
+        def fetch_cached_response(env)
+          key = cache_key(env)
+
+          if marshaled = Rails.cache.read(key)
+            Marshal.load(marshaled)
+          else
+            app.call(env).tap do |response|
+              Rails.cache.write(key, marshal(response))
+            end
+          end
+        end
+
+        def marshal(response)
+          code, headers, body = response
+
+          _headers = headers.dup.reject! { |key, val| key =~ /[^0-9A-Z_]/ || !val.respond_to?(:to_str) }
+
+          Marshal.dump([code, _headers, body])
+        end
+
+        def cacheable?(env)
+          CACHEABLE_REQUEST_METHODS.include?(env['REQUEST_METHOD']) &&
+          !env['steam.live_editing'] &&
+          env['steam.site'].try(:cache_enabled) &&
+          env['steam.page'].try(:cache_enabled)
+        end
+
+        def cache_key(env)
+          site, path, query = env['steam.site'], env['PATH_INFO'], env['QUERY_STRING']
+          key = "#{Locomotive::VERSION}/site/#{site._id}/#{site.last_modified_at.to_i}/page/#{path}/#{query}"
+          Digest::MD5.hexdigest(key)
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -12,9 +12,9 @@ module Locomotive
 
         def call(env)
           status, headers, response = @app.call(env)
-          site, page, locale = env['steam.site'], env['steam.page'], env['steam.locale'].to_s
+          site, page, locale, live_editing = env['steam.site'], env['steam.page'], env['steam.locale'].to_s, env['steam.live_editing']
 
-          if page && !page.redirect && page.response_type == 'text/html' && response.first
+          if editable?(page, response, live_editing)
             html = %(
               <meta name="locomotive-locale" content="#{locale}" />
               <meta name="locomotive-editable-elements-path" content="#{editable_elements_path(site, page, locale, env)}" />
@@ -26,6 +26,12 @@ module Locomotive
           [status, headers, response]
         end
 
+        protected
+
+        def editable?(page, response, live_editing)
+          live_editing && page && !page.redirect && page.response_type == 'text/html' && response.first
+        end
+
         def editable_elements_path(site, page, locale, env)
           options = {}
 
@@ -38,7 +44,7 @@ module Locomotive
 
           options[:content_locale] = locale if site.locales.size > 1
 
-          super(site, page._id, options)
+          super(site.handle, page._id, options)
         end
 
       end