locomotive_cms 2.1.4 → 2.2.0

data/app/models/locomotive/editable_file.rb

@@ -2,7 +2,6 @@ module Locomotive
   class EditableFile < EditableElement
 
     ## behaviours ##
-    # mount_uploader :source, EditableFileUploader
     mount_uploader 'source', EditableFileUploader
 
     replace_field 'source', ::String, true
@@ -11,7 +10,6 @@ module Locomotive
     field :default_source_url, localize: true
 
     ## callbacks ##
-    # before_save { |c| puts "#{c.block}/#{c.slug} saved called !"}
     after_save :propagate_content
 
     ## methods ##

data/app/models/locomotive/editable_long_text.rb

@@ -1,5 +1,5 @@
 module Locomotive
-  class EditableLongText < EditableShortText
-
+  class EditableLongText < EditableText
+    # @deprecated
   end
-end
+end

data/app/models/locomotive/editable_short_text.rb

@@ -1,66 +1,5 @@
 module Locomotive
-  class EditableShortText < EditableElement
-
-    ## fields ##
-    field :content,         localize: true
-    field :default_content, type: Boolean, localize: true, default: true
-
-    ## methods ##
-
-    def content=(value)
-      return if value == self.content
-      self.add_current_locale
-      self.default_content = false unless self.new_record?
-      super
-    end
-
-    def default_content?
-      !!self.default_content
-    end
-
-    def content_from_default=(content)
-      if self.default_content?
-        self.content_will_change!
-        self.attributes['content'] ||= {}
-        self.attributes['content'][::Mongoid::Fields::I18n.locale.to_s] = content
-      end
-    end
-
-    def copy_attributes_from(el)
-      super(el)
-
-      self.attributes['content']          = el.content_translations || {}
-      self.attributes['default_content']  = el.default_content_translations
-    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!
-        self.attributes['content'][locale] = el.content
-      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
-
+  class EditableShortText < EditableText
+    # @deprecated
   end
-end
+end

data/app/models/locomotive/editable_text.rb

@@ -0,0 +1,84 @@
+module Locomotive
+  class EditableText < EditableElement
+
+    ## fields ##
+    field :content,         localize: true
+    field :default_content, type: Boolean, localize: true, default: true
+    field :format,          default: 'html'
+    field :rows,            type: Integer, default: 15
+    field :line_break,      type: Boolean, default: true
+
+    ## callbacks ##
+    before_save :strip_content
+
+    ## methods ##
+
+    def content=(value)
+      return if value == self.content
+      self.add_current_locale
+      self.default_content = false unless self.new_record?
+      super
+    end
+
+    def default_content?
+      !!self.default_content
+    end
+
+    def content_from_default=(content)
+      if self.default_content?
+        self.content_will_change!
+        self.attributes['content'] ||= {}
+        self.attributes['content'][::Mongoid::Fields::I18n.locale.to_s] = content
+      end
+    end
+
+    def copy_attributes_from(el)
+      super(el)
+
+      self.attributes['content']          = el.content_translations || {}
+      self.attributes['default_content']  = el.default_content_translations
+    end
+
+    def copy_default_attributes_from(el)
+      super(el)
+
+      %w(format rows line_break).each do |attr|
+        self.send(:"#{attr}=", el.send(attr.to_sym))
+      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!
+        self.attributes['content'][locale] = el.content
+      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
+
+  end
+end

data/app/models/locomotive/extensions/content_entry/csv.rb

@@ -7,16 +7,19 @@ module Locomotive
 
         # Get the values from the custom fields as an array.
         # Values are ordered by the position of the custom fields.
+        # It also adds the created_at value of the instance.
         #
         # @param [ Hash ] options For now, stores only the host for the File fields.
         #
         # @return [ Array ]
         #
         def to_values(options = {})
-          self.content_type.ordered_entries_custom_fields.map do |field|
+          values = self.content_type.ordered_entries_custom_fields.map do |field|
             value = self.send(field.name)
             self.value_from_type(field.type.to_sym, value, options)
           end.compact
+
+          values << I18n.l(self.created_at, format: :long)
         end
 
         protected
@@ -59,13 +62,14 @@ module Locomotive
             end
 
             fields = content_type.ordered_entries_custom_fields
+            labels = fields.map(&:label) << I18n.t('mongoid.attributes.locomotive/content_entry.created_at')
 
             CSV.generate(csv_options) do |csv|
               # header
-              csv << (fields.map(&:label) + [I18n.t('mongoid.attributes.locomotive/content_entry.created_at')])
+              csv << labels
               # body
               all.each do |entry|
-                csv << (entry.to_values(options) + [I18n.l(entry.created_at, format: :long)])
+                csv << entry.to_values(options)
               end
             end
           end

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

@@ -79,16 +79,14 @@ module Locomotive
             if existing_el.nil? # new one from parents
               new_el = self.editable_elements.build({}, el.class)
               new_el.copy_attributes_from(el)
-            else
+            elsif existing_el.from_parent? # it inherits from a parent page
               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 priority locales).each do |attr|
-                existing_el.send(:"#{attr}=", el.send(attr.to_sym))
-              end
+              # copy _type, hint, fixed, priority and locales + type custom attributes
+              existing_el.copy_default_attributes_from(el)
             end
           end
         end

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

@@ -74,6 +74,26 @@ module Locomotive
           [locale.to_s] + (locales - [locale.to_s])
         end
 
+        # Iterate through all the locales of the site and for each of them
+        # 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|
+            ::Mongoid::Fields::I18n.with_locale(locale) do
+              yield locale
+            end
+          end
+        end
+
+        # Call yield within the Mongoid::Fields::I18 context of the default locale.
+        #
+        def with_default_locale(&block)
+          ::Mongoid::Fields::I18n.with_locale(self.default_locale) do
+            yield
+          end
+        end
+
         protected
 
         def add_default_locale

data/app/models/locomotive/extensions/site/timezone.rb

@@ -0,0 +1,35 @@
+module Locomotive
+  module Extensions
+    module Site
+      module Timezone
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          ## fields ##
+          field :timezone_name, type: ::String, default: "UTC"
+          
+          # ## validations ##
+          validate :wrong_timezone_name
+          # 
+          # ## callbacks ##
+          # after_validation  :add_default_locale
+          # before_update     :verify_localized_default_pages_integrity
+        end
+        
+        def timezone
+          @timezone ||= ActiveSupport::TimeZone.new(self.timezone_name)
+        end      
+        
+        protected
+        def wrong_timezone_name
+          unless ActiveSupport::TimeZone.new(self.timezone_name)
+            self.errors.add :timezone, I18n.t(:wrong_timezone_name, scope: [:errors, :messages, :site])
+          end
+        end
+        
+      end
+    end
+  end
+end

data/app/models/locomotive/site.rb

@@ -8,18 +8,20 @@ module Locomotive
     extend  Extensions::Site::FirstInstallation
     include Extensions::Shared::Seo
     include Extensions::Site::Locales
+    include Extensions::Site::Timezone
 
     ## fields ##
     field :name
     field :robots_txt
 
     ## associations ##
-    has_many    :pages,           class_name: 'Locomotive::Page',          validate: false
-    has_many    :snippets,        class_name: 'Locomotive::Snippet',       dependent: :destroy, validate: false
-    has_many    :theme_assets,    class_name: 'Locomotive::ThemeAsset',    dependent: :destroy, validate: false
-    has_many    :content_assets,  class_name: 'Locomotive::ContentAsset',  dependent: :destroy, validate: false
-    has_many    :content_types,   class_name: 'Locomotive::ContentType',   dependent: :destroy, validate: false
-    has_many    :translations,    class_name: 'Locomotive::Translation',   dependent: :destroy, validate: false
+    has_many    :pages,           class_name: 'Locomotive::Page',           validate: false, autosave: false
+    has_many    :snippets,        class_name: 'Locomotive::Snippet',        dependent: :destroy, validate: false, autosave: false
+    has_many    :theme_assets,    class_name: 'Locomotive::ThemeAsset',     dependent: :destroy, validate: false, autosave: false
+    has_many    :content_assets,  class_name: 'Locomotive::ContentAsset',   dependent: :destroy, validate: false, autosave: false
+    has_many    :content_types,   class_name: 'Locomotive::ContentType',    dependent: :destroy, validate: false, autosave: false
+    has_many    :content_entries, class_name: 'Locomotive::ContentEntry',   dependent: :destroy, validate: false, autosave: false
+    has_many    :translations,    class_name: 'Locomotive::Translation',    dependent: :destroy, validate: false, autosave: false
     embeds_many :memberships,     class_name: 'Locomotive::Membership'
 
     ## validations ##
@@ -63,17 +65,19 @@ module Locomotive
     # method is available
     def create_default_pages!
       %w{index 404}.each do |slug|
-        page = self.pages.build(published: true)
-        self.locales.each do |locale|
-          ::Mongoid::Fields::I18n.with_locale(locale) do
-            page.attributes = {
-              slug:         slug,
-              title:        ::I18n.t("attributes.defaults.pages.#{slug}.title", locale: locale),
-              raw_template: ::I18n.t("attributes.defaults.pages.#{slug}.body", locale: locale)
-            }
-          end
+        page = nil
+
+        self.each_locale do |locale|
+          page ||= self.pages.build(published: true) # first locale = default one
+
+          page.attributes = {
+            slug:         slug,
+            title:        ::I18n.t("attributes.defaults.pages.#{slug}.title", locale: locale),
+            raw_template: ::I18n.t("attributes.defaults.pages.#{slug}.body", locale: locale)
+          }
         end
-        page.save
+
+        self.with_default_locale { page.save! }
       end
 
     end

data/app/models/locomotive/theme_asset.rb

@@ -144,7 +144,7 @@ module Locomotive
     def escape_shortcut_urls(text)
       return if text.blank?
 
-      text.gsub(/[("'](\/(stylesheets|javascripts|images|media|others)\/(([^;.]+)\/)*([a-zA-Z_\-0-9]+)\.[a-z]{2,3})(\?[0-9]+)?[)"']/) do |path|
+      text.gsub(/[("'](\/(stylesheets|javascripts|images|media|fonts|others)\/(([^;.]+)\/)*([a-zA-Z_\-0-9]+)\.[a-z]{2,3})(\?[0-9]+)?[)"']/) do |path|
 
         sanitized_path = path.gsub(/[("')]/, '').gsub(/^\//, '').gsub(/\?[0-9]+$/, '')
 

data/app/presenters/locomotive/content_entry_presenter.rb

@@ -19,7 +19,7 @@ module Locomotive
 
     with_options only_getter: true, if: Proc.new { html_view? } do |presenter|
       presenter.properties  :safe_attributes
-      presenter.properties  :select_custom_fields, :file_custom_fields, :has_many_custom_fields, :many_to_many_custom_fields
+      presenter.properties  :select_custom_fields, :file_custom_fields, :belongs_to_custom_fields, :has_many_custom_fields, :many_to_many_custom_fields
     end
 
     ## callbacks ##

data/app/presenters/locomotive/{editable_short_text_presenter.rb → editable_text_presenter.rb}

@@ -1,9 +1,9 @@
 module Locomotive
-  class EditableShortTextPresenter < EditableElementPresenter
+  class EditableTextPresenter < EditableElementPresenter
 
     ## properties ##
-
     properties :content, :default_content
+    properties :format, :line_break, :rows, only_getter: true
 
     ## callbacks ##
 
@@ -26,3 +26,15 @@ module Locomotive
 
   end
 end
+
+module Locomotive
+  class EditableShortTextPresenter < EditableTextPresenter
+    # @deprecated
+  end
+end
+
+module Locomotive
+  class EditableLongTextPresenter < EditableTextPresenter
+    # @deprecated
+  end
+end

data/app/views/locomotive/current_site/_form.html.haml

@@ -10,6 +10,7 @@
 = f.inputs name: :information  do
   = f.input :name, wrapper_html: { style: 'display: none' }
   = f.input :locales, as: '::Locomotive::Locales', collection: ordered_current_site_locales, input_html: { class: 'locales' }
+  = f.input :timezone_name, as: :select, include_blank: false, collection: options_for_site_timezones
 
 - if can?(:point, Locomotive::Site)
   - if manage_subdomain_or_domains?

data/app/views/locomotive/custom_fields/types/_belongs_to.html.haml

@@ -1,5 +1,6 @@
-= f.input :"#{name}_id",
-  label:      field.label,
-  hint:       field.hint,
-  as:         :select,
-  collection: options_for_belongs_to_custom_field(field.class_name)
+= f.input         :"#{name}_id",
+  label:          field.label,
+  hint:           field.hint,
+  as:             :string,
+  wrapper_html:   { class: 'select2' },
+  input_html:     { data: { value: f.object.send(field.name.to_sym).try(:_label), url: content_entries_url(field.class_name_to_content_type.slug, :json), per_page: Locomotive.config.ui[:per_page] } }

data/app/views/locomotive/pages/_editable_elements.html.haml

@@ -18,7 +18,7 @@
 
   %label{ for: 'page_editable_elements_attributes_{{index}}_content' } {{label}}
 
-  = text_area_tag 'page[editable_elements_attributes][{{index}}][content]', '{{content}}', id: 'page_editable_elements_attributes_{{index}}_content'
+  = text_area_tag 'page[editable_elements_attributes][{{index}}][content]', '{{content}}', id: 'page_editable_elements_attributes_{{index}}_content', rows: '{{rows}}'
 
   {{#if hint}}
   %p.inline-hints {{hint}}

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

@@ -14,6 +14,8 @@
 = stylesheet_link_tag     'locomotive', media: 'screen'
 = javascript_include_tag  'locomotive'
 
+= render 'locomotive/shared/main_app_head_before_backbone'
+
 %script{ type: 'text/javascript' }
   :plain
     window.locale                     = '#{I18n.locale}';