glebtv-ckeditor 4.6.0 → 4.7.3

data/lib/ckeditor/utils/content_type_detector.rb

@@ -4,8 +4,8 @@ require 'cocaine'
 module Ckeditor
   module Utils
     class ContentTypeDetector
-      EMPTY_CONTENT_TYPE = 'inode/x-empty'
-      DEFAULT_CONTENT_TYPE = 'application/octet-stream'
+      EMPTY_CONTENT_TYPE = 'inode/x-empty'.freeze
+      DEFAULT_CONTENT_TYPE = 'application/octet-stream'.freeze
 
       def initialize(file_path)
         @file_path = file_path
@@ -25,17 +25,14 @@ module Ckeditor
 
       def empty_file?
         return true if @file_path.blank?
-        File.exists?(@file_path) && File.size(@file_path) == 0
+        File.exist?(@file_path) && File.size(@file_path).zero?
       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
+        Cocaine::CommandLine.new('file', '-b --mime-type :file').run(file: @file_path).strip
+      rescue Cocaine::CommandLineError
+        DEFAULT_CONTENT_TYPE
       end
     end
   end
-end
+end

data/lib/ckeditor/utils/javascript_code.rb

@@ -3,8 +3,13 @@
 module Ckeditor
   module Utils
     class JavascriptCode < String
-      def as_json(options = nil) self end #:nodoc:
-      def encode_json(encoder) self end #:nodoc:
+      def as_json(_options = nil)
+        self
+      end
+
+      def encode_json(_encoder)
+        self
+      end
     end
   end
-end
+end

data/lib/ckeditor/version.rb

@@ -1,6 +1,6 @@
 module Ckeditor
   module Version
-    GEM = "4.6.0".freeze
-    EDITOR = "4.6.2".freeze
+    GEM = '4.7.3'.freeze
+    EDITOR = '4.7.3'.freeze
   end
 end

data/lib/generators/ckeditor/install_generator.rb

@@ -6,29 +6,29 @@ module Ckeditor
     class InstallGenerator < Rails::Generators::Base
       include Rails::Generators::Migration
 
-      desc "Generates migration for Asset (Picture, AttachmentFile) models"
+      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 :orm, type: :string, default: 'active_record',
+                         desc: 'Backend processor for upload support'
 
-      class_option :backend, :type => :string, :default => 'paperclip',
-        :desc => "paperclip (default), carrierwave, refile or dragonfly"
+      class_option :backend, type: :string, default: 'paperclip',
+                             desc: 'paperclip (default), carrierwave, refile or dragonfly'
 
       def self.source_root
         @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
       end
 
-      def self.next_migration_number(dirname)
-        Time.now.strftime("%Y%m%d%H%M%S")
+      def self.next_migration_number(_dirname)
+        Time.now.strftime('%Y%m%d%H%M%S')
       end
 
       # copy configuration
       def copy_initializer
-        template "ckeditor.rb", "config/initializers/ckeditor.rb"
+        template 'ckeditor.rb', 'config/initializers/ckeditor.rb'
 
-        if backend == "dragonfly"
-          template File.join("base", "dragonfly", "initializer.rb"), "config/initializers/ckeditor_dragonfly.rb"
+        if backend_dragonfly?
+          template 'base/dragonfly/initializer.rb', 'config/initializers/ckeditor_dragonfly.rb'
         end
       end
 
@@ -42,42 +42,64 @@ module Ckeditor
                    File.join('app/models', ckeditor_dir, "#{filename}.rb")
         end
 
-        if backend == "carrierwave"
+        if backend_carrierwave?
           template "#{uploaders_dir}/uploaders/ckeditor_attachment_file_uploader.rb",
-                   File.join("app/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")
+                   File.join('app/uploaders', 'ckeditor_picture_uploader.rb')
         end
       end
 
       def create_ckeditor_migration
-        if ["active_record"].include?(orm)
-          migration_template "#{generator_dir}/migration.rb", File.join('db/migrate', "create_ckeditor_assets.rb")
+        if ['active_record'].include?(orm)
+          migration_template "#{generator_dir}/#{migration_file}.rb",
+                             File.join('db/migrate', 'create_ckeditor_assets.rb'),
+                             migration_version: migration_version
         end
       end
 
       protected
 
-        def ckeditor_dir
-          'ckeditor'
-        end
+      def backend_carrierwave?
+        backend == 'carrierwave'
+      end
 
-        def generator_dir
-          @generator_dir ||= [orm, backend].join('/')
-        end
+      def backend_dragonfly?
+        backend == 'dragonfly'
+      end
 
-        def uploaders_dir
-          @uploaders_dir ||= ['base', 'carrierwave'].join('/')
-        end
+      def ckeditor_dir
+        'ckeditor'
+      end
 
-        def orm
-          (options[:orm] || "active_record").to_s
-        end
+      def generator_dir
+        @generator_dir ||= [orm, backend].join('/')
+      end
 
-        def backend
-          (options[:backend] || "paperclip").to_s
-        end
+      def uploaders_dir
+        @uploaders_dir ||= 'base/carrierwave'
+      end
+
+      def orm
+        (options[:orm] || 'active_record').to_s
+      end
+
+      def backend
+        (options[:backend] || 'paperclip').to_s
+      end
+
+      def rails5?
+        Rails.version.start_with? '5'
+      end
+
+      def migration_version
+        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+      end
+
+      def migration_file
+        rails5? ? 'migration_versioned' : 'migration'
+      end
     end
   end
 end

data/lib/generators/ckeditor/pundit_policy_generator.rb

@@ -3,8 +3,7 @@ require 'rails/generators'
 module Ckeditor
   module Generators
     class PunditPolicyGenerator < Rails::Generators::Base
-
-      desc "Generates policy files for Pundit"
+      desc 'Generates policy files for Pundit'
 
       def self.source_root
         @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
@@ -16,7 +15,6 @@ module Ckeditor
           template "pundit_policy/#{model_name}_policy.rb", "app/policies/ckeditor/#{model_name}_policy.rb"
         end
       end
-
     end
   end
 end

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

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

data/lib/generators/ckeditor/templates/active_record/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/active_record/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/active_record/carrierwave/migration.rb

@@ -1,23 +1,19 @@
-class CreateCkeditorAssets < ActiveRecord::Migration[4.2]
+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  :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/carrierwave/migration_versioned.rb

@@ -0,0 +1,22 @@
+class CreateCkeditorAssets < ActiveRecord::Migration<%= migration_version %>
+  def self.up
+    create_table :ckeditor_assets do |t|
+      t.string  :data_file_name, null: false
+      t.string  :data_content_type
+      t.integer :data_file_size
+      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/active_record/dragonfly/ckeditor/asset.rb

@@ -3,5 +3,5 @@ class Ckeditor::Asset < ActiveRecord::Base
   include Ckeditor::Backend::Dragonfly
 
   dragonfly_accessor :data, app: :ckeditor
-  validates_presence_of :data
+  validates :data, presence: true
 end

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

@@ -1,5 +1,5 @@
 class Ckeditor::AttachmentFile < Ckeditor::Asset
-  validates_property :ext, :of => :data, :in => attachment_file_types unless attachment_file_types.empty?
+  validates_property :ext, of: :data, in: attachment_file_types unless attachment_file_types.empty?
 
   def url_thumb
     Ckeditor::Utils.filethumb(filename)

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

@@ -1,12 +1,12 @@
 class Ckeditor::Picture < Ckeditor::Asset
-  validates_property :format, :of => :data, :in => image_file_types unless image_file_types.empty?
-  validates_property :image?, :of => :data, :as => true, :message => :invalid
+  validates_property :format, of: :data, in: image_file_types unless image_file_types.empty?
+  validates_property :image?, of: :data, as: true, message: :invalid
 
   def url_content
-    data.thumb("800x800>").url
+    data.thumb('800x800>').url
   end
 
   def url_thumb
-    data.thumb("118x100#").url(url_thumb_options)
+    data.thumb('118x100#').url(url_thumb_options)
   end
 end

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

@@ -1,24 +1,20 @@
-class CreateCkeditorAssets < ActiveRecord::Migration[4.2]
+class CreateCkeditorAssets < ActiveRecord::Migration
   def self.up
     create_table :ckeditor_assets do |t|
-      t.string  :data_uid, :null => false
-      t.string  :data_name, :null => false
+      t.string  :data_uid, null: false
+      t.string  :data_name, null: false
       t.string  :data_mime_type
       t.integer :data_size
-
-      t.integer :assetable_id
-      t.string  :assetable_type, :limit => 30
-      t.string  :type, :limit => 30
+      t.string  :type, limit: 30
 
       # Uncomment these to save image dimensions, if your need them.
       t.integer :data_width
       t.integer :data_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/dragonfly/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_uid, null: false
+      t.string  :data_name, null: false
+      t.string  :data_mime_type
+      t.integer :data_size
+      t.string  :type, limit: 30
+
+      # Uncomment these to save image dimensions, if your need them.
+      t.integer :data_width
+      t.integer :data_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/active_record/paperclip/ckeditor/attachment_file.rb

@@ -1,10 +1,10 @@
 class Ckeditor::AttachmentFile < Ckeditor::Asset
   has_attached_file :data,
-                    :url => "/ckeditor_assets/attachments/:id/:filename",
-                    :path => ":rails_root/public/ckeditor_assets/attachments/:id/:filename"
+                    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_size :data, less_than: 100.megabytes
   do_not_validate_attachment_file_type :data
 
   def url_thumb

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

@@ -1,12 +1,12 @@
 class Ckeditor::Picture < Ckeditor::Asset
   has_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_presence :data
-  validates_attachment_size :data, :less_than => 2.megabytes
-  validates_attachment_content_type :data, :content_type => /\Aimage/
+  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,12 +1,10 @@
-class CreateCkeditorAssets < ActiveRecord::Migration[4.2]
+class CreateCkeditorAssets < ActiveRecord::Migration
   def self.up
     create_table :ckeditor_assets do |t|
       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
 
       # Uncomment	it to save images dimensions, if your need it
@@ -16,8 +14,7 @@ class CreateCkeditorAssets < ActiveRecord::Migration[4.2]
       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/paperclip/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_file_name, null: false
+      t.string  :data_content_type
+      t.integer :data_file_size
+      t.string  :data_fingerprint
+      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