locomotive_cms 2.0.0.rc1 → 2.0.0.rc2

data/Gemfile

@@ -33,7 +33,7 @@ group :test do
 
   # gem 'growl-glue'
 
-  gem 'cucumber-rails'
+  gem 'cucumber-rails', :require => false
   gem 'rspec-rails', '~> 2.8.0'
   gem 'shoulda-matchers'
 

data/LICENSE

@@ -1,6 +1,6 @@
 == MIT License
 
-Copyright (c) 2010, Didier Lafforgue.
+Copyright (c) 2010-2012, Didier Lafforgue.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/app/assets/javascripts/locomotive/models/editable_element.js.coffee

@@ -5,6 +5,11 @@ class Locomotive.Models.EditableElement extends Backbone.Model
       for key, value of @.toJSON()
         hash[key] = value if _.include(['id', 'source', 'content', 'remove_source'], key)
 
+      if @get('type') == 'EditableFile'
+        delete hash['content']
+      else
+        delete hash['source']
+
 class Locomotive.Models.EditableElementsCollection extends Backbone.Collection
 
   model: Locomotive.Models.EditableElement

data/app/assets/stylesheets/locomotive/backoffice/application.css.scss

@@ -78,6 +78,12 @@ ul.list {
       outline: none;
     }
 
+    span.untranslated {
+      @include label;
+      top: -1px;
+      left: 5px;
+    }
+
     div.more {
       position: absolute;
       top: 0px;
@@ -212,6 +218,12 @@ ul.list {
 
       &.hidden a { font-style: italic; font-weight: normal; }
 
+      span.untranslated {
+        @include label;
+        top: 3px;
+        left: 5px;
+      }
+
       .more {
         position: absolute;
         top: 0px;

data/app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.scss

@@ -568,9 +568,11 @@ form.formtastic {
               }
 
               &.label {
-                 margin-left: 8px;
-                 font-weight: bold;
-                 color: #000;
+                margin-left: 8px;
+                font-weight: bold;
+                color: #000;
+                height: 31px;
+                width: auto;
               }
 
             } // ul .col

data/app/assets/stylesheets/locomotive/shared/_helpers.css.scss

@@ -55,3 +55,18 @@
     border-bottom: 1px dotted #efe4a5;
   }
 }
+
+@mixin label {
+  display: inline-block;
+  position: relative;
+
+  background-color: #858585;
+  @include border-radius(3px);
+  padding: 1px 3px 2px;
+
+  line-height: 16px;
+  font-size: 11px;
+  font-weight: bold;
+  color: #fff;
+  @include single-text-shadow(rgba(0, 0, 0, 0.6), 0px, -1px, 0px);
+}

data/app/controllers/locomotive/api/content_entries_controller.rb

@@ -5,10 +5,15 @@ module Locomotive
       before_filter :set_content_type
 
       def index
-        @content_entries = @content_type.list_or_group_entries
+        @content_entries = @content_type.ordered_entries
         respond_with @content_entries
       end
 
+      def show
+        @content_entry = @content_type.entries.any_of({ :_id => params[:id] }, { :_slug => params[:id] }).first
+        respond_with @content_entry, :status => @content_entry ? :ok : :not_found
+      end
+
       def create
         @content_entry = @content_type.entries.create(params[:content_entry])
         respond_with @content_entry, :location => main_app.locomotive_api_content_entries_url(@content_type.slug)

data/app/helpers/locomotive/content_types_helper.rb

@@ -16,9 +16,9 @@ module Locomotive
       current_site.content_types.ordered.only(:site_id, :name, :slug, :label_field_name).each_with_index do |content_type, index|
         next if !content_type.persisted?
 
-        if index >= Locomotive.config.ui.max_content_types
+        if index >= Locomotive.config.ui[:max_content_types]
           if self.is_content_type_selected(content_type)
-            others << visible.delete_at(Locomotive.config.ui.max_content_types - 1) # swap content types
+            others << visible.delete_at(Locomotive.config.ui[:max_content_types] - 1) # swap content types
             visible.insert(0, content_type)
           else
             others << content_type # fills the "..." menu

data/app/helpers/locomotive/custom_fields_helper.rb

@@ -17,7 +17,7 @@ module Locomotive
 
     def options_for_group_by_field(content_type)
       content_type.ordered_entries_custom_fields.find_all do |field|
-        %w(select).include?(field.type)
+        %w(select belongs_to).include?(field.type)
       end.map do |field|
         [field.label, field._id]
       end

data/app/models/locomotive/content_entry.rb

@@ -30,7 +30,7 @@ module Locomotive
 
     ## named scopes ##
     scope :visible, :where => { :_visible => true }
-    scope :latest_updated, :order_by => :updated_at.desc, :limit => Locomotive.config.ui.latest_entries_nb
+    scope :latest_updated, :order_by => :updated_at.desc, :limit => Locomotive.config.ui[:latest_entries_nb]
 
     ## methods ##
 
@@ -39,11 +39,21 @@ module Locomotive
     alias :_permalink= :_slug=
 
     def _label(type = nil)
-      if self._label_field_name
+      value = if self._label_field_name
         self.send(self._label_field_name.to_sym)
       else
         self.send((type || self.content_type).label_field_name.to_sym)
       end
+
+      value.respond_to?(:to_label) ? value.to_label : value
+    end
+
+    def translated?
+      if self.respond_to?(:"#{self._label_field_name}_translations")
+        self.send(:"#{self._label_field_name}_translations").key?(::Mongoid::Fields::I18n.locale.to_s) #rescue false
+      else
+        true
+      end
     end
 
     def next

data/app/models/locomotive/content_type.rb

@@ -5,7 +5,9 @@ module Locomotive
 
     ## extensions ##
     include CustomFields::Source
+    include Extensions::ContentType::DefaultValues
     include Extensions::ContentType::ItemTemplate
+    include Extensions::ContentType::Sync
 
     ## fields ##
     field :name
@@ -32,7 +34,6 @@ module Locomotive
     ## callbacks ##
     before_validation   :normalize_slug
     after_validation    :bubble_fields_errors_up
-    before_save         :set_default_values
     before_update       :update_label_field_name_in_entries
 
     ## validations ##
@@ -55,11 +56,12 @@ module Locomotive
     end
 
     def ordered_entries(conditions = {})
-      self.entries.order_by([order_by_definition]).where(conditions)
+      _order_by_definition = (conditions || {}).delete(:order_by).try(:split) || self.order_by_definition
+      self.entries.order_by([_order_by_definition]).where(conditions)
     end
 
     def groupable?
-      !!self.group_by_field && group_by_field.type == 'select'
+      !!self.group_by_field && %w(select belongs_to).include?(group_by_field.type)
     end
 
     def group_by_field
@@ -68,7 +70,11 @@ module Locomotive
 
     def list_or_group_entries
       if self.groupable?
-        self.entries.group_by_select_option(self.group_by_field.name, self.order_by_definition)
+        if group_by_field.type == 'select'
+          self.entries.group_by_select_option(self.group_by_field.name, self.order_by_definition)
+        else
+          group_by_belongs_to_field(self.group_by_field)
+        end
       else
         self.ordered_entries
       end
@@ -110,30 +116,33 @@ module Locomotive
 
     protected
 
+    def group_by_belongs_to_field(field)
+      grouped_entries     = self.ordered_entries.group_by(&:"#{field.name}_id")
+      columns             = grouped_entries.keys
+      target_content_type = self.class_name_to_content_type(field.class_name)
+      all_columns         = target_content_type.ordered_entries
+
+      all_columns.map do |column|
+        if columns.include?(column._id)
+          {
+            :name     => column._label(target_content_type),
+            :entries  => grouped_entries.delete(column._id)
+          }
+        else
+          nil
+        end
+      end.compact.tap do |groups|
+        unless grouped_entries.empty? # "orphans" ?
+          groups << { :name => nil, :entries => grouped_entries.values.flatten }
+        end
+      end
+    end
+
     def order_by_attribute
       return self.order_by if %w(created_at updated_at _position).include?(self.order_by)
       self.entries_custom_fields.find(self.order_by).name rescue 'created_at'
     end
 
-    def set_default_values
-      self.order_by ||= 'created_at'
-
-      if @new_label_field_name.present?
-        self.label_field_id = self.entries_custom_fields.detect { |f| f.name == @new_label_field_name.underscore }._id
-      end
-
-      if self.label_field_id.blank?
-        self.label_field_id = self.entries_custom_fields.first._id
-      end
-
-      field = self.entries_custom_fields.find(self.label_field_id)
-
-      # the label field should always be required
-      field.required = true
-
-      self.label_field_name = field.name
-    end
-
     def normalize_slug
       self.slug = self.name.clone if self.slug.blank? && self.name.present?
       self.slug.permalink! if self.slug.present?
@@ -179,63 +188,3 @@ module Locomotive
   end
 end
 
-# def list_or_group_contents
-#   if self.groupable?
-#     groups = self.contents.klass.send(:"group_by_#{self.group_by_field._alias}", :ordered_contents)
-#
-#     # look for items with no category or unknown ones
-#     items_without_category = self.contents.find_all { |c| !self.group_by_field.category_ids.include?(c.send(self.group_by_field_name)) }
-#     if not items_without_category.empty?
-#       groups << { :name => nil, :items => items_without_category }
-#     else
-#       groups
-#     end
-#   else
-#     self.ordered_contents
-#   end
-# end
-#
-# def latest_updated_contents
-#   self.contents.latest_updated.reject { |c| !c.persisted? }
-# end
-#
-# def ordered_contents(conditions = {})
-#   column = self.order_by.to_sym
-#
-#   list = (if conditions.nil? || conditions.empty?
-#     self.contents
-#   else
-#     conditions_with_names = {}
-#
-#     conditions.each do |key, value|
-#       # convert alias (key) to name
-#       field = self.entries_custom_fields.detect { |f| f._alias == key }
-#
-#       case field.kind.to_sym
-#       when :category
-#         if (category_item = field.category_items.where(:name => value).first).present?
-#           conditions_with_names[field._name.to_sym] = category_item._id
-#         end
-#       else
-#         conditions_with_names[field._name.to_sym] = value
-#       end
-#     end
-#
-#     self.contents.where(conditions_with_names)
-#   end).sort { |a, b| (a.send(column) && b.send(column)) ? (a.send(column) || 0) <=> (b.send(column) || 0) : 0 }
-#
-#   return list if self.order_manually?
-#
-#   self.asc_order? ? list : list.reverse
-# end
-#
-# def sort_contents!(ids)
-#   ids.each_with_index do |id, position|
-#     self.contents.find(BSON::ObjectId(id))._position_in_list = position
-#   end
-#   self.save
-# end
-#
-# def group_by_field
-#   @group_by_field ||= self.entries_custom_fields.detect { |f| f._name == self.group_by_field_name }
-# end

data/app/models/locomotive/editable_file.rb

@@ -1,9 +1,9 @@
 module Locomotive
   class EditableFile < EditableElement
 
-    mount_uploader :source, EditableFileUploader
+    mount_uploader 'source', EditableFileUploader
 
-    replace_field :source, ::String, true
+    replace_field 'source', ::String, true
 
     def content
       self.source? ? self.source.url : self.default_content

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

@@ -0,0 +1,59 @@
+module Locomotive
+  module Extensions
+    module ContentType
+      module DefaultValues
+
+        extend ActiveSupport::Concern
+
+        included do
+          before_save :set_order_by
+          before_save :set_label_field
+          before_save :set_default_order_by_for_has_many_fields
+        end
+
+        protected
+
+        def set_order_by
+          unless self.order_by.nil? || %w(created_at updated_at _position).include?(self.order_by)
+            field = self.entries_custom_fields.where(:name => self.order_by).first || self.entries_custom_fields.find(self.order_by)
+
+            if field
+              self.order_by = field._id
+            end
+          end
+
+          self.order_by ||= 'created_at'
+        end
+
+        def set_label_field
+          if @new_label_field_name.present?
+            self.label_field_id = self.entries_custom_fields.detect { |f| f.name == @new_label_field_name.underscore }._id
+          end
+
+          # unknown label_field_name, get the first one instead
+          if self.label_field_id.blank?
+            self.label_field_id = self.entries_custom_fields.first._id
+          end
+
+          field = self.entries_custom_fields.find(self.label_field_id)
+
+          # the label field should always be required
+          field.required = true
+
+          self.label_field_name = field.name
+        end
+
+        def set_default_order_by_for_has_many_fields
+          self.entries_custom_fields.where(:type.in => %w(has_many many_to_many)).each do |field|
+            if field.ui_enabled?
+              field.order_by = nil
+            else
+              field.order_by = field.class_name_to_content_type.order_by_definition
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,62 @@
+module Locomotive
+  module Extensions
+    module ContentType
+      module Sync
+
+        extend ActiveSupport::Concern
+
+        included do
+          after_save :sync_relationships_order_by
+        end
+
+        protected
+
+        # If the user changes the order of the content type, we have to make
+        # sure that other related content types tied to the current one through
+        # a belongs_to / has_many relationship also gets updated.
+        #
+        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|
+            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|
+              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
+
+                operations['$set']["entries_custom_fields.#{target_field._index}.order_by"] = self.order_by_definition
+              end
+            end
+
+            unless operations['$set'].empty?
+              persist_content_type_changes target_content_type, operations
+            end
+          end
+        end
+
+        # Save the changes for the content type passed in parameter without forgetting
+        # to bump the version.. It also updates the recipe for related entries.
+        # That method does not call the Mongoid API but directly MongoDB.
+        #
+        # @param [ ContentType ] content_type The content type to update
+        # @param [ Hash ] operations The MongoDB atomic operations
+        #
+        def persist_content_type_changes(content_type, operations)
+          content_type.entries_custom_fields_version += 1
+
+          operations['$set']['entries_custom_fields_version'] = content_type.entries_custom_fields_version
+
+          self.collection.update({ '_id' => content_type._id }, 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
+        end
+
+      end
+    end
+  end
+end