ckeditor 4.0.8 → 4.0.9

data/README.md

@@ -10,13 +10,21 @@ CKEditor is a ready-for-use HTML text editor designed to simplify web content cr
 * Files browser
 * HTML5 files uploader
 * Hooks for formtastic and simple_form forms generators
+* Integrated with authorization framework CanCan and Pundit
 
 ## Installation
 
 For basic usage just include ckeditor gem:
 
 ```
-gem "ckeditor"
+gem 'ckeditor'
+```
+#### Using with ruby 1.8.7
+
+For usage with ruby 1.8.7 you need to specify gem version:
+
+```
+gem 'ckeditor', '4.0.4'
 ```
 
 For files uploading support you need generage models for file storage.
@@ -32,7 +40,7 @@ Currently supported next backends:
 For active_record orm is used paperclip gem (it's by default).
 
 ```
-gem "paperclip"
+gem 'paperclip'
 
 rails generate ckeditor:install --orm=active_record --backend=paperclip
 ```
@@ -40,8 +48,8 @@ rails generate ckeditor:install --orm=active_record --backend=paperclip
 #### ActiveRecord + carrierwave
 
 ```
-gem "carrierwave"
-gem "mini_magick"
+gem 'carrierwave'
+gem 'mini_magick'
 
 rails generate ckeditor:install --orm=active_record --backend=carrierwave
 ```
@@ -57,8 +65,8 @@ rails generate ckeditor:install --orm=mongoid --backend=paperclip
 #### Mongoid + carrierwave
 
 ```
-gem "carrierwave-mongoid", :require => 'carrierwave/mongoid'
-gem "mini_magick"
+gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
+gem 'mini_magick'
 
 rails generate ckeditor:install --orm=mongoid --backend=carrierwave
 ```
@@ -75,7 +83,7 @@ config.autoload_paths += %W(#{config.root}/app/models/ckeditor)
 Mount engine in your routes (config/routes.rb):
 
 ```ruby
-mount Ckeditor::Engine => "/ckeditor"
+mount Ckeditor::Engine => '/ckeditor'
 ```
 
 ## Usage
@@ -91,11 +99,11 @@ Form helpers:
 ```erb
 <%= form_for @page do |form| -%>
   ...
-  <%= form.cktext_area :notes, :class => "someclass", :ckeditor => {:language => "uk"} %>
+  <%= form.cktext_area :notes, :class => 'someclass', :ckeditor => {:language => 'uk'} %>
   ...
-  <%= form.cktext_area :content, :value => "Default value", :id => "sometext" %>
+  <%= form.cktext_area :content, :value => 'Default value', :id => 'sometext' %>
   ...
-  <%= cktext_area :page, :info, :cols => 40, :ckeditor => {:uiColor => "#AADC6E", :toolbar => "mini"} %>
+  <%= cktext_area :page, :info, :cols => 40, :ckeditor => {:uiColor => '#AADC6E', :toolbar => 'mini'} %>
   ...
 <% end -%>
 ```
@@ -158,7 +166,7 @@ after 'deploy:assets:precompile', 'copy_nondigest_assets'
 Periodically check your error monitoring tool, if you see some part of ckeditor try to load
 unexisting non-digest asset - if so just add it in the ckeditor rake task.
 
-Also you can use gem [non-stupid-digest-assets](https://rubygems.org/gems/non-stupid-digest-assets), which do the same work. 
+Also you can use gem [non-stupid-digest-assets](https://rubygems.org/gems/non-stupid-digest-assets), which do the same work.
 
 To reduce the asset precompilation time, you can limit plugins and/or languages to those you need:
 
@@ -178,7 +186,7 @@ jQuery sample:
 ```html
 <script type='text/javascript' charset='UTF-8'>
   $(document).ready(function(){
-    $('form[data-remote]').bind("ajax:before", function(){
+    $('form[data-remote]').bind('ajax:before', function(){
       for (instance in CKEDITOR.instances){
         CKEDITOR.instances[instance].updateElement();
       }
@@ -224,18 +232,41 @@ can [:read, :create, :destroy], Ckeditor::Picture
 can [:read, :create, :destroy], Ckeditor::AttachmentFile
 ```
 
+### Pundit integration
+
+Just like CanCan, you can write this code in your config/initializers/ckeditor.rb file
+
+```ruby
+Ckeditor.setup do |config|
+  config.authorize_with :pundit
+end
+```
+
+And then, generate the policy files for model **Picture** and **AttachmentFile**
+
+```
+$ rails g ckeditor:pundit_policy
+```
+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.
+
+You can simply customize these two policy files as you like.
+
 ## I18n
 
 ```yml
 en:
   ckeditor:
-    page_title: "CKEditor Files Manager"
-    confirm_delete: "Delete file?"
+    page_title: 'CKEditor Files Manager'
+    confirm_delete: 'Delete file?'
     buttons:
-      cancel: "Cancel"
-      upload: "Upload"
-      delete: "Delete"
-      next: "Next"
+      cancel: 'Cancel'
+      upload: 'Upload'
+      delete: 'Delete'
+      next: 'Next'
 ```
 
 ## Tests

data/app/assets/javascripts/ckeditor/init.js.erb

@@ -3,14 +3,6 @@
 
 (function() {
   if (typeof window['CKEDITOR_BASEPATH'] === "undefined" || window['CKEDITOR_BASEPATH'] === null) {
-    window['CKEDITOR_BASEPATH'] = "<%= asset_path('ckeditor') %>/";
+    window['CKEDITOR_BASEPATH'] = "<%= asset_path('assets/ckeditor') %>/";
   }
 }).call(this);
-
-function ck_load() {
-  $('.ckeditor').each(function(){
-    CKEDITOR.replace( $(this).attr('name') );
-  });
-}
-
-$(document).on('page:load', ck_load);

data/app/assets/javascripts/ckeditor/override.js.erb

@@ -14,7 +14,7 @@ window.CKEDITOR_GETURL = function( resource ) {
   // Add the timestamp, except for directories.
   if ( resource.charAt( resource.length - 1 ) != '/'  ){
     var url = resource.match( /^(.*?:\/\/[^\/]*)\/assets\/(.+)/ );
-    if(url) resource = url[1] + (CKEDITOR_ASSETS_MAPPING[url[2]] || '/assets/' + url[2]);
+    if(url) resource = (CKEDITOR_ASSETS_MAPPING[url[2]] || '/assets/' + url[2]);
   }
 
   return resource;

data/lib/ckeditor.rb

@@ -17,6 +17,7 @@ module Ckeditor
   module Hooks
     autoload :SimpleFormBuilder, 'ckeditor/hooks/simple_form'
     autoload :CanCanAuthorization, 'ckeditor/hooks/cancan'
+    autoload :PunditAuthorization, 'ckeditor/hooks/pundit'
   end
   
   module Backend

data/lib/ckeditor/engine.rb

@@ -33,6 +33,10 @@ module Ckeditor
       if Object.const_defined?("CanCan")
         require "ckeditor/hooks/cancan"
       end
+
+      if Object.const_defined?("Pundit")
+        require "ckeditor/hooks/pundit"
+      end
     end
   end
 end

data/lib/ckeditor/hooks/pundit.rb

@@ -0,0 +1,47 @@
+require 'pundit'
+
+module Ckeditor
+  module Hooks
+    # This adapter is for the Pundit[https://github.com/elabs/pundit] authorization library.
+    # You can create another adapter for different authorization behavior, just be certain it
+    # responds to each of the public methods here.
+    class PunditAuthorization
+
+      include Ckeditor::Helpers::Controllers
+
+      # See the +authorize_with+ config method for where the initialization happens.
+      def initialize(controller)
+        @controller = controller
+        @controller.extend ControllerExtension
+      end
+
+      # This method is called in every controller action and should raise an exception
+      # when the authorization fails. The first argument is the name of the controller
+      # 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)
+        raise Pundit::NotAuthorizedError unless authorized?(action, model_object)
+      end
+
+      # This method is called primarily from the view to determine whether the given user
+      # has access to perform the action on a given model. It should return true when authorized.
+      # This takes the same arguments as +authorize+. The difference is that this will
+      # return a boolean whereas +authorize+ will raise an exception when not authorized.
+      def authorized?(action, model_object = nil)
+        Pundit.policy(@controller.current_user_for_pundit, model_object).public_send(action + '?' ) if action
+      end
+
+      private
+
+      module ControllerExtension
+        def current_user_for_pundit
+          # use ckeditor_current_user instead of default current_user so it works with
+          # whatever current user method is defined with Ckeditor
+          ckeditor_current_user
+        end
+      end
+    end
+  end
+end
+
+Ckeditor::AUTHORIZATION_ADAPTERS[:pundit] = Ckeditor::Hooks::PunditAuthorization

data/lib/ckeditor/version.rb

@@ -1,6 +1,6 @@
 module Ckeditor
   module Version
-    GEM = "4.0.8".freeze
-    EDITOR = "4.3.1".freeze
+    GEM = "4.0.9".freeze
+    EDITOR = "4.3.2".freeze
   end
 end

data/lib/generators/ckeditor/pundit_policy_generator.rb

@@ -0,0 +1,22 @@
+require 'rails/generators'
+
+module Ckeditor
+  module Generators
+    class PunditPolicyGenerator < Rails::Generators::Base
+
+      desc "Generates policy files for Pundit"
+
+      def self.source_root
+        @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+      end
+
+      # copy configuration
+      def copy_policy_files
+        [:picture, :attachment_file].each do |model_name|
+          template "pundit_policy/#{model_name}_policy.rb", "app/policies/ckeditor/#{model_name}_policy.rb"
+        end
+      end
+
+    end
+  end
+end

data/lib/generators/ckeditor/templates/pundit_policy/attachment_file_policy.rb

@@ -0,0 +1,20 @@
+class Ckeditor::AttachmentFilePolicy
+  attr_reader :user, :attachment
+
+  def initialize(user, attachment)
+    @user = user
+    @attachment = attachment
+  end
+
+  def index?
+    true and ! @user.nil?
+  end
+
+  def create?
+    true and ! @user.nil?
+  end
+
+  def destroy?
+    @attachment.assetable_id == @user.id
+  end
+end

data/lib/generators/ckeditor/templates/pundit_policy/picture_policy.rb

@@ -0,0 +1,20 @@
+class Ckeditor::PicturePolicy
+  attr_reader :user, :picture
+
+  def initialize(user, picture)
+    @user = user
+    @picture = picture
+  end
+
+  def index?
+    true and ! @user.nil?
+  end
+
+  def create?
+    true and ! @user.nil?
+  end
+
+  def destroy?
+    @picture.assetable_id == @user.id
+  end
+end

data/vendor/assets/javascripts/ckeditor/CHANGES.md

@@ -1,6 +1,42 @@
 CKEditor 4 Changelog
 ====================
 
+## CKEditor 4.3.2
+
+* [#11331](http://dev.ckeditor.com/ticket/11331): A menu button will have a changed label when selected instead of using the `aria-pressed` attribute.
+* [#11177](http://dev.ckeditor.com/ticket/11177): Widget drag handler improvements:
+  * [#11176](http://dev.ckeditor.com/ticket/11176): Fixed: Initial position is not updated when the widget data object is empty.
+  * [#11001](http://dev.ckeditor.com/ticket/11001): Fixed: Multiple synchronous layout recalculations are caused by initial drag handler positioning causing performance issues.
+  * [#11161](http://dev.ckeditor.com/ticket/11161): Fixed: Drag handler is not repositioned in various situations.
+  * [#11281](http://dev.ckeditor.com/ticket/11281): Fixed: Drag handler and mask are duplicated after widget reinitialization.
+* [#11207](http://dev.ckeditor.com/ticket/11207): [Firefox] Fixed: Misplaced [Enhanced Image](http://ckeditor.com/addon/image2) resizer in the inline editor.
+* [#11102](http://dev.ckeditor.com/ticket/11102): `CKEDITOR.template` improvements:
+  * [#11102](http://dev.ckeditor.com/ticket/11102): Added newline character support.
+  * [#11216](http://dev.ckeditor.com/ticket/11216): Added "\\'" substring support.
+* [#11121](http://dev.ckeditor.com/ticket/11121): [Firefox] Fixed: High Contrast mode is enabled when the editor is loaded in a hidden iframe.
+* [#11350](http://dev.ckeditor.com/ticket/11350): The default value of [`config.contentsCss`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-contentsCss) is affected by [`CKEDITOR.getUrl`](http://docs.ckeditor.com/#!/api/CKEDITOR-method-getUrl).
+* [#11097](http://dev.ckeditor.com/ticket/11097): Improved the [Autogrow](http://ckeditor.com/addon/autogrow) plugin performance when dealing with very big tables.
+* [#11290](http://dev.ckeditor.com/ticket/11290): Removed redundant code in the [Source Dialog](http://ckeditor.com/addon/sourcedialog) plugin.
+* [#11133](http://dev.ckeditor.com/ticket/11133): [Page Break](http://ckeditor.com/addon/pagebreak) becomes editable if pasted.
+* [#11126](http://dev.ckeditor.com/ticket/11126): Fixed: Native Undo executed once the bottom of the snapshot stack is reached.
+* [#11131](http://dev.ckeditor.com/ticket/11131): [Div Editing Area](http://ckeditor.com/addon/divarea): Fixed: Error thrown when switching to source mode if the selection was in widget's nested editable.
+* [#11139](http://dev.ckeditor.com/ticket/11139): [Div Editing Area](http://ckeditor.com/addon/divarea): Fixed: Elements Path is not cleared after switching to source mode.
+* [#10778](http://dev.ckeditor.com/ticket/10778): Fixed a bug with range enlargement. The range no longer expands to visible whitespace.
+* [#11146](http://dev.ckeditor.com/ticket/11146): [IE] Fixed: Preview window switches Internet Explorer to Quirks Mode.
+* [#10762](http://dev.ckeditor.com/ticket/10762): [IE] Fixed: JavaScript code displayed in preview window's URL bar.
+* [#11186](http://dev.ckeditor.com/ticket/11186): Introduced the [`widgets.repository.addUpcastCallback`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-addUpcastCallback) method that allows to block upcasting given element to a widget.
+* [#11307](http://dev.ckeditor.com/ticket/11307): Fixed: Paste as Plain Text conflict with the [MooTools](http://mootools.net) library.
+* [#11140](http://dev.ckeditor.com/ticket/11140): [IE11] Fixed: Anchors are not draggable.
+* [#11379](http://dev.ckeditor.com/ticket/11379): Changed default contents `line-height` to unitless values to avoid huge text overlapping (like in [#9696](http://dev.ckeditor.com/ticket/9696)).
+* [#10787](http://dev.ckeditor.com/ticket/10787): [Firefox] Fixed: Broken replacement of text while pasting into `div`-based editor.
+* [#10884](http://dev.ckeditor.com/ticket/10884): Widgets integration with the [Show Blocks](http://ckeditor.com/addon/showblocks) plugin.
+* [#11021](http://dev.ckeditor.com/ticket/11021): Fixed: An error thrown when selecting entire editable contents while fake selection is on.
+* [#11086](http://dev.ckeditor.com/ticket/11086): [IE8] Re-enable inline widgets drag&drop in Internet Explorer 8.
+* [#11372](http://dev.ckeditor.com/ticket/11372): Widgets: Special characters encoded twice in nested editables.
+* [#10068](http://dev.ckeditor.com/ticket/10068): Fixed: Support for protocol-relative URLs.
+* [#11283](http://dev.ckeditor.com/ticket/11283): [Enhanced Image](http://ckeditor.com/addon/image2): A `<div>` element with `text-align: center` and an image inside is not recognised correctly.
+* [#11196](http://dev.ckeditor.com/ticket/11196): [Accessibility Instructions](http://ckeditor.com/addon/a11yhelp): Allowed additional keyboard button labels to be translated in the dialog window.
+
 ## CKEditor 4.3.1
 
 **Important Notes:**

data/vendor/assets/javascripts/ckeditor/LICENSE.md

@@ -2,7 +2,7 @@ Software License Agreement
 ==========================
 
 CKEditor - The text editor for Internet - http://ckeditor.com
-Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
 
 Licensed under the terms of any of the following licenses at your
 choice:

data/vendor/assets/javascripts/ckeditor/README.md

@@ -1,7 +1,7 @@
 CKEditor 4
 ==========
 
-Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.  
+Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.  
 http://ckeditor.com - See LICENSE.md for license information.
 
 CKEditor is a text editor to be used inside web pages. It's not a replacement

data/vendor/assets/javascripts/ckeditor/adapters/jquery.js

@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 (function(a){CKEDITOR.config.jqueryOverrideVal="undefined"==typeof CKEDITOR.config.jqueryOverrideVal?!0:CKEDITOR.config.jqueryOverrideVal;"undefined"!=typeof a&&(a.extend(a.fn,{ckeditorGet:function(){var a=this.eq(0).data("ckeditorInstance");if(!a)throw"CKEditor is not initialized yet, use ckeditor() with a callback.";return a},ckeditor:function(g,d){if(!CKEDITOR.env.isCompatible)throw Error("The environment is incompatible.");if(!a.isFunction(g))var k=d,d=g,g=k;var i=[],d=d||{};this.each(function(){var b=

data/vendor/assets/javascripts/ckeditor/build-config.js

@@ -1,14 +1,25 @@
-
-/**
- * @license Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.html or http://ckeditor.com/license
+/**
+ * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or http://ckeditor.com/license
  */
 
 /**
  * This file was added automatically by CKEditor builder.
- * You may re-use it at any time at http://ckeditor.com/builder to build CKEditor again.
- * 
- * NOTE: 
+ * You may re-use it at any time to build CKEditor again.
+ *
+ * If you would like to build CKEditor online again
+ * (for example to upgrade), visit one the following links:
+ *
+ * (1) http://ckeditor.com/builder
+ *     Visit online builder to build CKEditor from scratch.
+ *
+ * (2) http://ckeditor.com/builder/0a65b3bcdcd34789da36844fa1d0eb27
+ *     Visit online builder to build CKEditor, starting with the same setup as before.
+ *
+ * (3) http://ckeditor.com/builder/download/0a65b3bcdcd34789da36844fa1d0eb27
+ *     Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
+ *
+ * NOTE:
  *    This file is not used by CKEditor, you may remove it.
  *    Changing this file will not change your CKEditor configuration.
  */
@@ -24,20 +35,17 @@ var CKBUILDER_CONFIG = {
 		'.mailmap'
 	],
 	plugins : {
-		'about' : 1,
 		'a11yhelp' : 1,
-		'dialogadvtab' : 1,
+		'about' : 1,
 		'basicstyles' : 1,
 		'bidi' : 1,
 		'blockquote' : 1,
 		'clipboard' : 1,
 		'colorbutton' : 1,
 		'colordialog' : 1,
-		'templates' : 1,
 		'contextmenu' : 1,
+		'dialogadvtab' : 1,
 		'div' : 1,
-		'resize' : 1,
-		'toolbar' : 1,
 		'elementspath' : 1,
 		'enterkey' : 1,
 		'entities' : 1,
@@ -46,16 +54,14 @@ var CKBUILDER_CONFIG = {
 		'flash' : 1,
 		'floatingspace' : 1,
 		'font' : 1,
-		'forms' : 1,
 		'format' : 1,
+		'forms' : 1,
 		'horizontalrule' : 1,
 		'htmlwriter' : 1,
 		'iframe' : 1,
-		'wysiwygarea' : 1,
 		'image' : 1,
 		'indentblock' : 1,
 		'indentlist' : 1,
-		'smiley' : 1,
 		'justify' : 1,
 		'language' : 1,
 		'link' : 1,
@@ -65,103 +71,95 @@ var CKBUILDER_CONFIG = {
 		'maximize' : 1,
 		'newpage' : 1,
 		'pagebreak' : 1,
-		'pastetext' : 1,
 		'pastefromword' : 1,
+		'pastetext' : 1,
 		'preview' : 1,
 		'print' : 1,
 		'removeformat' : 1,
+		'resize' : 1,
 		'save' : 1,
+		'scayt' : 1,
 		'selectall' : 1,
 		'showblocks' : 1,
 		'showborders' : 1,
+		'smiley' : 1,
 		'sourcearea' : 1,
 		'specialchar' : 1,
-		'scayt' : 1,
 		'stylescombo' : 1,
 		'tab' : 1,
 		'table' : 1,
 		'tabletools' : 1,
+		'templates' : 1,
+		'toolbar' : 1,
 		'undo' : 1,
 		'wsc' : 1,
-		'dialog' : 1,
-		'dialogui' : 1,
-		'panelbutton' : 1,
-		'button' : 1,
-		'floatpanel' : 1,
-		'panel' : 1,
-		'menu' : 1,
-		'popup' : 1,
-		'fakeobjects' : 1,
-		'richcombo' : 1,
-		'listblock' : 1,
-		'indent' : 1,
-		'menubutton' : 1
+		'wysiwygarea' : 1
 	},
 	languages : {
 		'af' : 1,
-		'sq' : 1,
 		'ar' : 1,
-		'eu' : 1,
+		'bg' : 1,
 		'bn' : 1,
 		'bs' : 1,
-		'bg' : 1,
 		'ca' : 1,
-		'zh-cn' : 1,
-		'zh' : 1,
-		'hr' : 1,
 		'cs' : 1,
+		'cy' : 1,
 		'da' : 1,
-		'nl' : 1,
+		'de' : 1,
+		'el' : 1,
 		'en' : 1,
 		'en-au' : 1,
 		'en-ca' : 1,
 		'en-gb' : 1,
 		'eo' : 1,
+		'es' : 1,
 		'et' : 1,
-		'fo' : 1,
+		'eu' : 1,
+		'fa' : 1,
 		'fi' : 1,
+		'fo' : 1,
 		'fr' : 1,
 		'fr-ca' : 1,
 		'gl' : 1,
-		'ka' : 1,
-		'de' : 1,
-		'el' : 1,
 		'gu' : 1,
 		'he' : 1,
 		'hi' : 1,
+		'hr' : 1,
 		'hu' : 1,
-		'is' : 1,
 		'id' : 1,
+		'is' : 1,
 		'it' : 1,
 		'ja' : 1,
+		'ka' : 1,
 		'km' : 1,
 		'ko' : 1,
 		'ku' : 1,
-		'lv' : 1,
 		'lt' : 1,
+		'lv' : 1,
 		'mk' : 1,
-		'ms' : 1,
 		'mn' : 1,
-		'no' : 1,
+		'ms' : 1,
 		'nb' : 1,
-		'fa' : 1,
+		'nl' : 1,
+		'no' : 1,
 		'pl' : 1,
-		'pt-br' : 1,
 		'pt' : 1,
+		'pt-br' : 1,
 		'ro' : 1,
 		'ru' : 1,
-		'sr' : 1,
-		'sr-latn' : 1,
 		'si' : 1,
 		'sk' : 1,
 		'sl' : 1,
-		'es' : 1,
+		'sq' : 1,
+		'sr' : 1,
+		'sr-latn' : 1,
 		'sv' : 1,
 		'th' : 1,
 		'tr' : 1,
 		'ug' : 1,
 		'uk' : 1,
 		'vi' : 1,
-		'cy' : 1
+		'zh' : 1,
+		'zh-cn' : 1
 	}
 };