locomotive_cms 2.0.3 → 2.1.0

data/app/models/locomotive/theme_asset.rb

@@ -13,20 +13,23 @@ module Locomotive
     field :height,  type: Integer
     field :size,    type: Integer
     field :folder,  default: nil
+    field :checksum
+
     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', autosave: false
 
     ## indexes ##
-    index :site_id
-    index [[:site_id, Mongo::ASCENDING], [:local_path, Mongo::ASCENDING]]
+    index site_id:  1
+    index site_id:  1, local_path: 1
 
     ## callbacks ##
     before_validation :check_for_folder_changes
     before_validation :store_plain_text
     before_validation :sanitize_folder
     before_validation :build_local_path
+    before_save       :calculate_checksum
 
     ## validations ##
     validates_presence_of   :site
@@ -104,7 +107,7 @@ module Locomotive
     end
 
     def self.all_grouped_by_folder(site)
-      assets = site.theme_assets.order_by([[:slug, :asc]])
+      assets = site.theme_assets.order_by(:slug.asc)
       assets.group_by { |a| a.folder.split('/').first.to_sym }
     end
 
@@ -141,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})[)"']/) do |path|
+      text.gsub(/[("'](\/(stylesheets|javascripts|images|media|others)\/(([^;.]+)\/)*([a-zA-Z_\-0-9]+)\.[a-z]{2,3})(\?[0-9]+)?[)"']/) do |path|
 
         sanitized_path = path.gsub(/[("')]/, '').gsub(/^\//, '')
 
@@ -156,7 +159,7 @@ module Locomotive
     def check_for_folder_changes
       # https://github.com/jnicklas/carrierwave/issues/330
       # https://github.com/jnicklas/carrierwave-mongoid/issues/23
-      if self.persisted? && self.folder_changed? && !self.source_filename_changed?
+      if self.persisted? && self.folder_changed? && !self.changed_attributes.key?('source_filename')
         # a simple way to rename a file
         old_asset         = self.class.where(_id: self._id).first # bypass memoization by mongoid
         file              = old_asset.source.file
@@ -170,5 +173,13 @@ module Locomotive
       self.errors.add(:source, :extname_changed) if self.persisted? && self.content_type_changed?
     end
 
+    def calculate_checksum
+      begin
+        self.checksum = Digest::MD5.hexdigest(self.source.read)
+      rescue Errno::ENOENT => e
+        # no file
+      end
+    end
+
   end
 end

data/app/models/locomotive/translation.rb

@@ -11,25 +11,30 @@ class Locomotive::Translation
 
   ## validations ##
   validates_uniqueness_of :key, scope: :site_id
-  validates_presence_of 	:site, :key
+  validates_presence_of   :site, :key
 
   ## scopes ##
-  scope :ordered, :order_by => [[:key, :asc]]
+  scope :ordered, order_by(key: :asc)
 
   ## callbacks ##
-	before_validation :underscore_key
-
-	## methods ##
-
-	protected
-
-	# Make sure the translation key is underscored
-	# since it is the unique way to use it in a liquid template.
-	#
-	def underscore_key
-		if self.key
-			self.key = self.key.permalink.underscore
-		end
-	end
+  before_validation :underscore_key
+  before_validation :remove_blanks
+
+  ## methods ##
+
+  protected
+
+  # Make sure the translation key is underscored
+  # since it is the unique way to use it in a liquid template.
+  #
+  def underscore_key
+    if self.key
+      self.key = self.key.permalink.underscore
+    end
+  end
+  
+  def remove_blanks
+    self.values.delete_if { |k,v| v.blank? }
+  end
 
 end

data/app/presenters/locomotive/account_presenter.rb

@@ -3,7 +3,7 @@ module Locomotive
 
     ## properties ##
     properties  :name, :email, :locale
-    property    :admin, only_getter: true
+    properties  :admin, :api_key, only_getter: true
 
     with_options only_setter: true do |presenter|
       presenter.properties :password, :password_confirmation

data/app/presenters/locomotive/content_entry_presenter.rb

@@ -7,7 +7,7 @@ module Locomotive
 
     property    :_slug
 
-    property    :_position, required: false
+    properties  :_position, :_visible, required: false
 
     properties  :seo_title, :meta_keywords, :meta_description, required: false
 
@@ -37,7 +37,7 @@ module Locomotive
     end
 
     def safe_attributes
-      self.__source.custom_fields_safe_setters + %w(_slug seo_title meta_keywords meta_description)
+      self.__source.custom_fields_safe_setters + %w(_slug _visible seo_title meta_keywords meta_description)
     end
 
     ## other methods ##

data/app/presenters/locomotive/content_field_presenter.rb

@@ -5,7 +5,7 @@ module Locomotive
 
     properties  :name, :label, :type
 
-    properties  :required, :localized, type: 'Boolean'
+    properties  :required, :localized, :unique, type: 'Boolean'
 
     properties  :hint, :position, required: false
 
@@ -49,7 +49,7 @@ module Locomotive
     end
 
     def class_slug
-      self.content_type.class_name_to_content_type(self.__source.class_name).try(:slug)
+      self.content_type.class_name_to_content_type(self.__source.class_name).try(:slug) rescue ::Mongoid::Errors::DocumentNotFound
     end
 
     def class_name=(value)

data/app/presenters/locomotive/content_type_presenter.rb

@@ -6,7 +6,7 @@ module Locomotive
     properties  :name, :slug
 
     # must to be declared before the others
-    collection  :entries_custom_fields, alias: :fields, presenter: ContentFieldPresenter
+    property    :entries_custom_fields, alias: :fields
 
     property    :description, required: false
 
@@ -24,6 +24,11 @@ module Locomotive
 
     ## other getters / setters ##
 
+    def entries_custom_fields
+      list = self.__source.ordered_entries_custom_fields
+      list ? list.map(&:as_json) : []
+    end
+
     def entries_custom_fields=(fields)
       destroyed_fields = []
 

data/app/presenters/locomotive/theme_asset_presenter.rb

@@ -3,8 +3,8 @@ module Locomotive
 
     ## properties ##
 
-    properties  :content_type,  :folder
-    property    :plain_text,    allow_nil: false
+    properties  :content_type, :folder, :checksum
+    property    :plain_text,    allow_nil: false, description: 'Only returned after an update'
 
     with_options only_setter: true do |presenter|
       presenter.properties :plain_text_name, :plain_text_type, :performing_plain_text, :source

data/app/uploaders/locomotive/editable_file_uploader.rb

@@ -3,7 +3,7 @@
 module Locomotive
   class EditableFileUploader < ::CarrierWave::Uploader::Base
 
-  	include ::CarrierWave::MimeTypes
+    include ::CarrierWave::MimeTypes
 
     process :set_content_type
 

data/app/uploaders/locomotive/theme_asset_uploader.rb

@@ -18,7 +18,7 @@ module Locomotive
     end
 
     def self.build(site, path)
-      asset     = site.theme_assets.build(:folder => File.dirname(path))
+      asset     = site.theme_assets.build(folder: File.dirname(path))
       uploader  = ThemeAssetUploader.new(asset)
       uploader.retrieve_from_store!(File.basename(path))
       uploader

data/app/views/locomotive/accounts/new.html.haml

@@ -5,17 +5,17 @@
 
 %p!= t('.help')
 
-= semantic_form_for @account, :url => accounts_url do |f|
+= semantic_form_for @account, url: accounts_url do |f|
 
-  = f.inputs :name => :information do
+  = f.inputs name: :information do
     = f.input :name
     - unless f.object.respond_to?(:password)
       = f.input :email
 
   - if f.object.respond_to?(:password)
-    = f.inputs :name => :credentials do
+    = f.inputs name: :credentials do
       = f.input :email
-      = f.input :password, :input_html => { :autocomplete => "off" }
-      = f.input :password_confirmation, :input_html => { :autocomplete => "off" }
+      = f.input :password, input_html: { autocomplete: "off" }
+      = f.input :password_confirmation, input_html: { autocomplete: "off" }
 
-  = render 'locomotive/shared/form_actions', :back_url => edit_current_site_url, :button_label => :create
+  = render 'locomotive/shared/form_actions', back_url: edit_current_site_url, button_label: :create

data/app/views/locomotive/content_assets/_asset.html.haml

@@ -1,5 +1,5 @@
-%li{ :id => "asset-#{asset.id}", :class => "asset #{'last' if (asset_counter + 1) % 6 == 0}"}
-  %h4= link_to truncate(asset.name, :length => 17), edit_admin_asset_path(asset)
+%li{ id: "asset-#{asset.id}", class: "asset #{'last' if (asset_counter + 1) % 6 == 0}"}
+  %h4= link_to truncate(asset.name, length: 17), edit_admin_asset_path(asset)
   = vignette_tag(asset)
   .actions
-    = link_to_icon :trash, '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }, :title => t('locomotive.buttons.delete')
+    = link_to_icon :trash, '#', class: 'remove', data: { confirm: t('locomotive.messages.confirm') }, title: t('locomotive.buttons.delete')

data/app/views/locomotive/content_assets/_picker.html.haml

@@ -1,33 +1,33 @@
-%script{ :type => 'text/html', :id => 'content_asset_picker' }
+%script{ type: 'text/html', id: 'content_asset_picker' }
 
   %h2!= t('.title')
 
-  %p.no-items{ :style => 'display: none' }!= t('.no_items')
+  %p.no-items{ style: 'display: none' }!= t('.no_items')
 
-  %ul.list.content-assets{ :style => 'display: none' }
+  %ul.list.content-assets{ style: 'display: none' }
     %li.clear
 
   .dialog-actions
-    = link_to t('locomotive.buttons.close'), '#', :id => 'close-link'
+    = link_to t('locomotive.buttons.close'), '#', id: 'close-link'
 
     .button-wrapper.upload
-      = form_tag content_assets_url(:json), :class => 'quick-upload' do
-        = file_field_tag 'content_asset[source]', :multiple => 'multiple'
-        = link_to t('locomotive.content_assets.image_picker.upload'), content_assets_url(:json), :class => 'new', :id => 'upload-link'
+      = form_tag content_assets_url(:json), class: 'quick-upload' do
+        = file_field_tag 'content_asset[source]', multiple: 'multiple'
+        = link_to t('locomotive.content_assets.image_picker.upload'), content_assets_url(:json), class: 'new', id: 'upload-link'
 
-%script{ :type => 'text/html', :id => 'content_asset' }
+%script{ type: 'text/html', id: 'content_asset' }
 
   %h4
-    = link_to '{{filename}}', '{{url}}', :alt => '{{full_filename}}', :title => '{{full_filename}}'
+    = link_to '{{filename}}', '{{url}}', alt: '{{full_filename}}', title: '{{full_filename}}'
   {{#if image}}
   .image
     .inside
-      %img{ :src => '{{vignette_url}}' }
+      %img{ src: '{{vignette_url}}' }
   {{else}}
-  .icon{ :class => '{{content_type}}' }
+  .icon{ class: '{{content_type}}' }
     .inside
       {{content_type_text}}
   {{/if}}
 
   .actions
-    = link_to_icon :trash, '#', :class => 'remove', :'data-confirm' => t('locomotive.messages.confirm')
+    = link_to_icon :trash, '#', class: 'remove', :'data-confirm' => t('locomotive.messages.confirm')

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

@@ -3,20 +3,21 @@
 
 - content_for :backbone_view_data do
   :plain
-    content_entry: #{j to_json(@content_entry)},
-    content_type: #{j to_json(@content_type)}
+    content_entry: #{escape_json to_json(@content_entry)},
+    content_type: #{escape_json to_json(@content_type)}
 
-= f.inputs :name => :attributes do
+= f.inputs name: :attributes do
   - @content_type.ordered_entries_custom_fields.each_with_index do |field, index|
     = render "locomotive/custom_fields/types/#{field.type}",
-      :f            => f,
-      :name         => field.name.to_sym,
-      :field        => field,
-      :highlighted  => field._id == @content_type.label_field_id
+      f:            f,
+      name:         field.name.to_sym,
+      field:        field,
+      highlighted:  field._id == @content_type.label_field_id
 
-= f.inputs :name => :advanced_options, :class => "inputs foldable #{'folded' if inputs_folded?(@content_entry)}" do
+= f.inputs name: :advanced_options, class: "inputs foldable #{'folded' if inputs_folded?(@content_entry)}" do
 
   = f.input :_slug
+  = f.input :_visible, as: :'Locomotive::Toggle'
   = f.input :seo_title
   = f.input :meta_keywords
   = f.input :meta_description

data/app/views/locomotive/content_entries/_list.html.haml

@@ -1,9 +1,9 @@
 - if entries.empty?
-  %p.no-items!= t('.no_items', :url => new_content_entry_url(content_type.slug))
+  %p.no-items!= t('.no_items', url: new_content_entry_url(content_type.slug))
 - else
-  %ul{ :id => 'entries-list', :class => "#{'list' unless content_type.groupable?} #{'sortable' if content_type.order_manually?}", :'data-url' => sort_content_entries_url(content_type.slug, :json) }
+  %ul{ id: 'entries-list', class: "#{'list' unless content_type.groupable?} #{'sortable' if content_type.order_manually?}", :'data-url' => sort_content_entries_url(content_type.slug, :json) }
     - entries.each do |entry|
-      %li.item{ :id => "entry-#{entry._id}" }
+      %li.item{ id: "entry-#{entry._id}" }
         %span.handle
 
         %strong= link_to entry_label(content_type, entry), edit_content_entry_url(content_type.slug, entry)
@@ -13,6 +13,9 @@
         .more
           %span
             != t('locomotive.content_entries.index.updated_at')
-          = l entry.updated_at, :format => :short rescue 'n/a'
+          = l entry.updated_at, format: :short rescue 'n/a'
 
-          = link_to_icon :trash, content_entry_url(content_type.slug, entry), :title => t('locomotive.buttons.delete'), :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }, :method => :delete
+          = link_to_icon :trash, content_entry_url(content_type.slug, entry), title: t('locomotive.buttons.delete'), class: 'remove', data: { confirm: t('locomotive.messages.confirm') }, method: :delete
+
+  - if entries.respond_to?(:current_page)
+    = paginate entries, namespace: 'locomotive'

data/app/views/locomotive/content_entries/edit.html.haml

@@ -1,4 +1,4 @@
-- title t('.title', :type => @content_type.name.capitalize)
+- title t('.title', type: @content_type.name.capitalize)
 
 - content_for :submenu do
   = render 'locomotive/shared/menu/contents'
@@ -8,17 +8,17 @@
 
 - content_for :buttons do
   - if can?(:manage, Locomotive::ContentType)
-    = local_action_button t('locomotive.content_entries.index.edit'), edit_content_type_url(@content_type), :icon => 'icon-pencil'
+    = local_action_button t('locomotive.content_entries.index.edit'), edit_content_type_url(@content_type), icon: 'icon-pencil'
 
-  = local_action_button t('locomotive.content_entries.index.new'), new_content_entry_url(@content_type.slug), :icon => 'icon-plus'
+  = local_action_button t('locomotive.content_entries.index.new'), new_content_entry_url(@content_type.slug), icon: 'icon-plus'
 
 %p= @content_type.description
 
-= semantic_form_for @content_entry, :as => :content_entry, :url => content_entry_url(@content_type.slug, @content_entry), :html => { :multipart => true } do |form|
+= semantic_form_for @content_entry, as: :content_entry, url: content_entry_url(@content_type.slug, @content_entry), html: { multipart: true } do |form|
 
-  = render 'form', :f => form
+  = render 'form', f: form
 
-  = render 'locomotive/shared/form_actions', :back_url => content_entries_url(@content_type.slug), :button_label => :update
+  = render 'locomotive/shared/form_actions', back_url: content_entries_url(@content_type.slug), button_label: :update
 
 - content_for :foot do
   = render_has_many_forms

data/app/views/locomotive/content_entries/index.html.haml

@@ -1,13 +1,15 @@
-- title t('.title', :type => @content_type.name.capitalize)
+- title t('.title', type: @content_type.name.capitalize)
 
 - content_for :actions do
   = render 'locomotive/shared/actions/contents'
 
 - content_for :buttons do
   - if can?(:manage, Locomotive::ContentType)
-    = local_action_button :edit, edit_content_type_url(@content_type), :icon => 'icon-pencil'
+    = local_action_button :edit, edit_content_type_url(@content_type), icon: 'icon-pencil'
 
-  = local_action_button :new, new_content_entry_url(@content_type.slug), :icon => 'icon-plus'
+  = local_action_button :export, export_content_entries_url(@content_type.slug, :csv), icon: 'icon-download'
+
+  = local_action_button :new, new_content_entry_url(@content_type.slug), icon: 'icon-plus'
 
 - if @content_type.description.present?
   %p= @content_type.description
@@ -17,9 +19,9 @@
     .box
       %h3= group[:name] || t('.category_noname')
       .inner
-        = render 'list', :content_type => @content_type, :entries => group[:entries]
+        = render 'list', content_type: @content_type, entries: group[:entries]
 - else
-  = render 'list', :content_type => @content_type, :entries => @content_entries
+  = render 'list', content_type: @content_type, entries: @content_entries
 
 - # Note: submenu has to be here in order to have the previous entries correctly rendered since we do not return
 - #       all the attributes of the content types in the following code (causing stale documents)
@@ -29,4 +31,4 @@
 - if can?(:manage, Locomotive::ContentType)
   #local-actions-bottom-bar
     %p.tleft
-      = link_to t('.destroy'), content_type_url(@content_type), :data => { :confirm => t('locomotive.messages.confirm') }, :method => :delete, :class => 'button remove'
+      = link_to t('.destroy'), content_type_url(@content_type), data: { confirm: t('locomotive.messages.confirm') }, method: :delete, class: 'button remove'

data/app/views/locomotive/content_entries/new.html.haml

@@ -1,4 +1,4 @@
-- title t('.title', :type => @content_type.name.capitalize)
+- title t('.title', type: @content_type.name.capitalize)
 
 - content_for :submenu do
   = render 'locomotive/shared/menu/contents'
@@ -8,15 +8,15 @@
 
 - if can?(:manage, Locomotive::ContentType)
   - content_for :buttons do
-    = local_action_button t('locomotive.content_entries.index.edit'), edit_content_type_url(@content_type), :icon => 'icon-pencil'
+    = local_action_button t('locomotive.content_entries.index.edit'), edit_content_type_url(@content_type), icon: 'icon-pencil'
 
 %p= @content_type.description
 
-= semantic_form_for @content_entry, :as => :content_entry, :url => content_entries_url(@content_type.slug), :html => { :multipart => true } do |form|
+= semantic_form_for @content_entry, as: :content_entry, url: content_entries_url(@content_type.slug), html: { multipart: true } do |form|
 
-  = render 'form', :f => form
+  = render 'form', f: form
 
-  = render 'locomotive/shared/form_actions', :back_url => content_entries_url(@content_type.slug), :button_label => :create
+  = render 'locomotive/shared/form_actions', back_url: content_entries_url(@content_type.slug), button_label: :create
 
 - content_for :foot do
   = render_has_many_forms