ckeditor 4.1.6 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5eabd9522c6e41cc16b578e752c34cb931454a92
-  data.tar.gz: c11df316e009cde1dcef7c0046ee8db5ab08bdbe
+  metadata.gz: 7ba28bfa21d329af77d72bb3f6d787618ea1ba91
+  data.tar.gz: dd4bd4dbcb3bab209666f640bc775b5d331b0ba3
 SHA512:
-  metadata.gz: ba3eab2c3f744e674b0569974f4cab7832c1c64d5927f25d1d3155dc13160d78d0610966c16661b9d422c4bc84c7eeb28b49cad85168571689f5a9e18e20eb04
-  data.tar.gz: 1d01d18849af4afcb915182b1caf1d4fc2df8159001ceceed5e72c597e6a62943c45abe81254f19a7948768d8f2347a475444c3af0d37e48ed8fd44e50ab03a7
+  metadata.gz: cfd9a557133ffdde4d12ea628dfbfd05de84aeca946de7694b8f1ee021cfb40b4ea724cee62aa1ef2aae5cf0bfa88380f9f325ae9b9c71c22c5db4e3a29ad69c
+  data.tar.gz: b07c84bda9a828f867e2fe524cc45a1ddbb11f7c55765a9162ba235e93bfae29cfca2c08ae9e9cd094672aa678d82619cd5b8de6dc38b5909ffa3930d26d3596

data/Gemfile

@@ -1,42 +1,35 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gemspec
 
-gem "rails", "4.2.4"
-
-platforms :mri_18 do
-  group :test do
-    gem 'ruby-debug'
-    gem 'SystemTimer'
-  end
-end
+gem 'rails', '4.2.7'
 
 platforms :ruby do
-  gem "sqlite3"
+  gem 'sqlite3'
 
   group :development do
-    gem "unicorn", "~> 4.0.1"
+    gem 'unicorn', '~> 4.0.1'
   end
 
   group :development, :test do
     gem 'jquery-rails', '~> 4.0.4'
-    gem "capybara", ">= 0.4.0"
-    gem "mynyml-redgreen", "~> 0.7.1", :require => 'redgreen'
+    gem 'capybara', '>= 0.4.0'
+    gem 'mynyml-redgreen', '~> 0.7.1', require: 'redgreen'
   end
 
   group :active_record do
     gem 'paperclip'
-    gem "carrierwave"
-    gem "dragonfly"
-    gem "mini_magick"
-    gem "refile", require: "refile/rails"
-    gem "refile-mini_magick"
+    gem 'carrierwave'
+    gem 'dragonfly'
+    gem 'mini_magick'
+    gem 'refile', require: 'refile/rails'
+    gem 'refile-mini_magick'
   end
 
   group :mongoid do
     gem 'mongoid', '~> 5.0.0'
-    gem "bson_ext"
-    gem 'mongoid-paperclip', :require => 'mongoid_paperclip'
-    gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
+    gem 'bson_ext'
+    gem 'mongoid-paperclip', require: 'mongoid_paperclip'
+    gem 'carrierwave-mongoid', require: 'carrierwave/mongoid'
   end
 end

data/README.md

@@ -8,8 +8,8 @@ CKEditor is a WYSIWYG text editor designed to simplify web content creation. It
 
 ## Features
 
-* Ckeditor version 4.5.6 (9 Dec 2015)
-* Rails 4 integration
+* Ckeditor version 4.5.10 (13 Jul 2016)
+* Rails 4.2-5 integration
 * Files browser
 * HTML5 file uploader
 * Hooks for formtastic and simple_form forms generators
@@ -32,7 +32,7 @@ gem 'ckeditor', github: 'galetahub/ckeditor'
 For file upload support, you must generate the necessary file storage models.
 The currently supported backends are:
 
-* ActiveRecord (paperclip, carrierwave, dragonfly)
+* ActiveRecord (paperclip, carrierwave, dragonfly, refile)
 * Mongoid (paperclip, carrierwave, dragonfly)
 
 ### How to generate models to store uploaded files
@@ -78,7 +78,7 @@ rails generate ckeditor:install --orm=active_record --backend=dragonfly
 #### Mongoid + paperclip
 
 ```
-gem 'mongoid-paperclip', :require => 'mongoid_paperclip'
+gem 'mongoid-paperclip', require: 'mongoid_paperclip'
 
 rails generate ckeditor:install --orm=mongoid --backend=paperclip
 ```
@@ -86,7 +86,7 @@ rails generate ckeditor:install --orm=mongoid --backend=paperclip
 #### Mongoid + carrierwave
 
 ```
-gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
+gem 'carrierwave-mongoid', require: 'carrierwave/mongoid'
 gem 'mini_magick'
 
 rails generate ckeditor:install --orm=mongoid --backend=carrierwave
@@ -98,7 +98,7 @@ All ckeditor models will be generated in the app/models/ckeditor directory.
 Models are autoloaded in Rails 4. For earlier Rails versions, you need to add them to the autoload path (in application.rb):
 
 ```ruby
-config.autoload_paths += %W(#{config.root}/app/models/ckeditor)
+config.autoload_paths += %w(#{config.root}/app/models/ckeditor)
 ```
 
 Mount the Ckeditor::Engine in your routes (config/routes.rb):
@@ -126,7 +126,7 @@ Setup editor version to load (more info here http://cdn.ckeditor.com/)
 
 Ckeditor.setup do |config|
   # //cdn.ckeditor.com/<version.number>/<distribution>/ckeditor.js
-  config.cdn_url = "//cdn.ckeditor.com/4.5.6/standard/ckeditor.js"
+  config.cdn_url = "//cdn.ckeditor.com/4.5.10/standard/ckeditor.js"
 end
 ```
 
@@ -140,9 +140,9 @@ In view template include ckeditor CDN:
 
 ```slim
 = form_for @page do |form|
-  = form.cktext_area :notes, :class => 'someclass', :ckeditor => {:language => 'uk'}
-  = form.cktext_area :content, :value => 'Default value', :id => 'sometext'  
-  = cktext_area :page, :info, :cols => 40, :ckeditor => {:uiColor => '#AADC6E', :toolbar => 'mini'}
+  = form.cktext_area :notes, class: 'someclass', ckeditor: { language: 'uk'}
+  = form.cktext_area :content, value: 'Default value', id: 'sometext'
+  = cktext_area :page, :info, cols: 40, ckeditor: { uiColor: '#AADC6E', toolbar: 'mini' }
 ```
 
 ### Customize ckeditor
@@ -237,14 +237,14 @@ jQuery sample:
 ### Formtastic integration
 
 ```slim
-= form.input :content, :as => :ckeditor
-= form.input :content, :as => :ckeditor, :input_html => { :ckeditor => { :height => 400 } }
+= form.input :content, as: :ckeditor
+= form.input :content, as: :ckeditor, input_html: { ckeditor: { height: 400 } }
 ```
 
 ### SimpleForm integration
 
 ```slim
-= form.input :content, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Full'} }
+= form.input :content, as: :ckeditor, input_html: { ckeditor: { toolbar: 'Full' } }
 ```
 
 ### CanCan integration
@@ -294,6 +294,17 @@ By default, only the user that logged in can access the models (with actions *in
 
 You can customize these two policy files as you like.
 
+## Engine configuration
+ * To override the default CKEditor routes create a [config.js](https://github.com/galetahub/ckeditor/blob/master/app/assets/javascripts/ckeditor/config.js) file within the host application at `app/assets/javascripts/ckeditor/config.js`
+ * To override the default parent controller
+```
+# in config/initializers/ckeditor.rb
+
+Ckeditor.setup do |config|
+  config.parent_controller = 'MyController'
+end
+```
+
 ## I18n
 
 ```yml

data/app/controllers/ckeditor/application_controller.rb

@@ -1,9 +1,9 @@
-class Ckeditor::ApplicationController < ApplicationController
+class Ckeditor::ApplicationController < Ckeditor.parent_controller.constantize
   layout 'ckeditor/application'
 
-  before_filter :find_asset, :only => [:destroy]
-  before_filter :ckeditor_authorize!
-  before_filter :authorize_resource
+  before_action :find_asset, :only => [:destroy]
+  before_action :ckeditor_authorize!
+  before_action :authorize_resource
 
   protected
 

data/app/controllers/ckeditor/attachment_files_controller.rb

@@ -1,6 +1,6 @@
 class Ckeditor::AttachmentFilesController < Ckeditor::ApplicationController
-  skip_before_filter :verify_authenticity_token, only: :create
-  
+  skip_before_action :verify_authenticity_token, only: :create
+
   def index
     @attachments = Ckeditor.attachment_file_adapter.find_all(ckeditor_attachment_files_scope)
     @attachments = Ckeditor::Paginatable.new(@attachments).page(params[:page])

data/app/controllers/ckeditor/pictures_controller.rb

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

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

@@ -6,7 +6,7 @@
 	</div>
 
   <div class="fileupload-list">
-    <%= render :partial => 'ckeditor/shared/asset', :collection => @attachments.scoped %>
+    <%= render :partial => 'ckeditor/shared/asset', :collection => @attachments %>
   </div>
 
   <% unless @attachments.last_page? %>

data/lib/ckeditor.rb

@@ -28,14 +28,14 @@ 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)
+  IMAGE_TYPES = %w(image/jpeg image/png image/gif image/jpg image/pjpeg image/tiff image/x-png).freeze
 
-  DEFAULT_AUTHORIZE = Proc.new {}
+  DEFAULT_AUTHORIZE = -> {}
 
   AUTHORIZATION_ADAPTERS = {}
 
-  DEFAULT_CURRENT_USER = Proc.new do
-    request.env["warden"].try(:user) || respond_to?(:current_user) && current_user
+  DEFAULT_CURRENT_USER = lambda do
+    request.env['warden'].try(:user) || respond_to?(:current_user) && current_user
   end
 
   # Allowed image file types for upload.
@@ -43,6 +43,11 @@ module Ckeditor
   mattr_accessor :image_file_types
   @@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)
+
   # Allowed attachment file types for upload.
   # Set to nil or [] (empty array) for all file types
   mattr_accessor :attachment_file_types
@@ -56,10 +61,6 @@ module Ckeditor
   mattr_accessor :asset_path
   @@asset_path = nil
 
-  # Ckeditor assets for precompilation
-  mattr_accessor :assets
-  @@assets = nil
-
   # Remove digest from ckeditor asset files while running assets:precompile task?
   mattr_accessor :run_on_precompile
   @@run_on_precompile = true
@@ -90,6 +91,10 @@ module Ckeditor
   @@picture_model = nil
   @@attachment_file_model = nil
 
+  # Configurable parent controller
+  mattr_accessor :parent_controller
+  @@parent_controller = 'ApplicationController'
+
   # Default way to setup Ckeditor. Run rails generate ckeditor to create
   # a fresh initializer with all configuration values.
   #
@@ -113,11 +118,15 @@ module Ckeditor
 
   # All css and js files from ckeditor folder
   def self.assets
-    @@assets ||= if Ckeditor.cdn_enabled?
-      ["ckeditor/config.js"]
-    else
-      Utils.select_assets("ckeditor", "vendor/assets/javascripts") << "ckeditor/init.js"
-    end
+    @assets ||= if Ckeditor.cdn_enabled?
+                  ['ckeditor/config.js']
+                else
+                  Utils.select_assets('ckeditor', 'vendor/assets/javascripts') << 'ckeditor/init.js'
+                end
+  end
+
+  def self.assets=(value)
+    @assets = value.nil? ? nil : Array(value)
   end
 
   def self.run_on_precompile?
@@ -198,11 +207,11 @@ module Ckeditor
     extension = args.shift
 
     if extension
-      @authorize = Proc.new {
+      @authorize = lambda do
         @authorization_adapter = Ckeditor::AUTHORIZATION_ADAPTERS[extension].new(*([self] + args).compact)
-      }
-    else
-      @authorize = block if block
+      end
+    elsif block_given?
+      @authorize = block
     end
 
     @authorize || DEFAULT_AUTHORIZE
@@ -221,10 +230,10 @@ module Ckeditor
   #   end
   #
   def self.current_user_method(&block)
-    @current_user = block if block
+    @current_user = block if block_given?
     @current_user || DEFAULT_CURRENT_USER
   end
 end
 
-require 'ckeditor/engine'
+require 'ckeditor/rails'
 require 'ckeditor/version'

data/lib/ckeditor/asset_response.rb

@@ -22,38 +22,82 @@ module Ckeditor
       !(ckeditor? || json?) ? params[:qqfile] : params[:upload]
     end
 
+    def current_mode
+      @current_mode ||= extract_mode
+    end
+
     def success(relative_url_root = nil)
-      if json?
-        {
-          json: { "uploaded" => 1, "fileName" => asset.filename, "url" => asset.url }.to_json
-        }
-      elsif ckeditor?
-        {
-          text: %Q"<script type='text/javascript'>
-            window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, '#{relative_url_root}#{Ckeditor::Utils.escape_single_quotes(asset.url_content)}');
-          </script>"
-        }
+      send("success_#{current_mode}", relative_url_root)
+    end
+
+    def errors
+      send("errors_#{current_mode}")
+    end
+
+    private
+
+    def success_json(_relative_url_root = nil)
+      {
+        json: { uploaded: 1, fileName: asset.filename, url: asset.url }.to_json
+      }
+    end
+
+    def success_ckeditor(relative_url_root = nil)
+      {
+        text: %"<script type='text/javascript'>
+          window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, '#{asset_url(relative_url_root)}');
+        </script>"
+      }
+    end
+
+    def success_default(_relative_url_root = nil)
+      {
+        json: asset.to_json(only: [:id, :type])
+      }
+    end
+
+    def errors_json
+      {
+        json: { uploaded: 0, error: { message: error_message } }.to_json
+      }
+    end
+
+    def errors_ckeditor
+      {
+        text: %"<script type='text/javascript'>
+          window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, null, '#{error_message}');
+        </script>"
+      }
+    end
+
+    def errors_default
+      {
+        json: { message: error_message }.to_json
+      }
+    end
+
+    def error_message
+      Ckeditor::Utils.escape_single_quotes(asset.errors.full_messages.first)
+    end
+
+    def asset_url(relative_url_root)
+      url = Ckeditor::Utils.escape_single_quotes(asset.url_content)
+
+      if URI(url).relative?
+        "#{relative_url_root}#{url}"
       else
-        {
-          json: asset.to_json(only: [:id, :type])
-        }
+        url
       end
     end
 
-    def errors
+    def extract_mode
       if json?
-        {
-          json: { "uploaded" => 0, "error" => { "message" => "Upload failed"} }.to_json
-        }
+        :json
       elsif ckeditor?
-        {
-          text: %Q"<script type='text/javascript'>
-            window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, null, '#{Ckeditor::Utils.escape_single_quotes(asset.errors.full_messages.first)}');
-          </script>"
-        }
+        :ckeditor
       else
-        {nothing: true, format: :json}
+        :default
       end
     end
   end
-end
+end

data/lib/ckeditor/backend/carrierwave.rb

@@ -12,7 +12,7 @@ module Ckeditor
         def self.extended(base)
           base.class_eval do
             process :extract_content_type
-            process :set_size
+            process :extract_size
           end
         end
       end
@@ -40,17 +40,20 @@ module Ckeditor
           model.data_content_type = Utils::ContentTypeDetector.new(file.path).detect
         end
 
-        def set_size
+        def extract_size
           model.data_file_size = file.size
         end
 
-        def read_dimensions
+        def extract_dimensions
           if model.image? && model.has_dimensions?
-            magick = ::MiniMagick::Image.new(current_path)
-            model.width, model.height = magick[:width], magick[:height]
+            model.width = magick[:width]
+            model.height = magick[:height]
           end
         end
 
+        def magick
+          @magick ||= ::MiniMagick::Image.new(current_path)
+        end
       end
     end
   end