locomotive_cms 2.0.3 → 2.1.0

data/app/models/locomotive/content_asset.rb

@@ -8,20 +8,20 @@ module Locomotive
     include Extensions::Asset::Vignette
 
     ## fields ##
-    field :content_type,  :type => String
-    field :width,         :type => Integer
-    field :height,        :type => Integer
-    field :size,          :type => Integer
-    field :position,      :type => Integer, :default => 0
+    field :content_type,  type: String
+    field :width,         type: Integer
+    field :height,        type: Integer
+    field :size,          type: Integer
+    field :position,      type: Integer, default: 0
 
     ## associations ##
-    belongs_to :site, :class_name => 'Locomotive::Site'
+    belongs_to :site, class_name: 'Locomotive::Site'
 
     ## validations ##
     validates_presence_of :source
 
     ## behaviours ##
-    mount_uploader :source, ContentAssetUploader, :mount_on => :source_filename
+    mount_uploader :source, ContentAssetUploader, mount_on: :source_filename
 
     ## methods ##
 
@@ -33,7 +33,7 @@ module Locomotive
     end
 
     def to_liquid
-      { :url => self.source.url }.merge(self.attributes).stringify_keys
+      { url: self.source.url }.merge(self.attributes).stringify_keys
     end
 
   end

data/app/models/locomotive/content_entry.rb

@@ -6,6 +6,7 @@ module Locomotive
     ## extensions ##
     include ::CustomFields::Target
     include Extensions::Shared::Seo
+    include Extensions::ContentEntry::Csv
 
     ## fields ##
     field :_slug
@@ -29,8 +30,8 @@ module Locomotive
     after_create      :send_notifications
 
     ## named scopes ##
-    scope :visible, where: { _visible: true }
-    scope :latest_updated, order_by: :updated_at.desc, limit: Locomotive.config.ui[:latest_entries_nb]
+    scope :visible, where(_visible: true)
+    scope :latest_updated, order_by(updated_at: :desc).limit(Locomotive.config.ui[:latest_entries_nb])
 
     ## methods ##
 
@@ -114,7 +115,7 @@ module Locomotive
     # @param [ Array ] The ordered array of ids
     #
     def self.sort_entries!(ids)
-      list = self.any_in(_id: ids.map { |id| BSON::ObjectId.from_string(id.to_s) }).to_a
+      list = self.any_in(_id: ids.map { |id| Moped::BSON::ObjectId.from_string(id.to_s) }).to_a
       ids.each_with_index do |id, position|
         if entry = list.detect { |e| e._id.to_s == id.to_s }
           entry.update_attributes _position: position
@@ -154,7 +155,7 @@ module Locomotive
       criterion = self.content_type.order_by_attribute.to_sym.send(matcher)
       value     = self.send(self.content_type.order_by_attribute.to_sym)
 
-      self.class.where(criterion => value).order_by([order_by]).limit(1).first
+      self.class.where(criterion => value).order_by(:order_by.asc).limit(1).first
     end
 
     # Sets the slug of the instance by using the value of the highlighted field
@@ -171,9 +172,9 @@ module Locomotive
 
     # Return the next available unique slug as a string
     def next_unique_slug
-      slug        = self._slug.gsub(/-\d*$/, '')
-      last_slug   = self.class.where(:_id.ne => self._id, _slug: /^#{slug}-?\d*?$/i).order_by(:_slug).last._slug
-      next_number = last_slug.scan(/-(\d)$/).flatten.first.to_i + 1
+      slug        = self._slug.gsub(/-\d+$/, '')
+      similar_slugs   = self.class.where(:_id.ne => self._id, _slug: /^#{slug}-?\d*$/i)
+      next_number = similar_slugs.map {|s| s._slug.scan(/-(\d+)$/).flatten.last.to_i }.max + 1
       [slug, next_number].join('-')
     end
 

data/app/models/locomotive/content_type.rb

@@ -13,9 +13,9 @@ module Locomotive
     field :name
     field :description
     field :slug
-    field :label_field_id,              type: BSON::ObjectId
+    field :label_field_id,              type: Moped::BSON::ObjectId
     field :label_field_name
-    field :group_by_field_id,           type: BSON::ObjectId
+    field :group_by_field_id,           type: Moped::BSON::ObjectId
     field :order_by
     field :order_direction,             default: 'asc'
     field :public_submission_enabled,   type: Boolean, default: false
@@ -32,10 +32,10 @@ module Locomotive
     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]]
+    index site_id: 1, slug: 1
 
     ## callbacks ##
     before_validation   :normalize_slug
@@ -80,7 +80,7 @@ module Locomotive
       self.find_entries_custom_field(self.group_by_field_id)
     end
 
-    def list_or_group_entries
+    def list_or_group_entries(options = {})
       if self.groupable?
         if group_by_field.type == 'select'
           self.entries.group_by_select_option(self.group_by_field.name, self.order_by_definition)
@@ -88,7 +88,11 @@ module Locomotive
           group_by_belongs_to_field(self.group_by_field)
         end
       else
-        self.ordered_entries
+        if options[:page].nil?
+          self.ordered_entries
+        else
+          self.ordered_entries.page(options[:page]).per(options[:per_page])
+        end
       end
     end
 
@@ -214,7 +218,8 @@ module Locomotive
     #
     def ensure_class_name_security(field)
       if field.class_name =~ /^Locomotive::ContentEntry([a-z0-9]+)$/
-        content_type = Locomotive::ContentType.find($1)
+        # if the content type does not exist (anymore), bypass the security checking
+        content_type = Locomotive::ContentType.find($1) rescue return
 
         if content_type.site_id != self.site_id
           field.errors.add :class_name, :security

data/app/models/locomotive/editable_control.rb

@@ -3,7 +3,7 @@ module Locomotive
 
     ## fields ##
     field :content
-    field :options, :type => Array,   :default => []
+    field :options, type: Array,   default: []
 
     ## methods ##
 
@@ -42,7 +42,7 @@ module Locomotive
           }
         }
 
-        self.page.collection.update self._selector, operations, :multi => true
+        self.page.collection.find(self._selector).update(operations, multi: true)
       end
       true
     end

data/app/models/locomotive/editable_element.rb

@@ -8,23 +8,23 @@ module Locomotive
     field :slug
     field :block
     field :hint
-    field :priority,          :type => Integer, :default => 0
-    field :fixed,             :type => Boolean, :default => false
-    field :disabled,          :type => Boolean, :default => false, :localize => true
-    field :from_parent,       :type => Boolean, :default => false
-    field :locales,           :type => Array,   :default => []
+    field :priority,          type: Integer, default: 0
+    field :fixed,             type: Boolean, default: false
+    field :disabled,          type: Boolean, default: false, localize: true
+    field :from_parent,       type: Boolean, default: false
+    field :locales,           type: Array,   default: []
 
     ## associations ##
-    embedded_in :page, :class_name => 'Locomotive::Page', :inverse_of => :editable_elements
+    embedded_in :page, class_name: 'Locomotive::Page', inverse_of: :editable_elements
 
     ## validations ##
     validates_presence_of :slug
 
     ## callbacks ##
-    after_save :propagate_content, :if => :fixed?
+    after_save :propagate_content, if: :fixed?
 
     ## scopes ##
-    scope :by_priority, :order_by => [[:priority, :desc]]
+    scope :by_priority, order_by(priority: :desc)
 
     ## methods ##
 
@@ -61,6 +61,11 @@ module Locomotive
     # @param [ Hash ] attributes The up-to-date attributes
     #
     def copy_attributes(attributes)
+      # _type is among the mass-assign protected attributes.
+      if type = attributes.delete(:_type)
+        self._type = type
+      end
+
       self.attributes = attributes
     end
 

data/app/models/locomotive/editable_file.rb

@@ -2,14 +2,16 @@ module Locomotive
   class EditableFile < EditableElement
 
     ## behaviours ##
+    # mount_uploader :source, EditableFileUploader
     mount_uploader 'source', EditableFileUploader
 
     replace_field 'source', ::String, true
 
     ## fields ##
-    field :default_source_url, :localize => true
+    field :default_source_url, localize: true
 
     ## callbacks ##
+    # before_save { |c| puts "#{c.block}/#{c.slug} saved called !"}
     after_save :propagate_content
 
     ## methods ##
@@ -40,7 +42,7 @@ module Locomotive
     def copy_attributes_from(el)
       super(el)
 
-      if el.source_translations.nil?
+      if el.source_translations.blank?
         self.attributes['default_source_url'] = el.attributes['default_source_url'] || {}
       else
         el.source_translations.keys.each do |locale|
@@ -77,7 +79,7 @@ module Locomotive
           }
         }
 
-        self.page.collection.update self._selector, operations, :multi => true
+        self.page.collection.find(self._selector).update(operations, multi: true)
       end
     end
 

data/app/models/locomotive/editable_short_text.rb

@@ -2,8 +2,8 @@ module Locomotive
   class EditableShortText < EditableElement
 
     ## fields ##
-    field :content,         :localize => true
-    field :default_content, :type => Boolean, :localize => true, :default => true
+    field :content,         localize: true
+    field :default_content, type: Boolean, localize: true, default: true
 
     ## methods ##
 
@@ -57,7 +57,7 @@ module Locomotive
           }
         }
 
-        self.page.collection.update self._selector, operations, :multi => true
+        self.page.collection.find(self._selector).update(operations, multi: true)
       end
       true
     end

data/app/models/locomotive/extensions/asset/types.rb

@@ -7,7 +7,7 @@ module Locomotive
 
         included do
           %w{media image stylesheet javascript font pdf}.each do |type|
-            scope :"only_#{type}", where(:content_type => type)
+            scope :"only_#{type}", where(content_type: type)
 
             define_method("#{type}?") do
               self.content_type.to_s == type
@@ -20,7 +20,7 @@ module Locomotive
           def by_content_type(content_type)
             return self.all if content_type.blank?
 
-            self.all.where(:content_type => content_type.to_s)
+            self.all.where(content_type: content_type.to_s)
           end
 
         end

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

@@ -0,0 +1,78 @@
+module Locomotive
+  module Extensions
+    module ContentEntry
+      module Csv
+
+        extend ActiveSupport::Concern
+
+        # Get the values from the custom fields as an array.
+        # Values are ordered by the position of the custom fields.
+        #
+        # @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|
+            value = self.send(field.name)
+            self.value_from_type(field.type.to_sym, value, options)
+          end.compact
+        end
+
+        protected
+
+        # Return the transformed value for a particular field type (string, text, ...etc).
+        #
+        # @param [ Symbol ] type Type of the field
+        # @param [ Object ] value Value of the field in the current instance
+        # @param [ Hash ] options For now, stores only the host for the File fields.
+        #
+        # @return [ Object ]
+        #
+        def value_from_type(type, value, options)
+          case type
+          when :file
+            value.blank? ? '' : value.guess_url(options[:host])
+          when :belongs_to
+            value.try(:_label)
+          when :has_many, :many_to_many
+            value.map(&:_label).join(', ')
+          when :tags
+            [*value].join(', ')
+          else
+            value
+          end
+        end
+
+        module ClassMethods
+
+          # Generate a csv from a collection of content entries
+          #
+          # @param [ Hash ] options Options for the csv generation
+          #
+          # @return [ String ] The well-generated CSV document
+          #
+          def to_csv(options = {})
+            content_type  = options.delete(:content_type) || all.first.try(:content_type)
+            csv_options   = options.select do |k, v|
+              CSV::DEFAULT_OPTIONS.keys.include?(k.to_sym)
+            end
+
+            fields = content_type.ordered_entries_custom_fields
+
+            CSV.generate(csv_options) do |csv|
+              # header
+              csv << fields.map(&:label)
+              # body
+              all.each do |entry|
+                csv << entry.to_values(options)
+              end
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ module Locomotive
 
         included do
           field :raw_item_template
-          field :serialized_item_template, :type => Binary
+          field :serialized_item_template, type: Moped::BSON::Binary
 
           before_validation :serialize_item_template
 
@@ -27,14 +27,14 @@ module Locomotive
             begin
               self._parse_and_serialize_item_template
             rescue ::Liquid::SyntaxError => error
-              @item_parsing_errors << I18n.t(:liquid_syntax, :error => error.to_s, :scope => [:errors, :messages])
+              @item_parsing_errors << I18n.t(:liquid_syntax, error: error.to_s, scope: [:errors, :messages])
             end
           end
         end
 
         def _parse_and_serialize_item_template
           item_template = ::Liquid::Template.parse(self.raw_item_template, {})
-          self.serialized_item_template = BSON::Binary.new(Marshal.dump(item_template))
+          self.serialized_item_template = Moped::BSON::Binary.new(:generic, Marshal.dump(item_template))
         end
 
         def item_template_must_be_valid

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

@@ -18,12 +18,12 @@ module Locomotive
         def sync_relationships_order_by
           current_class_name = self.klass_with_custom_fields(:entries).name
 
-          self.entries_custom_fields.where(:type => 'belongs_to').each do |field|
+          self.entries_custom_fields.where(type: 'belongs_to').each do |field|
             target_content_type = self.class_name_to_content_type(field.class_name)
 
             operations = { '$set' => {} }
 
-            target_content_type.entries_custom_fields.where(:type.in => %w(has_many many_to_many), :ui_enabled => false, :class_name => current_class_name).each do |target_field|
+            target_content_type.entries_custom_fields.where(:type.in => %w(has_many many_to_many), ui_enabled: false, class_name: current_class_name).each do |target_field|
               if target_field.order_by != self.order_by_definition
                 target_field.order_by = self.order_by_definition # needed by the custom_fields_recipe_for method in order to be up to date
 
@@ -49,11 +49,11 @@ module Locomotive
 
           operations['$set']['entries_custom_fields_version'] = content_type.entries_custom_fields_version
 
-          self.collection.update({ '_id' => content_type._id }, operations)
+          self.collection.find(_id: content_type._id).update(operations)
 
           collection, selector = content_type.entries.collection, content_type.entries.criteria.selector
 
-          collection.update selector, { '$set' => { 'custom_fields_recipe' => content_type.custom_fields_recipe_for(:entries) } }, :multi => true
+          collection.find(selector).update({ '$set' => { 'custom_fields_recipe' => content_type.custom_fields_recipe_for(:entries) } }, multi: true)
         end
 
       end

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

@@ -100,7 +100,7 @@ module Locomotive
           return if ids.empty?
 
           # super fast way to remove useless elements all in once
-          self.collection.update(self.atomic_selector, '$pull' => { 'editable_elements' => { '_id' => { '$in' => ids } } })
+          self.collection.find(self.atomic_selector).update('$pull' => { 'editable_elements' => { '_id' => { '$in' => ids } } })
 
           # mark them as destroyed
           self.editable_elements.each do |el|

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

@@ -7,7 +7,7 @@ module Locomotive
 
         included do
           ## fields ##
-          field :serialized_template,   type: Binary, localize: true
+          field :serialized_template,   type: Moped::BSON::Binary, localize: true
           field :template_dependencies, type: Array, default: [], localize: true
           field :snippet_dependencies,  type: Array, default: [], localize: true
 
@@ -61,7 +61,7 @@ module Locomotive
         end
 
         def _serialize_template
-          self.serialized_template = BSON::Binary.new(Marshal.dump(@template))
+          self.serialized_template = Moped::BSON::Binary.new(:generic, Marshal.dump(@template))
         end
 
         def parse(context = {})

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

@@ -28,8 +28,14 @@ module Locomotive
             depth = path == 'index' ? 0 : path.split('/').size
 
             matching_paths = path == 'index' ? %w(index) : path_combinations(path)
+            
+            query = if I18n.locale != I18n.default_locale
+              site.pages.where(depth: depth).any_of({:fullpath.in => matching_paths}, {"fullpath.#{I18n.default_locale}" => {'$in' => matching_paths}})
+            else
+              site.pages.where(depth: depth, :fullpath.in => matching_paths)
+            end
 
-            site.pages.where(depth: depth, :fullpath.in => matching_paths).each do |_page|
+            query.each do |_page|
               if !_page.published? && !logged_in
                 next
               else