ckeditor 4.0.9 → 4.0.10

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.3.1 (full)
+* Ckeditor version 4.3.2 (full)
 * Rails 4 integration
 * Files browser
 * HTML5 files uploader

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

@@ -3,6 +3,6 @@
 
 (function() {
   if (typeof window['CKEDITOR_BASEPATH'] === "undefined" || window['CKEDITOR_BASEPATH'] === null) {
-    window['CKEDITOR_BASEPATH'] = "<%= asset_path('assets/ckeditor') %>/";
+    window['CKEDITOR_BASEPATH'] = "<%= asset_path(Ckeditor.asset_path) %>/";
   }
 }).call(this);

data/app/controllers/ckeditor/application_controller.rb

@@ -1,13 +1,13 @@
 class Ckeditor::ApplicationController < ::ApplicationController
   respond_to :html, :json
   layout 'ckeditor/application'
-  
+
   before_filter :find_asset, :only => [:destroy]
   before_filter :ckeditor_authorize!
   before_filter :authorize_resource
 
   protected
-    
+
     def respond_with_asset(asset)
       file = params[:CKEditor].blank? ? params[:qqfile] : params[:upload]
       asset.data = Ckeditor::Http.normalize_param(file, request)
@@ -18,7 +18,7 @@ class Ckeditor::ApplicationController < ::ApplicationController
         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
         render :nothing => true

data/app/controllers/ckeditor/attachment_files_controller.rb

@@ -3,22 +3,22 @@ class Ckeditor::AttachmentFilesController < Ckeditor::ApplicationController
   def index
     @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?)
   end
-  
+
   def create
     @attachment = Ckeditor.attachment_file_model.new
-	  respond_with_asset(@attachment)
+    respond_with_asset(@attachment)
   end
-  
+
   def destroy
     @attachment.destroy
     respond_with(@attachment, :location => attachment_files_path)
   end
-  
+
   protected
-  
+
     def find_asset
       @attachment = Ckeditor.attachment_file_adapter.get!(params[:id])
     end

data/app/controllers/ckeditor/pictures_controller.rb

@@ -3,22 +3,22 @@ class Ckeditor::PicturesController < Ckeditor::ApplicationController
   def index
     @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_with(@pictures, :layout => @pictures.first_page?)
   end
-  
+
   def create
     @picture = Ckeditor.picture_model.new
-	  respond_with_asset(@picture)
+    respond_with_asset(@picture)
   end
-  
+
   def destroy
     @picture.destroy
     respond_with(@picture, :location => pictures_path)
   end
-  
+
   protected
-  
+
     def find_asset
       @picture = Ckeditor.picture_adapter.get!(params[:id])
     end

data/lib/ckeditor.rb

@@ -6,27 +6,27 @@ module Ckeditor
   autoload :Http, 'ckeditor/http'
   autoload :TextArea, 'ckeditor/text_area'
   autoload :Paginatable, 'ckeditor/paginatable'
-  
+
   module Helpers
     autoload :ViewHelper, 'ckeditor/helpers/view_helper'
     autoload :FormHelper, 'ckeditor/helpers/form_helper'
     autoload :FormBuilder, 'ckeditor/helpers/form_builder'
     autoload :Controllers, 'ckeditor/helpers/controllers'
   end
-  
+
   module Hooks
     autoload :SimpleFormBuilder, 'ckeditor/hooks/simple_form'
     autoload :CanCanAuthorization, 'ckeditor/hooks/cancan'
     autoload :PunditAuthorization, 'ckeditor/hooks/pundit'
   end
-  
+
   module Backend
     autoload :Paperclip, 'ckeditor/backend/paperclip'
     autoload :CarrierWave, 'ckeditor/backend/carrierwave'
     autoload :Dragonfly, 'ckeditor/backend/dragonfly'
   end
 
-  IMAGE_TYPES = ['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)
 
   DEFAULT_AUTHORIZE = Proc.new {}
 
@@ -35,21 +35,25 @@ module Ckeditor
   DEFAULT_CURRENT_USER = Proc.new do
     request.env["warden"].try(:user) || respond_to?(:current_user) && current_user
   end
-  
-  # Allowed image file types for upload. 
+
+  # Allowed image file types for upload.
   # Set to nil or [] (empty array) for all file types
   mattr_accessor :image_file_types
-  @@image_file_types = ["jpg", "jpeg", "png", "gif", "tiff"]
-  
-  # Allowed attachment file types for upload. 
+  @@image_file_types = %w(jpg jpeg png gif tiff)
+
+  # Allowed attachment file types for upload.
   # Set to nil or [] (empty array) for all file types
   mattr_accessor :attachment_file_types
-  @@attachment_file_types = ["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
   @@relative_path = '/assets/ckeditor'
-  
+
+  # Ckeditor assets path
+  mattr_accessor :asset_path
+  @@asset_path = (Rails::VERSION::MAJOR == 4 ? 'assets/ckeditor' : 'ckeditor')
+
   # Ckeditor assets for precompilation
   mattr_accessor :assets
   @@assets = nil
@@ -84,11 +88,11 @@ module Ckeditor
   def self.setup
     yield self
   end
-  
+
   def self.root_path
     @root_path ||= Pathname.new(File.dirname(File.expand_path('../', __FILE__)))
   end
-  
+
   # All css and js files from ckeditor folder
   def self.assets
     @@assets ||= Utils.select_assets("ckeditor", "vendor/assets/javascripts") << "ckeditor/init.js"
@@ -162,7 +166,7 @@ module Ckeditor
   #
   def self.authorize_with(*args, &block)
     extension = args.shift
-    
+
     if extension
       @authorize = Proc.new {
         @authorization_adapter = Ckeditor::AUTHORIZATION_ADAPTERS[extension].new(*([self] + args).compact)

data/lib/ckeditor/backend/carrierwave.rb

@@ -8,7 +8,7 @@ module Ckeditor
         base.send(:include, InstanceMethods)
         base.send(:extend, ClassMethods)
       end
-      
+
       module ClassMethods
         def self.extended(base)
           base.class_eval do
@@ -17,7 +17,7 @@ module Ckeditor
           end
         end
       end
-      
+
       module InstanceMethods
         # process :strip
         def strip
@@ -27,7 +27,7 @@ module Ckeditor
             img
           end
         end
-        
+
         # process :quality => 85
         def quality(percentage)
           manipulate! do |img|
@@ -36,28 +36,28 @@ module Ckeditor
             img
           end
         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
-        end 
-        
+        end
+
         def set_size
           model.data_file_size = file.size
         end
-        
+
         def read_dimensions
           if model.image? && model.has_dimensions?
             magick = ::MiniMagick::Image.new(current_path)
             model.width, model.height = magick[:width], magick[:height]
           end
         end
-        
+
       end
     end
   end

data/lib/ckeditor/backend/dragonfly.rb

@@ -5,7 +5,7 @@ module Ckeditor
         base.send(:include, InstanceMethods)
         base.send(:extend, ClassMethods)
       end
-      
+
       module ClassMethods
         def attachment_file_types
           @attachment_file_types ||= Ckeditor.attachment_file_types.map(&:to_sym).tap do |formats|
@@ -22,7 +22,7 @@ module Ckeditor
           @image_file_types ||= Ckeditor.image_file_types.map(&:to_sym)
         end
       end
-      
+
       module InstanceMethods
         delegate :url, :path, :size, :image?, :width, :height, :to => :data
 

data/lib/ckeditor/backend/paperclip.rb

@@ -7,18 +7,18 @@ module Ckeditor
         base.send(:include, InstanceMethods)
         base.send(:extend, ClassMethods)
       end
-      
+
       module ClassMethods
         def self.extended(base)
           base.class_eval do
             before_validation :extract_content_type
             before_create :read_dimensions, :parameterize_filename
-            
+
             delegate :url, :path, :styles, :size, :content_type, :to => :data
           end
         end
       end
-      
+
       module InstanceMethods
         def geometry
           @geometry ||= begin
@@ -26,7 +26,7 @@ module Ckeditor
             ::Paperclip::Geometry.from_file(file)
           end
         end
-                
+
         protected
 
           def parameterize_filename

data/lib/ckeditor/engine.rb

@@ -4,28 +4,28 @@ require 'ckeditor'
 module Ckeditor
   class Engine < ::Rails::Engine
     isolate_namespace Ckeditor
-    
+
     initializer "ckeditor.assets_precompile", :group => :all do |app|
       app.config.assets.precompile += Ckeditor.assets
     end
-    
+
     initializer "ckeditor.helpers" do
       ActiveSupport.on_load(:action_controller) do
         ActionController::Base.send :include, Ckeditor::Helpers::Controllers
       end
-    
+
       ActiveSupport.on_load :action_view do
         ActionView::Base.send :include, Ckeditor::Helpers::ViewHelper
         ActionView::Base.send :include, Ckeditor::Helpers::FormHelper
         ActionView::Helpers::FormBuilder.send :include, Ckeditor::Helpers::FormBuilder
       end
     end
-    
+
     initializer "ckeditor.hooks" do
       if Object.const_defined?("Formtastic")
         require "ckeditor/hooks/formtastic"
       end
-      
+
       if Object.const_defined?("SimpleForm")
         require "ckeditor/hooks/simple_form"
       end

data/lib/ckeditor/helpers/controllers.rb

@@ -2,9 +2,9 @@ module Ckeditor
   module Helpers
     module Controllers
       extend ActiveSupport::Concern
-      
+
       protected
-        
+
         def ckeditor_current_user
           instance_eval &Ckeditor.current_user_method
         end
@@ -12,20 +12,20 @@ module Ckeditor
         def ckeditor_authorize!
           instance_eval &Ckeditor.authorize_with
         end
-        
+
         def ckeditor_before_create_asset(asset)
           asset.assetable = ckeditor_current_user if ckeditor_current_user
           return true
         end
-        
+
         def ckeditor_pictures_scope(options = {})
           ckeditor_filebrowser_scope(options)
         end
-        
+
         def ckeditor_attachment_files_scope(options = {})
           ckeditor_filebrowser_scope(options)
         end
-        
+
         def ckeditor_filebrowser_scope(options = {})
           { :order => [:id, :desc] }.merge(options)
         end

data/lib/ckeditor/helpers/form_builder.rb

@@ -2,7 +2,7 @@ module Ckeditor
   module Helpers
     module FormBuilder
       extend ActiveSupport::Concern
-      
+
       def cktext_area(method, options = {})
         @template.send("cktext_area", @object_name, method, objectify_options(options))
       end

data/lib/ckeditor/helpers/form_helper.rb

@@ -2,7 +2,7 @@ module Ckeditor
   module Helpers
     module FormHelper
       extend ActiveSupport::Concern
-      
+
       def cktext_area(object_name, method, options = {})
         TextArea.new(self, options).render_instance_tag(object_name, method)
       end

data/lib/ckeditor/helpers/view_helper.rb

@@ -2,7 +2,7 @@ module Ckeditor
   module Helpers
     module ViewHelper
       extend ActiveSupport::Concern
-      
+
       def cktext_area_tag(name, content = nil, options = {})
         TextArea.new(self, options).render_tag(name, content)
       end

data/lib/ckeditor/hooks/formtastic.rb

@@ -2,7 +2,7 @@ require "formtastic"
 
 class CkeditorInput
   include ::Formtastic::Inputs::Base
-  
+
   def to_html
     input_wrapping do
       label_html <<

data/lib/ckeditor/http.rb

@@ -36,7 +36,7 @@ module Ckeditor
         @tempfile.size
       end
     end
-    
+
     # Usage (paperclip example)
     # @asset.data = QqFile.new(params[:qqfile], request)
     class QqFile < ::Tempfile
@@ -44,27 +44,27 @@ module Ckeditor
       def initialize(filename, request, tmpdir = Dir::tmpdir)
         @original_filename  = filename
         @request = request
-        
+
         super Digest::SHA1.hexdigest(filename), tmpdir
         binmode
         fetch
       end
-     
+
       def fetch
         self.write(body)
         self.rewind
         self
       end
-     
+
       def original_filename
         @original_filename
       end
-     
+
       def content_type
         types = MIME::Types.type_for(original_filename)
         types.empty? ? @request.content_type : types.first.to_s
       end
-      
+
       def body
         if @request.raw_post.respond_to?(:force_encoding)
           @request.raw_post.force_encoding("UTF-8")
@@ -73,7 +73,7 @@ module Ckeditor
         end
       end
     end
-    
+
     # Convert nested Hash to HashWithIndifferentAccess and replace
     # file upload hash with UploadedFile objects
     def self.normalize_param(*args)

data/lib/ckeditor/orm/active_record.rb

@@ -8,13 +8,13 @@ module Ckeditor
           base.send(:include, Base::AssetBase::InstanceMethods)
           base.send(:extend, ClassMethods)
         end
-        
+
         module ClassMethods
           def self.extended(base)
             base.class_eval do
               self.table_name = "ckeditor_assets"
-              
-              belongs_to :assetable, :polymorphic => true              
+
+              belongs_to :assetable, :polymorphic => true
             end
           end
         end

data/lib/ckeditor/orm/base.rb

@@ -10,11 +10,11 @@ module Ckeditor
           def size
             data_file_size
           end
-          
+
           def has_dimensions?
             respond_to?(:width) && respond_to?(:height)
           end
-          
+
           def image?
             Ckeditor::IMAGE_TYPES.include?(data_content_type)
           end
@@ -30,7 +30,7 @@ module Ckeditor
           def url_thumb
             url(:thumb)
           end
-          
+
           def as_json_methods
             [:url_content, :url_thumb, :size, :filename, :format_created_at]
           end

data/lib/ckeditor/orm/mongoid.rb

@@ -12,12 +12,12 @@ module Ckeditor
           base.send(:include, InstanceMethods)
           base.send(:extend, ClassMethods)
         end
-        
+
         module InstanceMethods
           def type
             _type
           end
-          
+
           def as_json_methods
             [:id, :type] + super
           end
@@ -30,8 +30,8 @@ module Ckeditor
               field :data_file_size, :type => Integer
               field :width, :type => Integer
               field :height, :type => Integer
-              
-              belongs_to :assetable, :polymorphic => true              
+
+              belongs_to :assetable, :polymorphic => true
             end
           end
         end

data/lib/ckeditor/utils.rb

@@ -12,16 +12,16 @@ module Ckeditor
       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
       end
-      
+
       def js_replace(dom_id, options = nil)
         js = ["if (typeof CKEDITOR != 'undefined') {"]
 
@@ -35,10 +35,10 @@ module Ckeditor
         js << "}"
         js.join(" ").html_safe
       end
-      
+
       def js_fileuploader(uploader_type, options = {})
         options = { :multiple => true, :element => "fileupload" }.merge(options)
-        
+
         case uploader_type.to_s.downcase
           when "image" then
             options[:action] = JavascriptCode.new("EDITOR.config.filebrowserImageUploadUrl")
@@ -58,14 +58,14 @@ module Ckeditor
 
       def filethumb(filename)
         extname = filename.blank? ? "unknown" : File.extname(filename).gsub(/^\./, '')
-	      image = "#{extname}.gif"
-	      source = Ckeditor.root_path.join("app/assets/javascripts/ckeditor/filebrowser/images/thumbs")
+        image = "#{extname}.gif"
+        source = Ckeditor.root_path.join("app/assets/javascripts/ckeditor/filebrowser/images/thumbs")
 
-	      unless File.exists?(File.join(source, image))
-	        image = "unknown.gif"
-	      end
+        unless File.exists?(File.join(source, image))
+          image = "unknown.gif"
+        end
 
-	      File.join(Ckeditor.relative_path, "filebrowser/images/thumbs", image)
+        File.join(Ckeditor.relative_path, "filebrowser/images/thumbs", image)
       end
 
       def select_assets(path, relative_path)

data/lib/ckeditor/version.rb

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

data/lib/generators/ckeditor/install_generator.rb

@@ -7,14 +7,14 @@ module Ckeditor
       include Rails::Generators::Migration
 
       desc "Generates migration for Asset (Picture, AttachmentFile) models"
-      
+
       # ORM configuration
       class_option :orm, :type => :string, :default => "active_record",
         :desc => "Backend processor for upload support"
-      
+
       class_option :backend, :type => :string, :default => 'paperclip',
         :desc => "paperclip (default), carrierwave, or dragonfly"
-      
+
       def self.source_root
         @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
       end
@@ -31,7 +31,7 @@ module Ckeditor
           template File.join("base", "dragonfly", "initializer.rb"), "config/initializers/ckeditor_dragonfly.rb"
         end
       end
-      
+
       def mount_engine
         route "mount Ckeditor::Engine => '/ckeditor'"
       end
@@ -41,11 +41,11 @@ module Ckeditor
           template "#{generator_dir}/ckeditor/#{filename}.rb",
                    File.join('app/models', ckeditor_dir, "#{filename}.rb")
         end
-        
+
         if backend == "carrierwave"
           template "#{uploaders_dir}/uploaders/ckeditor_attachment_file_uploader.rb",
                    File.join("app/uploaders", "ckeditor_attachment_file_uploader.rb")
-          
+
           template "#{uploaders_dir}/uploaders/ckeditor_picture_uploader.rb",
                    File.join("app/uploaders", "ckeditor_picture_uploader.rb")
         end
@@ -56,7 +56,7 @@ module Ckeditor
           migration_template "#{generator_dir}/migration.rb", File.join('db/migrate', "create_ckeditor_assets.rb")
         end
       end
-      
+
       protected
 
         def ckeditor_dir
@@ -66,15 +66,15 @@ module Ckeditor
         def generator_dir
           @generator_dir ||= [orm, backend].join('/')
         end
-        
+
         def uploaders_dir
           @uploaders_dir ||= ['base', 'carrierwave'].join('/')
         end
-        
+
         def orm
           (options[:orm] || "active_record").to_s
         end
-        
+
         def backend
           (options[:backend] || "paperclip").to_s
         end

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

@@ -2,6 +2,6 @@ class Ckeditor::Asset < ActiveRecord::Base
   include Ckeditor::Orm::ActiveRecord::AssetBase
 
   delegate :url, :current_path, :content_type, :to => :data
-  
+
   validates_presence_of :data
 end

data/lib/generators/ckeditor/templates/active_record/carrierwave/migration.rb

@@ -4,18 +4,18 @@ class CreateCkeditorAssets < ActiveRecord::Migration
       t.string  :data_file_name, :null => false
       t.string  :data_content_type
       t.integer :data_file_size
-      
+
       t.integer :assetable_id
       t.string  :assetable_type, :limit => 30
       t.string  :type, :limit => 30
-      
+
       # Uncomment	it to save images dimensions, if your need it
       t.integer :width
       t.integer :height
-      
+
       t.timestamps
     end
-    
+
     add_index "ckeditor_assets", ["assetable_type", "type", "assetable_id"], :name => "idx_ckeditor_assetable_type"
     add_index "ckeditor_assets", ["assetable_type", "assetable_id"], :name => "idx_ckeditor_assetable"
   end

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

@@ -2,7 +2,7 @@ class Ckeditor::AttachmentFile < Ckeditor::Asset
   has_attached_file :data,
                     :url => "/ckeditor_assets/attachments/:id/:filename",
                     :path => ":rails_root/public/ckeditor_assets/attachments/:id/:filename"
-  
+
   validates_attachment_size :data, :less_than => 100.megabytes
   validates_attachment_presence :data
 

data/lib/generators/ckeditor/templates/active_record/paperclip/migration.rb

@@ -4,7 +4,7 @@ class CreateCkeditorAssets < ActiveRecord::Migration
       t.string  :data_file_name, :null => false
       t.string  :data_content_type
       t.integer :data_file_size
-      
+
       t.integer :assetable_id
       t.string  :assetable_type, :limit => 30
       t.string  :type, :limit => 30
@@ -15,7 +15,7 @@ class CreateCkeditorAssets < ActiveRecord::Migration
 
       t.timestamps
     end
-    
+
     add_index "ckeditor_assets", ["assetable_type", "type", "assetable_id"], :name => "idx_ckeditor_assetable_type"
     add_index "ckeditor_assets", ["assetable_type", "assetable_id"], :name => "idx_ckeditor_assetable"
   end

data/lib/generators/ckeditor/templates/base/carrierwave/uploaders/ckeditor_attachment_file_uploader.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 class CkeditorAttachmentFileUploader < CarrierWave::Uploader::Base
   include Ckeditor::Backend::CarrierWave
-  
+
   # Include RMagick or ImageScience support:
   # include CarrierWave::RMagick
   # include CarrierWave::MiniMagick

data/lib/generators/ckeditor/templates/base/carrierwave/uploaders/ckeditor_picture_uploader.rb

@@ -27,7 +27,7 @@ class CkeditorPictureUploader < CarrierWave::Uploader::Base
   # def scale(width, height)
   #   # do something
   # end
-  
+
   process :read_dimensions
 
   # Create different versions of your uploaded files:

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

@@ -2,6 +2,6 @@ class Ckeditor::Asset
   include Ckeditor::Orm::Mongoid::AssetBase
 
   delegate :url, :current_path, :size, :content_type, :filename, :to => :data
-  
+
   validates_presence_of :data
 end

data/test/ckeditor_test.rb

@@ -9,7 +9,7 @@ class CkeditorTest < ActiveSupport::TestCase
   test "truth" do
     assert_kind_of Module, Ckeditor
   end
-  
+
   test 'setup block yields self' do
     Ckeditor.setup do |config|
       assert_equal Ckeditor, config

data/test/controllers/attachment_files_controller_test.rb

@@ -2,62 +2,62 @@ require 'test_helper'
 
 class AttachmentFilesControllerTest < ActionController::TestCase
   tests Ckeditor::AttachmentFilesController
-  
+
   include RawPost
   include ControllerHooks
-  
+
   def setup
     @attachment = fixture_file_upload('files/rails.tar.gz', 'application/x-gzip')
   end
-  
+
   def teardown
     Ckeditor::AttachmentFile.destroy_all
   end
-  
+
   test "index action" do
     get :index
-    
+
     assert_equal 200, @response.status
     assert_template "ckeditor/attachment_files/index"
   end
-  
+
   test "create action via filebrowser" do
     assert_difference 'Ckeditor::AttachmentFile.count' do
       post :create, :qqfile => @attachment
     end
-    
+
     assert_equal 200, @response.status
   end
-  
+
   test "create action via CKEditor upload form" do
     assert_difference 'Ckeditor::AttachmentFile.count' do
       post :create, :upload => @attachment, :CKEditor => 'ckeditor_field'
     end
-    
+
     assert_equal 200, @response.status
   end
-  
+
   test "create action via html5 upload" do
     assert_difference 'Ckeditor::AttachmentFile.count' do
       raw_post :create, { :qqfile => @attachment.original_filename }, @attachment.read
     end
-    
+
     assert_equal 200, @response.status
   end
-  
+
   test "invalid params for create action" do
     assert_no_difference 'Ckeditor::AttachmentFile.count' do
       post :create, :qqfile => nil
     end
   end
-  
+
   test "destroy action via filebrowser" do
     @attachment_file = Ckeditor::AttachmentFile.create :data => @attachment
-    
+
     assert_difference 'Ckeditor::AttachmentFile.count', -1 do
       delete :destroy, :id => @attachment_file.id
     end
-    
+
     assert_equal 302, @response.status
   end
 end

data/test/controllers/pictures_controller_test.rb

@@ -2,63 +2,63 @@ require 'test_helper'
 
 class PicturesControllerTest < ActionController::TestCase
   tests Ckeditor::PicturesController
-  
+
   include RawPost
   include Ckeditor::Engine.routes.url_helpers
   include ControllerHooks
-  
+
   def setup
     @image = fixture_file_upload('files/rails.png', 'image/png')
   end
-  
+
   def teardown
     Ckeditor::Picture.destroy_all
   end
-  
+
   test "index action" do
     get :index
-    
+
     assert_equal 200, @response.status
     assert_template "ckeditor/pictures/index"
   end
-  
+
   test "create action via filebrowser" do
     assert_difference 'Ckeditor::Picture.count' do
       post :create, :qqfile => @image
     end
-    
+
     assert_equal 200, @response.status
   end
-  
+
   test "create action via CKEditor upload form" do
     assert_difference 'Ckeditor::Picture.count' do
       post :create, :upload => @image, :CKEditor => 'ckeditor_field'
     end
-    
+
     assert_equal 200, @response.status
   end
-  
+
   test "create action via html5 upload" do
     assert_difference 'Ckeditor::Picture.count' do
       raw_post :create, { :qqfile => @image.original_filename }, @image.read, "image/png"
     end
-    
+
     assert_equal 200, @response.status
   end
-  
+
   test "invalid params for create action" do
     assert_no_difference 'Ckeditor::Picture.count' do
       post :create, :qqfile => nil
     end
   end
-  
+
   test "destroy action via filebrowser" do
     @picture = Ckeditor::Picture.create :data => @image
-    
+
     assert_difference 'Ckeditor::Picture.count', -1 do
       delete :destroy, :id => @picture.id
     end
-    
+
     assert_equal 302, @response.status
   end
 end

data/test/dummy/config/routes.rb

@@ -1,6 +1,6 @@
 Dummy::Application.routes.draw do
   resources :posts
   root :to => "posts#index"
-  
+
   mount Ckeditor::Engine => '/ckeditor'
 end

data/test/functional/posts_controller_test.rb

@@ -11,7 +11,7 @@ class PostsControllerTest < ActionController::TestCase
 
   test "include javascripts" do
     get :index
-    
+
     assert_select "script[src=/assets/application.js]"
     assert_select "script", Regexp.new(Regexp.escape(%q!CKEDITOR.replace('test_area');!))
   end
@@ -25,7 +25,7 @@ class PostsControllerTest < ActionController::TestCase
 
   test "form builder helper" do
     get :new
-    
+
     assert_select "textarea#post_content[name='post[content]'][cols=40][rows=20]", ""
     assert_select "script", Regexp.new(Regexp.escape(%q!CKEDITOR.replace('post_content', {"width":800,"height":400});!))
     assert_select "textarea#new_info_content[name='post[info]'][cols=40][rows=20]", "Defaults info content"

data/test/generators/install_generator_test.rb

@@ -8,7 +8,7 @@ class InstallGeneratorTest < Rails::Generators::TestCase
 
   setup do
     dir = File.expand_path("../../", __FILE__)
-    
+
     FileUtils.mkdir_p File.join(dir, 'tmp/config')
     FileUtils.cp File.join(dir, 'support/routes.txt'), File.join(dir, 'tmp/config/routes.rb')
   end
@@ -25,7 +25,7 @@ class InstallGeneratorTest < Rails::Generators::TestCase
 
     assert_file "config/initializers/ckeditor.rb", /require "ckeditor\/orm\/mongoid"/
   end
-  
+
   test "models and migration for active_record orm via paperclip" do
     run_generator %w(--orm=active_record --backend=paperclip)
 
@@ -46,7 +46,7 @@ class InstallGeneratorTest < Rails::Generators::TestCase
     assert_file "app/models/ckeditor/asset.rb"
     assert_file "app/models/ckeditor/picture.rb"
     assert_file "app/models/ckeditor/attachment_file.rb"
-    
+
     assert_file "app/uploaders/ckeditor_attachment_file_uploader.rb"
     assert_file "app/uploaders/ckeditor_picture_uploader.rb"
 
@@ -81,17 +81,17 @@ class InstallGeneratorTest < Rails::Generators::TestCase
 
     assert_no_migration "db/migrate/create_ckeditor_assets.rb"
   end
-  
+
   test "models for mongoid orm via carrierwave" do
     run_generator %w(--orm=mongoid --backend=carrierwave)
-  
+
     assert_file "app/models/ckeditor/asset.rb"
     assert_file "app/models/ckeditor/picture.rb"
     assert_file "app/models/ckeditor/attachment_file.rb"
-    
+
     assert_file "app/uploaders/ckeditor_attachment_file_uploader.rb"
     assert_file "app/uploaders/ckeditor_picture_uploader.rb"
-  
+
     assert_no_migration "db/migrate/create_ckeditor_assets.rb"
   end
 end

data/test/models/attachment_file_test.rb

@@ -7,14 +7,14 @@ class AttachmentFileTest < ActiveSupport::TestCase
 
   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 "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

data/test/models/picture_test.rb

@@ -7,12 +7,12 @@ class PictureTest < ActiveSupport::TestCase
 
   test "Set file content_type and size" do
     @picture = create_picture
-    
+
     assert_equal "image/png", @picture.data_content_type
     assert_equal "rails.png", @picture.data_file_name
     assert_equal 6646, @picture.data_file_size
     assert @picture.url_thumb.include?('thumb_rails.png')
-    
+
     if @picture.has_dimensions?
       assert_equal 50, @picture.width
       assert_equal 64, @picture.height

data/test/models/utils_test.rb

@@ -2,15 +2,14 @@ require 'test_helper'
 
 class UtilsTest < ActiveSupport::TestCase
   test 'exists filethumb' do
-    ["avi", "doc", "docx", "exe", "gz", "htm", "jpg", "mp3", "mpg", "pdf", 
-     "psd", "rar", "swf", "tar", "txt", "wmv", "xlsx", "zip"].each do |ext|
+    %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}")
     end
-    
+
     assert_equal "/assets/ckeditor/filebrowser/images/thumbs/unknown.gif", Ckeditor::Utils.filethumb("somefile.ddd")
   end
-  
-  test 'wrong filethumb' do    
+
+  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("")

data/test/support/helpers.rb

@@ -3,25 +3,25 @@ require 'action_dispatch/testing/test_process'
 
 class ActiveSupport::TestCase
   include ActionDispatch::TestProcess
-  
+
   def new_attachment(data = nil)
     data ||= fixture_file_upload('files/rails.tar.gz', 'application/x-gzip')
-    
+
     Ckeditor.attachment_file_model.new(:data => data)
   end
-  
+
   def create_attachment(data = nil)
     attachment = new_attachment(data)
     attachment.save!
     attachment
   end
-  
+
   def new_picture(data = nil)
     data ||= fixture_file_upload('files/rails.png', 'image/png')
-    
+
     Ckeditor.picture_model.new(:data => data)
   end
-  
+
   def create_picture(data = nil)
     picture = new_picture(data)
     picture.save!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ckeditor
 version: !ruby/object:Gem::Version
-  version: 4.0.9
+  version: 4.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types