locomotivecms 3.0.0.pre.alpha.3 → 3.0.0.pre.beta.1

data/app/models/locomotive/content_asset.rb

@@ -37,9 +37,5 @@ module Locomotive
       File.extname(self.source_filename).gsub(/^\./, '')
     end
 
-    def to_liquid
-      { url: self.source.url }.merge(self.attributes).stringify_keys
-    end
-
   end
 end

data/app/models/locomotive/content_entry.rb

@@ -12,7 +12,6 @@ module Locomotive
     include Concerns::ContentEntry::Localized
     include Concerns::ContentEntry::Counter
     include Concerns::ContentEntry::NextPrevious
-    include Concerns::ContentEntry::Notifications
 
     ## fields ##
     field :_slug,             localize: true
@@ -53,6 +52,9 @@ module Locomotive
     index _type: 1, _position: 1
     index content_type_id: 1, _position: 1
 
+    index site_id: 1, content_type_id: 1, _visible: 1
+    index site_id: 1, content_type_id: 1, _visible: 1, _position: 1
+
     ## methods ##
 
     alias :visible? :_visible?
@@ -113,13 +115,13 @@ module Locomotive
       end
     end
 
-    # All the content entries no matter the content type they belong to
-    # share the same liquid drop class.
-    #
-    # @param [ Class ] The liquid drop class
-    #
-    def self.drop_class
-      Locomotive::Liquid::Drops::ContentEntry
+    def to_liquid(type = nil)
+      (type || self.content_type).to_steam_entry(self).to_liquid
+
+      # 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
     end
 
     protected

data/app/models/locomotive/content_type.rb

@@ -7,7 +7,7 @@ module Locomotive
     include ::CustomFields::Source
     include Concerns::ContentType::Label
     include Concerns::ContentType::DefaultValues
-    include Concerns::ContentType::ItemTemplate
+    include Concerns::ContentType::EntryTemplate
     include Concerns::ContentType::Sync
     include Concerns::ContentType::GroupBy
     include Concerns::ContentType::OrderBy
@@ -26,6 +26,7 @@ module Locomotive
     field :public_submission_accounts,  type: Array
     field :filter_fields,               type: Array
     field :number_of_entries
+    field :display_settings,            type: Hash
 
     ## associations ##
     belongs_to  :site,      class_name: 'Locomotive::Site', validate: false
@@ -36,6 +37,7 @@ module Locomotive
     scope :by_id_or_slug, ->(id_or_slug) {
       any_of({ _id: id_or_slug }, { slug: id_or_slug })
     }
+    scope :localized, -> { elem_match(entries_custom_fields: { localized: true }) }
 
     ## indexes ##
     index site_id: 1, slug: 1
@@ -93,6 +95,15 @@ module Locomotive
       _field || self.entries_custom_fields.where(name: id_or_name).first
     end
 
+    # A localized content type owns at least one localized field.
+    def localized?
+      self.entries_custom_fields.where(localized: true).count > 0
+    end
+
+    def hidden?
+      (self.display_settings || {})['hidden']
+    end
+
     protected
 
     def normalize_slug

data/app/models/locomotive/editable_element.rb

@@ -21,14 +21,24 @@ module Locomotive
     validates_presence_of :slug
 
     ## callbacks ##
-    # after_save :propagate_content, if: :fixed?
 
     ## scopes ##
     scope :by_priority,         -> { order_by(priority: :desc) }
     scope :by_block_and_slug,   ->(block, slug) { where(block: block, slug: slug) }
 
+    ## non-persisted attributes ##
+    attr_accessor :block_name, :block_priority
+
     ## methods ##
 
+    def label
+      self.slug
+    end
+
+    def block_label
+      (@block_name || self.block).humanize
+    end
+
     def disabled?
       !!self.disabled # the original method does not work quite well with the localization
     end
@@ -41,80 +51,6 @@ module Locomotive
       self._parent.try(:_id)
     end
 
-    def humanized_id
-      [self.block, self.slug].compact.join('_').gsub('/', '_')
-    end
-
-    # def disabled_in_all_translations?
-    #   return self.disabled_translations if self.disabled_translations.is_a?(Boolean)
-    #   return false if disabled_translations.blank?
-    #   self.disabled_translations.all? { |_, v| v == true }
-    # end
-
-    # # Determines if the current element can be edited in the back-office
-    # #
-    # def editable?
-    #   !self.disabled? &&
-    #   self.locales.include?(::Mongoid::Fields::I18n.locale.to_s) &&
-    #   (!self.fixed? || !self.from_parent?) &&
-    #   !self.destroyed?
-    # end
-
-    # def _run_rearrange_callbacks
-    #   # callback from page/tree. not needed in the editable elements
-    # end
-
-    # def default_content?
-    #   # needs to be overridden for each kind of elements
-    #   true
-    # end
-
-    # # Copy attributes extracted from the corresponding Liquid tag
-    # # Each editable element overrides this method.
-    # #
-    # # @param [ Hash ] attributes The up-to-date attributes
-    # #
-    # def copy_attributes(attributes)
-    #   # _type is among the mass-assign protected attributes.
-    #   if type = attributes.delete(:_type)
-    #     self._type = type
-    #   end
-
-    #   self.attributes = attributes
-    # end
-
-    # # Copy attributes from an existing editable element coming
-    # # from the parent page. Each type of an editable element may or not
-    # # override this method. The source element is a new record.
-    # #
-    # # @param [ EditableElement] el The source element
-    # #
-    # def copy_attributes_from(el)
-    #   self.attributes   = el.attributes.reject { |attr| !%w(slug block hint priority fixed disabled locales from_parent).include?(attr) }
-    #   self.from_parent  = true
-    # end
-
-    # # Copy the default attributes: _type, hint, fixed, priority and locales
-    # # from an existing editable element coming from the parent page.
-    # # Each type of an editable element may or not override this method for
-    # # options for instance.
-    # #
-    # # @param [ EditableElement] el The source element
-    # #
-    # def copy_default_attributes_from(el)
-    #   # only the type, hint and fixed properties can be modified from the element
-    #   %w(_type hint fixed priority locales).each do |attr|
-    #     self.send(:"#{attr}=", el.send(attr.to_sym))
-    #   end
-    # end
-
-    # # Set the default content from an existing editable element coming
-    # # from the parent page. Each editable element may or not
-    # # override this method. The source element is an existing record.
-    # def set_default_content_from(el)
-    #   self.add_current_locale
-    # end
-
     # Make sure the current locale is added to the list
     # of locales for the current element so that we know
     # in which languages the element was translated.
@@ -124,36 +60,5 @@ module Locomotive
       self.locales << locale unless self.locales.include?(locale)
     end
 
-    # # Set the content of the editable element with a default value
-    # # only if the content has not already been modified by the user.
-    # #
-    # # @param [ String ] content The default content.
-    # #
-    # def content_from_default=(content)
-    #   # needs to be overridden for each kind of elements
-    # end
-
-    # protected
-
-    # def _selector
-    #   locale = ::Mongoid::Fields::I18n.locale
-    #   {
-    #     'site_id'                         => self.page.site_id,
-    #     "template_dependencies.#{locale}" => { '$in' => [self.page._id] },
-    #     'editable_elements.fixed'         => true,
-    #     'editable_elements.block'         => self.block,
-    #     'editable_elements.slug'          => self.slug,
-    #   }
-    # end
-
-    # # Update the value (or content) of the elements matching the same block/slug
-    # # as the current element in all the pages inheriting from the current page.
-    # # This method is called only if the element has the "fixed" property set to true.
-    # # It also needs to be overridden for each kind of elements (file, short text, ...etc)
-    # #
-    # def propagate_content
-    #   true
-    # end
-
   end
 end

data/app/models/locomotive/editable_file.rb

@@ -10,7 +10,7 @@ module Locomotive
     field :default_source_url, localize: true
 
     ## callbacks ##
-    # after_save :propagate_content
+    after_initialize :init_localized_source
 
     ## methods ##
 
@@ -27,64 +27,17 @@ module Locomotive
 
     alias :content= :source=
 
-    # def default_content?
-    #   !self.source? && self.default_source_url.present?
-    # end
-
-    # def copy_attributes(attributes)
-    #   unless self.default_content?
-    #     attributes.delete(:default_source_url)
-    #   end
-
-    #   super(attributes)
-    # end
-
-    # def copy_attributes_from(el)
-    #   super(el)
-
-    #   if el.source_translations.blank?
-    #     self.attributes['default_source_url'] = el.attributes['default_source_url'] || {}
-    #   else
-    #     el.source_translations.keys.each do |locale|
-    #       ::Mongoid::Fields::I18n.with_locale(locale) do
-    #         self.default_source_url = el.source? ? el.source.url : el.default_source_url
-    #       end
-    #     end
-    #   end
-    # end
-
-    # def set_default_content_from(el)
-    #   super(el)
-
-    #   locale = ::Mongoid::Fields::I18n.locale.to_s
-
-    #   # make sure the default_source_url is safely defined
-    #   self.attributes['default_source_url'] ||= { locale => nil }
-
-    #   if self.attributes['default_source_url'][locale].nil?
-    #     self.default_source_url = el.default_source_url
-    #   end
-    # end
-
     def remove_source=(value)
       self.source_will_change! # notify the page to run the callbacks for that element
       super
     end
 
-    # protected
+    private
 
-    # def propagate_content
-    #   if self.source_changed?
-    #     operations  = {
-    #       '$set' => {
-    #         "editable_elements.$.default_source_url.#{::Mongoid::Fields::I18n.locale}" => self.source.url
-    #       }
-    #     }
-
-    #     self.page.collection.find(self._selector).update(operations, multi: true)
-    #   end
-    #   true
-    # end
+    def init_localized_source
+      # FIXME: the source of the element is not correctly set for the first time (certainly because the source is localized)
+      attributes[:source] = {} unless self.persisted?
+    end
 
   end
 end

data/app/models/locomotive/editable_model.rb

@@ -0,0 +1,13 @@
+module Locomotive
+  class EditableModel < EditableElement
+
+    def content_type
+      @content_type ||= self.page.site.content_types.by_id_or_slug(self.slug).first
+    end
+
+    def label
+      self.content_type.name
+    end
+
+  end
+end

data/app/models/locomotive/editable_text.rb

@@ -32,59 +32,8 @@ module Locomotive
       end
     end
 
-    # def copy_attributes_from(el)
-    #   super(el)
-
-    #   self.copy_formatting_attributes_from(el)
-
-    #   self.attributes['content']          = el.content_translations || {}
-    #   self.attributes['default_content']  = el.default_content_translations
-    # end
-
-    # def copy_default_attributes_from(el)
-    #   super(el)
-
-    #   self.copy_formatting_attributes_from(el)
-    # end
-
-    # def copy_formatting_attributes_from(el)
-    #   %w(format rows line_break).each do |attr|
-    #     self.attributes[attr] = el.attributes[attr]
-    #   end
-    # end
-
-    # def set_default_content_from(el)
-    #   super(el)
-
-    #   locale = ::Mongoid::Fields::I18n.locale.to_s
-
-    #   if self.default_content? || self.attributes['default_content'][locale].nil?
-    #     self.default_content = true
-
-    #     self.content_will_change!
-
-    #     if self.attributes['content']
-    #       self.attributes['content'][locale] = el.content
-    #     end
-    #   end
-    # end
-
     protected
 
-    # def propagate_content
-    #   if self.content_changed?
-    #     operations  = {
-    #       '$set' => {
-    #         "editable_elements.$.content.#{::Mongoid::Fields::I18n.locale}"         => self.content,
-    #         "editable_elements.$.default_content.#{::Mongoid::Fields::I18n.locale}" => false,
-    #       }
-    #     }
-
-    #     self.page.collection.find(self._selector).update(operations, multi: true)
-    #   end
-    #   true
-    # end
-
     def strip_content
       self.content.strip! unless self.content.blank?
     end

data/app/models/locomotive/page.rb

@@ -31,19 +31,21 @@ module Locomotive
     belongs_to :site, class_name: 'Locomotive::Site', validate: false, autosave: false
 
     ## indexes ##
-    index site_id:    1
-    index parent_id:  1
-    index fullpath:   1, site_id: 1
+    index site_id: 1
+    index site_id: 1, handle: 1
+    index parent_id: 1
+    index site_id: 1, fullpath: 1
 
     ## behaviours ##
     slugify_from        :title
 
     ## callbacks ##
-    after_initialize    :set_default_raw_template
-    before_save         :build_fullpath
-    before_save         :record_current_locale
+    before_create       :localize_slug
+    before_create       :build_fullpath
+    before_update       :build_fullpath, unless: :skip_callbacks_on_update
+    before_save         :record_current_locale, unless: :skip_callbacks_on_update
     before_destroy      :do_not_remove_index_and_404_pages
-    after_save          :update_children
+    after_save          :update_children, unless: :skip_callbacks_on_update
 
     ## validations ##
     validates_presence_of     :site,    :title, :slug
@@ -64,6 +66,8 @@ module Locomotive
 
     delegate :fullpath, to: :parent, prefix: true
 
+    attr_accessor :skip_callbacks_on_update
+
     ## methods ##
 
     def index?
@@ -109,28 +113,38 @@ module Locomotive
     def do_not_remove_index_and_404_pages
       return if self.site.nil? || self.site.destroyed?
 
-      if self.index? || self.not_found?
+      if self.index_or_not_found?
         self.errors[:base] << ::I18n.t('errors.messages.protected_page')
       end
 
       self.errors.empty?
     end
 
-    def set_default_raw_template
-      begin
-        self.raw_template ||= ::I18n.t('attributes.defaults.pages.other.body')
-      rescue ActiveModel::MissingAttributeError
-        # page not loaded from MongoDB without the raw_template attribute
+    # The slug of a new page should be the same in all
+    # the locales of a site.
+    def localize_slug
+      _slug = self.slug
+
+      self.site.each_locale(false) do |locale, _|
+        self.slug = _slug
       end
     end
 
     def build_fullpath
-      if self.index? || self.not_found?
+      if self.index_or_not_found?
         self.fullpath = self.slug
       else
-        slugs = self.ancestors_and_self.map(&:slug)
-        slugs.shift unless slugs.size == 1
-        self.fullpath = slugs.compact.join('/')
+        _parent = self.parent # do not hit the database more than once
+
+        self.site.each_locale do |locale, current|
+          # if the page has been already persisted, we don't need to update the fullpath
+          # in the locales other than in the current one.
+          next if self.persisted? && !current
+
+          parent_fullpath = self.depth == 1 ? nil : _parent.try(:fullpath)
+
+          self.fullpath = [parent_fullpath, self.slug].compact.join('/')
+        end
       end
     end