locomotive_cms 2.0.0.rc12 → 2.0.0

data/app/models/locomotive/content_type.rb

@@ -13,33 +13,40 @@ module Locomotive
     field :name
     field :description
     field :slug
-    field :label_field_id,              :type => BSON::ObjectId
+    field :label_field_id,              type: BSON::ObjectId
     field :label_field_name
-    field :group_by_field_id,           :type => BSON::ObjectId
+    field :group_by_field_id,           type: BSON::ObjectId
     field :order_by
-    field :order_direction,             :default => 'asc'
-    field :public_submission_enabled,   :type => Boolean, :default => false
-    field :public_submission_accounts,  :type => Array
+    field :order_direction,             default: 'asc'
+    field :public_submission_enabled,   type: Boolean, default: false
+    field :public_submission_accounts,  type: Array
 
     ## associations ##
-    belongs_to  :site,      :class_name => 'Locomotive::Site'
-    has_many    :entries,   :class_name => 'Locomotive::ContentEntry', :dependent => :destroy
+    belongs_to  :site,      class_name: 'Locomotive::Site'
+    has_many    :entries,   class_name: 'Locomotive::ContentEntry', dependent: :destroy do
+
+      def find_by_id_or_permalink(id_or_permalink)
+        any_of({ _id: id_or_permalink }, { _slug: id_or_permalink }).first
+      end
+
+    end
 
     ## named scopes ##
-    scope :ordered, :order_by => :updated_at.desc
+    scope :ordered, order_by: :updated_at.desc
 
     ## indexes ##
     index [[:site_id, Mongo::ASCENDING], [:slug, Mongo::ASCENDING]]
 
     ## callbacks ##
     before_validation   :normalize_slug
+    before_validation   :sanitize_public_submission_accounts
     after_validation    :bubble_fields_errors_up
     before_update       :update_label_field_name_in_entries
 
     ## validations ##
     validates_presence_of   :site, :name, :slug
-    validates_uniqueness_of :slug, :scope => :site_id
-    validates_size_of       :entries_custom_fields, :minimum => 1, :message => :too_few_custom_fields
+    validates_uniqueness_of :slug, scope: :site_id
+    validates_size_of       :entries_custom_fields, minimum: 1, message: :too_few_custom_fields
 
     ## behaviours ##
     custom_fields_for :entries
@@ -70,7 +77,7 @@ module Locomotive
     end
 
     def group_by_field
-      self.entries_custom_fields.find(self.group_by_field_id) rescue nil
+      self.find_entries_custom_field(self.group_by_field_id)
     end
 
     def list_or_group_entries
@@ -91,7 +98,7 @@ module Locomotive
 
     def label_field_id=(value)
       # update the label_field_name if the label_field_id is changed
-      new_label_field_name = self.entries_custom_fields.where(:_id => value).first.try(:name)
+      new_label_field_name = self.entries_custom_fields.where(_id: value).first.try(:name)
       self.label_field_name = new_label_field_name
       super(value)
     end
@@ -102,6 +109,28 @@ module Locomotive
       super(value)
     end
 
+    # Get the class name of the entries.
+    #
+    # @return [ String ] The class name of all the entries
+    #
+    def entries_class_name
+      self.klass_with_custom_fields(:entries).to_s
+    end
+
+    # Find a custom field describing an entry based on its id
+    # in first or its name if not found.
+    #
+    # @param [ String ] id_or_name The id of name of the field
+    #
+    # @return [ Object ] The custom field or nit if not found
+    #
+    def find_entries_custom_field(id_or_name)
+      return nil if id_or_name.nil? # bypass the memoization
+
+      _field = self.entries_custom_fields.find(id_or_name) rescue nil
+      _field || self.entries_custom_fields.where(name: id_or_name).first
+    end
+
     # Retrieve from a class name the associated content type within the scope of a site.
     # If no content type is found, the method returns nil
     #
@@ -111,21 +140,13 @@ module Locomotive
     # @return [ Locomotive::ContentType ] The content type matching the class_name
     #
     def self.class_name_to_content_type(class_name, site)
-      if class_name =~ /^Locomotive::Entry(.*)/
+      if class_name =~ /^Locomotive::ContentEntry(.*)/
         site.content_types.find($1)
       else
         nil
       end
     end
 
-    def to_presenter
-      Locomotive::ContentTypePresenter.new(self)
-    end
-
-    def as_json(options = {})
-      self.to_presenter.as_json
-    end
-
     protected
 
     def group_by_belongs_to_field(field)
@@ -137,15 +158,15 @@ module Locomotive
       all_columns.map do |column|
         if columns.include?(column._id)
           {
-            :name     => column._label(target_content_type),
-            :entries  => grouped_entries.delete(column._id)
+            name:     column._label(target_content_type),
+            entries:  grouped_entries.delete(column._id)
           }
         else
           nil
         end
       end.compact.tap do |groups|
         unless grouped_entries.empty? # "orphans" ?
-          groups << { :name => nil, :entries => grouped_entries.values.flatten }
+          groups << { name: nil, entries: grouped_entries.values.flatten }
         end
       end
     end
@@ -157,13 +178,20 @@ module Locomotive
 
     def normalize_slug
       self.slug = self.name.clone if self.slug.blank? && self.name.present?
-      self.slug.permalink! if self.slug.present?
+      self.slug.permalink!(true) if self.slug.present?
+    end
+
+    # We do not want to have a blank value in the list of accounts.
+    def sanitize_public_submission_accounts
+      if self.public_submission_accounts
+        self.public_submission_accounts.reject! { |id| id.blank? }
+      end
     end
 
     def bubble_fields_errors_up
       return if self.errors[:entries_custom_fields].empty?
 
-      hash = { :base => self.errors[:entries_custom_fields] }
+      hash = { base: self.errors[:entries_custom_fields] }
 
       self.entries_custom_fields.each do |field|
         next if field.valid?
@@ -175,7 +203,7 @@ module Locomotive
     end
 
     def update_label_field_name_in_entries
-      self.klass_with_custom_fields(:entries).update_all :_label_field_name => self.label_field_name
+      self.klass_with_custom_fields(:entries).update_all _label_field_name: self.label_field_name
     end
 
     # Makes sure the class_name filled in a belongs_to or has_many field
@@ -185,7 +213,7 @@ module Locomotive
     # @param [ CustomFields::Field ] field The field to check
     #
     def ensure_class_name_security(field)
-      if field.class_name =~ /^Locomotive::Entry([a-z0-9]+)$/
+      if field.class_name =~ /^Locomotive::ContentEntry([a-z0-9]+)$/
         content_type = Locomotive::ContentType.find($1)
 
         if content_type.site_id != self.site_id

data/app/models/locomotive/editable_control.rb

@@ -31,10 +31,6 @@ module Locomotive
       end
     end
 
-    def as_json(options = {})
-      Locomotive::EditableControlPresenter.new(self).as_json
-    end
-
     protected
 
     def propagate_content

data/app/models/locomotive/editable_element.rb

@@ -1,7 +1,8 @@
 module Locomotive
   class EditableElement
 
-    include ::Mongoid::Document
+    # include ::Mongoid::Document
+    include Locomotive::Mongoid::Document
 
     ## fields ##
     field :slug
@@ -38,7 +39,10 @@ module Locomotive
     # 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.disabled? &&
+      self.locales.include?(::Mongoid::Fields::I18n.locale.to_s) &&
+      (!self.fixed? || !self.from_parent?) &&
+      !self.destroyed?
     end
 
     def _run_rearrange_callbacks
@@ -70,6 +74,13 @@ module Locomotive
       self.from_parent  = true
     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.
@@ -97,7 +108,7 @@ module Locomotive
         "template_dependencies.#{locale}" => { '$in' => [self.page._id] },
         'editable_elements.fixed'         => true,
         'editable_elements.block'         => self.block,
-        'editable_elements.slug'          => self.slug
+        'editable_elements.slug'          => self.slug,
       }
     end
 
@@ -111,4 +122,4 @@ module Locomotive
     end
 
   end
-end
+end

data/app/models/locomotive/editable_file.rb

@@ -51,16 +51,22 @@ module Locomotive
       end
     end
 
+    def set_default_content_from(el)
+      super(el)
+
+      locale = ::Mongoid::Fields::I18n.locale.to_s
+
+      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
       self.default_source_url = nil
       super
     end
 
-    def as_json(options = {})
-      Locomotive::EditableFilePresenter.new(self).as_json
-    end
-
     protected
 
     def propagate_content
@@ -76,4 +82,4 @@ module Locomotive
     end
 
   end
-end
+end

data/app/models/locomotive/editable_long_text.rb

@@ -1,11 +1,5 @@
 module Locomotive
   class EditableLongText < EditableShortText
 
-    ## methods ##
-
-    def as_json(options = {})
-      Locomotive::EditableLongTextPresenter.new(self).as_json
-    end
-
   end
-end
+end

data/app/models/locomotive/editable_short_text.rb

@@ -33,8 +33,17 @@ module Locomotive
       self.attributes['default_content']  = el.default_content_translations
     end
 
-    def as_json(options = {})
-      Locomotive::EditableShortTextPresenter.new(self).as_json
+    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!
+        self.attributes['content'][locale] = el.content
+      end
     end
 
     protected
@@ -54,4 +63,4 @@ module Locomotive
     end
 
   end
-end
+end

data/app/models/locomotive/extensions/content_type/default_values.rb

@@ -14,10 +14,8 @@ module Locomotive
         protected
 
         def set_order_by
-          unless self.order_by.nil? || %w(created_at updated_at _position).include?(self.order_by)
-            field = self.entries_custom_fields.where(:name => self.order_by).first || self.entries_custom_fields.find(self.order_by)
-
-            if field
+          unless self.order_by.blank? || %w(created_at updated_at _position).include?(self.order_by)
+            if field = self.find_entries_custom_field(self.order_by)
               self.order_by = field._id
             end
           end

data/app/models/locomotive/extensions/page/editable_elements.rb

@@ -6,7 +6,7 @@ module Locomotive
         extend ActiveSupport::Concern
 
         included do
-          embeds_many   :editable_elements, :class_name => 'Locomotive::EditableElement', :cascade_callbacks => true
+          embeds_many   :editable_elements, class_name: 'Locomotive::EditableElement', cascade_callbacks: true
 
           after_save    :remove_disabled_editable_elements
 
@@ -14,7 +14,12 @@ module Locomotive
         end
 
         def disable_parent_editable_elements(block)
-          self.editable_elements.each { |el| el.disabled = true if el.from_parent? && el.block == block }
+          Rails.logger.debug "[disable_parent_editable_elements] #{block.inspect}"
+          self.editable_elements.each do |el|
+            if el.from_parent? && (el.block == block || el.block =~ %r(^#{block}/))
+              el.disabled = true
+            end
+          end
         end
 
         def disable_all_editable_elements
@@ -34,6 +39,10 @@ module Locomotive
           groups.delete_if { |block, elements| elements.empty? }
         end
 
+        def find_editable_elements(block)
+          self.editable_elements.find_all { |el| el.block == block }
+        end
+
         def find_editable_element(block, slug)
           self.editable_elements.detect { |el| el.block == block && el.slug == slug }
         end
@@ -57,6 +66,7 @@ module Locomotive
         end
 
         def enable_editable_elements(block)
+          Rails.logger.debug "[enable_editable_elements] #{block.inspect}"
           self.editable_elements.each { |el| el.disabled = false if el.block == block }
         end
 
@@ -72,8 +82,11 @@ module Locomotive
             else
               existing_el.disabled = false
 
+              # make sure the default content gets updated too
+              existing_el.set_default_content_from(el)
+
               # only the type, hint and fixed properties can be modified from the parent element
-              %w(_type hint fixed).each do |attr|
+              %w(_type hint fixed priority locales).each do |attr|
                 existing_el.send(:"#{attr}=", el.send(attr.to_sym))
               end
             end
@@ -88,6 +101,12 @@ module Locomotive
 
           # super fast way to remove useless elements all in once
           self.collection.update(self.atomic_selector, '$pull' => { 'editable_elements' => { '_id' => { '$in' => ids } } })
+
+          # mark them as destroyed
+          self.editable_elements.each do |el|
+            next unless ids.include?(el._id)
+            el.destroyed = true
+          end
         end
 
       end

data/app/models/locomotive/extensions/page/listed.rb

@@ -8,7 +8,7 @@ module Locomotive
         included do
 
           ## fields ##
-          field :listed, :type => Boolean, :default => true
+          field :listed, type: Boolean, default: true
 
         end
 

data/app/models/locomotive/extensions/page/parse.rb

@@ -7,9 +7,9 @@ module Locomotive
 
         included do
           ## fields ##
-          field :serialized_template,   :type => Binary, :localize => true
-          field :template_dependencies, :type => Array, :default => [], :localize => true
-          field :snippet_dependencies,  :type => Array, :default => [], :localize => true
+          field :serialized_template,   type: Binary, localize: true
+          field :template_dependencies, type: Array, default: [], localize: true
+          field :snippet_dependencies,  type: Array, default: [], localize: true
 
           ## virtual attributes
           attr_reader :template_changed
@@ -22,17 +22,23 @@ module Locomotive
           validate :template_must_be_valid
 
           ## scopes ##
-          scope :pages, lambda { |domain| { :any_in => { :domains => [*domain] } } }
+          scope :pages, lambda { |domain| { any_in: { domains: [*domain] } } }
         end
 
         def template
           @template ||= Marshal.load(self.serialized_template.to_s) rescue nil
         end
 
+        def force_serialize_template
+          self.serialize_template
+          @done_serialize_template = true
+        end
+
         protected
 
         def serialize_template
-          if self.new_record? || self.raw_template_changed?
+          if !@done_serialize_template &&
+              (self.new_record? || self.raw_template_changed?)
             @template_changed = true
 
             @parsing_errors = []
@@ -40,11 +46,11 @@ module Locomotive
             begin
               self._parse_and_serialize_template
             rescue ::Liquid::SyntaxError => error
-              @parsing_errors << I18n.t(:liquid_syntax, :fullpath => self.fullpath, :error => error.to_s, :scope => [:errors, :messages, :page])
+              @parsing_errors << I18n.t(:liquid_syntax, fullpath: self.fullpath, error: error.to_s, scope: [:errors, :messages, :page])
             rescue ::Locomotive::Liquid::PageNotFound => error
-              @parsing_errors << I18n.t(:liquid_extend, :fullpath => self.fullpath, :scope => [:errors, :messages, :page])
+              @parsing_errors << I18n.t(:liquid_extend, fullpath: self.fullpath, scope: [:errors, :messages, :page])
             rescue ::Locomotive::Liquid::PageNotTranslated => error
-              @parsing_errors << I18n.t(:liquid_translation, :fullpath => self.fullpath, :scope => [:errors, :messages, :page])
+              @parsing_errors << I18n.t(:liquid_translation, fullpath: self.fullpath, scope: [:errors, :messages, :page])
             end
           end
         end
@@ -61,7 +67,7 @@ module Locomotive
         def parse(context = {})
           self.disable_all_editable_elements
 
-          default_context = { :site => self.site, :page => self, :templates => [], :snippets => [] }
+          default_context = { site: self.site, page: self, templates: [], snippets: [] }
 
           context = default_context.merge(context)
 
@@ -94,7 +100,7 @@ module Locomotive
           # finally save them all
           ::Locomotive::Page.without_callback(:save, :after, :update_template_descendants) do
             template_descendants.each do |page|
-              page.save(:validate => false)
+              page.save(validate: false)
             end
           end
         end
@@ -105,7 +111,7 @@ module Locomotive
           end
 
           direct_descendants.each do |page|
-            page.send(:_parse_and_serialize_template, { :cached_parent => self, :cached_pages => cached })
+            page.send(:_parse_and_serialize_template, { cached_parent: self, cached_pages: cached })
 
             template_descendants.delete(page) # no need to loop over it next time
 
@@ -116,4 +122,4 @@ module Locomotive
       end
     end
   end
-end
+end