ckeditor 4.1.3 → 4.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 437399a86513da9974358bcd63b29c0ae032f003
-  data.tar.gz: c77dc6017531c912ddfff16c22d0dcc33a4eb362
+  metadata.gz: a5ab3c91e941e56450800b6c991093bc7a7e75a8
+  data.tar.gz: 31ad06d98d3826df129a979b4aad38b54e0ddab0
 SHA512:
-  metadata.gz: 33f454a7cda68e57d1c40e733d46d5145e50df37cecd1206d7573372764ccdae63701a71e34879eacb52d7d217c497d5c5ce0def0ffbc27a0b6bd39de8975dc3
-  data.tar.gz: 288f73890cc18d4b35d6cf588891a11fc64d775ef26d86f06b6f168e35cd768e8c55e716d3f409974916d9c0506cf49faa891431f0d98ca2536ee939d93af067
+  metadata.gz: bb2b5f55f0c149b1f1f2c4cc9d2981c3865c734e36caa5821337701d279ee7f40f1791958adbeca284d01a809e27054fb32fb4ba8d276cea674b7fcc8e836c08
+  data.tar.gz: fbf129a97fd6d13ab530e00b3802a4bdcac85e594cee449caf8a09bd7de74572395d502818b4d87743b229653826054b2e3984aa158a3ff883b013ebd4286c16

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec
 
-gem "rails", "3.2.21"
+gem "rails", "4.2.4"
 
 platforms :mri_18 do
   group :test do
@@ -19,19 +19,22 @@ platforms :ruby do
   end
 
   group :development, :test do
+    gem 'jquery-rails', '~> 4.0.4'
     gem "capybara", ">= 0.4.0"
     gem "mynyml-redgreen", "~> 0.7.1", :require => 'redgreen'
   end
 
   group :active_record do
-    gem 'paperclip', '~> 4.1.1'
+    gem 'paperclip'
     gem "carrierwave"
     gem "dragonfly"
     gem "mini_magick"
+    gem "refile", require: "refile/rails"
+    gem "refile-mini_magick"
   end
 
   group :mongoid do
-    gem "mongoid"
+    gem 'mongoid', '~> 5.0.0'
     gem "bson_ext"
     gem 'mongoid-paperclip', :require => 'mongoid_paperclip'
     gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'

data/README.md

@@ -1,11 +1,14 @@
 # Ckeditor
 
+[![Build Status](https://semaphoreci.com/api/v1/projects/9c3e4e36-9716-4362-aaa5-ef9644c72313/565007/badge.svg)](https://semaphoreci.com/igor-galeta/ckeditor)
+[![Code Climate](https://codeclimate.com/github/galetahub/ckeditor/badges/gpa.svg)](https://codeclimate.com/github/galetahub/ckeditor)
+
 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.7 (full 27 Jan 2015)
+* Ckeditor version 4.5.4 (full 06 Oct 2015)
 * Rails 4 integration
 * Files browser
 * HTML5 file uploader
@@ -61,6 +64,16 @@ gem 'mini_magick'
 rails generate ckeditor:install --orm=active_record --backend=carrierwave
 ```
 
+#### ActiveRecord + refile
+
+```
+gem 'refile', require: "refile/rails"
+gem 'refile-mini_magick'
+
+rails generate ckeditor:install --orm=active_record --backend=refile
+```
+
+
 #### ActiveRecord + dragonfly
 
 Requires Dragonfly 1.0 or greater.
@@ -146,7 +159,7 @@ Adding a custom toolbar:
 
 CKEDITOR.editorConfig = function (config) {
   // ... other configuration ...
-  
+
   config.toolbar_mini = [
     ["Bold",  "Italic",  "Underline",  "Strike",  "-",  "Subscript",  "Superscript"],
   ];
@@ -291,9 +304,11 @@ en:
 ## Tests
 
 ```bash
-$> rake test
-$> rake test CKEDITOR_ORM=mongoid
+$> rake test CKEDITOR_BACKEND=paperclip
 $> rake test CKEDITOR_BACKEND=carrierwave
+$> rake test CKEDITOR_BACKEND=refile
+$> rake test CKEDITOR_BACKEND=dragonfly
+$> rake test CKEDITOR_ORM=mongoid
 
 $> rake test:controllers
 $> rake test:generators

data/app/controllers/ckeditor/application_controller.rb

@@ -8,13 +8,19 @@ class Ckeditor::ApplicationController < ApplicationController
   protected
 
     def respond_with_asset(asset)
-      file = params[:CKEditor].blank? ? params[:qqfile] : params[:upload]
+      file = (params[:CKEditor].blank? && params[:responseType] != 'json') ? params[:qqfile] : params[:upload]
       asset.data = Ckeditor::Http.normalize_param(file, request)
 
       callback = ckeditor_before_create_asset(asset)
 
       if callback && asset.save
-        if params[:CKEditor].blank?
+        if params[:responseType] == 'json'
+          render json: {
+            "uploaded" => 1,
+            "fileName" => asset.filename,
+            "url" => asset.url
+          }.to_json
+        elsif params[:CKEditor].blank?
           render :json => asset.to_json(:only=>[:id, :type])
         else
           render :text => %Q"<script type='text/javascript'>
@@ -22,7 +28,14 @@ class Ckeditor::ApplicationController < ApplicationController
             </script>"
         end
       else
-        if params[:CKEditor].blank?
+        if params[:responseType] == 'json'
+          render json: {
+            "uploaded" => 0,
+            "error" => {
+              "message" => "Upload failed"
+            }
+          }.to_json
+        elsif params[:CKEditor].blank?
           render :nothing => true, :format => :json
         else
           render :text => %Q"<script type='text/javascript'>

data/app/controllers/ckeditor/attachment_files_controller.rb

@@ -1,5 +1,6 @@
 class Ckeditor::AttachmentFilesController < Ckeditor::ApplicationController
-
+  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,4 +1,5 @@
 class Ckeditor::PicturesController < Ckeditor::ApplicationController
+  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

@@ -4,14 +4,14 @@
   		<%= link_to I18n.t(:upload, :scope => [:ckeditor, :buttons]), 'javascript:void(0)', :class => "add" %>
 		</div>
 	</div>
-  
+
   <div class="fileupload-list">
-    <%= render :partial => 'ckeditor/shared/asset', :collection => @attachments.scoped %>		
+    <%= render :partial => 'ckeditor/shared/asset', :collection => @attachments.scoped %>
   </div>
 
   <% unless @attachments.last_page? %>
     <div class="pagination">
-      <%= link_to I18n.t("ckeditor.buttons.next"), params.merge(:page => @attachments.next_page), :class => "next", :rel => "next" %>
+      <%= link_to I18n.t("ckeditor.buttons.next"), ckeditor.attachment_files_path(params.merge(:page => @attachments.next_page)), :class => "next", :rel => "next" %>
     </div>
   <% end -%>
 

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

@@ -4,14 +4,14 @@
   		<%= link_to I18n.t(:upload, :scope => [:ckeditor, :buttons]), 'javascript:void(0)', :class => "add" %>
 		</div>
 	</div>
-  
+
   <div class="fileupload-list" data-endless="true">
-    <%= render :partial => 'ckeditor/shared/asset', :collection => @pictures.scoped %>		
+    <%= render :partial => 'ckeditor/shared/asset', :collection => @pictures.scoped %>
   </div>
 
   <% unless @pictures.last_page? %>
     <div class="pagination">
-      <%= link_to I18n.t("ckeditor.buttons.next"), params.merge(:page => @pictures.next_page), :class => "next", :rel => "next" %>
+      <%= link_to I18n.t("ckeditor.buttons.next"), ckeditor.pictures_path(params.merge(:page => @pictures.next_page)), :class => "next", :rel => "next" %>
     </div>
   <% end -%>
 

data/config/locales/bg.ckeditor.yml

@@ -0,0 +1,9 @@
+bg:
+  ckeditor:
+    page_title: "Списък с файлове"
+    confirm_delete: "Сигурни ли сте, че искате да изтриете този файл?"
+    buttons:
+      cancel: "Откажи"
+      upload: "Качи"
+      delete: "Изтрий"
+      next: "Следващ"

data/lib/ckeditor.rb

@@ -24,6 +24,7 @@ module Ckeditor
     autoload :Paperclip, 'ckeditor/backend/paperclip'
     autoload :CarrierWave, 'ckeditor/backend/carrierwave'
     autoload :Dragonfly, 'ckeditor/backend/dragonfly'
+    autoload :Refile, 'ckeditor/backend/refile'
   end
 
   IMAGE_TYPES = %w(image/jpeg image/png image/gif image/jpg image/pjpeg image/tiff image/x-png)

data/lib/ckeditor/backend/refile.rb

@@ -0,0 +1,37 @@
+module Ckeditor
+  module Backend
+    module Refile
+      extend ActiveSupport::Concern
+
+      included do
+        validates :data, presence: true
+        delegate :rewind, :download, :to_io, :exists?, :delete, :size, :close, :eof?, :read, to: :data
+        alias_attribute :data_file_name, :data_filename
+        alias_attribute :data_file_size, :data_size
+      end
+
+      class_methods do
+        def attachment_file_types
+          @attachment_file_types ||= Ckeditor.attachment_file_types.map(&:to_s)
+        end
+
+        def image_file_types
+          @image_file_types ||= Ckeditor.image_file_types.map(&:to_s)
+        end
+      end
+
+      def url(*attrs)
+        ::Refile.attachment_url(self, :data, *attrs)
+      end
+
+      def read_dimensions
+        if model.image? && model.has_dimensions?
+          magick = MiniMagick::Image.open(model.to_io)
+          model.width = magick.width
+          model.height = magick.height
+        end
+      end
+      
+    end
+  end
+end

data/lib/ckeditor/version.rb

@@ -1,6 +1,6 @@
 module Ckeditor
   module Version
-    GEM = "4.1.3".freeze
-    EDITOR = "4.5.2".freeze
+    GEM = "4.1.4".freeze
+    EDITOR = "4.5.4".freeze
   end
 end

data/lib/generators/ckeditor/install_generator.rb

@@ -13,7 +13,7 @@ module Ckeditor
         :desc => "Backend processor for upload support"
 
       class_option :backend, :type => :string, :default => 'paperclip',
-        :desc => "paperclip (default), carrierwave, or dragonfly"
+        :desc => "paperclip (default), carrierwave, refile or dragonfly"
 
       def self.source_root
         @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))

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

@@ -1,23 +1,23 @@
 class CreateCkeditorAssets < ActiveRecord::Migration
   def self.up
     create_table :ckeditor_assets do |t|
-      t.string  :data_file_name, :null => false
+      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
+      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
+      t.timestamps null: false
     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"
+    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
 
   def self.down

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

@@ -0,0 +1,4 @@
+class Ckeditor::Asset < ActiveRecord::Base
+  include Ckeditor::Backend::Refile
+  include Ckeditor::Orm::ActiveRecord::AssetBase
+end

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

@@ -0,0 +1,7 @@
+class Ckeditor::AttachmentFile < Ckeditor::Asset
+  attachment :data, extension: attachment_file_types
+
+  def url_thumb
+    @url_thumb ||= Ckeditor::Utils.filethumb(filename)
+  end
+end

data/lib/generators/ckeditor/templates/active_record/refile/ckeditor/picture.rb

@@ -0,0 +1,11 @@
+class Ckeditor::Picture < Ckeditor::Asset
+  attachment :data, extension: image_file_types
+
+  def url_content
+    url
+  end
+
+  def url_thumb
+    url(:fill, 118, 100)
+  end
+end

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

@@ -0,0 +1,28 @@
+class CreateCkeditorAssets < ActiveRecord::Migration
+  def self.up
+    create_table :ckeditor_assets do |t|
+      t.string  :data_id, :null => false
+      t.string  :data_filename, :null => false
+      t.integer :data_size
+      t.string  :data_content_type
+
+
+      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
+
+  def self.down
+    drop_table :ckeditor_assets
+  end
+end

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

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require 'carrierwave'
+
 class CkeditorAttachmentFileUploader < CarrierWave::Uploader::Base
   include Ckeditor::Backend::CarrierWave
 

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

@@ -2,9 +2,10 @@ class Ckeditor::AttachmentFile < Ckeditor::Asset
   has_mongoid_attached_file :data,
                             :url => "/ckeditor_assets/attachments/:id/:filename",
                             :path => ":rails_root/public/ckeditor_assets/attachments/:id/:filename"
-
+                            
+  validates_attachment_presence :data                            
   validates_attachment_size :data, :less_than => 100.megabytes
-  validates_attachment_presence :data
+  do_not_validate_attachment_file_type :data
 
   def url_thumb
     @url_thumb ||= Ckeditor::Utils.filethumb(filename)

data/lib/generators/ckeditor/templates/mongoid/paperclip/ckeditor/picture.rb

@@ -6,6 +6,7 @@ class Ckeditor::Picture < Ckeditor::Asset
 
   validates_attachment_size :data, :less_than => 2.megabytes
   validates_attachment_presence :data
+  validates_attachment_content_type :data, :content_type => /\Aimage/
 
   def url_content
     url(:content)

data/test/controllers/attachment_files_controller_test.rb

@@ -4,10 +4,10 @@ class AttachmentFilesControllerTest < ActionController::TestCase
   tests Ckeditor::AttachmentFilesController
 
   include RawPost
-  include ControllerHooks
 
   def setup
     @attachment = fixture_file_upload('files/rails.tar.gz', 'application/x-gzip')
+    @routes = Ckeditor::Engine.routes
   end
 
   def teardown
@@ -47,7 +47,7 @@ class AttachmentFilesControllerTest < ActionController::TestCase
 
   test "invalid params for create action" do
     assert_no_difference 'Ckeditor::AttachmentFile.count' do
-      post :create, :qqfile => nil
+      post :create, :qqfile => nil, :format => :html
     end
   end
 

data/test/controllers/pictures_controller_test.rb

@@ -4,11 +4,10 @@ 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')
+    @routes = Ckeditor::Engine.routes
   end
 
   def teardown
@@ -48,7 +47,7 @@ class PicturesControllerTest < ActionController::TestCase
 
   test "invalid params for create action" do
     assert_no_difference 'Ckeditor::Picture.count' do
-      post :create, :qqfile => nil
+      post :create, :qqfile => nil, :format => :html
     end
   end
 

data/test/dummy/app/assets/javascripts/application.js

@@ -6,6 +6,5 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require_tree .
 
 //= require ckeditor/init

data/test/dummy/app/controllers/application_controller.rb

@@ -1,4 +1,3 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  respond_to :html, :xml
 end