locomotivecms 3.1.2 → 3.2.0.rc1

data/app/helpers/locomotive/sites_helper.rb

@@ -8,21 +8,22 @@ module Locomotive
     end
 
     def options_for_site_locales
-      Locomotive.config.site_locales.map do |locale|
-        text          = I18n.t("locomotive.locales.#{locale}")
-        flag_url      = path_to_image "locomotive/icons/flags/#{locale}.png"
-        nice_display  = h("<img class='flag' src='#{flag_url}' width='24px' />" + text)
+      Rails.cache.fetch(base_cache_key_without_site + ['locales']) do
+        Locomotive.config.site_locales.map do |locale|
+          text          = I18n.t("locomotive.locales.#{locale}")
+          nice_display  = h("#{flag_tag(locale)} #{text}")
 
-        [
-          text,
-          locale,
-          { :"data-display" => nice_display }
-        ]
+          [
+            text,
+            locale,
+            { :"data-display" => nice_display }
+          ]
+        end
       end
     end
 
     def options_for_site_timezones
-      Rails.cache.fetch('views/helpers/timezones') do
+      Rails.cache.fetch([Locomotive::VERSION, 'timezones']) do
         ActiveSupport::TimeZone.all.map do |tz|
           [tz.to_s, tz.name]
         end

data/app/jobs/locomotive/send_pony_email_job.rb

@@ -0,0 +1,37 @@
+module Locomotive
+
+  class SendPonyEmailJob < ActiveJob::Base
+
+    queue_as :default
+
+    def perform(options)
+      _options = prepare_options(options)
+
+      Pony.mail(_options)
+    end
+
+    protected
+
+    def prepare_options(options)
+      _options = options.deep_symbolize_keys
+
+      _options[:via] = _options[:via].to_sym if _options[:via]
+
+      if _options[:via_options] && (value = _options[:via_options][:authentication])
+        _options[:via_options][:authentication] = value.to_sym
+      end
+
+      # if attachments, decode them because they were enccoding in base64
+      if attachments = _options.delete(:attachments)
+        _options[:attachments] = {}
+        attachments.each do |name, content|
+          _options[:attachments][name.to_s] = Base64.decode64(content)
+        end
+      end
+
+      _options
+    end
+
+  end
+
+end

data/app/models/locomotive/concerns/content_entry/counter.rb

@@ -13,12 +13,23 @@ module Locomotive
 
         end
 
+        private
+
         def inc_number_of_entries
-          self.content_type.inc(number_of_entries: 1)
+          change_number_of_entries(1)
         end
 
         def dec_number_of_entries
-          self.content_type.inc(number_of_entries: -1)
+          change_number_of_entries(-1)
+        end
+
+        def change_number_of_entries(delta)
+          Locomotive::ContentType.collection.update_one(
+            { _id: self.content_type_id },
+            {
+              '$inc' => { 'number_of_entries' => delta },
+              '$set' => { 'updated_at' => Time.zone.now }
+            })
         end
 
       end

data/app/models/locomotive/concerns/content_type/filter_fields.rb

@@ -0,0 +1,26 @@
+module Locomotive
+  module Concerns
+    module ContentType
+      module FilterFields
+
+        extend ActiveSupport::Concern
+
+        included do
+          ## fields ##
+          field :filter_fields, type: Array
+
+          ## callbacks ##
+          before_validation :sanitize_filter_fields
+        end
+
+        # We do not want to have a blank value in the list of fields used to filter the entries.
+        def sanitize_filter_fields
+          if self.filter_fields
+            self.filter_fields.reject! { |id| id.blank? }
+          end
+        end
+
+      end
+    end
+  end
+end

data/app/models/locomotive/concerns/page/layout.rb

@@ -39,6 +39,10 @@ module Locomotive
           !(self.fullpath =~ IS_LAYOUT_REGEX).nil?
         end
 
+        def use_layout?
+          !(self.raw_template =~ EXTENDS_REGEX).nil?
+        end
+
         # The layout is also defined in the raw_template. The UI
         # needs it in order to select the layout in the layouts dropdown menu
         def find_layout

data/app/models/locomotive/concerns/page/to_steam.rb

@@ -0,0 +1,20 @@
+module Locomotive
+  module Concerns
+    module Page
+      module ToSteam
+
+        def to_steam
+          @steam_page ||= steam_repositories.page.build(self.attributes.symbolize_keys)
+        end
+
+        private
+
+        def steam_repositories
+          @steam_repositories ||= Locomotive::Steam::Services.build_instance.repositories
+        end
+
+      end
+
+    end
+  end
+end

data/app/models/locomotive/concerns/site/access_points.rb

@@ -11,6 +11,7 @@ module Locomotive
           field :handle
           field :domains, type: Array, default: []
           field :redirect_to_first_domain, type: Boolean, default: false
+          field :redirect_to_https, type: Boolean, default: false
 
           ## indexes ##
           index domains: 1

data/app/models/locomotive/concerns/site/metafields.rb

@@ -72,7 +72,7 @@ module Locomotive
                   'name' => { 'type' => 'string', 'not': { 'enum': ['dom_id', 'model_name', 'method_missing', '_name', '_label', '_position', '_fields', '_t'] } },
                   'label' => { 'type' => ['string', 'object'] },
                   'hint' => { 'type' => ['string', 'object'] },
-                  'type' => { 'enum': ['string', 'text', 'integer', 'float', 'file', 'image', 'boolean', 'select', 'color'] },
+                  'type' => { 'enum' => ['string', 'text', 'integer', 'float', 'image', 'boolean', 'select', 'color'] },
                   'position' => { 'type' => 'integer' },
                   'select_options' => { 'type' => ['object', 'array'] },
                   'localized' => { 'type' => 'boolean' },

data/app/models/locomotive/content_type.rb

@@ -14,6 +14,7 @@ module Locomotive
     include Concerns::ContentType::OrderBy
     include Concerns::ContentType::ClassHelpers
     include Concerns::ContentType::PublicSubmissionTitleTemplate
+    include Concerns::ContentType::FilterFields
 
     ## fields ##
     field :name
@@ -26,7 +27,6 @@ module Locomotive
     field :order_direction,             default: 'asc'
     field :public_submission_enabled,   type: Boolean,  default: false
     field :public_submission_accounts,  type: Array,    default: []
-    field :filter_fields,               type: Array
     field :number_of_entries
     field :display_settings,            type: Hash
 
@@ -46,11 +46,9 @@ module Locomotive
     ## callbacks ##
     before_validation   :normalize_slug
     before_validation   :sanitize_public_submission_accounts
-    before_validation   :sanitize_filter_fields
     after_validation    :bubble_fields_errors_up
 
     ## validations ##
-    # validates_presence_of   :site, :name, :slug
     validates_presence_of   :name, :slug
     validates_uniqueness_of :slug, scope: :site_id
     validates_size_of       :entries_custom_fields, minimum: 1, message: :too_few_custom_fields
@@ -124,13 +122,6 @@ module Locomotive
       end
     end
 
-    # We do not want to have a blank value in the list of fields used to filter the entries.
-    def sanitize_filter_fields
-      if self.filter_fields
-        self.filter_fields.reject! { |id| id.blank? }
-      end
-    end
-
     def bubble_fields_errors_up
       return if self.errors[:entries_custom_fields].empty?
 

data/app/models/locomotive/page.rb

@@ -16,6 +16,7 @@ module Locomotive
     include Concerns::Page::Templatized
     include Concerns::Page::Redirect
     include Concerns::Page::Listed
+    include Concerns::Page::ToSteam
 
     ## fields ##
     field :title,               localize: true

data/app/models/locomotive/site.rb

@@ -53,10 +53,6 @@ module Locomotive
       self.pages.unscoped.where(conditions || {}).order_by_depth_and_position
     end
 
-    def fetch_page(path, logged_in)
-      Locomotive::Page.fetch_page_from_path self, path, logged_in
-    end
-
     def localized_content_types
       self.content_types.localized
     end

data/app/policies/locomotive/site_policy.rb

@@ -46,7 +46,7 @@ module Locomotive
     end
 
     def permitted_attributes
-      plain = [:name, :handle, :picture, :remove_picture, :seo_title, :meta_keywords, :meta_description, :timezone_name, :robots_txt, :cache_enabled, :redirect_to_first_domain, :private_access, :password, :prefix_default_locale]
+      plain = [:name, :handle, :picture, :remove_picture, :seo_title, :meta_keywords, :meta_description, :timezone_name, :robots_txt, :cache_enabled, :redirect_to_first_domain, :redirect_to_https, :private_access, :password, :prefix_default_locale]
       hash  = { domains: [], locales: [], url_redirections: [] }
 
       unless update_advanced?
@@ -56,7 +56,7 @@ module Locomotive
       end
 
       unless point?
-        plain -= [:handle, :redirect_to_first_domain, :private_access, :password]
+        plain -= [:handle, :redirect_to_first_domain, :redirect_to_https, :private_access, :password]
         hash.delete(:domains)
       end
 

data/app/services/locomotive/content_entry_service.rb

@@ -247,9 +247,8 @@ module Locomotive
           where[content_type.label_field_name.to_sym] = regexp
         else
           where['$or'] = []
-          self.content_type.filter_fields.each do |field_id|
-            field = self.content_type.entries_custom_fields.find(field_id)
-            where['$or'] << { field.name => regexp }
+          self.content_type.filter_fields.each do |field_name|
+            where['$or'] << { field_name => regexp }
           end
         end
       end

data/app/services/locomotive/page_parsing_service.rb

@@ -14,12 +14,15 @@ module Locomotive
           parse(page)
 
           persist_editable_elements(page, parsed).tap do |elements|
-            remove_useless_editable_elements(page, elements)
+            # FIXME (Did): do not remove "useless" editable elements since
+            # they might have become orphaned because of a typo for instance.
+            # Instead, we should warn the Wagon developer (TODO).
+            # remove_useless_editable_elements(page, elements)
           end
         end
       end
     rescue Exception => e
-      Rails.logger.error "[PageParsing] " + e.message + "\n\t" + e.backtrace.join("\n\t")
+      logger.error "[PageParsing] " + e.message + "\n\t" + e.backtrace.join("\n\t")
       nil
     end
 
@@ -160,11 +163,12 @@ module Locomotive
       end
     end
 
-    def remove_useless_editable_elements(page, elements)
-      if _elements = (elements.map { |p, _elements| p._id == page._id ? _elements : nil }.flatten.compact)
-        page.editable_elements.where(:_id.nin => _elements.map(&:_id)).destroy_all
-      end
-    end
+    # FIXME (Did): see comment on line 17.
+    # def remove_useless_editable_elements(page, elements)
+    #   if _elements = (elements.map { |p, _elements| p._id == page._id ? _elements : nil }.flatten.compact)
+    #     page.editable_elements.where(:_id.nin => _elements.map(&:_id)).destroy_all
+    #   end
+    # end
 
     def assign_block_information(element, blocks)
       if element.block && (options = blocks[element.block])

data/app/views/locomotive/current_site/_locale.html.slim

@@ -8,8 +8,8 @@
       i.fa.fa-bars
 
     .text
-      = image_tag "locomotive/icons/flags/#{locale}.png", alt: locale, size: '24x24'
-      |  
+      = flag_tag locale
+      |   
       = I18n.t("locomotive.locales.#{locale}")
 
     .buttons

data/app/views/locomotive/current_site/form/_access_points.html.slim

@@ -5,6 +5,7 @@
     = f.input :domains, as: :array, hint: t(:domains, scope: 'simple_form.hints.locomotive.site', domain: Locomotive.config.host || request.host).html_safe, placeholder: true, collection: f.object.domains, template: :domain, template_url: new_domain_current_site_path(current_site)
 
     = f.input :redirect_to_first_domain, as: :toggle
+    = f.input :redirect_to_https, as: :toggle
 
   = f.inputs :private_access do
     = f.input :private_access, as: :toggle

data/app/views/locomotive/editable_elements/_edit.html.slim

@@ -21,7 +21,7 @@
       .col-sm-4.col-xs-4
         .text-right
           - if current_site.localized?
-            = locale_picker_link
+            = page_locale_picker_link(@page, @content_entry)
           - unless @editable_elements.blank?
             |  
             = f.action

data/app/views/locomotive/editable_elements/index_without_preview.html.slim

@@ -31,7 +31,7 @@
                 label.select.optional.control-label for='page_block'
                   = t(:region, scope: 'simple_form.labels.locomotive.editable_element')
                 span.form-wrapper
-                  = select_tag 'block', options_for_page_blocks(@editable_elements_by_block)
+                  = select_tag 'block', options_for_page_blocks(@blocks)
 
           .col-md-12
             = render 'form', f: f

data/app/views/locomotive/layouts/account.html.slim

@@ -19,8 +19,7 @@ html xmlns='http://www.w3.org/1999/xhtml' lang=I18n.locale
     = stylesheet_link_tag     'locomotive/account', media: 'screen'
 
     javascript:
-      window.locale                     = '#{I18n.locale}';
-      window.content_locale             = '#{::Mongoid::Fields::I18n.locale}';
+      window.locale                     = '#{locale}';
 
       $(document).ready(function() {
 

data/app/views/locomotive/layouts/application.html.slim

@@ -34,14 +34,4 @@ html xmlns='http://www.w3.org/1999/xhtml'
 
             = yield
 
-      / .drawer
-      /   .close-button
-      /     i.fa.fa-times
-      /   .content-inner
-      /     .scrollable
-      /       .container-fluid
-      /         .row
-      /           .col-md-12
-      /             h1 Right sidebar
-
       = yield :foot

data/app/views/locomotive/pages/_header.html.slim

@@ -1,4 +1,4 @@
-- title t(:title, title: @page.title, fullpath: preview_page_path(@page), scope: 'locomotive.pages.edit')
+- title t(:title, title: h(@page.title), fullpath: preview_page_path(@page), scope: 'locomotive.pages.edit')
 
 = help t('.help', default: '')
 

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

@@ -25,8 +25,8 @@ link href="https://fonts.googleapis.com/css?family=Muli:400,300|Noto+Sans:400,70
 = render 'locomotive/shared/main_app_head_before_backbone'
 
 javascript:
-  window.locale                     = '#{I18n.locale}';
-  window.content_locale             = '#{::Mongoid::Fields::I18n.locale}';
+  window.locale                     = '#{locale}';
+  window.content_locale             = '#{current_content_locale}';
 
   $(document).ready(function() {
 

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

@@ -6,8 +6,9 @@
     span.caret
   ul.dropdown-menu.dropdown-menu-right
     - current_site.locales.each do |locale|
+      - url = url_block ? url_block.call(locale) : "?content_locale=#{locale}"
       li
-        a href="?content_locale=#{locale}"
+        a href=url
           = flag_tag locale, '17x17'
           |  
           |  

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

@@ -1,18 +1,20 @@
-.image-dialog-content style='display: none'
-  = locomotive_form_for image_form, url: '#', defaults: { placeholder: false, hint: false } do |f|
-    = f.inputs do
-      = f.input :src
-      = f.input :title
-      = f.input :alignment, include_blank: false, collection: [[:default, ''],
-        [:left, 'wysiwyg-float-left'],
-        [:right, 'wysiwyg-float-right']],
-        label_method: ->(el) { t("simple_form.options.locomotive.rte_input_image_form.alignment.#{el.first}") }
+- cache base_cache_key_without_site do
 
-    p.text-right
-      a.btn.btn-success.btn-sm.apply
-        = f.submit_text
+  .image-dialog-content style='display: none'
+    = locomotive_form_for image_form, url: '#', defaults: { placeholder: false, hint: false } do |f|
+      = f.inputs do
+        = f.input :src
+        = f.input :title
+        = f.input :alignment, include_blank: false, collection: [[:default, ''],
+          [:left, 'wysiwyg-float-left'],
+          [:right, 'wysiwyg-float-right']],
+          label_method: ->(el) { t("simple_form.options.locomotive.rte_input_image_form.alignment.#{el.first}") }
 
-      |  
+      p.text-right
+        a.btn.btn-success.btn-sm.apply
+          = f.submit_text
 
-      a.btn.btn-default.btn-sm.cancel
-        = f.submit_text :cancel
+        |  
+
+        a.btn.btn-default.btn-sm.cancel
+          = f.submit_text :cancel