glebtv-ckeditor 4.4.7.4 → 4.5.7

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

@@ -3,12 +3,10 @@ class Ckeditor::Picture < Ckeditor::Asset
                     :url  => "/ckeditor_assets/pictures/:id/:style_:basename.:extension",
                     :path => ":rails_root/public/ckeditor_assets/pictures/:id/:style_:basename.:extension",
                     :styles => { :content => '800>', :thumb => '118x100#' }
-  
-  if respond_to?(:validates_attachment_content_type)
-    validates_attachment_content_type :data, :content_type => ['image/gif', 'image/jpeg', 'image/jpg', 'image/png'], if: :data?
-  end
-  validates_attachment_size :data, :less_than => 10.megabytes
+
   validates_attachment_presence :data
+  validates_attachment_size :data, :less_than => 2.megabytes
+  validates_attachment_content_type :data, :content_type => /\Aimage/
 
   def url_content
     url(:content)

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.string  :data_fingerprint
       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/base/dragonfly/initializer.rb

@@ -1,26 +1,20 @@
-# Load Dragonfly for Rails if it isn't loaded already.
-require "dragonfly/rails/images"
+# Load Dragonfly if it isn't loaded already.
+require "dragonfly"
 
-# Use a separate Dragonfly "app" for CKEditor.
-app = Dragonfly[:ckeditor]
-app.configure_with(:rails)
-app.configure_with(:imagemagick)
+Dragonfly.app(:ckeditor).configure do
+  plugin :imagemagick
+  secret "<%= SecureRandom.hex(32) %>"
 
-# Define the ckeditor_file_accessor macro.
-app.define_macro(ActiveRecord::Base, :ckeditor_file_accessor) if defined?(ActiveRecord::Base)
-app.define_macro_on_include(Mongoid::Document, :ckeditor_file_accessor) if defined?(Mongoid::Document)
-
-app.configure do |c|
   # Store files in public/uploads/ckeditor. This is not
   # mandatory and the files don't even have to be stored under
-  # public. If not storing under public then set server_root to nil.
-  c.datastore.root_path = Rails.root.join("public", "uploads", "ckeditor", Rails.env).to_s
-  c.datastore.server_root = Rails.root.join("public").to_s
+  # public. See http://markevans.github.io/dragonfly/data-stores
+  datastore :file,
+    root_path: Rails.root.join("public", "uploads", "ckeditor", Rails.env).to_s,
+    server_root: 'public'
 
-  # Accept asset requests on /ckeditor_assets. Again, this is not
-  # mandatory. Just be sure to include :job somewhere.
-  c.url_format = "/uploads/ckeditor/:job/:basename.:format"
+  # Accept asset requests on /ckeditor_assets. Again, this path is
+  # not mandatory. Just be sure to include :job somewhere.
+  url_format "/uploads/ckeditor/:job/:basename.:format"
 end
 
-# Insert our Dragonfly "app" into the stack.
-Rails.application.middleware.insert_after Rack::Cache, Dragonfly::Middleware, :ckeditor
+Rails.application.middleware.use Dragonfly::Middleware, :ckeditor

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

@@ -8,13 +8,16 @@ Ckeditor.setup do |config|
 
   # Allowed image file types for upload.
   # Set to nil or [] (empty array) for all file types
+  # By default: %w(jpg jpeg png gif tiff)
   # config.image_file_types = ["jpg", "jpeg", "png", "gif", "tiff"]
 
   # Allowed attachment file types for upload.
   # Set to nil or [] (empty array) for all file types
+  # By default: %w(doc docx xls odt ods pdf rar zip tar tar.gz swf)
   # config.attachment_file_types = ["doc", "docx", "xls", "odt", "ods", "pdf", "rar", "zip", "tar", "swf"]
 
   # Setup authorization to be run as a before filter
+  # By default: there is no authorization.
   # config.authorize_with :cancan
 
   # Asset model classes
@@ -22,5 +25,25 @@ Ckeditor.setup do |config|
   # config.attachment_file_model { Ckeditor::AttachmentFile }
 
   # Paginate assets
+  # By default: 24
   # config.default_per_page = 24
+
+  # Customize ckeditor assets path
+  # By default: nil
+  # config.asset_path = "http://www.example.com/assets/ckeditor/"
+
+  # To reduce the asset precompilation time, you can limit plugins and/or languages to those you need:
+  # By default: nil (no limit)
+  # config.assets_languages = ['en', 'uk']
+  # config.assets_plugins = ['image', 'smiley']
+
+  # CKEditor CDN
+  # More info here http://cdn.ckeditor.com/
+  # By default: nil (CDN disabled)
+  # config.cdn_url = "//cdn.ckeditor.com/4.5.6/standard/ckeditor.js"
+
+  # JS config url
+  # Used when CKEditor CDN enabled
+  # By default: "/assets/ckeditor/config.js"
+  # config.js_config_url = "/assets/ckeditor/config.js"
 end

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

@@ -2,13 +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"
-  
-  if respond_to?(:do_not_validate_attachment_file_type)
-    do_not_validate_attachment_file_type :data, if: :data?
-  end
-  
+                            
+  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

@@ -3,12 +3,10 @@ class Ckeditor::Picture < Ckeditor::Asset
                             :url  => "/ckeditor_assets/pictures/:id/:style_:basename.:extension",
                             :path => ":rails_root/public/ckeditor_assets/pictures/:id/:style_:basename.:extension",
                             :styles => { :content => '800>', :thumb => '118x100#' }
-  
-  if respond_to?(:validates_attachment_content_type)
-    validates_attachment_content_type :data, :content_type => ['image/gif', 'image/jpeg', 'image/jpg', 'image/png'], if: :data?
-  end
-  validates_attachment_size :data, :less_than => 10.megabytes
+
+  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/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

@@ -0,0 +1,26 @@
+require 'fileutils'
+
+namespace "ckeditor" do
+  desc "Create nondigest versions of all ckeditor digest assets"
+  task "nondigest" => [:environment] do
+    fingerprint = /\-[0-9a-f]{32,64}\./
+    path        = File.join Rails.root.to_s, "public", Ckeditor.base_path, "**/*"
+    files       = Dir[path]
+
+    for file in files
+      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, preserve: true
+      end
+    end
+  end
+end
+
+# Based on rake task from asset_sync gem
+if Rake::Task.task_defined?("assets:precompile")
+  Rake::Task["assets:precompile"].enhance do
+    Rake::Task["ckeditor:nondigest"].invoke if defined?(Ckeditor) && Ckeditor.run_on_precompile?
+  end
+end

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

data/test/dummy/app/views/layouts/application.html.erb

@@ -2,13 +2,13 @@
 <html>
 <head>
   <title>Dummy</title>
-  <%= stylesheet_link_tag    "application" %>
-  <%= javascript_include_tag "application" %>
+  <%= stylesheet_link_tag "application" %>
   <%= csrf_meta_tags %>
 </head>
 <body>
 
 <%= yield %>
 
+  <%= javascript_include_tag "application" %>
 </body>
 </html>

data/test/dummy/config/application.rb

@@ -1,14 +1,20 @@
 require File.expand_path('../boot', __FILE__)
 
-require 'rails/all'
-
-if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
-  Bundler.require(:default, CKEDITOR_ORM)
-end
+require "rails"
+# Pick the frameworks you want:
+require "active_model/railtie"
+# require "active_job/railtie"
+require "active_record/railtie"
+require "action_controller/railtie"
+# require "action_mailer/railtie"
+require "action_view/railtie"
+require "sprockets/railtie"
+require "rails/test_unit/railtie"
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
+Bundler.require(:default, CKEDITOR_ORM)
 
 require 'ckeditor'
 
@@ -48,12 +54,6 @@ module Dummy
     # like if you have constraints or database-specific column types
     # config.active_record.schema_format = :sql
 
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = false
-
     # Enable the asset pipeline
     config.assets.enabled = true