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

data/app/inputs/locomotive/code_input.rb

@@ -1,51 +1,5 @@
 module Locomotive
-  class CodeInput < ::SimpleForm::Inputs::TextInput # FormtasticBootstrap::Inputs::TextInput
-
-    # def input_wrapping(&block)
-    #   elements = [template.capture(&block), error_html, toolbar_html, hint_html]
-
-    #   template.content_tag(:li, elements.join("\n").html_safe, wrapper_html_options)
-    # end
-
-    # def hint_text
-    #   localized_string(method, options[:hint], :hint)
-    # end
-
-    # def to_html
-    #   input_wrapping do
-    #     builder.text_area(method, input_html_options)
-    #   end
-    # end
-
-    # def toolbar_html
-    #   elements = [image_picker_html, copy_from_main_locale_html].compact
-
-    #   return '' if elements.size == 0
-
-    #   template.content_tag(:div,
-    #     elements.join('&nbsp;|&nbsp;').html_safe,
-    #     class: 'more error-anchor')
-    # end
-
-    # def image_picker_html
-    #   return nil if options.delete(:picker) == false
-
-    #   template.link_to(
-    #     template.content_tag(:i, '', class: 'icon-picture') +
-    #     template.t('locomotive.code_editing.image_picker'),
-    #     template.theme_assets_path, id: 'image-picker-link', class: 'picture')
-    # end
-
-    # def copy_from_main_locale_html
-    #   url = options.delete(:main_locale_template_url)
-
-    #   return nil unless url
-
-    #   template.link_to(
-    #     template.content_tag(:i, '', class: 'icon-download') +
-    #     template.t('locomotive.code_editing.copy_template'),
-    #     url, id: 'copy-template-link', class: 'copy')
-    # end
+  class CodeInput < ::SimpleForm::Inputs::TextInput
 
   end
 end

data/app/inputs/locomotive/document_picker_input.rb

@@ -2,6 +2,7 @@ module Locomotive
   class DocumentPickerInput < ::SimpleForm::Inputs::Base
 
     include Locomotive::SimpleForm::BootstrapHelpers
+    include Locomotive::SimpleForm::Inputs::FasterTranslate
 
     def input(wrapper_options)
       data = extract_data

data/app/inputs/locomotive/rte_input.rb

@@ -1,6 +1,8 @@
 module Locomotive
   class RteInput < ::SimpleForm::Inputs::Base
 
+    include Locomotive::SimpleForm::Inputs::FasterTranslate
+
     def input(wrapper_options)
       input_html_options[:class] << 'form-control'
       toolbar_html + @builder.text_area(attribute_name, input_html_options)

data/app/inputs/locomotive/toggle_input.rb

@@ -1,6 +1,8 @@
 module Locomotive
   class ToggleInput < ::SimpleForm::Inputs::Base
 
+    include Locomotive::SimpleForm::Inputs::FasterTranslate
+
     def input(wrapper_options)
       template.content_tag(:div, class: 'toggle-wrapper') do
         @builder.check_box attribute_name, data: {

data/app/models/locomotive/activity.rb

@@ -0,0 +1,32 @@
+module Locomotive
+  class Activity
+
+    include Locomotive::Mongoid::Document
+
+    ## fields ##
+    field :key
+    field :parameters,  type: Hash
+
+    ## associations ##
+    belongs_to :site,       class_name: 'Locomotive::Site', validate: false, autosave: false
+    belongs_to :actor,      class_name: 'Locomotive::Account', validate: false, autosave: false
+
+    ## validations ##
+    validates_presence_of :key
+
+    ## indexes ##
+    index site_id: 1
+    index site_id: 1, created_at: 1
+
+    ## methods ##
+
+    def domain
+      self.key.split('.').first
+    end
+
+    def action
+      self.key.split('.').last
+    end
+
+  end
+end

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

@@ -11,7 +11,8 @@ module Locomotive
           field :_translated, type: Boolean, localize: true
 
           ## callbacks ##
-          before_save :persist_translated_status
+          before_create :localize_slug
+          before_save   :persist_translated_status
 
         end
 
@@ -70,6 +71,16 @@ module Locomotive
 
         protected
 
+        def localize_slug
+          return unless localized?
+
+          current_slug = self._slug
+
+          self.site.each_locale(false) do |locale, _|
+            self._slug = current_slug
+          end
+        end
+
         def persist_translated_status
           self._translated = self.translated?
         end

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

@@ -0,0 +1,52 @@
+module Locomotive
+  module Concerns
+    module ContentType
+      module EntryTemplate
+
+        extend ActiveSupport::Concern
+
+        included do
+          ## fields ##
+          field :entry_template
+
+          ## validation ##
+          validate :entry_template_must_be_valid
+        end
+
+        def render_entry_template(context)
+          return nil if entry_template.blank?
+          parsed_entry_template.render(context)
+        end
+
+        def to_steam
+          @steam_content_type ||= steam_repositories.content_type.build(self.attributes.symbolize_keys)
+        end
+
+        def to_steam_entry(entry)
+          entry_attributes = entry.attributes.symbolize_keys
+
+          steam_repositories.content_entry.with(to_steam).build(entry_attributes)
+        end
+
+        def steam_repositories
+          @steam_repositories ||= Locomotive::Steam::Services.build_instance.repositories
+        end
+
+        protected
+
+        def parsed_entry_template
+          @parsed_entry_template ||= ::Liquid::Template.parse(self.entry_template)
+        end
+
+        def entry_template_must_be_valid
+          begin
+            parsed_entry_template
+          rescue ::Liquid::SyntaxError => error
+            self.errors.add :entry_template, error.to_s
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -13,121 +13,10 @@ module Locomotive
           accepts_nested_attributes_for :editable_elements
         end
 
-        # def disable_parent_editable_elements(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
-        #   self.editable_elements.each { |el| el.disabled = true }
-        # end
-
-        # def editable_element_blocks
-        #   self.editable_elements.collect(&:block)
-        # end
-
-        # def enabled_editable_elements
-        #   self.editable_elements.by_priority.find_all(&:editable?)
-        # end
-
-        # def editable_elements_grouped_by_blocks
-        #   groups = self.enabled_editable_elements.group_by(&:block)
-        #   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
 
-        # def find_editable_files
-        #   self.editable_elements.find_all { |el| el.respond_to?(:source) }
-        # end
-
-        # def add_or_update_editable_element(attributes, type)
-        #   element = self.find_editable_element(attributes[:block], attributes[:slug])
-
-        #   if element
-        #     element.copy_attributes(attributes)
-        #   else
-        #     element = self.editable_elements.build(attributes, type)
-        #   end
-
-        #   element.add_current_locale
-
-        #   element
-        # 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
-
-        # def merge_editable_elements_from_page(source)
-        #   source.editable_elements.each do |el|
-        #     next if el.disabled?
-
-        #     existing_el = self.find_editable_element(el.block, el.slug)
-
-        #     if existing_el.nil? # new one from parents
-        #       new_el = self.editable_elements.build({}, el.class)
-        #       new_el.copy_attributes_from(el)
-        #     elsif existing_el.from_parent? # it inherits from a parent page
-        #       existing_el.disabled = false
-
-        #       # same type ? if not, convert it
-        #       if existing_el._type != el._type
-        #         existing_el = self.change_element_type(existing_el, el.class)
-        #       end
-
-        #       # make sure the default content gets updated too
-        #       existing_el.set_default_content_from(el)
-
-        #       # copy _type, hint, fixed, priority and locales + type custom attributes
-        #       existing_el.copy_default_attributes_from(el)
-        #     end
-        #   end
-        # end
-
-        # def change_element_type(element, klass)
-        #   # build the new element
-        #   self.editable_elements.build({}, klass).tap do |new_element|
-        #     # copy the most important mongoid internal attributes
-        #     %w{_id _index new_record}.each do |attr|
-        #       new_element.send(:"#{attr}=", element.send(attr.to_sym))
-        #     end
-
-        #     # copy the main attributes from the previous version
-        #     new_element.attributes = element.attributes.reject { |attr| !%w(slug block from_parent).include?(attr) }
-
-        #     # remove the old one
-        #     self.editable_elements.delete_one(element)
-        #   end
-        # end
-
-        # def remove_disabled_editable_elements
-        #   # get only those which are fully disabled, meaning in ALL the locales
-        #   ids = self.editable_elements.find_all { |el| el.disabled_in_all_translations? }.map(&:_id)
-
-        #   return if ids.empty?
-
-        #   # super fast way to remove useless elements all in once
-        #   self.collection.find(self.atomic_selector).update('$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
     end
   end

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

@@ -16,7 +16,7 @@ module Locomotive
           has_many    :layout_children, class_name: 'Locomotive::Page', inverse_of: :layout
 
           ## callbacks ##
-          before_validation :set_default_raw_template_if_layout
+          before_validation :set_default_raw_template
 
           ## scopes ##
           scope :layouts, -> { where(is_layout: true) }
@@ -29,14 +29,29 @@ module Locomotive
 
         private
 
-        def set_default_raw_template_if_layout
-          return true unless self.allow_layout?
+        def set_default_raw_template
+          if self.allow_layout?
+            set_default_raw_template_if_layout
+          else
+            set_default_raw_template_if_no_layout
+          end
+        end
 
+        def set_default_raw_template_if_layout
           if self.layout
             self.raw_template = %({% extends "#{self.layout.fullpath}" %})
-          elsif self.layout_id_was
-            # use case: layout -> no layout
-            self.raw_template = nil
+          elsif self.layout_id == 'parent'
+            self.raw_template = "{% extends 'parent' %}"
+          end
+        end
+
+        def set_default_raw_template_if_no_layout
+          return true if self.raw_template.present?
+
+          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' %}"
           end
         end
 

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

@@ -23,7 +23,9 @@ module Locomotive
           validate                  :domains_must_be_valid_and_unique
 
           ## callbacks ##
-          after_destroy :clear_cache_for_all_domains
+          before_validation :prepare_domain_sync
+          after_save        :emit_domain_sync_event
+          after_destroy     :emit_domain_deletion_event
 
           ## named scopes ##
           scope :match_domain, lambda { |domain| { any_in: { domains: [*domain] } } }
@@ -51,6 +53,12 @@ module Locomotive
 
         protected
 
+        def prepare_domain_sync
+          previous_domains  = self.domains_was || []
+          @added_domains    = self.domains - previous_domains
+          @removed_domains  = previous_domains - self.domains
+        end
+
         def domains_must_be_valid_and_unique
           return if self.domains.empty?
 
@@ -65,8 +73,21 @@ module Locomotive
           end
         end
 
-        def clear_cache_for_all_domains
-          self.domains.each { |name| Rails.cache.delete(name) }
+        def emit_domain_sync_event
+          return if @added_domains.blank? && @removed_domains.blank?
+
+          ActiveSupport::Notifications.instrument 'locomotive.site.domain_sync', {
+            added:    @added_domains,
+            removed:  @removed_domains
+          }
+        end
+
+        def emit_domain_deletion_event
+          return if self.domains.empty?
+
+          ActiveSupport::Notifications.instrument 'locomotive.site.domain_sync', {
+            removed: self.domains
+          }
         end
 
       end

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

@@ -16,7 +16,6 @@ module Locomotive
 
           ## callbacks ##
           after_validation  :add_default_locale
-          before_update     :verify_localized_default_pages_integrity
 
         end
 
@@ -67,7 +66,7 @@ module Locomotive
         end
 
         def is_default_locale?(locale)
-          locale == default_locale.to_s
+          locale.to_s == default_locale.to_s
         end
 
         def default_locale_was
@@ -82,10 +81,13 @@ module Locomotive
         # call yield with the related Mongoid::Fields::I18n locale context.
         # The first locale is the default one.
         #
-        def each_locale(&block)
-          self.locales.each do |locale|
+        def each_locale(include_default_locale = true, &block)
+          current_locale = ::Mongoid::Fields::I18n.locale
+          _locales = include_default_locale ? self.locales : (self.locales - [self.default_locale])
+
+          _locales.each do |locale|
             ::Mongoid::Fields::I18n.with_locale(locale) do
-              yield locale
+              yield locale, current_locale.to_s == locale.to_s
             end
           end
         end
@@ -110,28 +112,6 @@ module Locomotive
           end
         end
 
-        # Verify if the index and 404 pages in ALL the locales of the site
-        # have a non empty slug, fullpath and title. If not, it sets them.
-        #
-        def verify_localized_default_pages_integrity
-          if self.persisted? && self.locales_changed?
-            self.pages.where(:"slug.#{self.default_locale_was}".in => %w(index 404), depth: 0).each do |page|
-              modifications = { 'title' => {}, 'slug' => {}, 'fullpath' => {}, 'locales' => self.locales }
-
-              self.locales.each do |locale|
-                slug  = page.attributes['slug'][self.default_locale_was]
-                title = page.attributes['title'][locale] || ::I18n.t("attributes.defaults.pages.#{slug}.title", locale: locale)
-
-                modifications['slug'][locale]     = slug
-                modifications['fullpath'][locale] = slug
-                modifications['title'][locale]    = title
-              end
-
-              page.collection.find(_id: page._id).update('$set' => modifications)
-            end
-          end
-        end
-
       end
 
     end