locomotive_cms 2.0.0.rc12 → 2.0.0

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

@@ -8,12 +8,14 @@ module Locomotive
         included do
 
           ## fields ##
-          field :redirect,      :type => Boolean, :default => false
-          field :redirect_url,  :type => String, :localize => true
+          field :redirect,      type: Boolean, default:  false
+          field :redirect_url,  type: String,  localize: true
+          field :redirect_type, type: Integer, default:  301
 
           ## validations ##
-          validates_presence_of :redirect_url, :if => :redirect
-          validates_format_of   :redirect_url, :with => Locomotive::Regexps::URL, :allow_blank => true
+          validates_presence_of :redirect_type, if: :redirect?
+          validates_presence_of :redirect_url,  if: :redirect?
+          validates_format_of   :redirect_url,  with: Locomotive::Regexps::URL, allow_blank: true
 
         end
 

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

@@ -29,7 +29,7 @@ module Locomotive
 
             matching_paths = path == 'index' ? %w(index) : path_combinations(path)
 
-            site.pages.where(:depth => depth, :fullpath.in => matching_paths).each do |_page|
+            site.pages.where(depth: depth, :fullpath.in => matching_paths).each do |_page|
               if !_page.published? && !logged_in
                 next
               else

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

@@ -8,33 +8,33 @@ module Locomotive
         included do
 
           ## fields ##
-          field :templatized,             :type => Boolean, :default => false
-          field :templatized_from_parent, :type => Boolean, :default => false
+          field :templatized,             type: Boolean, default: false
+          field :templatized_from_parent, type: Boolean, default: false
           field :target_klass_name
 
           ## validations ##
-          validates_presence_of :target_klass_name, :if => :templatized?
+          validates_presence_of :target_klass_name, if: :templatized?
           validate              :ensure_target_klass_name_security
 
           ## callbacks ##
           before_validation :get_templatized_from_parent
-          before_validation :set_slug_if_templatized
           before_validation :ensure_target_klass_name_security
+          after_validation  :set_slug_if_templatized
           after_save        :propagate_templatized
 
           ## scopes ##
-          scope :templatized, :where => { :templatized => true }
+          scope :templatized, where: { templatized: true }
 
           ## virtual attributes ##
           attr_accessor :content_entry
         end
 
-        # Returns the class specified by the target_klass_name property
+        # Return the class specified by the target_klass_name property
         #
         # @example
         #
-        #   page.target_klass_name = 'Locomotive::Entry12345'
-        #   page.target_klass = Locomotive::Entry12345
+        #   page.target_klass_name = 'Locomotive::ContentEntry12345'
+        #   page.target_klass # <Locomotive::ContentEntry12345...>
         #
         # @return [ Class ] The target class
         #
@@ -42,13 +42,13 @@ module Locomotive
           target_klass_name.constantize
         end
 
-        # Returns the slug related to the target_klass.
-        # In other words, it returns the slug of the target content type.        
+        # 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.
         #
         def target_klass_slug
-          if self.target_klass_name =~ /^Locomotive::Entry([a-z0-9]+)$/
+          if self.target_klass_name =~ /^Locomotive::ContentEntry([a-z0-9]+)$/
             @content_type ||= self.site.content_types.find($1)
             @content_type.slug
           else
@@ -56,13 +56,26 @@ module Locomotive
           end
         end
 
-        # Gives the name which can be used in a liquid template in order
+        # Set the target klass from the slug of a content type
+        #
+        # @param [ String ] slug The slug of the content type
+        #
+        # @return [ Object ] The content type or nil if not found
+        #
+        def target_klass_slug=(slug)
+          if @content_type = self.site.content_types.where(slug: slug).first
+            self.target_klass_name = @content_type.entries_class_name
+          end
+          @content_type
+        end
+
+        # Give the name which can be used in a liquid template in order
         # to reference an entry. It uses the slug property if the target klass
         # is a Locomotive content type or the class name itself for the other classes.
         #
         # @example
         #
-        #   page.target_klass_name = 'Locomotive::Entry12345' # related to the content type Articles
+        #   page.target_klass_name = 'Locomotive::ContentEntry12345' # related to the content type Articles
         #   page.target_entry_name = 'article'
         #
         #   page.target_klass_name = 'OurProduct'
@@ -71,7 +84,7 @@ module Locomotive
         # @return [ String ] The name in lowercase and underscored
         #
         def target_entry_name
-          if self.target_klass_name =~ /^Locomotive::Entry([a-z0-9]+)$/
+          if self.target_klass_name =~ /^Locomotive::ContentEntry([a-z0-9]+)$/
             @content_type ||= self.site.content_types.find($1)
             @content_type.slug.singularize
           else
@@ -79,7 +92,7 @@ module Locomotive
           end
         end
 
-        # Finds the entry both specified by the target klass and identified by the permalink
+        # Find the entry both specified by the target klass and identified by the permalink
         #
         # @param [ String ] permalink The permalink of the entry
         #
@@ -89,6 +102,22 @@ module Locomotive
           target_klass.find_by_permalink(permalink)
         end
 
+        # Find all the ordered entries of the target klass filtered or not
+        # by the conditions passed in parameter.
+        #
+        # @param [ Hash ] conditions The conditions used to filter the entries (optional)
+        #
+        # @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)
+          else
+            []
+          end
+        end
+
         protected
 
         def get_templatized_from_parent
@@ -107,14 +136,14 @@ module Locomotive
           self.slug = 'content_type_template' if self.templatized? && !self.templatized_from_parent?
         end
 
-        # Makes sure the target_klass is owned by the site OR
+        # Make sure the target_klass is owned by the site OR
         # if it belongs to the models allowed by the application
         # thanks to the models_for_templatization option.
         #
         def ensure_target_klass_name_security
           return if !self.templatized? || self.target_klass_name.blank?
 
-          if self.target_klass_name =~ /^Locomotive::Entry([a-z0-9]+)$/
+          if self.target_klass_name =~ /^Locomotive::ContentEntry([a-z0-9]+)$/
             content_type = Locomotive::ContentType.find($1)
 
             if content_type.site_id != self.site_id
@@ -125,7 +154,7 @@ module Locomotive
           end
         end
 
-        # Sets the templatized, templatized_from_parent properties of
+        # Set the templatized, templatized_from_parent properties of
         # the children of the current page ONLY IF the templatized
         # attribute got changed.
         #
@@ -141,7 +170,7 @@ module Locomotive
             }
           }
 
-          self.collection.update selector, operations, :multi => true
+          self.collection.update selector, operations, multi: true
         end
 
       end

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

@@ -8,9 +8,10 @@ module Locomotive
         included do
           include ::Mongoid::Tree
           include ::Mongoid::Tree::Ordering
+          include PatchedTreeMethods
 
           ## fields ##
-          field :depth, :type => Integer, :default => 0
+          field :depth, type: Integer, default: 0
 
           ## callbacks ##
           before_save     :persist_depth
@@ -25,6 +26,17 @@ module Locomotive
           alias_method_chain :siblings_and_self, :scoping
         end
 
+        module PatchedTreeMethods
+
+          private
+
+          def assign_default_position
+            return if self.position.present? && !self.persisted?
+            super
+          end
+
+        end
+
         module ClassMethods
 
           # Returns the tree of pages from the site with the most minimal amount of queries.
@@ -104,7 +116,7 @@ module Locomotive
         #
         # @return [Mongoid::Criteria] Mongoid criteria to retrieve the document's siblings and itself
         def siblings_and_self_with_scoping
-          base_class.where(:parent_id => self.parent_id, :site_id => self.site_id)
+          base_class.where(parent_id: self.parent_id, site_id: self.site_id)
         end
 
         def depth

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

@@ -19,6 +19,14 @@ module Locomotive
 
         end
 
+        # Tell if the site serves other locales than the default one.
+        #
+        # @return [ Boolean ] True if the number of locales is greater than 1
+        #
+        def localized?
+          self.locales.size > 1
+        end
+
         # Returns the fullpath of a page in the context of the current locale (I18n.locale)
         # or the one passed in parameter. It also depends on the default site locale.
         #
@@ -30,10 +38,10 @@ module Locomotive
         #   # context 2: i18n.locale is 'fr'
         #   contact_us.fullpath <= 'fr/nous_contacter'
         #
-        # @params [ Page ] page The page we want the localized fullpath
-        # @params [ String ] locale The optional locale in place of the current one
+        # @param [ Page ] page The page we want the localized fullpath
+        # @param [ String ] locale The optional locale in place of the current one
         #
-        # @returns [ String ] The localized fullpath according to the current locale
+        # @return [ String ] The localized fullpath according to the current locale
         #
         def localized_page_fullpath(page, locale = nil)
           return nil if page.fullpath_translations.blank?

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

@@ -6,7 +6,7 @@ module Locomotive
         def enable_subdomain_n_domains_if_multi_sites
           # puts "multi_sites? #{Locomotive.config.multi_sites?} / manage_domains? #{Locomotive.config.manage_domains?} / heroku? #{Locomotive.heroku?} / bushido? #{Locomotive.bushido?}"
 
-          if Locomotive.config.multi_sites? || Locomotive.config.manage_domains?
+          if Locomotive.config.multi_sites_or_manage_domains?
 
             ## fields ##
             field :subdomain
@@ -23,7 +23,8 @@ module Locomotive
             validate                  :domains_must_be_valid_and_unique
 
             ## callbacks ##
-            before_save :add_subdomain_to_domains
+            before_save   :add_subdomain_to_domains
+            after_destroy :clear_cache_for_all_domains
 
             ## named scopes ##
             scope :match_domain, lambda { |domain| { :any_in => { :domains => [*domain] } } }
@@ -83,6 +84,10 @@ module Locomotive
             end
           end
 
+          def clear_cache_for_all_domains
+            self.domains.each { |name| Rails.cache.delete(name) }
+          end
+
         end
 
       end

data/app/models/locomotive/membership.rb

@@ -51,10 +51,6 @@ module Locomotive
       @ability ||= Ability.new(self.account, self.site)
     end
 
-    def as_json(options = {})
-      Locomotive::MembershipPresenter.new(self, options).as_json
-    end
-
     protected
 
     def define_role

data/app/models/locomotive/page.rb

@@ -65,6 +65,10 @@ module Locomotive
       self.slug == '404' && self.depth.to_i == 0
     end
 
+    def unpublished?
+      !self.published?
+    end
+
     def index_or_not_found?
       self.index? || self.not_found?
     end
@@ -82,19 +86,7 @@ module Locomotive
     end
 
     def translated_in
-      self.title_translations.keys
-    end
-
-    def to_liquid
-      Locomotive::Liquid::Drops::Page.new(self)
-    end
-
-    def to_presenter
-      Locomotive::PagePresenter.new(self)
-    end
-
-    def as_json(options = {})
-      self.to_presenter.as_json
+      self.title_translations.try(:keys)
     end
 
     protected

data/app/models/locomotive/site.rb

@@ -14,12 +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
-    embeds_many     :memberships,     :class_name => 'Locomotive::Membership'
+    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'
 
     ## validations ##
     validates_presence_of :name
@@ -30,7 +31,7 @@ module Locomotive
 
     ## behaviours ##
     enable_subdomain_n_domains_if_multi_sites
-    accepts_nested_attributes_for :memberships, :allow_destroy => true
+    accepts_nested_attributes_for :memberships, allow_destroy: true
 
     ## methods ##
 
@@ -43,23 +44,15 @@ module Locomotive
     end
 
     def accounts
-      Account.criteria.in(:_id => self.memberships.map(&:account_id))
+      Account.criteria.in(_id: self.memberships.map(&:account_id))
     end
 
     def admin_memberships
       self.memberships.find_all { |m| m.admin? }
     end
 
-    def to_liquid
-      Locomotive::Liquid::Drops::Site.new(self)
-    end
-
-    def to_presenter(options = {})
-      Locomotive::SitePresenter.new(self, options)
-    end
-
-    def as_json(options = {})
-      self.to_presenter(options).as_json
+    def is_admin?(account)
+      self.memberships.detect { |m| m.admin? && m.account_id == account._id }
     end
 
     protected
@@ -72,10 +65,10 @@ module Locomotive
       ::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
+            slug:         slug,
+            title:        ::I18n.t("attributes.defaults.pages.#{slug}.title"),
+            raw_template: ::I18n.t("attributes.defaults.pages.#{slug}.body"),
+            published:    true
           })
         end
       end
@@ -87,4 +80,4 @@ module Locomotive
     end
 
   end
-end
+end

data/app/models/locomotive/snippet.rb

@@ -26,19 +26,11 @@ module Locomotive
 
     ## methods ##
 
-    def to_presenter
-      Locomotive::SnippetPresenter.new(self)
-    end
-
-    def as_json(options = {})
-      self.to_presenter.as_json
-    end
-
     protected
 
     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
 
     def update_templates

data/app/models/locomotive/theme_asset.rb

@@ -9,14 +9,14 @@ module Locomotive
     ## fields ##
     field :local_path
     field :content_type
-    field :width,   :type => Integer
-    field :height,  :type => Integer
-    field :size,    :type => Integer
-    field :folder,  :default => nil
-    mount_uploader :source, ThemeAssetUploader, :mount_on => :source_filename
+    field :width,   type: Integer
+    field :height,  type: Integer
+    field :size,    type: Integer
+    field :folder,  default: nil
+    mount_uploader :source, ThemeAssetUploader, mount_on: :source_filename, validate_integrity: true
 
     ## associations ##
-    belongs_to :site, :class_name => 'Locomotive::Site'
+    belongs_to :site, class_name: 'Locomotive::Site'
 
     ## indexes ##
     index :site_id
@@ -30,11 +30,10 @@ module Locomotive
 
     ## validations ##
     validates_presence_of   :site
-    validates_presence_of   :source, :on => :create
-    validates_presence_of   :plain_text_name, :if => Proc.new { |a| a.performing_plain_text? }
-    validates_uniqueness_of :local_path, :scope => :site_id
-    validates_integrity_of  :source
-    validate                :content_type_can_not_changed
+    validates_presence_of   :source, on: :create
+    validates_presence_of   :plain_text_name, if: Proc.new { |a| a.performing_plain_text? }
+    validates_uniqueness_of :local_path, scope: :site_id
+    validate                :content_type_can_not_change
 
     ## named scopes ##
 
@@ -50,7 +49,8 @@ module Locomotive
 
     def local_path(short = false)
       if short
-        self.read_attribute(:local_path).gsub(/^#{self.content_type.to_s.pluralize}\//, '')
+        # self.read_attribute(:local_path).gsub(/^#{self.content_type.to_s.pluralize}\//, '')
+        self.read_attribute(:local_path).split('/')[1..-1].join('/')
       else
         self.read_attribute(:local_path)
       end
@@ -96,26 +96,22 @@ module Locomotive
       sanitized_source = self.escape_shortcut_urls(data)
 
       self.source = ::CarrierWave::SanitizedFile.new({
-        :tempfile => StringIO.new(sanitized_source),
-        :filename => "#{self.plain_text_name}.#{self.stylesheet? ? 'css' : 'js'}"
+        tempfile: StringIO.new(sanitized_source),
+        filename: "#{self.plain_text_name}.#{self.stylesheet? ? 'css' : 'js'}"
       })
 
       @plain_text = sanitized_source # no need to reset the plain_text instance variable to have the last version
     end
 
-    def to_liquid
-      { :url => self.source.url }.merge(self.attributes).stringify_keys
-    end
-
-    def as_json(options = {})
-      Locomotive::ThemeAssetPresenter.new(self, options).as_json
-    end
-
     def self.all_grouped_by_folder(site)
       assets = site.theme_assets.order_by([[:slug, :asc]])
       assets.group_by { |a| a.folder.split('/').first.to_sym }
     end
 
+    def to_liquid
+      { url: self.source.url }.merge(self.attributes).stringify_keys
+    end
+
     protected
 
     def safe_source_filename
@@ -129,7 +125,7 @@ module Locomotive
       self.folder = ActiveSupport::Inflector.transliterate(self.folder).gsub(/(\s)+/, '_').gsub(/^\//, '').gsub(/\/$/, '')
 
       # folder should begin by a root folder
-      if (self.folder =~ /^(stylesheets|javascripts|images|media|fonts)/).nil?
+      if (self.folder =~ /^(stylesheets|javascripts|images|media|fonts|others)($|\/)+/).nil?
         self.folder = File.join(self.content_type.to_s.pluralize, self.folder)
       end
     end
@@ -145,11 +141,11 @@ module Locomotive
     def escape_shortcut_urls(text)
       return if text.blank?
 
-      text.gsub(/[("'](\/(stylesheets|javascripts|images|media)\/(([^;.]+)\/)*([a-zA-Z_\-0-9]+)\.[a-z]{2,3})[)"']/) do |path|
+      text.gsub(/[("'](\/(stylesheets|javascripts|images|media|others)\/(([^;.]+)\/)*([a-zA-Z_\-0-9]+)\.[a-z]{2,3})[)"']/) do |path|
 
         sanitized_path = path.gsub(/[("')]/, '').gsub(/^\//, '')
 
-        if asset = self.site.theme_assets.where(:local_path => sanitized_path).first
+        if asset = self.site.theme_assets.where(local_path: sanitized_path).first
           "#{path.first}#{asset.source.url}#{path.last}"
         else
           path
@@ -162,7 +158,7 @@ module Locomotive
       # https://github.com/jnicklas/carrierwave-mongoid/issues/23
       if self.persisted? && self.folder_changed? && !self.source_filename_changed?
         # a simple way to rename a file
-        old_asset         = self.class.find(self._id)
+        old_asset         = self.class.where(_id: self._id).first # bypass memoization by mongoid
         file              = old_asset.source.file
         file.content_type = File.mime_type?(file.path) if file.content_type.nil?
         self.source       = file
@@ -170,9 +166,9 @@ module Locomotive
       end
     end
 
-    def content_type_can_not_changed
+    def content_type_can_not_change
       self.errors.add(:source, :extname_changed) if self.persisted? && self.content_type_changed?
     end
 
   end
-end
+end