glebtv-ckeditor 4.6.0 → 4.7.3

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

@@ -1,25 +1,20 @@
-class CreateCkeditorAssets < ActiveRecord::Migration[4.2]
+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.string  :data_id, null: false
+      t.string  :data_filename, null: false
       t.integer :data_size
       t.string  :data_content_type
+      t.string  :type, limit: 30
 
-
-      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
+      # 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, :type
   end
 
   def self.down

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

@@ -0,0 +1,23 @@
+class CreateCkeditorAssets < ActiveRecord::Migration<%= migration_version %>
+  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.string  :type, limit: 30
+
+      # Uncomment it to save images dimensions, if your need it
+      t.integer :width
+      t.integer :height
+
+      t.timestamps null: false
+    end
+
+    add_index :ckeditor_assets, :type
+  end
+
+  def self.down
+    drop_table :ckeditor_assets
+  end
+end

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

@@ -22,21 +22,21 @@ class CkeditorPictureUploader < CarrierWave::Uploader::Base
   # end
 
   # Process files as they are uploaded:
-  # process :scale => [200, 300]
+  # process scale: [200, 300]
   #
   # def scale(width, height)
   #   # do something
   # end
 
-  process :read_dimensions
+  process :extract_dimensions
 
   # Create different versions of your uploaded files:
   version :thumb do
-    process :resize_to_fill => [118, 100]
+    process resize_to_fill: [118, 100]
   end
 
   version :content do
-    process :resize_to_limit => [800, 800]
+    process resize_to_limit: [800, 800]
   end
 
   # Add a white list of extensions which are allowed to be uploaded.

data/lib/generators/ckeditor/templates/base/dragonfly/initializer.rb

@@ -1,5 +1,5 @@
 # Load Dragonfly if it isn't loaded already.
-require "dragonfly"
+require 'dragonfly'
 
 Dragonfly.app(:ckeditor).configure do
   plugin :imagemagick
@@ -8,13 +8,12 @@ Dragonfly.app(:ckeditor).configure do
   # Store files in public/uploads/ckeditor. This is not
   # mandatory and the files don't even have to be stored under
   # 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'
+  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 path is
   # not mandatory. Just be sure to include :job somewhere.
-  url_format "/uploads/ckeditor/:job/:basename.:format"
+  url_format '/uploads/ckeditor/:job/:basename.:format'
 end
 
 Rails.application.middleware.use Dragonfly::Middleware, :ckeditor

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

@@ -4,22 +4,31 @@ Ckeditor.setup do |config|
   # Load and configure the ORM. Supports :active_record (default), :mongo_mapper and
   # :mongoid (bson_ext recommended) by default. Other ORMs may be
   # available as additional gems.
-  require "ckeditor/orm/<%= options[:orm] %>"
+  require 'ckeditor/orm/<%= options[:orm] %>'
 
   # 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"]
+  # config.image_file_types = %w(jpg jpeg png gif tiff)
+
+  # Allowed flash file types for upload.
+  # Set to nil or [] (empty array) for all file types
+  # By default: %w(jpg jpeg png gif tiff)
+  # config.flash_file_types = %w(swf)
 
   # 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"]
+  # config.attachment_file_types = %w(doc docx xls odt ods pdf rar zip tar tar.gz swf)
 
   # Setup authorization to be run as a before filter
   # By default: there is no authorization.
   # config.authorize_with :cancan
 
+  # Override parent controller CKEditor inherits from
+  # By default: 'ApplicationController'
+  # config.parent_controller = 'MyController'
+
   # Asset model classes
   # config.picture_model { Ckeditor::Picture }
   # config.attachment_file_model { Ckeditor::AttachmentFile }
@@ -30,7 +39,7 @@ Ckeditor.setup do |config|
 
   # Customize ckeditor assets path
   # By default: nil
-  # config.asset_path = "http://www.example.com/assets/ckeditor/"
+  # 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)
@@ -40,10 +49,10 @@ Ckeditor.setup do |config|
   # 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"
+  # config.cdn_url = '//cdn.ckeditor.com/<%= Ckeditor::Version::EDITOR %>/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"
+  # By default: "ckeditor/config.js"
+  # config.js_config_url = 'ckeditor/config.js'
 end

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

@@ -1,7 +1,7 @@
 class Ckeditor::Asset
   include Ckeditor::Orm::Mongoid::AssetBase
 
-  delegate :url, :current_path, :size, :content_type, :filename, :to => :data
+  delegate :url, :current_path, :content_type, to: :data
 
-  validates_presence_of :data
+  validates :data, presence: true
 end

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

@@ -1,5 +1,5 @@
 class Ckeditor::AttachmentFile < Ckeditor::Asset
-  mount_uploader :data, CkeditorAttachmentFileUploader, :mount_on => :data_file_name
+  mount_uploader :data, CkeditorAttachmentFileUploader, mount_on: :data_file_name
 
   def url_thumb
     @url_thumb ||= Ckeditor::Utils.filethumb(filename)

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

@@ -1,5 +1,5 @@
 class Ckeditor::Picture < Ckeditor::Asset
-  mount_uploader :data, CkeditorPictureUploader, :mount_on => :data_file_name
+  mount_uploader :data, CkeditorPictureUploader, mount_on: :data_file_name
 
   def url_content
     url(:content)

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

@@ -1,10 +1,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
+                            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
   do_not_validate_attachment_file_type :data
 
   def url_thumb

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

@@ -1,12 +1,12 @@
 class Ckeditor::Picture < Ckeditor::Asset
   has_mongoid_attached_file :data,
-                            :url  => "/ckeditor_assets/pictures/:id/:style_:basename.:extension",
-                            :path => ":rails_root/public/ckeditor_assets/pictures/:id/:style_:basename.:extension",
-                            :styles => { :content => '800>', :thumb => '118x100#' }
+                            url: '/ckeditor_assets/pictures/:id/:style_:basename.:extension',
+                            path: ':rails_root/public/ckeditor_assets/pictures/:id/:style_:basename.:extension',
+                            styles: { content: '800>', thumb: '118x100#' }
 
-  validates_attachment_size :data, :less_than => 2.megabytes
+  validates_attachment_size :data, less_than: 2.megabytes
   validates_attachment_presence :data
-  validates_attachment_content_type :data, :content_type => /\Aimage/
+  validates_attachment_content_type :data, content_type: /\Aimage/
 
   def url_content
     url(:content)

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

@@ -15,6 +15,6 @@ class Ckeditor::AttachmentFilePolicy
   end
 
   def destroy?
-    attachment.assetable_id == user.id
+    user.present?
   end
-end
+end

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

@@ -15,6 +15,6 @@ class Ckeditor::PicturePolicy
   end
 
   def destroy?
-    picture.assetable_id == user.id
+    user.present?
   end
-end
+end

data/lib/tasks/ckeditor.rake

@@ -1,26 +1,18 @@
 require 'fileutils'
 
-namespace "ckeditor" do
-  desc "Create nondigest versions of all ckeditor digest assets"
-  task "nondigest" => [:environment] do
+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]
+    path = Rails.root.join("public#{Ckeditor.base_path}**/*")
 
-    for file in files
+    Dir[path].each do |file|
       next unless file =~ fingerprint
       nondigest = file.sub fingerprint, '.'
 
-      if !File.exist?(nondigest) or File.mtime(file) > File.mtime(nondigest)
+      if !File.exist?(nondigest) || 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/dummy/config/initializers/assets.rb

@@ -0,0 +1 @@
+Rails.application.config.assets.precompile += %w( ckeditor/* )

data/test/dummy/config/initializers/paperclip.rb

@@ -0,0 +1,3 @@
+if Object.const_defined?('Paperclip')
+  Paperclip.options[:command_path] = '/usr/local/bin/'
+end

data/test/functional/posts_controller_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class PostsControllerTest < ActionController::TestCase
   def setup
-    @post = Post.create!(:title => "test", :content => "content", :info => "info")
+    @post = Post.create!(title: "test", content: "content", info: "info")
   end
 
   def teardown
@@ -12,7 +12,6 @@ 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
 
@@ -33,7 +32,7 @@ class PostsControllerTest < ActionController::TestCase
   end
 
   test "text_area value" do
-    get :edit, :id => @post.id
+    get :edit, id: @post.id
 
     assert_select "textarea[name='post[content]']", "content"
     assert_select "textarea[name='post[info]']", "info"

data/test/generators/install_generator_test.rb

@@ -16,14 +16,14 @@ class InstallGeneratorTest < Rails::Generators::TestCase
   test "Assert all files are properly created" do
     run_generator %w(--orm=active_record)
 
-    assert_file "config/initializers/ckeditor.rb", /require "ckeditor\/orm\/active_record"/
+    assert_file "config/initializers/ckeditor.rb", /require 'ckeditor\/orm\/active_record'/
     assert_file "config/routes.rb", /mount\sCkeditor::Engine\s=\>\s\'\/ckeditor\'/
   end
 
   test "Assert configurator is valid for mongoid" do
     run_generator %w(--orm=mongoid)
 
-    assert_file "config/initializers/ckeditor.rb", /require "ckeditor\/orm\/mongoid"/
+    assert_file "config/initializers/ckeditor.rb", /require 'ckeditor\/orm\/mongoid'/
   end
 
   test "models and migration for active_record orm via paperclip" do

data/test/models/attachment_file_test.rb

@@ -5,18 +5,13 @@ class AttachmentFileTest < ActiveSupport::TestCase
     @attachment.destroy rescue nil
   end
 
-  test "Set file content_type and size" do
+  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 "rails.tar.gz", @attachment.data_file_name
 
     assert_match /application\/(x-)?gzip/, @attachment.data_content_type
     assert_equal 6823, @attachment.data_file_size
-    assert_equal "ckeditor/filebrowser/images/thumbs/gz.gif", @attachment.url_thumb
+    assert_equal "ckeditor/filebrowser/thumbs/gz.gif", @attachment.url_thumb
   end
 end