locomotivecms 3.0.0.pre.beta.1 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b4009f2488429e00c7d89ed8d530b3063ce5ebe
-  data.tar.gz: 523238ddc19928abc3f801e8d09d096baf5a8701
+  metadata.gz: d10fc58170b51a43910d6f1471a3f3ef30f06591
+  data.tar.gz: 7e07b1bb55d2f426bbdb595e4e92f31b7e4d5a15
 SHA512:
-  metadata.gz: 75a9d1de7dab0849ba152f7844ba387dff44dc97ac4bb17da20d3ca7a352085dd46757a9681db1f4e141a39943c11b7a0e8b827976f66ae51bfb5b07173b827a
-  data.tar.gz: 40665a5be1905a6405f88d476091a79fe2be2530b78abfebe879bf5102c4c969e9ced4ec74bc8f7adefa33b7ae85a48dd14a327e1b343c2a759c266c7eb8a6d0
+  metadata.gz: f4a440454798b26f56aa64e1a60ad77a8b676ac7337e6c11075b2c594528d877b0337a7326d6cd8d64fa0674de8f960f2a6e92341c13d01230b1daa4ec450089
+  data.tar.gz: 1406d6ea958450d83374bc6a5ce5ac59e0fdf72bf82b798ce693fc2436b37e690b6e3e4c1a23083b6123ba4d79de63a4a41171fdbf7aca1197370e96da6db16f

data/Gemfile

@@ -22,7 +22,7 @@ group :development do
   # gem 'custom_fields', github: 'locomotivecms/custom_fields', ref: '15cceb66ed'
 
   # gem 'locomotivecms_steam', path: '../in_progress/steam', require: false
-  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: '2650a1c', require: false
+  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'c487443', require: false
 
   # gem 'locomotive-aloha-rails', path: '../gems/aloha-rails' # for Developers
   # gem 'locomotive-tinymce-rails', path: '../gems/tinymce-rails' # for Developers
@@ -54,7 +54,6 @@ group :test do
   # gem 'cucumber-rails', require: false
   gem 'simplecov'
 
-
   gem 'capybara',             '~> 2.4.4'
   gem 'poltergeist'
 
@@ -64,8 +63,10 @@ group :test do
   gem 'factory_girl_rails'
   gem 'pickle'
   gem 'json_spec',            '~> 1.1.4'
-  gem 'database_cleaner'
+  gem 'database_cleaner',     '~> 1.4.1'
   gem 'timecop',              '~> 0.7.1'
 
+  gem 'email_spec'
+
   # gem 'debugger', git: 'git://github.com/cldwalker/debugger.git'
 end

data/app/api/locomotive/api.rb

@@ -20,6 +20,7 @@ module Locomotive
       helpers API::Helpers::ParamsHelper
       helpers API::Helpers::PersistenceHelper
       helpers API::Helpers::PaginationHelper
+      helpers API::Helpers::LocalesHelper
 
       include API::ExceptionRescuers
 

data/app/api/locomotive/api/entities/page_entity.rb

@@ -6,7 +6,7 @@ module Locomotive
 
         expose  :title, :parent_id, :position,
                 :handle, :depth, :response_type,
-                :listed, :published, :translated_in
+                :listed, :published, :translated_in, :cache_enabled
 
         # Path
         expose :slug, :fullpath

data/app/api/locomotive/api/entities/site_entity.rb

@@ -5,7 +5,7 @@ module Locomotive
       class SiteEntity < BaseEntity
 
         expose    :name, :handle, :seo_title, :meta_keywords, :meta_description,
-                  :robots_txt
+                  :robots_txt, :cache_enabled
 
         expose :locales, :domains
 
@@ -19,6 +19,14 @@ module Locomotive
           site.picture.url
         end
 
+        expose :content_version do |site, _|
+          site.content_version.to_i
+        end
+
+        expose :template_version do |site, _|
+          site.template_version.to_i
+        end
+
         expose :picture_thumbnail_url do |site, _|
           Locomotive::Dragonfly.resize_url site.picture.url, '100x100#'
         end

data/app/api/locomotive/api/exception_rescuers.rb

@@ -8,11 +8,9 @@ module Locomotive
       included do
 
         rescue_from :all do |e|
-          if Rails.env.development? || Rails.env.test?
-            raise e
-          else
-            error_response(message: { error: e.message }, status: 500)
-          end
+          Rails.logger.error "[API]" + e.message + "\"" + e.backtrace.join("\n")
+
+          error_response(message: { error: e.message }, status: 500)
         end
 
         rescue_from ::Mongoid::Errors::DocumentNotFound do

data/app/api/locomotive/api/forms/page_form.rb

@@ -4,7 +4,7 @@ module Locomotive
 
       class PageForm < BaseForm
 
-        attrs :title, :slug, :handle, :response_type, :published
+        attrs :title, :slug, :handle, :response_type, :published, :cache_enabled
 
         # Tree
         attrs :parent_id, :position, :listed

data/app/api/locomotive/api/forms/site_form.rb

@@ -4,8 +4,7 @@ module Locomotive
 
       class SiteForm < BaseForm
 
-        attrs :name, :handle, :robots_txt, :locales, :domains, :timezone, :picture
-
+        attrs :name, :handle, :robots_txt, :locales, :domains, :timezone, :picture, :cache_enabled
         attrs :seo_title, :meta_keywords, :meta_description, localized: true
 
         # Make sure locales and domains are in arrays.

data/app/api/locomotive/api/helpers/authentication_helper.rb

@@ -14,7 +14,7 @@ module Locomotive
         end
 
         def authenticate_locomotive_account!
-          error!('401 Unauthorized', 401) unless current_membership
+          error!('Unauthorized', 401) unless current_membership
           true
         end
 
@@ -22,6 +22,11 @@ module Locomotive
           @current_site ||= request.env['locomotive.site']
         end
 
+        def require_site!
+          error!('Unknown site', 404) unless current_site
+          true
+        end
+
         def current_membership
           return nil if current_account.nil?
           membership = current_site ? current_site.membership_for(current_account) : nil

data/app/api/locomotive/api/helpers/locales_helper.rb

@@ -0,0 +1,15 @@
+module Locomotive
+  module API
+    module Helpers
+      module LocalesHelper
+
+        include Locomotive::Concerns::SiteDispatcherController
+
+        def back_to_default_site_locale
+          ::Mongoid::Fields::I18n.locale = current_site.default_locale
+        end
+
+      end
+    end
+  end
+end

data/app/api/locomotive/api/helpers/params_helper.rb

@@ -7,6 +7,19 @@ module Locomotive
           @permitted_params ||= declared(params, include_missing: false)
         end
 
+        # Much safer than permitted_params because it also uses the current policy
+        # (Pundit) to filter the parameters.
+        #
+        # Example:
+        #
+        # permitted_params_from_policy(current_site, :site)
+        #
+        def permitted_params_from_policy(object_or_class, key)
+          _params     = permitted_params[key]
+          _attributes = policy(object_or_class).permitted_attributes
+          ::ActionController::Parameters.new(_params).permit(*_attributes)
+        end
+
       end
 
     end

data/app/api/locomotive/api/middlewares/locale_middleware.rb

@@ -26,11 +26,16 @@ module Locomotive
 
         def find_locale(env)
           env['HTTP_X_LOCOMOTIVE_LOCALE'].presence ||
-          Rack::Request.new(env).params[:locale].presence ||
+          params(env)[:locale].presence ||
+          params(env)['locale'].presence ||
           env['locomotive.site'].try(:default_locale).presence ||
           Locomotive.config.site_locales.first
         end
 
+        def params(env)
+          @params ||= Rack::Request.new(env).params
+        end
+
       end
 
     end

data/app/api/locomotive/api/resources/content_entry_resource.rb

@@ -59,6 +59,8 @@ module Locomotive
           post do
             authorize ContentEntry, :create?
 
+            back_to_default_site_locale
+
             form = form_klass.new(content_type, content_entry_params)
             @content_entry = service.create(form.serializable_hash)
 

data/app/api/locomotive/api/resources/content_type_resource.rb

@@ -62,7 +62,7 @@ module Locomotive
               optional :raw_item_template # deprecated
               optional :display_settings
               optional :public_submission_account_emails
-              optional :public_submission_accounts
+              optional :public_submission_enabled
             end
           end
           post do
@@ -106,7 +106,7 @@ module Locomotive
               optional :raw_item_template # deprecated
               optional :display_settings
               optional :public_submission_account_emails
-              optional :public_submission_accounts
+              optional :public_submission_enabled
             end
           end
           put ':id' do

data/app/api/locomotive/api/resources/current_site_resource.rb

@@ -9,6 +9,7 @@ module Locomotive
 
           before do
             authenticate_locomotive_account!
+            require_site!
           end
 
           helpers do
@@ -45,7 +46,7 @@ module Locomotive
           put do
             authorize current_site, :update?
 
-            current_site_form = Forms::SiteForm.new(permitted_params[:site])
+            current_site_form = Forms::SiteForm.new(permitted_params_from_policy(current_site, :site))
             service.update(current_site, current_site_form.serializable_hash)
 
             present current_site, with: entity_klass

data/app/api/locomotive/api/resources/membership_resource.rb

@@ -19,7 +19,6 @@ module Locomotive
             present memberships, with: entity_klass
           end
 
-
           desc "Show a membership"
           params do
             requires :id, type: String, desc: 'Membership ID'
@@ -32,7 +31,6 @@ module Locomotive
             end
           end
 
-
           desc 'Create a membership'
           params do
             requires :membership, type: Hash do
@@ -50,7 +48,6 @@ module Locomotive
             present membership, with: entity_klass, policy: current_policy
           end
 
-
           desc 'Update a membership'
           params do
             requires :id, type: String, desc: 'Membership ID'
@@ -68,7 +65,6 @@ module Locomotive
             present membership, with: entity_klass
           end
 
-
           desc "Delete a membership"
           params do
             requires :id, type: String, desc: 'Membership ID'

data/app/api/locomotive/api/resources/page_resource.rb

@@ -38,7 +38,7 @@ module Locomotive
             end
           end
 
-          desc 'Create a page'
+          desc 'Create a page (in the default locale)'
           params do
             requires :page, type: Hash do
               requires :title
@@ -57,6 +57,7 @@ module Locomotive
               optional :is_layout, type: Boolean
               optional :allow_layout, type: Boolean
               optional :editable_elements, type: Array
+              optional :cache_enabled
               optional :seo_title
               optional :meta_keywords
               optional :meta_description
@@ -64,6 +65,9 @@ module Locomotive
           end
           post do
             authorize Page, :create?
+
+            back_to_default_site_locale
+
             form = form_klass.new(current_site, page_params)
             persist_from_form(form)
 
@@ -89,6 +93,7 @@ module Locomotive
               optional :allow_layout, type: Boolean
               optional :template
               optional :editable_elements, type: Array
+              optional :cache_enabled
               optional :seo_title
               optional :meta_keywords
               optional :meta_description

data/app/api/locomotive/api/resources/site_resource.rb

@@ -65,12 +65,13 @@ module Locomotive
               optional :domains, type: Array
               optional :timezone
               optional :picture
+              optional :cache_enabled
             end
           end
           post do
             authorize Site, :create?
 
-            site_form = Forms::SiteForm.new(permitted_params[:site])
+            site_form = Forms::SiteForm.new(permitted_params_from_policy(Locomotive::Site, :site))
             site = service.create!(site_form.serializable_hash)
 
             present site, with: entity_klass
@@ -90,13 +91,14 @@ module Locomotive
               optional :domains, type: Array
               optional :timezone
               optional :picture
+              optional :cache_enabled
             end
           end
           put ':id' do
             site = load_site
             authorize site, :update?
 
-            site_form = Forms::SiteForm.new(permitted_params[:site])
+            site_form = Forms::SiteForm.new(permitted_params_from_policy(site, :site))
             site.assign_attributes(site_form.serializable_hash)
             site.save!
 

data/app/assets/javascripts/locomotive.js

@@ -11,6 +11,7 @@
 //= require underscore
 //= require backbone
 //= require codemirror
+//= require codemirror/modes/markdown
 //= require select2
 //= require nprogress
 //= require nprogress-ajax

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

@@ -1,5 +1,7 @@
+parent = if $('.content').size() > 0 then '.content' else '.wrapper'
+
 NProgress.configure
   showSpinner:  false
   ease:         'ease'
   speed:        500
-  parent:       '.content'
+  parent:       parent

data/app/assets/javascripts/locomotive/views/editable_elements/index_view.js.coffee

@@ -5,8 +5,8 @@ class Locomotive.Views.EditableElements.IndexView extends Backbone.View
   el: '.wrapper'
 
   events:
-    'click .expand-button': 'expand_preview'
-    'click .close-button':  'shrink_preview'
+    'click .content .expand-button': 'expand_preview'
+    'click .content .close-button':  'shrink_preview'
 
   expand_preview: (event) ->
     $('body').addClass('full-width-preview')
@@ -15,7 +15,7 @@ class Locomotive.Views.EditableElements.IndexView extends Backbone.View
     $('body').removeClass('full-width-preview')
 
   initialize: ->
-    _.bindAll(@, 'refresh_elements', 'refresh_image', 'refresh_image_on_remove', 'refresh_text')
+    _.bindAll(@, 'refresh_elements', 'refresh_image', 'refresh_image_on_remove', 'refresh_text', 'reload_page')
 
     view_options = if $('body').hasClass('live-editing') then {} else { el: '.main' }
 
@@ -25,6 +25,7 @@ class Locomotive.Views.EditableElements.IndexView extends Backbone.View
 
     @pubsub_image_changed_token = PubSub.subscribe('inputs.image_changed', @refresh_image)
     @pubsub_image_removed_token = PubSub.subscribe('inputs.image_removed', @refresh_image_on_remove)
+    @pubsub_pages_sorted_token  = PubSub.subscribe('pages.sorted', @reload_page)
 
     $('.preview iframe').load (event) => @on_iframe_load(event)
 
@@ -68,6 +69,11 @@ class Locomotive.Views.EditableElements.IndexView extends Backbone.View
     @refresh_elements 'text', data.view, ($elements) ->
       $elements.each -> $(this).html(data.content)
 
+  reload_page: (event) ->
+    $iframe = $('.preview iframe')
+    $target_window = $iframe[0].contentWindow
+    $iframe.attr('src', @preview_url)
+
   on_iframe_load: (event) ->
     $iframe = $('.preview iframe')
     $target_window = $iframe[0].contentWindow
@@ -106,3 +112,4 @@ class Locomotive.Views.EditableElements.IndexView extends Backbone.View
     PubSub.unsubscribe(@pubsub_image_changed_token)
     PubSub.unsubscribe(@pubsub_image_removed_token)
     PubSub.unsubscribe(@pubsub_text_token)
+    PubSub.unsubscribe(@pubsub_pages_sorted_token)

data/app/assets/javascripts/locomotive/views/inputs/markdown_view.js.coffee

@@ -0,0 +1,82 @@
+#= require ./text_view
+
+class Locomotive.Views.Inputs.MarkdownView extends Locomotive.Views.Inputs.TextView
+
+  events: _.extend {}, Locomotive.Views.Inputs.TextView.prototype.events,
+    'click a[data-markdown-command]': 'run_command'
+
+  opened_picker: false
+
+  initialize: ->
+    super
+
+    _.bindAll(@, 'insert_file')
+
+    @$textarea  = @$('textarea.markdown')
+    @editor     = CodeMirror.fromTextArea @$textarea[0],
+      mode:         'markdown'
+      tabMode:      'indent'
+      lineWrapping: true
+
+    @pubsub_token = PubSub.subscribe('file_picker.select', @insert_file)
+
+  run_command: (event) ->
+    $link   = $(event.target).closest('a')
+    command = $link.data('markdown-command')
+
+    switch command
+      when 'bold'       then @apply_bold()
+      when 'italic'     then @apply_italic()
+      when 'insertFile' then @open_file_picker($link.data('url'))
+      else
+        console.log "[Markdown input] command not implemented: #{command}"
+        return
+
+    @content_change_with_markdown()
+
+  apply_bold: ->
+    text = @editor.getSelection()
+    text = 'Some text' unless text? && text.length > 0
+    @editor.replaceSelection "**#{text}**"
+
+  apply_italic: ->
+    text = @editor.getSelection()
+    text = 'Some text' unless text? && text.length > 0
+    @editor.replaceSelection "*#{text}*"
+
+  insert_file: (msg, data) ->
+    return unless data.parent_view.cid == @.cid
+
+    text = @editor.getSelection()
+    text = data.title if !text? || text.length == 0
+
+    if data.image
+      @editor.replaceSelection " ![#{text}](#{data.url}) "
+    else
+      @editor.replaceSelection " [#{text}](#{data.url}) "
+
+    @content_change_with_markdown()
+    @hide_file_picker()
+
+  content_change_with_markdown: ->
+    event = $.Event 'change', target: @$textarea
+    @content_change(event)
+
+  text_value: (textarea) ->
+    kramed(@editor.getValue())
+
+  open_file_picker: (url) ->
+    if @opened_picker == false
+      window.application_view.drawer_view.open(
+        url,
+        Locomotive.Views.ContentAssets.PickerView,
+        { parent_view: @ })
+      @opened_picker = true
+
+  hide_file_picker: ->
+    window.application_view.drawer_view.close()
+    @opened_picker = false
+
+  remove: ->
+    PubSub.unsubscribe(@pubsub_token)
+    super