ckeditor 4.2.3 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f01d39fd69d31cd2d055978561b4bcbe3f1777b
-  data.tar.gz: 80a0c2fc15842b9ff6403f6d213c58f306726f7d
+  metadata.gz: 8322d6cb4547b48c4919776004ded1a350c05545
+  data.tar.gz: 9ab657aaca72e69a847357666e1da8eb46684295
 SHA512:
-  metadata.gz: 3dcd349b482553c6cbe7a3dccfaf61934c9a4c3b1b8bdcd9949dd6831d03252e23aa633b084cca7a74a6e23369d8a0416eb5e28d148f8f88d36c4ab736e21894
-  data.tar.gz: bada24f9807287455e3d5c208abf5e7c2cf2cdf0d64da638a68cea8d78bf9bab1b0525e1d50223151da6def6d94b6bde47b719c238aac4e5a69737ff63d134e1
+  metadata.gz: c0434a28caf6681dc5a769a12f75019e05042611d62b5ceb0d3f3b5703c07bb10de4ed7b254cfa5cf87ba4dd7e42f0659314acc70de7b319951acf0ed615e19a
+  data.tar.gz: 1842897fba7ae53915db54f91104fa73c71ac1fd2a4390b9fdb72779fa87d858f330ef153c57fbac6a129346c2c1fd3f41d2580222f37c40da05c240457966a1

data/README.md

@@ -8,8 +8,8 @@ CKEditor is a WYSIWYG text editor designed to simplify web content creation. It
 
 ## Features
 
-* CKEditor version 4.6.2 full (12 Jan 2017)
-* Rails 5.0.x, 4.2.x integration
+* CKEditor version 4.7.1 full (28 Jun 2017)
+* Rails 5.0.x, 5.1.x, 4.2.x integration
 * Files browser
 * HTML5 file uploader
 * Hooks for formtastic and simple_form forms generators
@@ -194,7 +194,7 @@ When overriding the default `config.js` file, you must set all configuration opt
 
 ### Deployment (only if you use ckeditor from gem vendor)
 
-For Rails 4, add the following to `config/initializers/assets.rb`:
+For Rails 4 and 5, add the following to `config/initializers/assets.rb`:
 
 ```ruby
 Rails.application.config.assets.precompile += %w( ckeditor/* )
@@ -267,10 +267,10 @@ Create a file app/assets/javascripts/init_ckeditor.coffee
 ```coffee
 ready = ->
   $('.ckeditor').each ->
-  CKEDITOR.replace $(this).attr('id')
+    CKEDITOR.replace $(this).attr('id')
 
 $(document).ready(ready)
-$(document).on('page:load', ready) } }
+$(document).on('page:load', ready)
 ```
 Make sure the file is loaded from your app/assets/javascripts/application.js
 

data/app/assets/javascripts/ckeditor/config.js

@@ -26,7 +26,7 @@ CKEDITOR.editorConfig = function( config )
   config.filebrowserImageBrowseUrl = "/ckeditor/pictures";
 
   // The location of a script that handles file uploads in the Image dialog.
-  config.filebrowserImageUploadUrl = "/ckeditor/pictures";
+  config.filebrowserImageUploadUrl = "/ckeditor/pictures?";
 
   // The location of a script that handles file uploads.
   config.filebrowserUploadUrl = "/ckeditor/attachment_files";

data/app/assets/stylesheets/ckeditor/filebrowser/uploader.scss

@@ -127,6 +127,46 @@ img {
   text-decoration: underline;
 }
 
-.pagination, .pagination a {
-    text-decoration: none;
+.pagination {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-weight: inherit;
+  font-style: inherit;
+  height: 40px;
+  text-align: center;
+  vertical-align: middle;
+}
+
+.pagination a {
+  height: 40px;
+  width: 50%;
+  padding-right: 5px;
+  padding-left: 5px;
+  text-decoration: none;
+
+  background: #f8f8f8;
+  border-color: #f5c002;
+  color: #000;
+
+  position: relative;
+  display: inline-block;
+  vertical-align: middle;
+  line-height: 40px;
+  font-weight: 400;
+  font-size: 13px;
+
+  padding: 0 20px;
+
+  box-sizing: border-box;
+  border: 1px solid #bcbcbc;
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  -ms-border-radius: 2px;
+  -o-border-radius: 2px;
+  border-radius: 2px;
+}
+
+.pagination a:hover {
+  background: #fff;
 }

data/app/controllers/ckeditor/attachment_files_controller.rb

@@ -1,5 +1,5 @@
 class Ckeditor::AttachmentFilesController < Ckeditor::ApplicationController
-  skip_before_action :verify_authenticity_token, only: :create
+  skip_before_action :verify_authenticity_token, only: :create, raise: false
 
   def index
     @attachments = Ckeditor.attachment_file_adapter.find_all(ckeditor_attachment_files_scope)

data/app/controllers/ckeditor/pictures_controller.rb

@@ -1,5 +1,5 @@
 class Ckeditor::PicturesController < Ckeditor::ApplicationController
-  skip_before_action :verify_authenticity_token, only: :create
+  skip_before_action :verify_authenticity_token, only: :create, raise: false
 
   def index
     @pictures = Ckeditor.picture_adapter.find_all(ckeditor_pictures_scope)

data/app/helpers/ckeditor/application_helper.rb

@@ -1,11 +1,2 @@
 module Ckeditor::ApplicationHelper
-  def assets_pipeline_enabled?
-    if Gem::Version.new(::Rails.version.to_s) >= Gem::Version.new('4.0.0')
-      defined?(Sprockets::Rails)
-    elsif Gem::Version.new(::Rails.version.to_s) >= Gem::Version.new('3.0.0')
-      Rails.application.config.assets.enabled
-    else
-      false
-    end
-  end
-end
+end

data/app/views/ckeditor/attachment_files/index.html.erb

@@ -11,7 +11,7 @@
 
   <% unless @attachments.last_page? %>
     <div class="pagination">
-      <%= link_to I18n.t("ckeditor.buttons.next"), ckeditor.attachment_files_path(params.merge(page: @attachments.next_page)), class: "next", rel: "next" %>
+      <%= link_to I18n.t("ckeditor.buttons.next"), ckeditor.attachment_files_path(page: @attachments.next_page), class: "next", rel: "next" %>
     </div>
   <% end -%>
 

data/app/views/ckeditor/pictures/index.html.erb

@@ -11,7 +11,7 @@
 
   <% unless @pictures.last_page? %>
     <div class="pagination">
-      <%= link_to I18n.t("ckeditor.buttons.next"), ckeditor.pictures_path(params.merge(page: @pictures.next_page)), class: "next", rel: "next" %>
+      <%= link_to I18n.t("ckeditor.buttons.next"), ckeditor.pictures_path(page: @pictures.next_page), class: "next", rel: "next" %>
     </div>
   <% end -%>
 

data/app/views/layouts/ckeditor/application.html.erb

@@ -7,7 +7,7 @@
   <title><%= I18n.t('page_title', scope: [:ckeditor]) %></title>
   <script src="//code.jquery.com/jquery-1.11.3.min.js" type="text/javascript"></script>
 
-  <% if assets_pipeline_enabled? -%>
+  <% if Ckeditor.assets_pipeline_enabled? -%>
     <%= stylesheet_link_tag "ckeditor/application" %>
     <%= javascript_include_tag "ckeditor/application" %>
   <% else -%>

data/lib/ckeditor.rb

@@ -28,7 +28,7 @@ module Ckeditor
     autoload :Refile, 'ckeditor/backend/refile'
   end
 
-  IMAGE_TYPES = %w(image/jpeg image/png image/gif image/jpg image/pjpeg image/tiff image/x-png).freeze
+  IMAGE_TYPES = %w[image/jpeg image/png image/gif image/jpg image/pjpeg image/tiff image/x-png].freeze
 
   DEFAULT_AUTHORIZE = -> {}
 
@@ -41,17 +41,17 @@ module Ckeditor
   # Allowed image file types for upload.
   # Set to nil or [] (empty array) for all file types
   mattr_accessor :image_file_types
-  @@image_file_types = %w(jpg jpeg png gif tiff)
+  @@image_file_types = %w[jpg jpeg png gif tiff]
 
   # Allowed flash file types for upload.
   # Set to nil or [] (empty array) for all file types
   mattr_accessor :flash_file_types
-  @@flash_file_types = %w(swf)
+  @@flash_file_types = %w[swf]
 
   # Allowed attachment file types for upload.
   # Set to nil or [] (empty array) for all file types
   mattr_accessor :attachment_file_types
-  @@attachment_file_types = %w(doc docx xls odt ods pdf rar zip tar tar.gz swf)
+  @@attachment_file_types = %w[doc docx xls odt ods pdf rar zip tar tar.gz swf]
 
   # Ckeditor files destination path
   mattr_accessor :relative_path
@@ -65,10 +65,6 @@ module Ckeditor
   mattr_accessor :run_on_precompile
   @@run_on_precompile = true
 
-  # Turn on/off filename parameterize
-  mattr_accessor :parameterize_filenames
-  @@parameterize_filenames = true
-
   # Paginate assets
   mattr_accessor :default_per_page
   @@default_per_page = 24
@@ -99,12 +95,17 @@ module Ckeditor
   mattr_accessor :controller_layout
   @@controller_layout = 'ckeditor/application'
 
+  # Turn on/off assets pipeline
+  # By default ckeditor will check assets pipeline
+  mattr_accessor :assets_pipeline_enabled
+  @@assets_pipeline_enabled = nil
+
   # Default way to setup Ckeditor. Run rails generate ckeditor to create
   # a fresh initializer with all configuration values.
   #
   # @example
   #   Ckeditor.setup do |config|
-  #     config.parameterize_filenames = false
+  #     config.default_per_page = 30
   #     config.attachment_file_types += ["xml"]
   #   end
   #
@@ -237,6 +238,11 @@ module Ckeditor
     @current_user = block if block_given?
     @current_user || DEFAULT_CURRENT_USER
   end
+
+  def self.assets_pipeline_enabled?
+    @@assets_pipeline_enabled = Utils.assets_pipeline_enabled? if @@assets_pipeline_enabled.nil?
+    @@assets_pipeline_enabled
+  end
 end
 
 require 'ckeditor/rails'

data/lib/ckeditor/asset_response.rb

@@ -7,6 +7,7 @@ module Ckeditor
     include ActionView::Helpers::JavaScriptHelper
 
     FUNCTION = 'window.parent.CKEDITOR.tools.callFunction'.freeze
+    JSON_TYPE = 'json'.freeze
 
     attr_reader :asset, :params
 
@@ -19,7 +20,7 @@ module Ckeditor
     end
 
     def json?
-      params[:responseType] == 'json'
+      params[:responseType] == JSON_TYPE
     end
 
     def ckeditor?

data/lib/ckeditor/backend/dragonfly.rb

@@ -1,7 +1,7 @@
 module Ckeditor
   module Backend
     module Dragonfly
-      FORMATS = %w(bz2 gz lzma xz).freeze
+      FORMATS = %w[bz2 gz lzma xz].freeze
 
       def self.included(base)
         base.send(:extend, ::Dragonfly::Model)
@@ -28,7 +28,7 @@ module Ckeditor
       end
 
       module InstanceMethods
-        delegate :url, :path, :size, :image?, :width, :height, to: :data
+        delegate :url, :path, :image?, :width, :height, to: :data
 
         alias_attribute :data_file_name, :data_name
         alias_attribute :data_content_type, :"data.mime_type"

data/lib/ckeditor/backend/paperclip.rb

@@ -10,9 +10,9 @@ module Ckeditor
         def self.extended(base)
           base.class_eval do
             before_validation :extract_content_type
-            before_create :extract_dimensions, :parameterize_filename
+            before_create :extract_dimensions
 
-            delegate :url, :path, :styles, :size, :content_type, to: :data
+            delegate :url, :path, :styles, :content_type, to: :data
           end
         end
       end
@@ -28,13 +28,6 @@ module Ckeditor
           @file ||= data.respond_to?(:queued_for_write) ? data.queued_for_write[:original] : data.to_file
         end
 
-        def parameterize_filename
-          unless data_file_name.blank?
-            filename = Ckeditor::Utils.parameterize_filename(data_file_name)
-            data.instance_write(:file_name, filename)
-          end
-        end
-
         def extract_dimensions
           if image? && has_dimensions?
             self.width = geometry.width

data/lib/ckeditor/backend/refile.rb

@@ -5,7 +5,7 @@ module Ckeditor
 
       included do
         validates :data, presence: true
-        delegate :rewind, :download, :to_io, :exists?, :delete, :size, :close, :eof?, :read, to: :data
+        delegate :rewind, :download, :to_io, :exists?, :delete, :close, :eof?, :read, to: :data
         alias_attribute :data_file_name, :data_filename
         alias_attribute :data_file_size, :data_size
       end

data/lib/ckeditor/helpers/controllers.rb

@@ -22,7 +22,7 @@ module Ckeditor
       end
 
       def ckeditor_filebrowser_scope(options = {})
-        { order: [:id, :desc] }.merge(options)
+        { order: [:id, :desc] }.merge!(options)
       end
     end
   end

data/lib/ckeditor/orm/base.rb

@@ -39,7 +39,7 @@ module Ckeditor
             options = {
               methods: as_json_methods,
               root: 'asset'
-            }.merge(options || {})
+            }.merge!(options || {})
 
             super(options)
           end

data/lib/ckeditor/utils.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require 'active_support/json/encoding'
 
 module Ckeditor
@@ -8,16 +9,7 @@ module Ckeditor
 
     class << self
       def escape_single_quotes(str)
-        str.gsub('\\','\0\0').gsub('</','<\/').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }
-      end
-
-      def parameterize_filename(filename)
-        return filename unless Ckeditor.parameterize_filenames
-
-        extension = File.extname(filename)
-        basename = filename.gsub(/#{extension}$/, '')
-
-        [basename.parameterize('_'), extension].join.downcase
+        str.gsub('\\', '\0\0').gsub('</', '<\/').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }
       end
 
       def js_replace(dom_id, options = nil)
@@ -41,7 +33,7 @@ module Ckeditor
       end
 
       def js_fileuploader(uploader_type, options = {})
-        options = { multiple: true, element: 'fileupload' }.merge(options)
+        options = { multiple: true, element: 'fileupload' }.merge!(options)
 
         case uploader_type.to_s.downcase
         when 'image' then
@@ -71,6 +63,16 @@ module Ckeditor
         File.join(Ckeditor.relative_path, 'filebrowser/thumbs', image)
       end
 
+      def assets_pipeline_enabled?
+        if Gem::Version.new(::Rails.version.to_s) >= Gem::Version.new('4.0.0')
+          defined?(Sprockets::Rails)
+        elsif Gem::Version.new(::Rails.version.to_s) >= Gem::Version.new('3.0.0')
+          Rails.application.config.assets.enabled
+        else
+          false
+        end
+      end
+
       def select_assets(path, relative_path)
         relative_folder = Ckeditor.root_path.join(relative_path)
         folder = relative_folder.join(path)

data/lib/ckeditor/version.rb

@@ -1,6 +1,6 @@
 module Ckeditor
   module Version
-    GEM = '4.2.3'.freeze
-    EDITOR = '4.6.2'.freeze
+    GEM = '4.2.4'.freeze
+    EDITOR = '4.7.1'.freeze
   end
 end

data/lib/generators/ckeditor/templates/mongoid/carrierwave/ckeditor/asset.rb

@@ -1,7 +1,7 @@
 class Ckeditor::Asset
   include Ckeditor::Orm::Mongoid::AssetBase
 
-  delegate :url, :current_path, :size, :content_type, :filename, to: :data
+  delegate :url, :current_path, :content_type, to: :data
 
   validates :data, presence: true
 end

data/test/models/attachment_file_test.rb

@@ -5,15 +5,10 @@ class AttachmentFileTest < ActiveSupport::TestCase
     @attachment.destroy rescue nil
   end
 
-  test "Set file content_type and size" do
+  test 'Set file content_type and size' do
     @attachment = create_attachment
 
-    # TODO: fix filename parameterization
-    if CKEDITOR_BACKEND == :paperclip
-      assert_equal "rails_tar.gz", @attachment.data_file_name
-    else
-      assert_equal "rails.tar.gz", @attachment.data_file_name
-    end
+    assert_equal "rails.tar.gz", @attachment.data_file_name
 
     assert_match /application\/(x-)?gzip/, @attachment.data_content_type
     assert_equal 6823, @attachment.data_file_size

data/test/tmp/app/models/ckeditor/asset.rb

@@ -0,0 +1,5 @@
+class Ckeditor::Asset
+  include Ckeditor::Orm::Mongoid::AssetBase
+  include Mongoid::Paperclip
+  include Ckeditor::Backend::Paperclip
+end

data/test/tmp/app/models/ckeditor/attachment_file.rb

@@ -0,0 +1,13 @@
+class Ckeditor::AttachmentFile < Ckeditor::Asset
+  has_mongoid_attached_file :data,
+                            url: '/ckeditor_assets/attachments/:id/:filename',
+                            path: ':rails_root/public/ckeditor_assets/attachments/:id/:filename'
+
+  validates_attachment_presence :data
+  validates_attachment_size :data, less_than: 100.megabytes
+  do_not_validate_attachment_file_type :data
+
+  def url_thumb
+    @url_thumb ||= Ckeditor::Utils.filethumb(filename)
+  end
+end