locomotive_cms 2.0.3 → 2.1.0

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

@@ -23,12 +23,24 @@ module Locomotive
           after_save        :propagate_templatized
 
           ## scopes ##
-          scope :templatized, where: { templatized: true }
+          scope :templatized, where(templatized: true)
 
           ## virtual attributes ##
           attr_accessor :content_entry
         end
 
+        # Return the content type specified by the target_klass_name property.
+        #
+        # @return [ Object ] The content type or nil if not found
+        #
+        def content_type
+          if self.target_klass_name =~ /^Locomotive::ContentEntry([a-z0-9]+)$/
+            @content_type ||= self.site.content_types.find($1)
+          else
+            nil
+          end
+        end
+
         # Return the class specified by the target_klass_name property
         #
         # @example
@@ -45,15 +57,10 @@ module Locomotive
         # Return the slug related to the target_klass.
         # In other words, it returns the slug of the target content type.
         #
-        # @return [ String ] The slug of the target class / content type. Nil if no target klass.
+        # @return [ String ] The slug of the target class / content type. Nil if no target klass matching a content type
         #
         def target_klass_slug
-          if self.target_klass_name =~ /^Locomotive::ContentEntry([a-z0-9]+)$/
-            @content_type ||= self.site.content_types.find($1)
-            @content_type.slug
-          else
-            nil
-          end
+          self.content_type.try(:slug)
         end
 
         # Set the target klass from the slug of a content type
@@ -84,9 +91,8 @@ module Locomotive
         # @return [ String ] The name in lowercase and underscored
         #
         def target_entry_name
-          if self.target_klass_name =~ /^Locomotive::ContentEntry([a-z0-9]+)$/
-            @content_type ||= self.site.content_types.find($1)
-            @content_type.slug.singularize
+          if self.content_type
+            self.content_type.slug.singularize
           else
             self.target_klass_name.underscore
           end
@@ -110,9 +116,8 @@ module Locomotive
         # @return [ Object ] The documents
         #
         def fetch_target_entries(conditions = {})
-          if self.target_klass_name =~ /^Locomotive::ContentEntry([a-z0-9]+)$/
-            @content_type ||= self.site.content_types.find($1)
-            @content_type.ordered_entries(conditions)
+          if self.content_type
+            self.content_type.ordered_entries(conditions)
           else
             []
           end
@@ -170,7 +175,7 @@ module Locomotive
             }
           }
 
-          self.collection.update selector, operations, multi: true
+          self.collection.find(selector).update(operations, multi: true)
         end
 
       end

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

@@ -18,8 +18,8 @@ module Locomotive
           before_destroy  :delete_descendants
 
           ## indexes ##
-          index :position
-          index [[:depth, Mongo::ASCENDING], [:position, Mongo::ASCENDING]]
+          index position: 1
+          index depth:    1, position: 1
 
           alias_method_chain :rearrange, :identity_map
           alias_method_chain :rearrange_children, :identity_map
@@ -49,7 +49,7 @@ module Locomotive
           # @return [ Array ] The first array of pages (depth = 0)
           #
           def quick_tree(site, minimal_attributes = true)
-            pages = (minimal_attributes ? site.pages.unscoped.minimal_attributes : site.pages.unscoped).order_by([:depth.asc, :position.asc]).to_a
+            pages = (minimal_attributes ? site.pages.unscoped.minimal_attributes : site.pages.unscoped).order_by(:depth.asc, :position.asc).to_a
 
             tmp = []
 
@@ -105,7 +105,7 @@ module Locomotive
         def sort_children!(ids)
           cached_children = self.children.to_a
           ids.each_with_index do |id, position|
-            child = cached_children.detect { |p| p._id == BSON::ObjectId(id) }
+            child = cached_children.detect { |p| p._id == Moped::BSON::ObjectId(id) }
             child.position = position
             child.save
           end

data/app/models/locomotive/extensions/shared/seo.rb

@@ -5,9 +5,9 @@ module Locomotive
         extend ActiveSupport::Concern
 
         included do
-          field :seo_title,         :type => String, :localize => true
-          field :meta_keywords,     :type => String, :localize => true
-          field :meta_description,  :type => String, :localize => true
+          field :seo_title,         type: String, localize: true
+          field :meta_keywords,     type: String, localize: true
+          field :meta_description,  type: String, localize: true
         end
 
       end # Seo

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

@@ -6,11 +6,14 @@ module Locomotive
         # only called during the installation workflow, just after the admin account has been created
         def create_first_one(attributes)
           site = self.new(attributes)
-
-          site.memberships.build :account => Account.first, :role => 'admin'
+          account = Account.first
+          site.memberships.build account: account, role: 'admin'
 
           site.save
 
+          account.locale = site.default_locale
+          account.save
+
           site
         end
 

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

@@ -8,7 +8,7 @@ module Locomotive
         included do
 
           ## fields ##
-          field :locales, :type => 'RawArray', :default => []
+          field :locales, type: ::RawArray, default: []
 
           ## validations ##
           validate :can_not_remove_default_locale
@@ -67,7 +67,7 @@ module Locomotive
         end
 
         def default_locale_was
-          self.locales_was.first || Locomotive.config.site_locales.first
+          self.locales_was.try(:first) || Locomotive.config.site_locales.first
         end
 
         def locale_fallbacks(locale)
@@ -82,25 +82,28 @@ module Locomotive
 
         def can_not_remove_default_locale
           if self.persisted? && !self.locales.include?(self.default_locale_was)
-            self.errors.add :locales, I18n.t(:default_locale_removed, :scope => [:errors, :messages, :site])
+            self.errors.add :locales, I18n.t(:default_locale_removed, scope: [:errors, :messages, :site])
           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|
+            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)
+                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.update({ :_id => page._id }, { '$set' => modifications })
+              page.collection.find(_id: page._id).update('$set' => modifications)
             end
           end
         end

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

@@ -10,16 +10,16 @@ module Locomotive
 
             ## fields ##
             field :subdomain
-            field :domains, :type => Array, :default => []
+            field :domains, type: Array, default: []
 
             ## indexes
-            index :domains
+            index domains: 1
 
             ## validations ##
             validates_presence_of     :subdomain
             validates_uniqueness_of   :subdomain
-            validates_exclusion_of    :subdomain, :in => Locomotive.config.reserved_subdomains
-            validates_format_of       :subdomain, :with => Locomotive::Regexps::SUBDOMAIN, :allow_blank => true
+            validates_exclusion_of    :subdomain, in: Locomotive.config.reserved_subdomains
+            validates_format_of       :subdomain, with: Locomotive::Regexps::SUBDOMAIN, allow_blank: true
             validate                  :domains_must_be_valid_and_unique
 
             ## callbacks ##
@@ -27,9 +27,9 @@ module Locomotive
             after_destroy :clear_cache_for_all_domains
 
             ## named scopes ##
-            scope :match_domain, lambda { |domain| { :any_in => { :domains => [*domain] } } }
+            scope :match_domain, lambda { |domain| { any_in: { domains: [*domain] } } }
             scope :match_domain_with_exclusion_of, lambda { |domain, site|
-              { :any_in => { :domains => [*domain] }, :where => { :_id.ne => site.id } }
+              { any_in: { domains: [*domain] }, where: { :_id.ne => site.id } }
             }
 
             send :include, InstanceMethods
@@ -75,11 +75,11 @@ module Locomotive
 
             self.domains_without_subdomain.each do |domain|
               if self.class.match_domain_with_exclusion_of(domain, self).any?
-                self.errors.add(:domains, :domain_taken, :value => domain)
+                self.errors.add(:domains, :domain_taken, value: domain)
               end
 
               if not domain =~ Locomotive::Regexps::DOMAIN
-                self.errors.add(:domains, :invalid_domain, :value => domain)
+                self.errors.add(:domains, :invalid_domain, value: domain)
               end
             end
           end

data/app/models/locomotive/membership.rb

@@ -4,15 +4,15 @@ module Locomotive
     include Locomotive::Mongoid::Document
 
     ## fields ##
-    field :role, :default => 'author'
+    field :role, default: 'author'
 
     ## associations ##
-    referenced_in :account, :class_name => 'Locomotive::Account', :validate => false
-    embedded_in   :site,    :class_name => 'Locomotive::Site',    :inverse_of => :memberships
+    belongs_to  :account, class_name: 'Locomotive::Account', validate: false
+    embedded_in :site,    class_name: 'Locomotive::Site',    inverse_of: :memberships
 
     ## validations ##
     validates_presence_of :account
-    validate              :can_change_role, :if => :role_changed?
+    validate              :can_change_role, if: :role_changed?
 
     ## callbacks ##
     before_save :define_role
@@ -29,7 +29,7 @@ module Locomotive
 
     def email=(email)
       @email = email
-      self.account = Locomotive::Account.where(:email => email).first
+      self.account = Locomotive::Account.where(email: email).first
     end
 
     def process!
@@ -62,7 +62,7 @@ module Locomotive
     # be an administrator
     def can_change_role
       current_site       = Thread.current[:site]
-      current_membership = current_site.memberships.where(:account_id => Thread.current[:account].id).first if current_site.present?
+      current_membership = current_site.memberships.where(account_id: Thread.current[:account].id).first if current_site.present?
 
       if current_membership.present?
         # The role cannot be set higher than the current one (we use the index in

data/app/models/locomotive/page.rb

@@ -3,6 +3,8 @@ module Locomotive
 
     include Locomotive::Mongoid::Document
 
+    MINIMAL_ATTRIBUTES = %w(_id title slug fullpath position depth published templatized redirect listed response_type parent_id parent_ids site_id created_at updated_at)
+
     ## Extensions ##
     include Extensions::Page::Tree
     include Extensions::Page::EditableElements
@@ -14,23 +16,23 @@ module Locomotive
     include Extensions::Shared::Seo
 
     ## fields ##
-    field :title,               :localize => true
-    field :slug,                :localize => true
-    field :fullpath,            :localize => true
+    field :title,               localize: true
+    field :slug,                localize: true
+    field :fullpath,            localize: true
     field :handle
-    field :raw_template,        :localize => true
-    field :locales,             :type => Array
-    field :published,           :type => Boolean, :default => false
-    field :cache_strategy,      :default => 'none'
-    field :response_type,       :default => 'text/html'
+    field :raw_template,        localize: true
+    field :locales,             type: Array
+    field :published,           type: Boolean, default: false
+    field :cache_strategy,      default: 'none'
+    field :response_type,       default: 'text/html'
 
     ## associations ##
-    belongs_to :site, :class_name => 'Locomotive::Site'
+    belongs_to :site, class_name: 'Locomotive::Site', autosave: false
 
     ## indexes ##
-    index :site_id
-    index :parent_id
-    index [[:fullpath, Mongo::ASCENDING], [:site_id, Mongo::ASCENDING]]
+    index site_id:    1
+    index parent_id:  1
+    index fullpath:   1, site_id: 1
 
     ## callbacks ##
     after_initialize    :set_default_raw_template
@@ -38,22 +40,23 @@ module Locomotive
     before_save         :build_fullpath
     before_save         :record_current_locale
     before_destroy      :do_not_remove_index_and_404_pages
+    after_save          :update_children
 
     ## validations ##
     validates_presence_of     :site,    :title, :slug
-    validates_uniqueness_of   :slug,    :scope => [:site_id, :parent_id]
-    validates_uniqueness_of   :handle,  :scope => :site_id, :allow_blank => true
-    validates_exclusion_of    :slug,    :in => Locomotive.config.reserved_slugs, :if => Proc.new { |p| p.depth <= 1 }
+    validates_uniqueness_of   :slug,    scope: [:site_id, :parent_id], allow_blank: true
+    validates_uniqueness_of   :handle,  scope: :site_id, allow_blank: true
+    validates_exclusion_of    :slug,    in: Locomotive.config.reserved_slugs, if: Proc.new { |p| p.depth <= 1 }
 
     ## named scopes ##
-    scope :latest_updated,      :order_by => [[:updated_at, :desc]], :limit => Locomotive.config.ui[:latest_entries_nb]
-    scope :root,                :where => { :slug => 'index', :depth => 0 }
-    scope :not_found,           :where => { :slug => '404', :depth => 0 }
-    scope :published,           :where => { :published => true }
-    scope :fullpath,            lambda { |fullpath| { :where => { :fullpath => fullpath } } }
-    scope :handle,              lambda { |handle| { :where => { :handle => handle } } }
-    scope :minimal_attributes,  lambda { |attrs = []| { :only => (attrs || []) + %w(title slug fullpath position depth published templatized redirect listed response_type parent_id parent_ids site_id created_at updated_at) } }
-    scope :dependent_from,      lambda { |id| { :where => { :template_dependencies.in => [id] } } }
+    scope :latest_updated,      order_by(updated_at: :desc).limit(Locomotive.config.ui[:latest_entries_nb])
+    scope :root,                where(slug: 'index', depth: 0)
+    scope :not_found,           where(slug: '404', depth: 0)
+    scope :published,           where(published: true)
+    scope :fullpath,            ->(fullpath){ where(fullpath: fullpath) }
+    scope :handle,              ->(handle){ where(handle: handle) }
+    scope :minimal_attributes,  ->(attrs = []) { without(self.fields.keys - MINIMAL_ATTRIBUTES) }
+    scope :dependent_from,      ->(id) { where(:template_dependencies.in => [id]) }
 
     ## methods ##
 
@@ -120,6 +123,10 @@ module Locomotive
       end
     end
 
+    def update_children
+      self.children.map(&:save) if self.slug_changed? or self.fullpath_changed?
+    end
+
     def record_current_locale
       self.locales ||= []
       self.locales << ::Mongoid::Fields::I18n.locale

data/app/models/locomotive/site.rb

@@ -14,13 +14,13 @@ module Locomotive
     field :robots_txt
 
     ## associations ##
-    references_many :pages,           class_name: 'Locomotive::Page',          validate: false
-    references_many :snippets,        class_name: 'Locomotive::Snippet',       dependent: :destroy, validate: false
-    references_many :theme_assets,    class_name: 'Locomotive::ThemeAsset',    dependent: :destroy, validate: false
-    references_many :content_assets,  class_name: 'Locomotive::ContentAsset',  dependent: :destroy, validate: false
-    references_many :content_types,   class_name: 'Locomotive::ContentType',   dependent: :destroy, validate: false
-    references_many :translations,    class_name: 'Locomotive::Translation',   dependent: :destroy, validate: false
-    embeds_many     :memberships,     class_name: 'Locomotive::Membership'
+    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
+    embeds_many :memberships,     class_name: 'Locomotive::Membership'
 
     ## validations ##
     validates_presence_of :name
@@ -62,16 +62,20 @@ module Locomotive
     # namespaced ::I18n should be changed to just I18n when the t()
     # method is available
     def create_default_pages!
-      ::Mongoid::Fields::I18n.with_locale(self.default_locale) do
-        %w{index 404}.each do |slug|
-          self.pages.create({
-            slug:         slug,
-            title:        ::I18n.t("attributes.defaults.pages.#{slug}.title"),
-            raw_template: ::I18n.t("attributes.defaults.pages.#{slug}.body"),
-            published:    true
-          })
+      %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
         end
+        page.save
       end
+
     end
 
     def destroy_pages

data/app/models/locomotive/snippet.rb

@@ -6,10 +6,10 @@ module Locomotive
     ## fields ##
     field :name
     field :slug
-    field :template, :localize => true
+    field :template, localize: true
 
     ## associations ##
-    referenced_in :site, :class_name => 'Locomotive::Site'
+    belongs_to :site, class_name: 'Locomotive::Site'
 
     ## callbacks ##
     before_validation :normalize_slug
@@ -18,7 +18,7 @@ module Locomotive
 
     ## validations ##
     validates_presence_of   :site, :name, :slug, :template
-    validates_uniqueness_of :slug, :scope => :site_id
+    validates_uniqueness_of :slug, scope: :site_id
 
     ## behaviours ##
     attr_protected  :id
@@ -37,7 +37,7 @@ module Locomotive
       return unless (self.site rescue false) # not run if the site is being destroyed
 
       pages = ::I18n.with_locale(::Mongoid::Fields::I18n.locale) do
-        pages = self.site.pages.any_in(:snippet_dependencies => [self.slug]).to_a
+        pages = self.site.pages.any_in(snippet_dependencies: [self.slug]).to_a
       end
 
       pages.each do |page|
@@ -46,7 +46,7 @@ module Locomotive
         page.send(:_serialize_template)
 
         Page.without_callback(:save, :after, :update_template_descendants) do
-          page.save(:validate => false)
+          page.save(validate: false)
         end
       end
     end