locomotive_cms 2.5.6 → 2.5.7

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

@@ -117,7 +117,7 @@ module Locomotive
         #
         def fetch_target_entries(conditions = {})
           if self.content_type
-            self.content_type.ordered_entries(conditions)
+            self.content_type.ordered_entries(where: conditions)
           else
             []
           end

data/app/models/locomotive/page.rb

@@ -8,6 +8,7 @@ module Locomotive
     ## Extensions ##
     include Extensions::Page::Tree
     include Extensions::Page::EditableElements
+    include Extensions::Page::Layout
     include Extensions::Page::Parse
     include Extensions::Page::Render
     include Extensions::Page::Templatized

data/app/presenters/locomotive/content_entry_presenter.rb

@@ -94,7 +94,11 @@ module Locomotive
       {}.tap do |hash|
         (self.__source.has_many_custom_fields + self.__source.many_to_many_custom_fields).each do |name, _|
           if self.__depth == 0
-            list = self.__source.send(name.to_sym).ordered
+            field = self.__source.content_type.find_entries_custom_field(name.to_s)
+
+            next if self.html_view? && !field.ui_enabled?
+
+            list  = self.__source.send(name.to_sym).ordered
             hash[name.to_s] = list.map do |entry|
               if self.html_view?
                 entry.to_presenter(depth: self.__depth + 1, html_view: true).as_json

data/app/presenters/locomotive/page_presenter.rb

@@ -16,7 +16,7 @@ module Locomotive
     property    :redirect, type: 'Boolean'
     properties  :redirect_url, :redirect_type
 
-    properties  :listed, :published, :templatized, type: 'Boolean'
+    properties  :listed, :published, :templatized, :is_layout, :allow_layout, type: 'Boolean'
 
     property    :templatized_from_parent, type: 'Boolean', only_getter: true
     property    :target_klass_slug, alias: [:target_klass_name, :target_entry_name]

data/app/services/locomotive/content_entry_service.rb

@@ -0,0 +1,81 @@
+module Locomotive
+  class ContentEntryService < Struct.new(:content_type)
+
+    # List all the entries of a content type.
+    #
+    # If the content type allows the pagination, in other words, if the entries are not
+    # ordered by the position column), then this method will return
+    # a paginated list of entries.
+    #
+    # This list can also be filtered by the _label attribute, by setting the "q" key in the options.
+    #
+    # For a more powerful search, you can use the "where" key which accepts a JSON string or a Hash.
+    #
+    # @param [ Hash ] options The options for the pagination and the filtering
+    #
+    # @return [ Object ] a paginated list of content entries
+    #
+    def all(options = {})
+      _options = prepare_options_for_all(options)
+
+      if _options[:grouping]
+        content_type.list_or_group_entries(_options)
+      else
+        content_type.ordered_entries(_options)
+      end
+    end
+
+    # Destroy all the entries of a content type.
+    # Runs each entry's destroy callbacks.
+    #
+    def destroy_all
+      content_type.entries.destroy_all
+    end
+
+    protected
+
+    def prepare_options_for_all(options)
+      where = prepare_where_statement(options)
+
+      {
+        page:           options[:page] || 1,
+        per_page:       options[:per_page] || Locomotive.config.ui[:per_page],
+        grouping:       options[:grouping] || options[:q].blank?,
+        where:          where
+      }.tap do |_options|
+        _options[:order_by] = options[:order_by] if options[:order_by]
+      end
+    end
+
+    def prepare_where_statement(options)
+      where = (case options[:where]
+      when String then options[:where].blank? ? {} : JSON.parse(options[:where])
+      when Hash   then options[:where]
+      else {}
+      end).with_indifferent_access
+
+      if options[:q]
+        where.merge!(prepare_query_statement(options[:q]))
+      end
+
+      where
+    end
+
+    def prepare_query_statement(query)
+      regexp  = /.*#{query.split.map { |q| Regexp.escape(q) }.join('.*')}.*/i
+
+      {}.tap do |where|
+        if self.content_type.filter_fields.blank?
+          where[content_type.label_field_name.to_sym] = regexp
+        else
+          where['$or'] = []
+          self.content_type.filter_fields.each do |field_id|
+            field = self.content_type.entries_custom_fields.find(field_id)
+            where['$or'] << { field.name => regexp }
+          end
+        end
+      end
+    end
+
+  end
+end

data/app/uploaders/locomotive/theme_asset_uploader.rb

@@ -10,7 +10,7 @@ module Locomotive
     end
 
     def extension_white_list
-      %w(jpg jpeg gif png css js swf flv eot svg ttf woff otf ico htc)
+      %w(jpg jpeg gif png css js swf flv eot svg ttf woff woff2 otf ico htc)
     end
 
     def self.url_for(site, path)

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

@@ -11,9 +11,17 @@
 
   = local_action_button :new, new_content_entry_path(@content_type.slug), icon: 'icon-plus'
 
+- if @content_type.filter_fields.present?
+  .search-box
+    = form_tag content_entries_path(@content_type.slug), method: :get do
+      %i.icon-search
+      = text_field_tag :q, params[:q], placeholder: t('.search_placeholder')
+
 - if @content_type.description.present?
   %p= @content_type.description
 
+.clear
+
 - if @content_type.groupable?
   - @content_entries.each do |group|
     .box

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

@@ -34,6 +34,8 @@
 
     = f.input :order_direction, as: :select, collection: options_for_order_direction, include_blank: false, wrapper_html: { style: "#{'display: none' if @content_type.order_manually?}" }
 
+    = f.input :filter_fields, as: :select, collection: options_for_filter_fields(@content_type), include_blank: false, multiple: true, wrapper_html: { class: 'multiple' }
+
     = f.input :public_submission_enabled, as: :'Locomotive::Toggle'
 
     = f.input :public_submission_accounts, as: :select, collection: options_for_account, include_blank: false, multiple: true, wrapper_html: { class: 'multiple', style: (@content_type.public_submission_enabled? ? '' : 'display: none') }

data/app/views/locomotive/notifications/new_content_entry.html.haml

@@ -1,4 +1,4 @@
-%p= t('.title', name: @account.name, domain: @domain, date: I18n.l(Time.zone.now), locale: @account.locale).html_safe
+%p= t('.title', name: @account.name, domain: @domain, date: I18n.l(Time.now.in_time_zone), locale: @account.locale).html_safe
 
 %p
   %b= t('.type', type: @type.name, locale: @account.locale)
@@ -28,4 +28,4 @@
         - when 'tags'
           = value.join(', ')
         - else
-          = value
+          = value

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

@@ -16,6 +16,9 @@
 
   = f.input :slug, required: false, hint: @page.slug.blank? ? t('.empty_slug') : public_page_url(@page, locale: current_content_locale), input_html: { :'data-url' => get_path_pages_path, disabled: @page.index? || @page.not_found? }, wrapper_html: { style: "#{'display: none' if @page.templatized? && !@page.templatized_from_parent?};", class: 'em-inline-hints' }
 
+  - if display_page_layouts?
+    = f.input :layout, as: :select, collection: options_for_page_layouts, include_blank: false
+
 = f.inputs name: :seo, class: "inputs foldable #{'folded' if inputs_folded?(@page)}" do
 
   = f.input :seo_title
@@ -29,6 +32,10 @@
   - if can?(:customize, @page)
     = f.input :handle
 
+    = f.input :is_layout, as: :'Locomotive::Toggle', input_html: { class: 'simple-toggle' }
+
+    = f.input :allow_layout, as: :'Locomotive::Toggle', input_html: { class: 'simple-toggle' }
+
     = f.input :response_type, as: :select, collection: options_for_page_response_type, include_blank: false
 
     = f.input :templatized, as: :'Locomotive::Toggle', style: "#{'display: none' if @page.redirect? || @page.templatized_from_parent?}"
@@ -51,7 +58,7 @@
 
     = f.input :cache_strategy, as: :select, collection: options_for_page_cache_strategy, include_blank: false, wrapper_html: { style: "#{'display: none' if @page.redirect?}" }
 
-- if can?(:customize, @page)
+- if can?(:customize, @page) && @page.layout.nil?
   = f.inputs name: :raw_template, class: "inputs foldable #{'folded' if inputs_folded?(@page)}" do
 
     = f.input :raw_template, as: :'Locomotive::Code', main_locale_template_url: page_main_template_path(@page)

data/config/locales/admin_ui.en.yml

@@ -155,6 +155,7 @@ en:
         delete_file: delete
         cancel: cancel
         default_block: Default
+        no_layout: Do not use a layout
         cache_strategy:
           none: None
           simple: Simple
@@ -303,6 +304,7 @@ en:
         category_noname: "No name"
         latest_entries: "Latest entries"
         updated_at: "Updated at"
+        search_placeholder: "Enter your search keywords here"
       list:
         no_items: "There are no entries for now. Just click <a href=\"%{url}\">here</a> to create the first one."
       new:

data/config/locales/admin_ui.fr.yml

@@ -304,6 +304,7 @@ fr:
         category_noname: "Pas de nom"
         latest_entries: "Eléments récents"
         updated_at: "Mis à jour le"
+        search_placeholder: "Tapez votre recherche ici"
       list:
         no_entries: "Il n'existe pas d'éléments. Vous pouvez commencer par créer un <a href='%{url}'>ici</a>"
       new:

data/config/locales/formtastic.en.yml

@@ -68,6 +68,8 @@ en:
         seo_title: "Define a page title which should be used as the value for the title tag in the head section. Leave it empty if you want to use the default value from the site settings."
         meta_keywords: "Overrides the site's meta keywords used within the head tag of the page. They are separated by a comma."
         meta_description: "Overrides the site's meta description used within the head tag of the page."
+        is_layout: "If true, this page can used as a layout for other pages."
+        allow_layout: "Let authors change or not the layout of that page."
       snippet:
         slug: "You need to know it in order to insert the snippet inside a page"
       site:
@@ -105,6 +107,7 @@ en:
         name: "We suggest you to type the plural form of the model. Ex: Projects, Recipes, Posts, Articles, ...etc"
         slug: "It will be used as the name of the collection in the liquid templates. Ex: <span class='code'>{{ contents.my_projects }}</span>"
         raw_item_template: "You can customize the text displayed for each item in the list. Simply use Liquid. Ex: <span class='code'>{{ entry.name }})</span>"
+        filter_fields: "If not empty, a filter bar will be displayed on the page listing the entries. The entries will be then filtered by the field(s) selected in the select box above."
         public_submission_enabled: "It is used to let people from outside to create new entries (example: messages in a contact form)"
         public_submission_accounts: "If the public submission option is enabled and for each entry created, sends a notification email to the accounts listed above."
         "custom_fields/field":

data/config/routes.rb

@@ -67,13 +67,15 @@ Rails.application.routes.draw do
 
       match 'documentation' => 'documentation#show'
 
+      match 'version' => 'version#show'
+
       resources :tokens, only: [:create, :destroy]
 
       resource  :current_site, controller: 'current_site', only: [:show, :update, :destroy]
 
       resources :memberships, only: [:index, :show, :create, :update, :destroy]
 
-      resource  :my_account, controller: 'my_account', only: :show
+      resource  :my_account, controller: 'my_account', only: [:show, :create, :update]
 
       with_options only: [:index, :show, :create, :update, :destroy] do |api|
 
@@ -87,7 +89,9 @@ Rails.application.routes.draw do
 
         api.resources :content_types
 
-        api.resources :content_entries, path: 'content_types/:slug/entries'
+        api.resources :content_entries, path: 'content_types/:slug/entries' do
+          delete :index, on: :collection, action: :destroy_all
+        end
 
         api.resources :theme_assets
 

data/features/api/content_entries.feature

@@ -19,6 +19,7 @@ Feature: Content Entries
       | Logo    | file          | false     |           |
       | Client  | belongs_to    | false     | Clients   |
     And I have "code, design" as "Type" values of the "Projects" model
+    And I have the "Projects" entries ordered by the "Name" field
     And I have a custom model named "Workers" with
       | label       | type          | required  |
       | Name        | string        | true      |
@@ -48,6 +49,18 @@ Feature: Content Entries
       | 4f832c2cb0d86d3f42fffff0    | p1    | first | code    | false     | 2012-07-01  | logo1.jpg   |
       | 4f832c2cb0d86d3f42fffff1    | p2    | 2nd   | design  | true      | 2012-11-30  | logo1.jpg   |
 
+  # paginating the content entries
+  Scenario: Paginating content entries
+    When I do an API GET request to content_types/projects/entries.json with:
+    """
+    {
+      "page": 1,
+      "per_page": 1
+    }
+    """
+    Then the JSON response should be an array
+    And the JSON response should have 1 entries
+
   # create content entry
 
   Scenario: Creating new project
@@ -71,15 +84,15 @@ Feature: Content Entries
     Then the JSON response should be an array
     And the JSON response should have 3 entries
     And the JSON should have the following:
-      | 2/name              | "Project 3"                   |
-      | 2/desc              | "The third"                   |
-      | 2/type              | "code"                        |
-      | 2/started           | false                         |
-      | 2/due               | "06/01/2012"                  |
-      | 2/workers/0         | "w1"                          |
-      | 2/workers/1         | "w3"                          |
-      | 2/client            | "c1"                          |
-    And the JSON at "2/logo" should match /logo2.jpg$/
+      | 0/name              | "Project 3"                   |
+      | 0/desc              | "The third"                   |
+      | 0/type              | "code"                        |
+      | 0/started           | false                         |
+      | 0/due               | "06/01/2012"                  |
+      | 0/workers/0         | "w1"                          |
+      | 0/workers/1         | "w3"                          |
+      | 0/client            | "c1"                          |
+    And the JSON at "0/logo" should match /logo2.jpg$/
     And the response content type should match /application\/json/
 
   Scenario: Updating existing project

data/features/backoffice/site.feature

@@ -35,7 +35,7 @@ Scenario: Add a new site with chosen locale
 Scenario: Change timezone of site
   Given I am an authenticated user
   When I go to the site settings
-  And I select "(GMT+04:00) Moscow" from "Timezone"
+  And I select "(GMT+03:00) Moscow" from "Timezone"
   Then I press "Save"
   Then I should see "My site was successfully updated." in the html code
 

data/features/public/content_entries.feature

@@ -12,11 +12,13 @@ Background:
     | Body          | string    | false       |
     | Hidden        | boolean   | false       |
     | Published at  | date      | false       |
+    | Category      | select    | false       |
+  And I have "Design, Development" as "Category" values of the "Articles" model
   And I have entries for "Articles" with
-    | title             | body                    | published_at  | hidden  |
-    | Hello world       | Lorem ipsum             | 2015-01-01    | false   |
-    | Lorem ipsum       | Lorem ipsum...          | 2013-03-23    | false   |
-    | Yadi Yada         | Lorem ipsum...          | 2013-03-23    | true    |
+    | title             | body                    | published_at  | category    | hidden  |
+    | Hello world       | Lorem ipsum             | 2015-01-01    | Development | false   |
+    | Lorem ipsum       | Lorem ipsum...          | 2013-03-23    | Development | false   |
+    | Yadi Yada         | Lorem ipsum...          | 2013-03-23    | Design      | true    |
 
 Scenario: List all of them
   Given a page named "my-articles" with the template:
@@ -29,6 +31,19 @@ Scenario: List all of them
     Hello world, Lorem ipsum, Yadi Yada
     """
 
+Scenario: Filter by a select field
+  Given a page named "my-articles" with the template:
+    """
+    {% with_scope category: 'Development' %}
+    {% for article in contents.articles %}{{ article.title }}, {% endfor %}
+    {% endwith_scope %}
+    """
+  When I view the rendered page at "/my-articles"
+  Then the rendered output should look like:
+    """
+    Hello world, Lorem ipsum
+    """
+
 Scenario: Filter by a boolean
   Given a page named "my-articles" with the template:
     """
@@ -66,4 +81,4 @@ Scenario: Filter with regexp
   Then the rendered output should look like:
     """
     Hello world, Yadi Yada
-    """
+    """

data/features/step_definitions/content_types_steps.rb

@@ -126,4 +126,10 @@ end
 Given(/^I click on the (\d+)[a-z]+ required flag$/) do |nth|
   find(".custom-field:nth-child(#{nth}) .required-input .switchHandle").click
   sleep(0.1)
+end
+
+Given(/^I have the "(.*?)" entries ordered by the "(.*?)" field$/) do |name, field|
+  content_type = Locomotive::ContentType.where(name: name).first
+  field = content_type.entries_custom_fields.detect { |f| f.label == field }
+  content_type.update_attribute :order_by, field.name
 end

data/lib/generators/locomotive/install/templates/devise.rb

@@ -1,8 +1,6 @@
 # Use this hook to configure devise mailer, warden hooks and so forth. The first
 # four configuration values can also be set straight in your models.
 Devise.setup do |config|
-  config.secret_key = "d9eb5171c59a4c817f68b0de27b8c1e340c2341b52cdbc60d3083d4e8958532" \
-                      "18dcc5f589cafde048faec956b61f864b9b5513ff9ce29bf9e5d58b0f234f8e3b"
 
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,

data/lib/locomotive/action_controller/responder.rb

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

data/lib/locomotive/carrierwave.rb

@@ -7,6 +7,7 @@ require 'locomotive/carrierwave/patches'
 # register missing mime types
 EXTENSIONS[:eot] = 'application/vnd.ms-fontobject'
 EXTENSIONS[:woff] = 'application/x-woff'
+EXTENSIONS[:woff2] = 'application/x-woff2'
 EXTENSIONS[:otf] = 'application/octet-stream'
 
 # Allow retina images

data/lib/locomotive/carrierwave/asset.rb

@@ -25,7 +25,7 @@ module Locomotive
               pdf:        ['application/pdf', 'application/x-pdf'],
               stylesheet: ['text/css'],
               javascript: ['text/javascript', 'text/js', 'application/x-javascript', 'application/javascript', 'text/x-component'],
-              font:       [/^application\/.*font/, 'application/x-font-ttf', 'application/vnd.ms-fontobject', 'image/svg+xml', 'application/x-woff', 'application/x-font-truetype', 'application/x-font-woff']
+              font:       [/^application\/.*font/, 'application/x-font-ttf', 'application/vnd.ms-fontobject', 'image/svg+xml', 'application/x-woff', 'application/x-woff2', 'application/x-font-truetype', 'application/x-font-woff', 'application/x-font-woff2']
             }
           end
 

data/lib/locomotive/httparty/webservice.rb

@@ -7,10 +7,12 @@ module Locomotive
       include ::HTTParty
 
       def self.consume(url, options = {})
-        options[:base_uri], path = self.extract_base_uri_and_path(url)
+        options[:method] = :get if options[:method].nil?
 
         options.delete(:format) if options[:format] == 'default'
 
+        path = extract_path(url, options)
+
         # auth ?
         username, password = options.delete(:username), options.delete(:password)
         options[:basic_auth] = { username: username, password: password } if username
@@ -18,25 +20,29 @@ module Locomotive
         self.perform_request_to(path, options)
       end
 
-      def self.extract_base_uri_and_path(url)
-        url = HTTParty.normalize_base_uri(url)
+      def self.extract_path(url, options)
+        url     = HTTParty.normalize_base_uri(url)
+        uri     = URI.parse(url)
+        params  = Rack::Utils.parse_nested_query(uri.query)
 
-        uri       = URI.parse(url)
-        path      = uri.request_uri || '/'
-        base_uri  = "#{uri.scheme}://#{uri.host}"
-        base_uri  += ":#{uri.port}" if uri.port != 80
+        key = options[:method].to_sym == :post ? :body : :query
+        options[key] = params unless params.blank?
 
-        [base_uri, path]
+        (uri.path.blank? ? '/' : uri.path).tap do
+          uri.query = nil; uri.path = ''
+          options[:base_uri] = uri.to_s
+        end
       end
 
       def self.perform_request_to(path, options)
-        # [DEBUG] puts "[WebService] consuming #{path}, #{options.inspect}"
+        # [DEBUG]
+        # puts "[WebService] consuming #{path}, #{options.inspect}"
 
         # sanitize the options
         options[:format]  = options[:format].gsub(/[\'\"]/, '').to_sym if options.has_key?(:format)
         options[:headers] = { 'User-Agent' => 'LocomotiveCMS' } if options[:with_user_agent]
 
-        response        = self.get(path, options)
+        response        = self.send(options.delete(:method), path, options)
         parsed_response = response.parsed_response
 
         if response.code == 200
@@ -52,4 +58,4 @@ module Locomotive
 
     end
   end
-end
+end