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

data/app/helpers/locomotive/shared/pages_helper.rb

@@ -2,6 +2,23 @@ module Locomotive
   module Shared
     module PagesHelper
 
+      def preview_page_path(page)
+        _path = params[:preview_path] || current_site.localized_page_fullpath(page, current_content_locale)
+        _path = 'index' if _path.blank?
+
+        _path += response_type_name(page)
+
+        truncate('/' + _path, length: 50)
+      end
+
+      def response_type_name(page)
+        if page.default_response_type?
+          ''
+        else
+          '.' + (MIME::Types[page.response_type.to_s].first.try(:preferred_extension) || 'html')
+        end
+      end
+
       def render_pages
         tree  = build_page_tree
         nodes = tree.map { |page, children| Node.new(page, children, controller) }

data/app/helpers/locomotive/translations_helper.rb

@@ -9,19 +9,5 @@ module Locomotive
       end) + '-done'
     end
 
-    # def untranslated_locales(site, translation)
-    #   list = site.locales.inject([]) do |memo,locale|
-    #     translation.values[locale].present? ? memo :  memo << I18n.t("locomotive.locales.#{locale}")
-    #   end
-
-    #   if list.empty?
-    #     ''
-    #   else
-    #     haml_tag :span, class: 'untranslated' do
-    #       haml_tag :em, I18n.t('locomotive.translations.untranslated', list: list.to_sentence)
-    #     end
-    #   end
-    # end
-
   end
 end

data/app/inputs/locomotive/color_input.rb

@@ -0,0 +1,18 @@
+module Locomotive
+  class ColorInput < ::SimpleForm::Inputs::StringInput
+
+    def input(wrapper_options)
+      <<-HTML
+        <div class="input-group">
+          #{super}
+          <span class="input-group-addon"><i></i></span>
+        </div>
+      HTML
+    end
+
+    def html5?
+      false
+    end
+
+  end
+end

data/app/inputs/locomotive/markdown_input.rb

@@ -0,0 +1,19 @@
+module Locomotive
+  class MarkdownInput < Locomotive::RteInput
+
+    def input(wrapper_options)
+      input_html_options[:class] << 'form-control'
+      toolbar_html + @builder.text_area(attribute_name, input_html_options)
+    end
+
+    def toolbar_html
+      template.render(
+        partial:  'locomotive/shared/rte/markdown_toolbar',
+        locals:   {
+          wysihtml5_prefix: wysihtml5_prefix,
+          image_popover:    image_popover,
+        })
+    end
+
+  end
+end

data/app/models/locomotive/account.rb

@@ -32,9 +32,10 @@ module Locomotive
     validates_presence_of :name
 
     ## associations ##
+    has_many :created_sites, class_name: 'Locomotive::Site', validate: false, autosave: false
 
     ## callbacks ##
-    before_destroy    :remove_memberships!
+    before_destroy :remove_memberships!
 
     ## scopes ##
     scope :ordered,   -> { order_by(name: :asc) }

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

@@ -0,0 +1,27 @@
+module Locomotive
+  module Concerns
+    module ContentEntry
+      module FileSize
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          ## fields ##
+          field :_file_size, type: Integer, default: 0
+
+          ## callbacks ##
+          before_save :sync_file_size
+
+        end
+
+        private
+
+        def sync_file_size
+          self._file_size = self.file_custom_fields.inject(0) { |sum,field| send(field).size + sum }
+        end
+
+      end
+    end
+  end
+end

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

@@ -22,7 +22,9 @@ module Locomotive
             target  = self.class_name_to_content_type(field.class_name)
             label   = target.label_field_name.to_sym
 
-            target.ordered_entries.only(:_id, label).map do |entry|
+            # FIXME: applying "only" with _id and label sounds like a good option for performance
+            # but it fails because of Mongoid and its way of dealing with localized attributes.
+            target.ordered_entries.map do |entry|
               { _id: entry._id, name: entry.send(label) }
             end
           end

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

@@ -5,6 +5,13 @@ module Locomotive
 
         extend ActiveSupport::Concern
 
+        IS_LAYOUT_REGEX         = /^layouts($|\/)/o.freeze
+        EXTENDS_REGEX           = /\{%\s+extends\s/o.freeze
+        EXTENDS_PARENT_REGEX    = /\{%\s+extends\s"?parent"?\s%}/o.freeze
+        EXTENDS_FULLPATH_REGEX  = /\{%\s+extends\s"?(\S+)"?\s%}/o.freeze
+        BLOCK_REGEX             = /\{%\s+block\s/o.freeze
+
+
         included do
 
           ## fields ##
@@ -16,7 +23,12 @@ module Locomotive
           has_many    :layout_children, class_name: 'Locomotive::Page', inverse_of: :layout
 
           ## callbacks ##
-          before_validation :set_default_raw_template
+          before_validation :valid_allow_layout_consistency
+          before_validation :set_raw_template_on_create, if: :new_record?
+          before_validation :set_raw_template_on_update, unless: :new_record?
+
+          ## validations ##
+          validate :index_can_not_extend_parent
 
           ## scopes ##
           scope :layouts, -> { where(is_layout: true) }
@@ -24,34 +36,66 @@ module Locomotive
         end
 
         def is_layout_or_related?
-          !(self.fullpath =~ /^layouts($|\/)/).nil?
+          !(self.fullpath =~ IS_LAYOUT_REGEX).nil?
         end
 
-        private
+        # 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
+          return if !self.allow_layout? || self.layout_id
 
-        def set_default_raw_template
-          if self.allow_layout?
-            set_default_raw_template_if_layout
-          else
-            set_default_raw_template_if_no_layout
+          if self.raw_template =~ EXTENDS_FULLPATH_REGEX
+            # first in the current locale
+            if (page = self.site.pages.fullpath($1).first).nil? && !self.site.is_default_locale?(::Mongoid::Fields::I18n.locale)
+              # give it a try in the default locale too
+              page = self.site.with_default_locale { self.site.pages.fullpath($1).first }
+            end
+
+            self.layout_id = page.try(:_id)
           end
         end
 
-        def set_default_raw_template_if_layout
-          if self.layout
-            self.raw_template = %({% extends "#{self.layout.fullpath}" %})
-          elsif self.layout_id == 'parent'
-            self.raw_template = "{% extends 'parent' %}"
+        private
+
+        # Even if the allow_layout attribute is true in a first time, we need
+        # to make sure the the raw_template includes only the "extends" liquid tag
+        # without any other code.
+        def valid_allow_layout_consistency
+          if allow_layout && raw_template.present? && raw_template =~ EXTENDS_REGEX
+            self.allow_layout = (raw_template =~ BLOCK_REGEX).nil?
           end
+          true
         end
 
-        def set_default_raw_template_if_no_layout
-          return true if self.raw_template.present?
+        def set_raw_template_on_create
+          set_raw_template
+          true
+        end
+
+        def set_raw_template_on_update
+          set_raw_template if allow_layout? && layout_id_changed?
+          true
+        end
+
+        def set_raw_template
+          return unless site
+
+          site.with_default_locale do
+            if layout_id == 'parent'
+              self.raw_template = '{% extends parent %}'
+            elsif layout
+              self.raw_template = %({% extends "#{self.layout.fullpath}" %})
+            elsif raw_template.blank? && !index?
+              self.raw_template = '{% extends parent %}'
+            end
+          end
+          # needed it by Steam to get the template from the default locale
+          site.each_locale(false) { self.raw_template = '' }
+        end
 
-          self.raw_template = if self.index? || !self.site.is_default_locale?(::Mongoid::Fields::I18n.locale)
-            '' # need it by Steam to get the template in the default locale
-          else
-            "{% extends 'parent' %}"
+        def index_can_not_extend_parent
+          if index? && raw_template =~ EXTENDS_PARENT_REGEX
+            self.errors.add(:layout_id, :index_can_not_extend_parent)
           end
         end
 

data/app/models/locomotive/concerns/shared/site_scope.rb

@@ -0,0 +1,37 @@
+module Locomotive
+  module Concerns
+    module Shared
+      module SiteScope
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          ## associations ##
+          belongs_to :site, class_name: 'Locomotive::Site', validate: false, autosave: false, touch: :true
+
+          ## validations ##
+          validates_presence_of :site
+
+          ## indexes ##
+          index site_id: 1
+
+          # Redefine the auto-generated method by the Mongoid Touchable module
+          # in order to touch another field of the site object.
+          def touch_site_after_create_or_destroy
+            without_autobuild do
+              _site = __send__(:site)
+              _site.touch(touch_site_attribute) if _site
+            end
+          end
+
+        end
+
+        def touch_site_attribute
+          nil
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module Locomotive
+  module Concerns
+    module Site
+      module Cache
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          ## fields ##
+          field :cache_enabled,     type: Boolean, default: false
+          field :template_version,  type: DateTime
+          field :content_version,   type: DateTime
+
+          ## callbacks ##
+          before_save  :touch_content_version
+
+          def touch_content_version
+            touch(:content_version)
+            true
+          end
+
+        end
+
+        def last_modified_at
+          [self.content_version, self.template_version].compact.sort.last || self.updated_at
+        end
+
+      end
+    end
+  end
+end

data/app/models/locomotive/concerns/theme_asset/plain_text.rb

@@ -0,0 +1,85 @@
+module Locomotive
+  module Concerns
+    module ThemeAsset
+      module PlainText
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          ## validations ##
+          validates_presence_of :plain_text_name, if: Proc.new { |a| a.performing_plain_text? }
+
+          ## callbacks ##
+          before_validation :store_plain_text
+
+          ## accessors ##
+          attr_accessor   :plain_text_name, :plain_text, :plain_text_type, :performing_plain_text
+
+        end
+
+        def plain_text_name
+          if not @plain_text_name_changed
+            @plain_text_name ||= self.safe_source_filename
+          end
+          @plain_text_name.gsub(/(\.[a-z0-9A-Z]+)$/, '') rescue nil
+        end
+
+        def plain_text_name=(name)
+          @plain_text_name_changed = true
+          @plain_text_name = name
+        end
+
+        def plain_text
+          # only for ruby >= 1.9.x. Forget about ruby 1.8
+          @plain_text ||= (self.source.read.force_encoding('UTF-8') rescue nil)
+        end
+
+        def plain_text_type
+          @plain_text_type || (stylesheet_or_javascript? ? self.content_type : nil)
+        end
+
+        def performing_plain_text?
+          Boolean.set(self.performing_plain_text) || false
+        end
+
+        def store_plain_text
+          return if self.persisted? && !self.stylesheet_or_javascript?
+
+          self.content_type ||= @plain_text_type if self.performing_plain_text?
+
+          data = self.performing_plain_text? ? self.plain_text : self.source.read
+
+          return if !self.stylesheet_or_javascript? || self.plain_text_name.blank? || data.blank?
+
+          sanitized_source = self.escape_shortcut_urls(data)
+
+          self.source = ::CarrierWave::SanitizedFile.new({
+            tempfile: StringIO.new(sanitized_source),
+            filename: "#{self.plain_text_name}.#{self.stylesheet? ? 'css' : 'js'}"
+          })
+
+          @plain_text = sanitized_source # no need to reset the plain_text instance variable to have the last version
+        end
+
+        def escape_shortcut_urls(text)
+          return if text.blank?
+
+          text.gsub(/[("'](\/(stylesheets|javascripts|images|media|fonts|pdfs|others)\/(([^;.]+)\/)*([a-zA-Z_\-0-9]+)\.[a-z]{2,4})(\?[0-9]+)?[)"']/) do |path|
+
+            sanitized_path = path.gsub(/[("')]/, '').gsub(/^\//, '').gsub(/\?[0-9]+$/, '')
+
+            if asset = self.site.theme_assets.where(local_path: sanitized_path).first
+              timestamp = self.updated_at.to_i
+              "#{path.first}#{asset.source.url}?#{timestamp}#{path.last}"
+            else
+              path
+            end
+          end
+        end
+
+      end
+    end
+  end
+end
+

data/app/models/locomotive/content_entry.rb

@@ -5,12 +5,14 @@ module Locomotive
 
     ## extensions ##
     include ::CustomFields::Target
+    include Concerns::Shared::SiteScope
     include Concerns::Shared::Seo
     include Concerns::Shared::Userstamp
     include Concerns::ContentEntry::Slug
     include Concerns::ContentEntry::Csv
     include Concerns::ContentEntry::Localized
     include Concerns::ContentEntry::Counter
+    include Concerns::ContentEntry::FileSize
     include Concerns::ContentEntry::NextPrevious
 
     ## fields ##
@@ -23,11 +25,10 @@ module Locomotive
     validates_uniqueness_of   :_slug, scope: :content_type_id, allow_blank: true
 
     ## associations ##
-    belongs_to  :site,          class_name: 'Locomotive::Site', validate: false, autosave: false
     belongs_to  :content_type,  class_name: 'Locomotive::ContentType', inverse_of: :entries, custom_fields_parent_klass: true
 
     ## callbacks ##
-    before_save       :set_site
+    before_validation :set_site
     before_save       :set_visibility
     before_create     :add_to_list_bottom
 
@@ -40,8 +41,8 @@ module Locomotive
     scope :by_ids_or_slugs, ->(ids_or_slugs) { all.any_of({ :_slug.in => [*ids_or_slugs] }, { :_id.in => [*ids_or_slugs] }) }
 
     ## indexes ##
-    index site_id: 1
     index _type: 1
+    index site_id: 1, updated_at: 1
     index content_type_id: 1
     Locomotive.config.site_locales.each do |locale|
       index _type: 1, "_slug.#{locale}" => 1
@@ -117,11 +118,10 @@ module Locomotive
 
     def to_liquid(type = nil)
       (type || self.content_type).to_steam_entry(self).to_liquid
+    end
 
-      # repositories  = Locomotive::Steam::Services.build_instance.repositories
-      # _content_type = repositories.content_type.build(content_type.attributes.symbolize_keys)
-
-      # repositories.content_entry.with(_content_type).build(self.attributes.symbolize_keys).to_liquid
+    def touch_site_attribute
+      :content_version
     end
 
     protected