ckeditor 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b293a89d93a9fec21bf515407aa6653525390cea
-  data.tar.gz: 54bdec36f7488d7d342f786f27ea05b211c649a6
+  metadata.gz: 1a521b18f6252ed84f4b0f733a3be5c82d14a36d
+  data.tar.gz: 08dd944031cf738410b264fc4f26d058a4ffdca0
 SHA512:
-  metadata.gz: cfa69f8249288901d774ceef2dba001c9366c87050fc1fc5bb18cb81e1e6034b9484018bf22c84ed228c636fdfcd559c01b58c982398629cc82c12e05531e918
-  data.tar.gz: 3bd0a775d343d5a5c5699791040ec89e5342b88a8278e1957436e58eafcb0d23b766b9ffc08951010792d3a4d65be7ab600e6adc9aef6039327a40a7ddaf060a
+  metadata.gz: 48415dfdc911779debeb1f03ee1697f5a6a1cb48c2da5803d53c6f8494804b6bacb85ddb238aca5a01c407079ad867a64695d315c17c641268adde88d6983927
+  data.tar.gz: 0fd956940b958d39fe96bfb9e7a66fac05669eccc191d387966a35dea2a7706e1619dcde47bfcf0d8fdf4e492202b559271ebe141fdde6941a44525bca4d78c9

data/Gemfile

@@ -24,7 +24,6 @@ platforms :ruby do
   end
 
   group :active_record do
-    # gem "paperclip", "~> 3.0.3"
     gem 'paperclip', '~> 4.1.1'
     gem "carrierwave"
     gem "dragonfly"

data/README.md

@@ -1,26 +1,26 @@
 # Ckeditor
 
-CKEditor is a ready-for-use HTML text editor designed to simplify web content creation. It's a WYSIWYG editor that brings common word processor features directly to your web pages. Enhance your website experience with our community maintained editor.
+CKEditor is a WYSIWYG text editor designed to simplify web content creation. It brings common word processing features directly to your web pages. Enhance your website experience with our community maintained editor.
 [ckeditor.com](http://ckeditor.com/)
 
 ## Features
 
-* Ckeditor version 4.4.6 (full)
+* Ckeditor version 4.4.7 (full 27 Jan 2015)
 * Rails 4 integration
 * Files browser
-* HTML5 files uploader
+* HTML5 file uploader
 * Hooks for formtastic and simple_form forms generators
 * Integrated with authorization framework CanCan and Pundit
 
 ## Installation
 
-For basic usage just include ckeditor gem:
+For basic usage just include the ckeditor gem:
 
 ```
 gem 'ckeditor'
 ```
 
-or if you want to use the latest version from github:
+or if you'd like to use the latest version from Github:
 
 ```
 gem 'ckeditor', github: 'galetahub/ckeditor'
@@ -28,23 +28,23 @@ gem 'ckeditor', github: 'galetahub/ckeditor'
 
 #### Using with ruby 1.8.7
 
-For usage with ruby 1.8.7 you need to specify gem version:
+For usage with ruby 1.8.7 you need to specify the gem version:
 
 ```
 gem 'ckeditor', '4.0.4'
 ```
 
-For files uploading support you need generate models for file storage.
-Currently supported next backends:
+For file upload support, you must generate the necessary file storage models.
+The currently supported backends are:
 
 * ActiveRecord (paperclip, carrierwave, dragonfly)
 * Mongoid (paperclip, carrierwave, dragonfly)
 
-### How generate models for store uploading files
+### How to generate models to store uploaded files
 
 #### ActiveRecord + paperclip
 
-For active_record orm is used paperclip gem (it's by default).
+To use the active_record orm with paperclip (i.e. the default settings):
 
 ```
 gem 'paperclip'
@@ -61,6 +61,16 @@ gem 'mini_magick'
 rails generate ckeditor:install --orm=active_record --backend=carrierwave
 ```
 
+#### ActiveRecord + dragonfly
+
+Requires Dragonfly 1.0 or greater.
+
+```
+gem 'dragonfly'
+
+rails generate ckeditor:install --orm=active_record --backend=dragonfly
+```
+
 #### Mongoid + paperclip
 
 ```
@@ -80,14 +90,14 @@ rails generate ckeditor:install --orm=mongoid --backend=carrierwave
 
 #### Load generated models
 
-All ckeditor models will be generated into app/models/ckeditor folder.
-Models are autoloaded in Rails 4. For earlier Rails versions you need to add them to autoload path (in application.rb):
+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)
 ```
 
-Mount engine in your routes (config/routes.rb):
+Mount the Ckeditor::Engine in your routes (config/routes.rb):
 
 ```ruby
 mount Ckeditor::Engine => '/ckeditor'
@@ -117,9 +127,9 @@ Form helpers:
 
 ### Customize ckeditor
 
-All ckeditor options [here](http://docs.ckeditor.com/#!/api/CKEDITOR.config)
+All ckeditor options can be found [here](http://docs.ckeditor.com/#!/api/CKEDITOR.config)
 
-In order to configure the ckeditor default options, create files:
+In order to configure the ckeditor default options, create the following files:
 
 ```
 app/assets/javascripts/ckeditor/config.js
@@ -129,7 +139,7 @@ app/assets/javascripts/ckeditor/contents.css
 
 #### Custom toolbars example
 
-Adding custom toolbar:
+Adding a custom toolbar:
 
 ```javascript
 # in app/assets/javascripts/ckeditor/config.js
@@ -146,7 +156,7 @@ CKEDITOR.editorConfig = function (config) {
 }
 ```
 
-When overriding default `config.js` you have to set all configuration yourself since bundled `config.js` will not be loaded. To see the default configuration run `bundle open ckeditor` and copy `app/assets/javascripts/ckeditor/config.js` to your project and customize it to your needs.
+When overriding the default `config.js` file, you must set all configuration options yourself as the bundled `config.js` will not be loaded. To see the default configuration, run `bundle open ckeditor`, copy `app/assets/javascripts/ckeditor/config.js` into your project and customize it to your needs.
 
 ### Deployment
 
@@ -156,7 +166,7 @@ For Rails 4, add the following to `config/initializers/assets.rb`:
 Rails.application.config.assets.precompile += %w( ckeditor/* )
 ```
 
-Since version 4.1.0, non-digested assets of ckeditor will simply be copied after digested assets were compiled.
+As of version 4.1.0, non-digested assets of Ckeditor will simply be copied after digested assets were compiled.
 For older versions, use gem [non-stupid-digest-assets](https://rubygems.org/gems/non-stupid-digest-assets), to copy non digest assets.
 
 To reduce the asset precompilation time, you can limit plugins and/or languages to those you need:
@@ -170,7 +180,7 @@ Ckeditor.setup do |config|
 end
 ```
 
-Note that you have to list your plugins including all their dependencies.
+Note that you have to list your plugins, including all their dependencies.
 
 ### Include customized CKEDITOR_BASEPATH setting
 
@@ -219,7 +229,7 @@ jQuery sample:
 
 ### CanCan integration
 
-To use cancan with Ckeditor, add this to an initializer.
+To use cancan with Ckeditor, add this to an initializer:
 
 ```ruby
 # in config/initializers/ckeditor.rb
@@ -230,7 +240,7 @@ end
 ```
 
 At this point, all authorization will fail and no one will be able to access the filebrowser pages.
-To grant access, add this to Ability#initialize
+To grant access, add this to Ability#initialize:
 
 ```ruby
 # Always performed
@@ -243,7 +253,7 @@ can [:read, :create, :destroy], Ckeditor::AttachmentFile
 
 ### Pundit integration
 
-Just like CanCan, you can write this code in your config/initializers/ckeditor.rb file
+Just like CanCan, you can write this code in your config/initializers/ckeditor.rb file:
 
 ```ruby
 Ckeditor.setup do |config|
@@ -251,7 +261,7 @@ Ckeditor.setup do |config|
 end
 ```
 
-And then, generate the policy files for model **Picture** and **AttachmentFile**
+Then, generate the policy files for model **Picture** and **AttachmentFile**
 
 ```
 $ rails g ckeditor:pundit_policy
@@ -260,9 +270,9 @@ By this command, you will got two files:
 > app/policies/ckeditor/picture_policy.rb
 app/policies/ckeditor/attachment_file_policy.rb
 
-By default, only the user that logged in can access the models(with action *index* and *create*), and only the owner of the asset can **destroy** the resource.
+By default, only the user that logged in can access the models (with actions *index* and *create*) and only the owner of the asset can **destroy** the resource.
 
-You can simply customize these two policy files as you like.
+You can customize these two policy files as you like.
 
 ## I18n
 
@@ -291,4 +301,4 @@ $> rake test:integration
 $> rake test:models
 ```
 
-This project rocks and uses MIT-LICENSE.
+This project rocks and uses the MIT-LICENSE.

data/app/assets/javascripts/ckeditor/filebrowser/stylesheets/uploader.css.erb

@@ -26,7 +26,7 @@ img {
 	top: 0;
 }
 .gal-holder .gal-item .gal-del:hover {
-	-moz-opacity: 0.7; 
+	-moz-opacity: 0.7;
 	-khtml-opacity: 0.7;
 	opacity: 0.7;
 }
@@ -85,6 +85,10 @@ img {
 	overflow: hidden;
 	width: 500px;
 }
+.img-name {
+	word-wrap: break-word;
+	width: auto !important;
+}
 .gal-holder .gal-item .gal-inner-holder .img-data .time-size {
 	display: block;
 	overflow: hidden;
@@ -119,4 +123,4 @@ img {
 
 .pagination, .pagination a {
     text-decoration: none;
-}
+}

data/app/controllers/ckeditor/application_controller.rb

@@ -1,5 +1,4 @@
 class Ckeditor::ApplicationController < ApplicationController
-  respond_to :html, :json
   layout 'ckeditor/application'
 
   before_filter :find_asset, :only => [:destroy]
@@ -15,18 +14,20 @@ class Ckeditor::ApplicationController < ApplicationController
       callback = ckeditor_before_create_asset(asset)
 
       if callback && asset.save
-        body = params[:CKEditor].blank? ? asset.to_json(:only=>[:id, :type]) : %Q"<script type='text/javascript'>
-          window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, '#{config.relative_url_root}#{Ckeditor::Utils.escape_single_quotes(asset.url_content)}');
-        </script>"
-
-        render :text => body
-      else
-        if params[:CKEditor]
+        if params[:CKEditor].blank?
+          render :json => asset.to_json(:only=>[:id, :type])
+        else
           render :text => %Q"<script type='text/javascript'>
-              window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, null, '#{asset.errors.full_messages.first}');
+              window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, '#{config.relative_url_root}#{Ckeditor::Utils.escape_single_quotes(asset.url_content)}');
             </script>"
+        end
+      else
+        if params[:CKEditor].blank?
+          render :nothing => true, :format => :json
         else
-          render :nothing => true
+          render :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>"
         end
       end
     end

data/app/controllers/ckeditor/attachment_files_controller.rb

@@ -4,7 +4,9 @@ class Ckeditor::AttachmentFilesController < Ckeditor::ApplicationController
     @attachments = Ckeditor.attachment_file_adapter.find_all(ckeditor_attachment_files_scope)
     @attachments = Ckeditor::Paginatable.new(@attachments).page(params[:page])
 
-    respond_with(@attachments, :layout => @attachments.first_page?)
+    respond_to do |format|
+      format.html { render :layout => @attachments.first_page? }
+    end
   end
 
   def create
@@ -14,7 +16,11 @@ class Ckeditor::AttachmentFilesController < Ckeditor::ApplicationController
 
   def destroy
     @attachment.destroy
-    respond_with(@attachment, :location => attachment_files_path)
+
+    respond_to do |format|
+      format.html { redirect_to attachment_files_path }
+      format.json { render :nothing => true, :status => 204 }
+    end
   end
 
   protected

data/app/controllers/ckeditor/pictures_controller.rb

@@ -4,7 +4,9 @@ class Ckeditor::PicturesController < Ckeditor::ApplicationController
     @pictures = Ckeditor.picture_adapter.find_all(ckeditor_pictures_scope)
     @pictures = Ckeditor::Paginatable.new(@pictures).page(params[:page])
 
-    respond_with(@pictures, :layout => @pictures.first_page?)
+    respond_to do |format|
+      format.html { render :layout => @pictures.first_page? }
+    end
   end
 
   def create
@@ -14,7 +16,11 @@ class Ckeditor::PicturesController < Ckeditor::ApplicationController
 
   def destroy
     @picture.destroy
-    respond_with(@picture, :location => pictures_path)
+
+    respond_to do |format|
+      format.html { redirect_to pictures_path }
+      format.json { render :nothing => true, :status => 204 }
+    end
   end
 
   protected

data/config/locales/ja.ckeditor.yml

@@ -0,0 +1,9 @@
+ja:
+  ckeditor:
+    page_title: "CKEditor ファイル・マネージャー"
+    confirm_delete: "ファイルを削除しますか？"
+    buttons:
+      cancel: "キャンセル"
+      upload: "アップロード"
+      delete: "削除"
+      next: "次へ"

data/lib/ckeditor.rb

@@ -58,6 +58,10 @@ module Ckeditor
   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
+
   # Turn on/off filename parameterize
   mattr_accessor :parameterize_filenames
   @@parameterize_filenames = true
@@ -102,6 +106,10 @@ module Ckeditor
     @@assets ||= Utils.select_assets("ckeditor", "vendor/assets/javascripts") << "ckeditor/init.js"
   end
 
+  def self.run_on_precompile?
+    @@run_on_precompile
+  end
+
   def self.picture_model(&block)
     if block_given?
       self.picture_model = block

data/lib/ckeditor/backend/dragonfly.rb

@@ -2,24 +2,26 @@ module Ckeditor
   module Backend
     module Dragonfly
       def self.included(base)
-        base.send(:include, InstanceMethods)
+        base.send(:extend, ::Dragonfly::Model)
+        base.send(:extend, ::Dragonfly::Model::Validations)
         base.send(:extend, ClassMethods)
+        base.send(:include, InstanceMethods)
       end
 
       module ClassMethods
         def attachment_file_types
-          @attachment_file_types ||= Ckeditor.attachment_file_types.map(&:to_sym).tap do |formats|
+          @attachment_file_types ||= Ckeditor.attachment_file_types.map(&:to_s).tap do |formats|
             # This is not ideal but Dragonfly doesn't return double
             # extensions. Having said that, the other backends
             # currently don't use attachment_file_types at all.
-            [ :bz2, :gz, :lzma, :xz ].each do |f|
-              formats << f if formats.include?("tar.#{f}".to_sym)
+            [ 'bz2', 'gz', 'lzma', 'xz' ].each do |f|
+              formats << f if formats.include?("tar.#{f}")
             end
           end
         end
 
         def image_file_types
-          @image_file_types ||= Ckeditor.image_file_types.map(&:to_sym)
+          @image_file_types ||= Ckeditor.image_file_types.map(&:to_s)
         end
       end
 
@@ -27,7 +29,7 @@ module Ckeditor
         delegate :url, :path, :size, :image?, :width, :height, :to => :data
 
         alias_attribute :data_file_name, :data_name
-        alias_attribute :data_content_type, :data_mime_type
+        alias_attribute :data_content_type, :"data.mime_type"
         alias_attribute :data_file_size, :data_size
 
         private

data/lib/ckeditor/hooks/cancan.rb

@@ -19,7 +19,10 @@ module Ckeditor
       # action as a symbol (:create, :destroy, etc.). The second argument is the actual model
       # instance if it is available.
       def authorize(action, model_object = nil)
-        @controller.current_ability.authorize!(action.to_sym, model_object) if action
+        if action
+          @controller.instance_variable_set(:@_authorized, true)
+          @controller.current_ability.authorize!(action.to_sym, model_object)
+        end
       end
 
       # This method is called primarily from the view to determine whether the given user

data/lib/ckeditor/utils.rb

@@ -25,9 +25,9 @@ module Ckeditor
 
         if options && !options.keys.empty?
           js_options = ActiveSupport::JSON.encode(options)
-          js << "CKEDITOR.replace('#{dom_id}', #{js_options});"
+          js << "if (CKEDITOR.instances['#{dom_id}'] == undefined) { CKEDITOR.replace('#{dom_id}', #{js_options}); }"
         else
-          js << "CKEDITOR.replace('#{dom_id}');"
+          js << "if (CKEDITOR.instances['#{dom_id}'] == undefined) { CKEDITOR.replace('#{dom_id}'); }"
         end
 
         js << "} else { setTimeout(arguments.callee, 50); } })();"

data/lib/ckeditor/version.rb

@@ -1,6 +1,6 @@
 module Ckeditor
   module Version
-    GEM = "4.1.1".freeze
-    EDITOR = "4.4.6".freeze
+    GEM = "4.1.2".freeze
+    EDITOR = "4.4.7".freeze
   end
 end

data/lib/generators/ckeditor/templates/active_record/dragonfly/ckeditor/asset.rb

@@ -2,6 +2,6 @@ class Ckeditor::Asset < ActiveRecord::Base
   include Ckeditor::Orm::ActiveRecord::AssetBase
   include Ckeditor::Backend::Dragonfly
 
-  ckeditor_file_accessor :data
+  dragonfly_accessor :data, app: :ckeditor
   validates_presence_of :data
 end

data/lib/generators/ckeditor/templates/active_record/dragonfly/ckeditor/attachment_file.rb

@@ -1,5 +1,5 @@
 class Ckeditor::AttachmentFile < Ckeditor::Asset
-  validates_property :format, :of => :data, :in => attachment_file_types unless attachment_file_types.empty?
+  validates_property :ext, :of => :data, :in => attachment_file_types unless attachment_file_types.empty?
 
   def url_thumb
     Ckeditor::Utils.filethumb(filename)