locomotive_cms 2.5.6 → 2.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dfbff0cc38b5176c19758fbfc3f62445f568dd7
-  data.tar.gz: a3cbab7b3f997330faa9d3be3cd19102b4f4594e
+  metadata.gz: 1b1e10abc04c335552fd44727e7aee6af1ad1d6d
+  data.tar.gz: 2472daa204aa2cfb17d1631ba2a24f51e2d5ef75
 SHA512:
-  metadata.gz: 027015441876276ed84f1a4bd441f92e8c2f4b8e6ccae09321eeecf1bf762ec0e6f61cfeb3d0bf8a8a1d205dd3fed985dbdd3e0c4895efb4ead37afc0ab33438
-  data.tar.gz: fb8250bc13cb6e7e174967e11d91fc5061484f5cd1632f215a8612c2b6db114516fd9aa2fb593876d4e6eceb7d3e284f7bab3a4112a40d1761280ee79094343a
+  metadata.gz: bfeba1baa372344dd774f12c82ba6585ce3fe036befc1482fed64053e0729f8fc44523427573833896636ca69e4f56f164ab450c3bf9fec220144cf5b6570d09
+  data.tar.gz: dfa3a093037b69b739486d26721a9cf32f17a5bce994ce73126afcf12a2469185320e73ba6a635fbdcbf774a051de067b48d0967d01cb380aa3aebd4d8911391

data/Gemfile

@@ -14,6 +14,8 @@ end
 # The rest of the dependencies are for use when in the locomotive development / test environments
 
 group :test, :development do
+
+  gem 'test-unit'
   gem 'rspec-rails', '~> 2.13.0' # In order to have rspec tasks and generators
   gem 'rspec-cells', '0.1.10'
 end
@@ -30,6 +32,8 @@ group :development do
 
   # gem 'carrierwave-mongoid', git: 'git://github.com/locomotivecms/carrierwave-mongoid.git'
 
+  gem 'eventmachine', '~> 1.0.4'
+
   gem 'thor'
   gem 'github_api'
 
@@ -42,8 +46,8 @@ group :test do
 
   gem 'cucumber-rails', require: false
 
-  # gem 'autotest', platforms: :mri
-  # gem 'ZenTest', platforms: :mri
+  gem 'autotest', platforms: :mri
+  gem 'ZenTest', platforms: :mri
 
   gem 'poltergeist',        '~> 1.1.0'
   gem 'shoulda-matchers',   '~> 1.5.2'
@@ -59,5 +63,5 @@ group :test do
 
   gem 'mocha', '~> 0.13.0', require: false
 
-  # gem 'debugger', git: 'git://github.com/cldwalker/debugger.git'
+  gem 'debugger', git: 'git://github.com/cldwalker/debugger.git'
 end

data/app/assets/javascripts/locomotive/utils/tinymce_settings.js.coffee

@@ -4,7 +4,6 @@ window.Locomotive.tinyMCE =
     theme: 'advanced'
     skin: 'locomotive'
     plugins: 'safari,jqueryinlinepopups,table,locomotive_media,fullscreen,paste'
-    extended_valid_elements: 'iframe[width|height|frameborder|allowfullscreen|src|title]'
     theme_advanced_buttons1: 'fullscreen,code,|,bold,italic,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,bullist,numlist,|,outdent,indent,blockquote,|,link,unlink,|,table,|,locomotive_media,|,pasteword'
     theme_advanced_buttons2: 'formatselect,fontselect,fontsizeselect'
     theme_advanced_buttons3: ''
@@ -16,6 +15,7 @@ window.Locomotive.tinyMCE =
     fullscreen_new_window: false
     fullscreen_settings:
       theme_advanced_path_location: 'top'
+    extended_valid_elements: 'iframe[width|height|frameborder|allowfullscreen|src|title],img[src|alt|title|height|usemap|hspace|vspace|border|onmouseover|onmouseout|name|width|style|class|align|id],figure[width|style|class|align|id],figcaption[style|class],font[class|color|face|id|lang|size|style|title],u,strong/b'
 
   minimalSettings:
     theme: 'advanced'
@@ -35,12 +35,12 @@ window.Locomotive.tinyMCE =
     forced_root_block: false
     force_br_newlines: true
     force_p_newlines: false
+    extended_valid_elements: 'iframe[width|height|frameborder|allowfullscreen|src|title],img[src|alt|title|height|usemap|hspace|vspace|border|onmouseover|onmouseout|name|width|style|class|align|id],figure[width|style|class|align|id],figcaption[style|class],font[class|color|face|id|lang|size|style|title],u,strong/b'
 
   popupSettings:
     theme: 'advanced'
     skin: 'locomotive'
     plugins: 'safari,jqueryinlinepopups,locomotive_media,fullscreen,paste'
-    extended_valid_elements: 'iframe[width|height|frameborder|allowfullscreen|src|title]'
     theme_advanced_buttons1: 'fullscreen,code,|,bold,italic,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,bullist,numlist,|,outdent,indent,blockquote,|,link,unlink,|,locomotive_media,|,pasteword'
     theme_advanced_buttons2: 'formatselect,fontselect,fontsizeselect'
     theme_advanced_buttons3: ''
@@ -51,4 +51,5 @@ window.Locomotive.tinyMCE =
     convert_urls: false
     fullscreen_new_window: false
     fullscreen_settings:
-      theme_advanced_path_location: 'top'
+      theme_advanced_path_location: 'top'
+    extended_valid_elements: 'iframe[width|height|frameborder|allowfullscreen|src|title],img[src|alt|title|height|usemap|hspace|vspace|border|onmouseover|onmouseout|name|width|style|class|align|id],figure[width|style|class|align|id],figcaption[style|class],font[class|color|face|id|lang|size|style|title],u,strong/b'

data/app/assets/javascripts/locomotive/views/pages/_form_view.js.coffee

@@ -93,7 +93,7 @@ class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
       @editor.on 'change', (editor, change) => @model.set(raw_template: editor.getValue())
 
   after_inputs_fold: ->
-    @editor.refresh()
+    @editor.refresh() if @editor?
 
   render_editable_elements: ->
     @$('.formtastic fieldset.inputs:first').before(@editable_elements_view.render().el)
@@ -160,4 +160,4 @@ class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
 
   enable_other_checkboxes: ->
     @$('li.toggle input[type=checkbox].simple-toggle').checkToggle()
-    @$('li.toggle.simple-toggle input[type=checkbox]').checkToggle()
+    @$('li.toggle.simple-toggle input[type=checkbox]').checkToggle()

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

@@ -366,4 +366,37 @@ p span.code {
       height: auto;
     }
   }
-}
+}
+
+/* ___ search box (content_entries) ___ */
+
+.search-box {
+  float: right;
+  margin-bottom: 15px;
+
+  form {
+    display: inline-block;
+    @include border-radius(16px);
+    border: 4px solid #cbcbcb;
+    line-height: 20px;
+
+    .icon-search {
+      position: relative;
+      top: 2px;
+      margin-left: 10px;
+      color: #8b8d9a;
+      font-size: 18px;
+    }
+
+    input[type=text] {
+      display: inline-block;
+      min-width: 240px;
+      margin: 0 10px 0 6px;
+      line-height: 20px;
+      border: none;
+      font-size: 13px;
+      color: #8b8d9a;
+      font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
+    }
+  }
+}

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

@@ -39,6 +39,14 @@ module Locomotive
         authenticate_locomotive_account!
       end
 
+      def require_site
+        return true if current_site
+
+        render_no_site_error
+
+        false # halt chain
+      end
+
       def set_locale
         locale = params[:locale] ||
           current_site.try(:default_locale) ||

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

@@ -10,8 +10,8 @@ module Locomotive
       })
 
       def index
-        @content_entries = @content_entries.order_by([get_content_type.order_by_definition])
-        respond_with @content_entries
+        @content_entries = service.all(params.slice(:page, :per_page, :order_by, :where))
+        respond_with(@content_entries)
       end
 
       def show
@@ -35,12 +35,25 @@ module Locomotive
         respond_with @content_entry, location: main_app.locomotive_api_content_entries_url(@content_type.slug)
       end
 
+      def destroy_all
+        service.destroy_all
+        respond_to do |format|
+          format.html { render text: true }
+          format.json { render json: { success: true } }
+          format.xml  { render xml: { success: true } }
+        end
+      end
+
       protected
 
       def get_content_type
         @content_type ||= current_site.content_types.by_id_or_slug(params[:slug]).first
       end
 
+      def service
+        @service ||= Locomotive::ContentEntryService.new(get_content_type)
+      end
+
     end
   end
 end

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

@@ -6,10 +6,25 @@ module Locomotive
 
       skip_before_filter :require_site, :set_locale, :set_current_thread_variables
 
+      skip_before_filter :require_account, only: [:create]
+
       def show
         respond_with(current_locomotive_account)
       end
 
+      def create
+        @account = Locomotive::Account.new
+        @account.from_presenter(params[:account])
+        @account.save
+        respond_with(@account)
+      end
+
+      def update
+        current_locomotive_account.from_presenter(params[:account])
+        current_locomotive_account.save
+        respond_with(current_locomotive_account)
+      end
+
       protected
 
       def self.description

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

@@ -0,0 +1,17 @@
+module Locomotive
+  module Api
+    class VersionController < ApplicationController
+
+      skip_before_filter :require_account, :require_site, :set_current_thread_variables
+
+      def show
+        respond_to do |format|
+          format.html { render text: Locomotive::VERSION }
+          format.json { render json: { engine: Locomotive::VERSION } }
+          format.xml  { render xml: { engine: Locomotive::VERSION } }
+        end
+      end
+
+    end
+  end
+end

data/app/controllers/locomotive/base_controller.rb

@@ -64,4 +64,4 @@ module Locomotive
     end
 
   end
-end
+end

data/app/controllers/locomotive/content_entries_controller.rb

@@ -7,7 +7,7 @@ module Locomotive
 
     before_filter :back_to_default_site_locale, only: %w(new create)
 
-    before_filter :set_content_type
+    before_filter :get_content_type
 
     skip_load_and_authorize_resource
 
@@ -18,13 +18,8 @@ module Locomotive
     respond_to :csv,  only: [:export]
 
     def index
-      options = { page: params[:page] || 1, per_page: Locomotive.config.ui[:per_page] }
-      @content_entries = if params[:q]
-        @content_type.ordered_entries(options.merge(q: params[:q]))
-      else
-        @content_type.list_or_group_entries(options)
-      end
-      respond_with @content_entries
+      @content_entries = service.all(params.slice(:page, :per_page, :q, :where))
+      respond_with @content_entries, html_view: true
     end
 
     def export
@@ -76,13 +71,17 @@ module Locomotive
 
     protected
 
-    def set_content_type
+    def get_content_type
       @content_type ||= current_site.content_types.by_id_or_slug(params[:slug]).first
     end
 
+    def service
+      @service ||= Locomotive::ContentEntryService.new(get_content_type)
+    end
+
     def authorize_content
       authorize! params[:action].to_sym, ContentEntry
     end
 
   end
-end
+end

data/app/helpers/locomotive/content_types_helper.rb

@@ -69,5 +69,20 @@ module Locomotive
       end
     end
 
+    # List the fields which could be used to filter the content entries
+    # in the back-office.
+    # Not all the types are included. Only: string, text, integer, float, email
+    #
+    # @param [ ContentType ] content_type The content type owning the fields
+    #
+    # @return [ Array ] Used as it by the select_tag method
+    #
+    def options_for_filter_fields(content_type)
+      allowed_types = %w(string text integer float email)
+      fields = content_type.entries_custom_fields.where(:type.in => allowed_types)
+
+      fields.map { |field| [field.label, field._id] }
+    end
+
   end
-end
+end

data/app/helpers/locomotive/pages_helper.rb

@@ -36,6 +36,18 @@ module Locomotive
       list
     end
 
+    def display_page_layouts?
+      ((@page.persisted? && @page.allow_layout?) || !@page.persisted?) &&
+      !current_site.pages.layouts.empty?
+    end
+
+    def options_for_page_layouts
+      layouts = current_site.pages.layouts.map do |_layout|
+        [_layout.title, _layout._id]
+      end
+      [[t('.no_layout'), nil]] + layouts
+    end
+
     def options_for_target_klass_name
       base_models = current_site.content_types.map do |type|
         [type.name.humanize, type.klass_with_custom_fields(:entries)]
@@ -90,4 +102,4 @@ module Locomotive
     end
 
   end
-end
+end

data/app/models/locomotive/content_type.rb

@@ -20,6 +20,7 @@ module Locomotive
     field :order_direction,             default: 'asc'
     field :public_submission_enabled,   type: Boolean, default: false
     field :public_submission_accounts,  type: Array
+    field :filter_fields,               type: Array
 
     ## associations ##
     belongs_to  :site,      class_name: 'Locomotive::Site', validate: false
@@ -50,6 +51,7 @@ module Locomotive
     ## callbacks ##
     before_validation   :normalize_slug
     before_validation   :sanitize_public_submission_accounts
+    before_validation   :sanitize_filter_fields
     after_validation    :bubble_fields_errors_up
     before_update       :update_label_field_name_in_entries
 
@@ -80,25 +82,21 @@ module Locomotive
     # Order the list of entries, paginate it if requested
     # and filter it.
     #
-    # @param [ Hash ] options Options to filter and paginate.
+    # @param [ Hash ] options Options to filter (where key), order (order_by key) and paginate (page, per_page keys)
     #
     # @return [ Criteria ] A Mongoid criteria if not paginated (array otherwise).
     #
     def ordered_entries(options = nil)
       options ||= {}
 
+      # pagination
       page, per_page = options.delete(:page), options.delete(:per_page)
 
-      # search for a label
-      if options[:q]
-        options[label_field_name.to_sym] = /#{options.delete(:q)}/i
-      end
-
       # order list
       _order_by_definition = (options || {}).delete(:order_by).try(:split) || self.order_by_definition
 
       # get list
-      _entries = self.entries.order_by([_order_by_definition]).where(options)
+      _entries = self.entries.order_by([_order_by_definition]).where(options[:where] || {})
 
       # pagination or full list
       !self.order_manually? && page ? _entries.page(page).per(per_page) : _entries
@@ -236,6 +234,13 @@ module Locomotive
       end
     end
 
+    # We do not want to have a blank value in the list of fields used to filter the entries.
+    def sanitize_filter_fields
+      if self.filter_fields
+        self.filter_fields.reject! { |id| id.blank? }
+      end
+    end
+
     def bubble_fields_errors_up
       return if self.errors[:entries_custom_fields].empty?
 
@@ -263,7 +268,9 @@ module Locomotive
     def ensure_class_name_security(field)
       if field.class_name =~ /^Locomotive::ContentEntry([a-z0-9]+)$/
         # if the content type does not exist (anymore), bypass the security checking
-        content_type = Locomotive::ContentType.find($1) rescue return
+        content_type = Locomotive::ContentType.find($1) rescue nil
+
+        return if content_type.nil?
 
         if content_type.site_id != self.site_id
           field.errors.add :class_name, :security

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

@@ -0,0 +1,42 @@
+module Locomotive
+  module Extensions
+    module Page
+      module Layout
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          ## fields ##
+          field :is_layout,     type: Boolean, default: false
+          field :allow_layout,  type: Boolean, default: ->{ new_record? }
+
+          ## associations ##
+          belongs_to  :layout, class_name: 'Locomotive::Page', inverse_of: :layout_children, validate: false
+          has_many    :layout_children, class_name: 'Locomotive::Page', inverse_of: :layout
+
+          ## callbacks ##
+          before_validation :set_default_raw_template_if_layout
+
+          ## scopes ##
+          scope :layouts, where(is_layout: true)
+
+        end
+
+        private
+
+        def set_default_raw_template_if_layout
+          return true unless self.allow_layout?
+
+          if self.layout
+            self.raw_template = %({% extends "#{self.layout.fullpath}" %})
+          elsif self.layout_id_was
+            # use case: layout -> no layout
+            self.raw_template = nil
+          end
+        end
+
+      end
+    end
+  end
+end