locomotivecms 4.1.1 → 4.2.0.alpha1

data/app/views/locomotive/page_content/_edit.json.jbuilder

@@ -0,0 +1,50 @@
+json.data do
+  json.site do
+    json.sectionsContent sections_content(current_site, @sections, @section_definitions)
+  end
+
+  json.page do
+    json.(@page, :id, :title, :seo_title, :meta_description, :meta_keywords, :listed, :published)
+
+    json.slug @page.slug if display_slug?(@page)
+
+    json.fullpath nice_preview_page_path(@page)
+    json.contentEntryId @page.content_entry&.id
+    json.sectionsContent sections_content(@page, @sections, @section_definitions)
+    json.sectionsDropzoneContent sections_dropzone_content(@page)
+  end
+
+  json.sectionDefinitions @section_definitions
+
+  json.editableElements @editable_elements
+
+  json.sections do
+    json.all      sections_by_id(@sections, @page)
+    json.top      @sections[:top]
+    json.bottom   @sections[:bottom]
+    json.dropzone @sections[:dropzone]
+  end
+
+  json.locale   current_content_locale
+  json.locales  current_site.locales
+  json.uiLocale I18n.locale
+
+  json.contentTypes content_types_with_templates(current_site)
+end
+
+json.urls do
+  json.base               pages_path(current_site)
+  json.load               edit_page_content_path(current_site, @page)
+  json.save               page_content_path(current_site, @page, format: :json)
+  json.editableElements   editable_elements_path(current_site, @page)
+  json.settings           edit_page_path(current_site, @page)
+  json.preview            preview_page_path(@page, mounted_on: true)
+  json.localized_previews localized_preview_page_paths(@page, mounted_on: true)
+  json.thumbnail          root_path + '_image_thumbnail'
+  json.assets             content_assets_path(current_site, format: :json)
+  json.bulkAssetUpload    bulk_create_content_assets_path(current_site, :json)
+  json.resources          search_for_resources_path(current_site, format: :json)
+  json.loaderImage        image_url('locomotive/editor_loader.gif')
+  json.deadendImage       image_url('locomotive/deadend.png')
+  json.contentEntries     content_entries_paths_by_slug(current_site)
+end

data/app/views/locomotive/page_content/edit.html.erb

@@ -2,7 +2,7 @@
 
 <% content_for :head do %>
   <script>
-    const _json = <%== render template: 'locomotive/page_content/edit.json.jbuilder' %>;
+    const _json = <%== render partial: 'locomotive/page_content/edit', formats: :json %>;
 
     window.Locomotive.previewBaseUrl = "<%= preview_path(current_site) %>";
 

data/app/views/locomotive/page_content/edit.json.jbuilder

@@ -1,50 +1,52 @@
-json.data do
-  json.site do
-    json.sectionsContent sections_content(current_site, @sections, @section_definitions)
-  end
-
-  json.page do
-    json.(@page, :id, :title, :seo_title, :meta_description, :meta_keywords, :listed, :published)
-
-    json.slug @page.slug if display_slug?(@page)
-
-    json.fullpath nice_preview_page_path(@page)
-    json.contentEntryId @page.content_entry&.id
-    json.sectionsContent sections_content(@page, @sections, @section_definitions)
-    json.sectionsDropzoneContent sections_dropzone_content(@page)
-  end
-
-  json.sectionDefinitions @section_definitions
-
-  json.editableElements @editable_elements
-
-  json.sections do
-    json.all      sections_by_id(@sections, @page)
-    json.top      @sections[:top]
-    json.bottom   @sections[:bottom]
-    json.dropzone @sections[:dropzone]
-  end
-
-  json.locale   current_content_locale
-  json.locales  current_site.locales
-  json.uiLocale I18n.locale
-
-  json.contentTypes content_types_with_templates(current_site)
-end
-
-json.urls do
-  json.base               pages_path(current_site)
-  json.load               edit_page_content_path(current_site, @page)
-  json.save               page_content_path(current_site, @page, format: :json)
-  json.editableElements   editable_elements_path(current_site, @page)
-  json.settings           edit_page_path(current_site, @page)
-  json.preview            preview_page_path(@page, mounted_on: true)
-  json.localized_previews localized_preview_page_paths(@page, mounted_on: true)
-  json.thumbnail          root_path + '_image_thumbnail'
-  json.assets             content_assets_path(current_site, format: :json)
-  json.bulkAssetUpload    bulk_create_content_assets_path(current_site, :json)
-  json.resources          search_for_resources_path(current_site, format: :json)
-  json.loaderImage        image_url('locomotive/editor_loader.gif')
-  json.deadendImage       image_url('locomotive/deadend.png')
-  json.contentEntries     content_entries_paths_by_slug(current_site)
-end
+json.partial! 'edit'
+
+# json.data do
+#   json.site do
+#     json.sectionsContent sections_content(current_site, @sections, @section_definitions)
+#   end
+
+#   json.page do
+#     json.(@page, :id, :title, :seo_title, :meta_description, :meta_keywords, :listed, :published)
+
+#     json.slug @page.slug if display_slug?(@page)
+
+#     json.fullpath nice_preview_page_path(@page)
+#     json.contentEntryId @page.content_entry&.id
+#     json.sectionsContent sections_content(@page, @sections, @section_definitions)
+#     json.sectionsDropzoneContent sections_dropzone_content(@page)
+#   end
+
+#   json.sectionDefinitions @section_definitions
+
+#   json.editableElements @editable_elements
+
+#   json.sections do
+#     json.all      sections_by_id(@sections, @page)
+#     json.top      @sections[:top]
+#     json.bottom   @sections[:bottom]
+#     json.dropzone @sections[:dropzone]
+#   end
+
+#   json.locale   current_content_locale
+#   json.locales  current_site.locales
+#   json.uiLocale I18n.locale
+
+#   json.contentTypes content_types_with_templates(current_site)
+# end
+
+# json.urls do
+#   json.base               pages_path(current_site)
+#   json.load               edit_page_content_path(current_site, @page)
+#   json.save               page_content_path(current_site, @page, format: :json)
+#   json.editableElements   editable_elements_path(current_site, @page)
+#   json.settings           edit_page_path(current_site, @page)
+#   json.preview            preview_page_path(@page, mounted_on: true)
+#   json.localized_previews localized_preview_page_paths(@page, mounted_on: true)
+#   json.thumbnail          root_path + '_image_thumbnail'
+#   json.assets             content_assets_path(current_site, format: :json)
+#   json.bulkAssetUpload    bulk_create_content_assets_path(current_site, :json)
+#   json.resources          search_for_resources_path(current_site, format: :json)
+#   json.loaderImage        image_url('locomotive/editor_loader.gif')
+#   json.deadendImage       image_url('locomotive/deadend.png')
+#   json.contentEntries     content_entries_paths_by_slug(current_site)
+# end

data/config/initializers/devise.rb

@@ -4,7 +4,6 @@ module Locomotive
     class FailureApp < ::Devise::FailureApp
 
       include ::Locomotive::Engine.routes.url_helpers
-
       def redirect_url
         new_locomotive_account_session_path
       end
@@ -12,4 +11,8 @@ module Locomotive
     end
 
   end
-end
+end
+
+Devise.setup do |config|
+  config.secret_key = Rails.application.secret_key_base
+end

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

@@ -70,9 +70,4 @@ Locomotive.configure do |config|
   # Indicate whether you want to allow users to register with the site. If set
   # to false the registration page will not be shown. (Default: true)
   # config.enable_registration = true
-
-  # By default, Locomotive doesn't try to optimize the assets uploaded by the editors.
-  # If true, it will use imageoptim to decrease the size of an image without losing (too much of) quality.
-  # config.optimize_uploaded_files = false
-
 end

data/lib/locomotive/action_controller/responder.rb

@@ -78,7 +78,7 @@ module Locomotive
 
         if in_header
           set_flash_message!
-          message = URI::escape(controller.flash[type].to_str) if controller.flash[type]
+          message = ERB::Util.url_encode(controller.flash[type].to_str) if controller.flash[type]
 
           unless message.blank?
             controller.headers['X-Message']       = ActiveSupport::JSON.encode(message)

data/lib/locomotive/configuration.rb

@@ -30,8 +30,8 @@ module Locomotive
       },
       rack_cache:             {
         verbose:      true,
-        metastore:    URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/meta"), # URI encoded in case of spaces
-        entitystore:  URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/body")
+        metastore:    ERB::Util.url_encode("file:#{Rails.root}/tmp/dragonfly/cache/meta"), # URI encoded in case of spaces
+        entitystore:  ERB::Util.url_encode("file:#{Rails.root}/tmp/dragonfly/cache/body")
       },
       devise_modules:               [:registerable, :rememberable, :database_authenticatable, :recoverable, :trackable, :validatable, :encryptable, { encryptor: :sha1 }],
       steam_image_resizer_secret:   'please change it'

data/lib/locomotive/dependencies.rb

@@ -19,7 +19,6 @@ require 'slim'
 require 'simple_form'
 require 'responders'
 require 'carrierwave'
-require 'carrierwave-imageoptim'
 require 'custom_fields'
 require 'mimetype_fu'
 require 'actionmailer_with_request'
@@ -32,7 +31,6 @@ require 'csv'
 require 'rails-i18n'
 require 'json-schema'
 
-require 'codemirror/rails'
 require 'jquery/rails'
 require 'jquery-ui-rails'
 

data/lib/locomotive/engine.rb

@@ -12,6 +12,11 @@ module Locomotive
       end
     end
 
+    initializer 'locomotive.mongoid' do
+      # https://jira.mongodb.org/browse/MONGOID-5260?jql=text%20~%20%22pluck%20localized%22
+      ::Mongoid.legacy_pluck_distinct = true
+    end
+
     initializer 'locomotive.params.filter' do |app|
       # Do not log remote_<field>_url params because they can contain huge base64 string
       app.config.filter_parameters += [/\Aremote_.+_url\Z/]
@@ -21,8 +26,14 @@ module Locomotive
       ::ActionController::Base.wrap_parameters format: [:json]
     end
 
-    initializer 'locomotive.devise' do |app|
-      ::DeviseController.respond_to :html, :json
+    # initializer 'locomotive.devise' do |app|
+    #   ::DeviseController.respond_to :html, :json
+    # end
+
+    initializer 'locomotive.inflectors' do |app|
+      ActiveSupport::Inflector.inflections(:en) do |inflect|
+        inflect.acronym 'API'
+      end
     end
 
     initializer 'locomotive.assets' do |app|
@@ -31,6 +42,7 @@ module Locomotive
 
     initializer 'locomotive.precompile.hook', group: :all do |app|
       app.config.assets.precompile += %w(
+        locomotive_manifest.js
         locomotive/icons/flags/*.png
         locomotive/*.png
         locomotive/*.gif

data/lib/locomotive/mongoid/patches.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# # encoding: utf-8
 
 require 'mongoid'
 
@@ -41,73 +41,33 @@ module Mongoid #:nodoc:
     end
   end
 
-  # FIXME: https://github.com/benedikt/mongoid-tree/issues/58
-  # We replace all the @_#{name} occurences by @_#{name}_ivar.
-  module Relations
-    module Accessors
-      def reset_relation_criteria(name)
-        if instance_variable_defined?("@_#{name}_ivar")
-          send(name).reset_unloaded
-        end
-      end
-      def set_relation(name, relation)
-        instance_variable_set("@_#{name}_ivar", relation)
-      end
-    end
-    def reload_relations
-      relations.each_pair do |name, meta|
-        if instance_variable_defined?("@_#{name}_ivar")
-          if _parent.nil? || instance_variable_get("@_#{name}_ivar") != _parent
-            remove_instance_variable("@_#{name}_ivar")
-          end
-        end
-      end
-    end
-
+  # Hack to give a specific type to the EditableElement
+  module Association
     module Embedded
-      class Many < Relations::Many
-
-        def with_same_class!(document, klass)
-          return document if document.is_a?(klass)
-
-          Factory.build(klass, {}).tap do |_document|
-            # make it part of the relationship
-            _document.apply_post_processed_defaults
-            integrate(_document)
-
-            # make it look like the old document
-            attributes = document.attributes
-            attributes['_type'] = _document._type
-
-            _document.instance_variable_set(:@attributes, attributes)
-            _document.new_record  = document.new_record?
-            _document._index      = document._index
-
-            # finally, make the change in the lists
-            target[_document._index]    = _document
-            _unscoped[_document._index] = _document
+      class EmbedsMany
+        class Proxy < Association::Many
+          def with_same_class!(document, klass)
+            return document if document.is_a?(klass)
+
+            Factory.build(klass, {}).tap do |_document|
+              # make it part of the relationship
+              _document.apply_post_processed_defaults
+              integrate(_document)
+
+              # make it look like the old document
+              attributes = document.attributes
+              attributes['_type'] = _document._type
+
+              _document.instance_variable_set(:@attributes, attributes)
+              _document.new_record  = document.new_record?
+              _document._index      = document._index
+
+              # finally, make the change in the lists
+              _target[_document._index]   = _document
+              _unscoped[_document._index] = _document
+            end
           end
         end
-
-      end
-    end
-
-  end
-  module Extensions
-    module Object
-      def ivar(name)
-        if instance_variable_defined?("@_#{name}_ivar")
-          return instance_variable_get("@_#{name}_ivar")
-        else
-          false
-        end
-      end
-      def remove_ivar(name)
-        if instance_variable_defined?("@_#{name}_ivar")
-          return remove_instance_variable("@_#{name}_ivar")
-        else
-          false
-        end
       end
     end
   end

data/lib/locomotive/steam/services/api_entry_submission_service.rb

@@ -29,6 +29,7 @@ module Locomotive
           })
 
           entity = entry.to_steam(@content_type)
+
           Locomotive::Steam::Decorators::I18nDecorator.new(entity, locale)
         end
       end

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive
-  VERSION = '4.1.1'
+  VERSION = '4.2.0.alpha1'
 end

data/vendor/assets/javascripts/locomotive/codemirror/addons/comment/comment.js

@@ -0,0 +1,203 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var noOptions = {};
+  var nonWS = /[^\s\u00a0]/;
+  var Pos = CodeMirror.Pos;
+
+  function firstNonWS(str) {
+    var found = str.search(nonWS);
+    return found == -1 ? 0 : found;
+  }
+
+  CodeMirror.commands.toggleComment = function(cm) {
+    cm.toggleComment();
+  };
+
+  CodeMirror.defineExtension("toggleComment", function(options) {
+    if (!options) options = noOptions;
+    var cm = this;
+    var minLine = Infinity, ranges = this.listSelections(), mode = null;
+    for (var i = ranges.length - 1; i >= 0; i--) {
+      var from = ranges[i].from(), to = ranges[i].to();
+      if (from.line >= minLine) continue;
+      if (to.line >= minLine) to = Pos(minLine, 0);
+      minLine = from.line;
+      if (mode == null) {
+        if (cm.uncomment(from, to, options)) mode = "un";
+        else { cm.lineComment(from, to, options); mode = "line"; }
+      } else if (mode == "un") {
+        cm.uncomment(from, to, options);
+      } else {
+        cm.lineComment(from, to, options);
+      }
+    }
+  });
+
+  // Rough heuristic to try and detect lines that are part of multi-line string
+  function probablyInsideString(cm, pos, line) {
+    return /\bstring\b/.test(cm.getTokenTypeAt(Pos(pos.line, 0))) && !/^[\'\"`]/.test(line)
+  }
+
+  CodeMirror.defineExtension("lineComment", function(from, to, options) {
+    if (!options) options = noOptions;
+    var self = this, mode = self.getModeAt(from);
+    var firstLine = self.getLine(from.line);
+    if (firstLine == null || probablyInsideString(self, from, firstLine)) return;
+
+    var commentString = options.lineComment || mode.lineComment;
+    if (!commentString) {
+      if (options.blockCommentStart || mode.blockCommentStart) {
+        options.fullLines = true;
+        self.blockComment(from, to, options);
+      }
+      return;
+    }
+
+    var end = Math.min(to.ch != 0 || to.line == from.line ? to.line + 1 : to.line, self.lastLine() + 1);
+    var pad = options.padding == null ? " " : options.padding;
+    var blankLines = options.commentBlankLines || from.line == to.line;
+
+    self.operation(function() {
+      if (options.indent) {
+        var baseString = null;
+        for (var i = from.line; i < end; ++i) {
+          var line = self.getLine(i);
+          var whitespace = line.slice(0, firstNonWS(line));
+          if (baseString == null || baseString.length > whitespace.length) {
+            baseString = whitespace;
+          }
+        }
+        for (var i = from.line; i < end; ++i) {
+          var line = self.getLine(i), cut = baseString.length;
+          if (!blankLines && !nonWS.test(line)) continue;
+          if (line.slice(0, cut) != baseString) cut = firstNonWS(line);
+          self.replaceRange(baseString + commentString + pad, Pos(i, 0), Pos(i, cut));
+        }
+      } else {
+        for (var i = from.line; i < end; ++i) {
+          if (blankLines || nonWS.test(self.getLine(i)))
+            self.replaceRange(commentString + pad, Pos(i, 0));
+        }
+      }
+    });
+  });
+
+  CodeMirror.defineExtension("blockComment", function(from, to, options) {
+    if (!options) options = noOptions;
+    var self = this, mode = self.getModeAt(from);
+    var startString = options.blockCommentStart || mode.blockCommentStart;
+    var endString = options.blockCommentEnd || mode.blockCommentEnd;
+    if (!startString || !endString) {
+      if ((options.lineComment || mode.lineComment) && options.fullLines != false)
+        self.lineComment(from, to, options);
+      return;
+    }
+
+    var end = Math.min(to.line, self.lastLine());
+    if (end != from.line && to.ch == 0 && nonWS.test(self.getLine(end))) --end;
+
+    var pad = options.padding == null ? " " : options.padding;
+    if (from.line > end) return;
+
+    self.operation(function() {
+      if (options.fullLines != false) {
+        var lastLineHasText = nonWS.test(self.getLine(end));
+        self.replaceRange(pad + endString, Pos(end));
+        self.replaceRange(startString + pad, Pos(from.line, 0));
+        var lead = options.blockCommentLead || mode.blockCommentLead;
+        if (lead != null) for (var i = from.line + 1; i <= end; ++i)
+          if (i != end || lastLineHasText)
+            self.replaceRange(lead + pad, Pos(i, 0));
+      } else {
+        self.replaceRange(endString, to);
+        self.replaceRange(startString, from);
+      }
+    });
+  });
+
+  CodeMirror.defineExtension("uncomment", function(from, to, options) {
+    if (!options) options = noOptions;
+    var self = this, mode = self.getModeAt(from);
+    var end = Math.min(to.ch != 0 || to.line == from.line ? to.line : to.line - 1, self.lastLine()), start = Math.min(from.line, end);
+
+    // Try finding line comments
+    var lineString = options.lineComment || mode.lineComment, lines = [];
+    var pad = options.padding == null ? " " : options.padding, didSomething;
+    lineComment: {
+      if (!lineString) break lineComment;
+      for (var i = start; i <= end; ++i) {
+        var line = self.getLine(i);
+        var found = line.indexOf(lineString);
+        if (found > -1 && !/comment/.test(self.getTokenTypeAt(Pos(i, found + 1)))) found = -1;
+        if (found == -1 && (i != end || i == start) && nonWS.test(line)) break lineComment;
+        if (found > -1 && nonWS.test(line.slice(0, found))) break lineComment;
+        lines.push(line);
+      }
+      self.operation(function() {
+        for (var i = start; i <= end; ++i) {
+          var line = lines[i - start];
+          var pos = line.indexOf(lineString), endPos = pos + lineString.length;
+          if (pos < 0) continue;
+          if (line.slice(endPos, endPos + pad.length) == pad) endPos += pad.length;
+          didSomething = true;
+          self.replaceRange("", Pos(i, pos), Pos(i, endPos));
+        }
+      });
+      if (didSomething) return true;
+    }
+
+    // Try block comments
+    var startString = options.blockCommentStart || mode.blockCommentStart;
+    var endString = options.blockCommentEnd || mode.blockCommentEnd;
+    if (!startString || !endString) return false;
+    var lead = options.blockCommentLead || mode.blockCommentLead;
+    var startLine = self.getLine(start), endLine = end == start ? startLine : self.getLine(end);
+    var open = startLine.indexOf(startString), close = endLine.lastIndexOf(endString);
+    if (close == -1 && start != end) {
+      endLine = self.getLine(--end);
+      close = endLine.lastIndexOf(endString);
+    }
+    if (open == -1 || close == -1 ||
+        !/comment/.test(self.getTokenTypeAt(Pos(start, open + 1))) ||
+        !/comment/.test(self.getTokenTypeAt(Pos(end, close + 1))))
+      return false;
+
+    // Avoid killing block comments completely outside the selection.
+    // Positions of the last startString before the start of the selection, and the first endString after it.
+    var lastStart = startLine.lastIndexOf(startString, from.ch);
+    var firstEnd = lastStart == -1 ? -1 : startLine.slice(0, from.ch).indexOf(endString, lastStart + startString.length);
+    if (lastStart != -1 && firstEnd != -1 && firstEnd + endString.length != from.ch) return false;
+    // Positions of the first endString after the end of the selection, and the last startString before it.
+    firstEnd = endLine.indexOf(endString, to.ch);
+    var almostLastStart = endLine.slice(to.ch).lastIndexOf(startString, firstEnd - to.ch);
+    lastStart = (firstEnd == -1 || almostLastStart == -1) ? -1 : to.ch + almostLastStart;
+    if (firstEnd != -1 && lastStart != -1 && lastStart != to.ch) return false;
+
+    self.operation(function() {
+      self.replaceRange("", Pos(end, close - (pad && endLine.slice(close - pad.length, close) == pad ? pad.length : 0)),
+                        Pos(end, close + endString.length));
+      var openEnd = open + startString.length;
+      if (pad && startLine.slice(openEnd, openEnd + pad.length) == pad) openEnd += pad.length;
+      self.replaceRange("", Pos(start, open), Pos(start, openEnd));
+      if (lead) for (var i = start + 1; i <= end; ++i) {
+        var line = self.getLine(i), found = line.indexOf(lead);
+        if (found == -1 || nonWS.test(line.slice(0, found))) continue;
+        var foundEnd = found + lead.length;
+        if (pad && line.slice(foundEnd, foundEnd + pad.length) == pad) foundEnd += pad.length;
+        self.replaceRange("", Pos(i, found), Pos(i, foundEnd));
+      }
+    });
+    return true;
+  });
+});