ckeditor 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 718c57a411fa584f92a7b532b9044f0814cb8c4b
-  data.tar.gz: 8be0eb212ece8e16ee5cc7bbd72786e792b7e068
+  metadata.gz: b293a89d93a9fec21bf515407aa6653525390cea
+  data.tar.gz: 54bdec36f7488d7d342f786f27ea05b211c649a6
 SHA512:
-  metadata.gz: f9502d82221ba196b1ac27b2490095c79f83ab4ae3eb417d8b6fee07af2c55f45be2ca0961cac30c50bf63829ef1cfed63008a86b0931724f39a7bc4d63aebdd
-  data.tar.gz: d397998fd9e23e06e95e31456ce4c73cf4cf4a9d5dc885c935dea9865f6cd870f97ef5a6bb80aaff601089aa00fd67c3bd9ce7a37a3138ede1bef72539fcf545
+  metadata.gz: cfa69f8249288901d774ceef2dba001c9366c87050fc1fc5bb18cb81e1e6034b9484018bf22c84ed228c636fdfcd559c01b58c982398629cc82c12e05531e918
+  data.tar.gz: 3bd0a775d343d5a5c5699791040ec89e5342b88a8278e1957436e58eafcb0d23b766b9ffc08951010792d3a4d65be7ab600e6adc9aef6039327a40a7ddaf060a

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec
 
-gem "rails", "3.2.3"
+gem "rails", "3.2.21"
 
 platforms :mri_18 do
   group :test do

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2011 AIMBULANCE
+Copyright 2011-2014 Fodojo. http://www.fodojo.com/
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -5,7 +5,7 @@ CKEditor is a ready-for-use HTML text editor designed to simplify web content cr
 
 ## Features
 
-* Ckeditor version 4.4.2 (full)
+* Ckeditor version 4.4.6 (full)
 * Rails 4 integration
 * Files browser
 * HTML5 files uploader
@@ -19,6 +19,13 @@ For basic usage just include ckeditor gem:
 ```
 gem 'ckeditor'
 ```
+
+or if you want to use the latest version from github:
+
+```
+gem 'ckeditor', github: 'galetahub/ckeditor'
+```
+
 #### Using with ruby 1.8.7
 
 For usage with ruby 1.8.7 you need to specify gem version:
@@ -27,7 +34,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.
+For files uploading support you need generate models for file storage.
 Currently supported next backends:
 
 * ActiveRecord (paperclip, carrierwave, dragonfly)
@@ -74,7 +81,7 @@ rails generate ckeditor:install --orm=mongoid --backend=carrierwave
 #### Load generated models
 
 All ckeditor models will be generated into app/models/ckeditor folder.
-Autoload ckeditor models folder (application.rb):
+Models are autoloaded in Rails 4. For earlier Rails versions you need to add them to autoload path (in application.rb):
 
 ```ruby
 config.autoload_paths += %W(#{config.root}/app/models/ckeditor)
@@ -88,7 +95,7 @@ mount Ckeditor::Engine => '/ckeditor'
 
 ## Usage
 
-Include ckeditor javascripts rails 3.2 (application.js):
+Include ckeditor javascripts in your `app/assets/javascripts/application.js`:
 
 ```
 //= require ckeditor/init
@@ -120,8 +127,35 @@ app/assets/javascripts/ckeditor/config.js
 app/assets/javascripts/ckeditor/contents.css
 ```
 
+#### Custom toolbars example
+
+Adding custom toolbar:
+
+```javascript
+# in app/assets/javascripts/ckeditor/config.js
+
+CKEDITOR.editorConfig = function (config) {
+  // ... other configuration ...
+  
+  config.toolbar_mini = [
+    ["Bold",  "Italic",  "Underline",  "Strike",  "-",  "Subscript",  "Superscript"],
+  ];
+  config.toolbar = "simple";
+
+  // ... rest of the original config.js  ...
+}
+```
+
+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.
+
 ### Deployment
 
+For Rails 4, add the following to `config/initializers/assets.rb`:
+
+```ruby
+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.
 For older versions, use gem [non-stupid-digest-assets](https://rubygems.org/gems/non-stupid-digest-assets), to copy non digest assets.
 
@@ -136,8 +170,10 @@ Ckeditor.setup do |config|
 end
 ```
 
+Note that you have to list your plugins including all their dependencies.
+
 ### Include customized CKEDITOR_BASEPATH setting
-  
+
 Add your app/assets/javascripts/ckeditor/basepath.js.erb like
 
 ```erb

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

@@ -31,6 +31,8 @@ CKEDITOR.editorConfig = function( config )
   // The location of a script that handles file uploads.
   config.filebrowserUploadUrl = "/ckeditor/attachment_files";
 
+  config.allowedContent = true;
+
   // Rails CSRF token
   config.filebrowserParams = function(){
     var csrf_token, csrf_param, meta,
@@ -89,4 +91,27 @@ CKEDITOR.editorConfig = function( config )
       }
     }
   });
+
+  // Toolbar groups configuration.
+  config.toolbar = [
+    { name: 'document', groups: [ 'mode', 'document', 'doctools' ], items: [ 'Source'] },
+    { name: 'clipboard', groups: [ 'clipboard', 'undo' ], items: [ 'Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo' ] },
+    // { name: 'editing', groups: [ 'find', 'selection', 'spellchecker' ], items: [ 'Find', 'Replace', '-', 'SelectAll', '-', 'Scayt' ] },
+    // { name: 'forms', items: [ 'Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField' ] },
+    { name: 'links', items: [ 'Link', 'Unlink', 'Anchor' ] },
+    { name: 'insert', items: [ 'Image', 'Flash', 'Table', 'HorizontalRule', 'SpecialChar' ] },
+    { name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ], items: [ 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock' ] },
+    '/',
+    { name: 'styles', items: [ 'Styles', 'Format', 'Font', 'FontSize' ] },
+    { name: 'colors', items: [ 'TextColor', 'BGColor' ] },
+    { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ], items: [ 'Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat' ] }
+  ];
+
+  config.toolbar_mini = [
+    { name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ], items: [ 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock' ] },
+    { name: 'styles', items: [ 'Font', 'FontSize' ] },
+    { name: 'colors', items: [ 'TextColor', 'BGColor' ] },
+    { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ], items: [ 'Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat' ] },
+    { name: 'insert', items: [ 'Image', 'Table', 'HorizontalRule', 'SpecialChar' ] }
+  ];
 };

data/app/assets/javascripts/ckeditor/filebrowser/javascripts/application.js.erb

@@ -177,7 +177,7 @@ qq.extend(qq.FileUploaderInput.prototype, {
             qq.addClass(item, this._classes.success);
             
             asset.size = this._formatSize(asset.size);
-            asset.controller = (asset.type.toLowerCase() == "ckeditor::picture" ? "pictures" : "attachment_files");
+            asset.controller = (asset.type !== undefined && asset.type.toLowerCase() == "ckeditor::picture" ? "pictures" : "attachment_files");
             
             $(item).replaceWith($(this._options.template_id).tmpl(asset));
         } else {

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

@@ -118,5 +118,5 @@ img {
 }
 
 .pagination, .pagination a {
-	display: none;
+    text-decoration: none;
 }

data/{vendor → app}/assets/javascripts/ckeditor/styles.js

@@ -107,5 +107,4 @@ CKEDITOR.stylesSet.add( 'default', [
 
 	{ name: 'Borderless Table',		element: 'table',	styles: { 'border-style': 'hidden', 'background-color': '#E6E6FA' } },
 	{ name: 'Square Bulleted List',	element: 'ul',		styles: { 'list-style-type': 'square' } }
-] );
-
+] );

data/{vendor/assets/javascripts → app/assets/stylesheets}/ckeditor/contents.css

@@ -131,4 +131,4 @@ a > img {
 	margin: 1px;
 	border: none;
 	outline: 1px solid #0782C1;
-}
+}

data/app/controllers/ckeditor/application_controller.rb

@@ -1,4 +1,4 @@
-class Ckeditor::ApplicationController < ActionController::Base
+class Ckeditor::ApplicationController < ApplicationController
   respond_to :html, :json
   layout 'ckeditor/application'
 

data/lib/ckeditor.rb

@@ -48,7 +48,7 @@ module Ckeditor
 
   # Ckeditor files destination path
   mattr_accessor :relative_path
-  @@relative_path = '/assets/ckeditor'
+  @@relative_path = 'ckeditor'
 
   # Ckeditor assets path
   mattr_accessor :asset_path

data/lib/ckeditor/backend/carrierwave.rb

@@ -1,4 +1,3 @@
-require 'mime/types'
 require 'mini_magick'
 
 module Ckeditor
@@ -38,13 +37,7 @@ module Ckeditor
         end
 
         def extract_content_type
-          if file.content_type == 'application/octet-stream' || file.content_type.blank?
-            content_type = MIME::Types.type_for(original_filename).first
-          else
-            content_type = file.content_type
-          end
-
-          model.data_content_type = content_type.to_s
+          model.data_content_type = Utils::ContentTypeDetector.new(file.path).detect
         end
 
         def set_size

data/lib/ckeditor/backend/paperclip.rb

@@ -1,5 +1,3 @@
-require 'mime/types'
-
 module Ckeditor
   module Backend
     module Paperclip
@@ -21,14 +19,15 @@ module Ckeditor
 
       module InstanceMethods
         def geometry
-          @geometry ||= begin
-            file = data.respond_to?(:queued_for_write) ? data.queued_for_write[:original] : data.to_file
-            ::Paperclip::Geometry.from_file(file)
-          end
+          @geometry ||= ::Paperclip::Geometry.from_file(file)
         end
 
         protected
 
+          def file
+            @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)
@@ -43,12 +42,9 @@ module Ckeditor
             end
           end
 
-          # Extract content_type from filename using mime/types gem
           def extract_content_type
-            if data_content_type == "application/octet-stream" && !data_file_name.blank?
-              content_types = MIME::Types.type_for(data_file_name)
-              self.data_content_type = content_types.first.to_s unless content_types.empty?
-            end
+            path = file.nil? ? nil : file.path
+            self.data_content_type = Utils::ContentTypeDetector.new(path).detect
           end
       end
     end

data/lib/ckeditor/http.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'digest/sha1'
-require 'mime/types'
 
 module Ckeditor
   module Http
@@ -61,8 +60,7 @@ module Ckeditor
       end
 
       def content_type
-        types = MIME::Types.type_for(original_filename)
-        types.empty? ? @request.content_type : types.first.to_s
+        @request.content_type
       end
 
       def body

data/lib/ckeditor/utils.rb

@@ -3,10 +3,8 @@ require 'active_support/json/encoding'
 
 module Ckeditor
   module Utils
-    class JavascriptCode < String
-      def as_json(options = nil) self end #:nodoc:
-      def encode_json(encoder) self end #:nodoc:
-    end
+    autoload :JavascriptCode, 'ckeditor/utils/javascript_code'
+    autoload :ContentTypeDetector, 'ckeditor/utils/content_type_detector'
 
     class << self
       def escape_single_quotes(str)
@@ -105,6 +103,10 @@ module Ckeditor
           items
         end
       end
+
+      def extract_content_type(file)
+        
+      end
     end
   end
 end

data/lib/ckeditor/utils/content_type_detector.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+require 'cocaine'
+
+module Ckeditor
+  module Utils
+    class ContentTypeDetector
+      EMPTY_CONTENT_TYPE = 'inode/x-empty'
+      DEFAULT_CONTENT_TYPE = 'application/octet-stream'
+
+      def initialize(file_path)
+        @file_path = file_path
+      end
+
+      # content type detection strategy:
+      #
+      # 1. empty file: returns 'inode/x-empty'
+      # 2. nonempty file: if the file is not empty then returns the content type using file command
+      # 3. invalid file: file command raises error and returns 'application/octet-stream'
+
+      def detect
+        empty_file? ? EMPTY_CONTENT_TYPE : content_type_from_file_command
+      end
+
+      private
+
+      def empty_file?
+        return true if @file_path.blank?
+        File.exists?(@file_path) && File.size(@file_path) == 0
+      end
+
+      def content_type_from_file_command
+        type = begin
+          Cocaine::CommandLine.new('file', '-b --mime-type :file').run(file: @file_path)
+        rescue Cocaine::CommandLineError => e
+          # TODO: log command failure
+          DEFAULT_CONTENT_TYPE
+        end.strip
+      end
+    end
+  end
+end

data/lib/ckeditor/utils/javascript_code.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+
+module Ckeditor
+  module Utils
+    class JavascriptCode < String
+      def as_json(options = nil) self end #:nodoc:
+      def encode_json(encoder) self end #:nodoc:
+    end
+  end
+end

data/lib/ckeditor/version.rb

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

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

@@ -7,14 +7,14 @@ class Ckeditor::AttachmentFilePolicy
   end
 
   def index?
-    true and ! @user.nil?
+    user.present?
   end
 
   def create?
-    true and ! @user.nil?
+    user.present?
   end
 
   def destroy?
-    @attachment.assetable_id == @user.id
+    attachment.assetable_id == user.id
   end
 end

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

@@ -7,14 +7,14 @@ class Ckeditor::PicturePolicy
   end
 
   def index?
-    true and ! @user.nil?
+    user.present?
   end
 
   def create?
-    true and ! @user.nil?
+    user.present?
   end
 
   def destroy?
-    @picture.assetable_id == @user.id
+    picture.assetable_id == user.id
   end
 end

data/lib/tasks/ckeditor.rake

@@ -7,7 +7,7 @@ task "assets:precompile" do
     next unless file =~ fingerprint
     nondigest = file.sub fingerprint, '.'
     if !File.exist?(nondigest) or File.mtime(file) > File.mtime(nondigest)
-      FileUtils.cp file, nondigest, verbose: true
+      FileUtils.cp file, nondigest, verbose: true, preserve: true
     end
   end
-end
+end

data/test/models/attachment_file_test.rb

@@ -17,6 +17,6 @@ class AttachmentFileTest < ActiveSupport::TestCase
 
     assert_equal "application/x-gzip", @attachment.data_content_type
     assert_equal 6823, @attachment.data_file_size
-    assert_equal "/assets/ckeditor/filebrowser/images/thumbs/gz.gif", @attachment.url_thumb
+    assert_equal "ckeditor/filebrowser/images/thumbs/gz.gif", @attachment.url_thumb
   end
 end

data/test/models/utils_test.rb

@@ -3,16 +3,16 @@ require 'test_helper'
 class UtilsTest < ActiveSupport::TestCase
   test 'exists filethumb' do
     %w(avi doc docx exe gz htm jpg mp3 mpg pdf psd rar swf tar txt wmv xlsx zip).each do |ext|
-      assert_equal "/assets/ckeditor/filebrowser/images/thumbs/#{ext}.gif", Ckeditor::Utils.filethumb("somefile.#{ext}")
+      assert_equal "ckeditor/filebrowser/images/thumbs/#{ext}.gif", Ckeditor::Utils.filethumb("somefile.#{ext}")
     end
 
-    assert_equal "/assets/ckeditor/filebrowser/images/thumbs/unknown.gif", Ckeditor::Utils.filethumb("somefile.ddd")
+    assert_equal "ckeditor/filebrowser/images/thumbs/unknown.gif", Ckeditor::Utils.filethumb("somefile.ddd")
   end
 
   test 'wrong filethumb' do
-    assert_equal "/assets/ckeditor/filebrowser/images/thumbs/unknown.gif", Ckeditor::Utils.filethumb("somefile.ddd")
-    assert_equal "/assets/ckeditor/filebrowser/images/thumbs/unknown.gif", Ckeditor::Utils.filethumb("somefile")
-    assert_equal "/assets/ckeditor/filebrowser/images/thumbs/unknown.gif", Ckeditor::Utils.filethumb("")
-    assert_equal "/assets/ckeditor/filebrowser/images/thumbs/unknown.gif", Ckeditor::Utils.filethumb(nil)
+    assert_equal "ckeditor/filebrowser/images/thumbs/unknown.gif", Ckeditor::Utils.filethumb("somefile.ddd")
+    assert_equal "ckeditor/filebrowser/images/thumbs/unknown.gif", Ckeditor::Utils.filethumb("somefile")
+    assert_equal "ckeditor/filebrowser/images/thumbs/unknown.gif", Ckeditor::Utils.filethumb("")
+    assert_equal "ckeditor/filebrowser/images/thumbs/unknown.gif", Ckeditor::Utils.filethumb(nil)
   end
 end