glebtv-ckeditor 4.6.0 → 4.7.3

data/lib/ckeditor/backend/refile.rb

@@ -5,7 +5,7 @@ module Ckeditor
 
       included do
         validates :data, presence: true
-        delegate :rewind, :download, :to_io, :exists?, :delete, :size, :close, :eof?, :read, to: :data
+        delegate :rewind, :download, :to_io, :exists?, :delete, :close, :eof?, :read, to: :data
         alias_attribute :data_file_name, :data_filename
         alias_attribute :data_file_size, :data_size
       end
@@ -24,14 +24,16 @@ module Ckeditor
         ::Refile.attachment_url(self, :data, *attrs)
       end
 
-      def read_dimensions
+      def magick
+        @magick ||= MiniMagick::Image.open(model.to_io)
+      end
+
+      def extract_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/helpers/controllers.rb

@@ -5,30 +5,25 @@ module Ckeditor
 
       protected
 
-        def ckeditor_current_user
-          instance_eval &Ckeditor.current_user_method
-        end
+      def ckeditor_current_user
+        instance_exec(&Ckeditor.current_user_method)
+      end
 
-        def ckeditor_authorize!
-          instance_eval &Ckeditor.authorize_with
-        end
+      def ckeditor_authorize!
+        instance_exec(&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_pictures_scope(options = {})
-          ckeditor_filebrowser_scope(options)
-        end
+      def ckeditor_attachment_files_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
+      def ckeditor_filebrowser_scope(options = {})
+        { order: [:id, :desc] }.merge!(options)
+      end
     end
   end
 end

data/lib/ckeditor/helpers/form_builder.rb

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

data/lib/ckeditor/hooks/cancan.rb

@@ -33,8 +33,6 @@ module Ckeditor
         @controller.current_ability.can?(action.to_sym, model_object) if action
       end
 
-      private
-
       module ControllerExtension
         def current_ability
           # use ckeditor_current_user instead of default current_user so it works with

data/lib/ckeditor/hooks/formtastic.rb

@@ -1,4 +1,4 @@
-require "formtastic"
+require 'formtastic'
 
 class CkeditorInput
   include ::Formtastic::Inputs::Base
@@ -6,7 +6,7 @@ class CkeditorInput
   def to_html
     input_wrapping do
       label_html <<
-      builder.cktext_area(method, input_html_options)
+        builder.cktext_area(method, input_html_options)
     end
   end
 end

data/lib/ckeditor/hooks/pundit.rb

@@ -6,7 +6,6 @@ module Ckeditor
     # You can create another adapter for different authorization behavior, just be certain it
     # responds to each of the public methods here.
     class PunditAuthorization
-
       include Ckeditor::Helpers::Controllers
 
       # See the +authorize_with+ config method for where the initialization happens.
@@ -28,11 +27,9 @@ module Ckeditor
       # This takes the same arguments as +authorize+. The difference is that this will
       # return a boolean whereas +authorize+ will raise an exception when not authorized.
       def authorized?(action, model_object = nil)
-        Pundit.policy(@controller.current_user_for_pundit, model_object).public_send(action + '?' ) if action
+        Pundit.policy(@controller.current_user_for_pundit, model_object).public_send(action + '?') if action
       end
 
-      private
-
       module ControllerExtension
         def current_user_for_pundit
           # use ckeditor_current_user instead of default current_user so it works with

data/lib/ckeditor/hooks/simple_form.rb

@@ -1,20 +1,15 @@
 require 'simple_form'
 
-module Ckeditor::Hooks::SimpleForm
-  class CkeditorInput < ::SimpleForm::Inputs::Base
-    def input(wrapper_options = nil)
-      @builder.cktext_area(attribute_name, input_html_options)
+module Ckeditor
+  module Hooks
+    module SimpleForm
+      class CkeditorInput < ::SimpleForm::Inputs::Base
+        def input(_wrapper_options = nil)
+          @builder.cktext_area(attribute_name, input_html_options)
+        end
+      end
     end
   end
 end
 
-::SimpleForm::FormBuilder.map_type :ckeditor, :to => Ckeditor::Hooks::SimpleForm::CkeditorInput
-
-# TODO: remove this after a while, SimpleForm::FormBuilder#ckeditor is deprecated.
-class SimpleForm::FormBuilder
-  def ckeditor(attribute_name, options={}, &block)
-    warn "[DEPRECATION] calling f.ckeditor(:#{attribute_name}, ...) is deprecated, call f.input(:#{attribute_name}, :as => :ckeditor, #{options.to_s[1..-1]}) #{Kernel.caller.first}"
-    options[:as] = :ckeditor
-    self.input(attribute_name, options, &block)
-  end
-end
+::SimpleForm::FormBuilder.map_type :ckeditor, to: Ckeditor::Hooks::SimpleForm::CkeditorInput

data/lib/ckeditor/http.rb

@@ -39,33 +39,30 @@ module Ckeditor
     # Usage (paperclip example)
     # @asset.data = QqFile.new(params[:qqfile], request)
     class QqFile < ::Tempfile
+      attr_reader :original_filename
 
-      def initialize(filename, request, tmpdir = Dir::tmpdir)
-        @original_filename  = filename
+      def initialize(filename, request, tmpdir = Dir.tmpdir)
+        @original_filename = filename
         @request = request
 
-        super Digest::SHA1.hexdigest(filename), tmpdir
+        super(Digest::SHA1.hexdigest(filename), tmpdir)
         binmode
         fetch
       end
 
       def fetch
-        self.write(body)
-        self.rewind
+        write(body)
+        rewind
         self
       end
 
-      def original_filename
-        @original_filename
-      end
-
       def content_type
         @request.content_type
       end
 
       def body
         if @request.raw_post.respond_to?(:force_encoding)
-          @request.raw_post.force_encoding("UTF-8")
+          @request.raw_post.force_encoding('UTF-8')
         else
           @request.raw_post
         end
@@ -76,7 +73,8 @@ module Ckeditor
     # file upload hash with UploadedFile objects
     def self.normalize_param(*args)
       value = args.first
-      if Hash === value && value.has_key?(:tempfile)
+
+      if value.is_a?(Hash) && value.key?(:tempfile)
         UploadedFile.new(value)
       elsif value.is_a?(String)
         QqFile.new(*args)

data/lib/ckeditor/orm/active_record.rb

@@ -12,9 +12,7 @@ module Ckeditor
         module ClassMethods
           def self.extended(base)
             base.class_eval do
-              self.table_name = "ckeditor_assets"
-
-              belongs_to :assetable, :polymorphic => true
+              self.table_name = 'ckeditor_assets'
             end
           end
         end

data/lib/ckeditor/orm/base.rb

@@ -20,7 +20,7 @@ module Ckeditor
           end
 
           def format_created_at
-            self.created_at.strftime("%d.%m.%Y")
+            I18n.l(created_at, format: :short)
           end
 
           def url_content
@@ -37,11 +37,11 @@ module Ckeditor
 
           def as_json(options = nil)
             options = {
-              :methods => as_json_methods,
-              :root => "asset"
-            }.merge(options || {})
+              methods: as_json_methods,
+              root: 'asset'
+            }.merge!(options || {})
 
-            super options
+            super(options)
           end
         end
       end

data/lib/ckeditor/orm/mongoid.rb

@@ -26,12 +26,10 @@ module Ckeditor
         module ClassMethods
           def self.extended(base)
             base.class_eval do
-              field :data_content_type, :type => String
-              field :data_file_size, :type => Integer
-              field :width, :type => Integer
-              field :height, :type => Integer
-
-              belongs_to :assetable, :polymorphic => true
+              field :data_content_type, type: String
+              field :data_file_size, type: Integer
+              field :width, type: Integer
+              field :height, type: Integer
             end
           end
         end

data/lib/ckeditor/paginatable.rb

@@ -16,6 +16,8 @@ module Ckeditor
     def scoped
       @scope.limit(limit_value).offset(offset_value)
     end
+    alias all scoped
+    alias to_a scoped
 
     # Next page number in the collection
     def next_page
@@ -53,4 +55,4 @@ module Ckeditor
       (offset / limit_value) + 1
     end
   end
-end
+end

data/lib/ckeditor/rails.rb

@@ -0,0 +1,39 @@
+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
+      require 'ckeditor/hooks/formtastic'  if Object.const_defined?('Formtastic')
+      require 'ckeditor/hooks/simple_form' if Object.const_defined?('SimpleForm')
+
+      require 'ckeditor/hooks/cancan' if Object.const_defined?('CanCan')
+      require 'ckeditor/hooks/pundit' if Object.const_defined?('Pundit')
+    end
+
+    rake_tasks do
+      load Ckeditor.root_path.join('lib/tasks/ckeditor.rake')
+
+      if Rake::Task.task_defined?('assets:precompile')
+        Rake::Task['assets:precompile'].enhance do
+          Rake::Task['ckeditor:nondigest'].invoke if Ckeditor.run_on_precompile?
+        end
+      end
+    end
+  end
+end

data/lib/ckeditor/text_area.rb

@@ -1,6 +1,7 @@
 require 'active_support'
 require 'action_view/helpers/tag_helper'
 require 'action_view/helpers/form_tag_helper'
+require 'action_view/helpers/javascript_helper'
 
 module Ckeditor
   class TextArea
@@ -14,7 +15,7 @@ module Ckeditor
       @template = template
       @options = options.stringify_keys
       @ck_options = (@options.delete('ckeditor') || {}).stringify_keys
-      @ck_options['customConfig'] ||= Ckeditor.js_config_url if Ckeditor.cdn_enabled?
+      @ck_options['customConfig'] ||= template.asset_path(Ckeditor.js_config_url) if Ckeditor.cdn_enabled?
     end
 
     def render_instance_tag(object_name, method)
@@ -32,22 +33,22 @@ module Ckeditor
 
     protected
 
-      def render(input)
-        output_buffer << input
-        output_buffer << javascript_tag(Utils.js_replace(options['id'], ck_options))
-        output_buffer
-      end
+    def render(input)
+      output_buffer << input
+      output_buffer << javascript_tag(Utils.js_replace(options['id'], ck_options))
+      output_buffer
+    end
 
-      def output_buffer
-        @output_buffer ||= ActiveSupport::SafeBuffer.new
-      end
+    def output_buffer
+      @output_buffer ||= ActiveSupport::SafeBuffer.new
+    end
 
-      def build_tag(object_name, method)
-        if defined?(ActionView::Base::Tags::TextArea)
-          ActionView::Base::Tags::TextArea.new(object_name, method, template, options.symbolize_keys)
-        else
-          ActionView::Base::InstanceTag.new(object_name, method, template, options.delete('object'))
-        end
+    def build_tag(object_name, method)
+      if defined?(ActionView::Base::Tags::TextArea)
+        ActionView::Base::Tags::TextArea.new(object_name, method, template, options.symbolize_keys)
+      else
+        ActionView::Base::InstanceTag.new(object_name, method, template, options.delete('object'))
       end
+    end
   end
 end

data/lib/ckeditor/utils.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require 'active_support/json/encoding'
 
 module Ckeditor
@@ -8,45 +9,42 @@ module Ckeditor
 
     class << self
       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
+        str.gsub('\\', '\0\0').gsub('</', '<\/').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }
       end
 
       def js_replace(dom_id, options = nil)
-        js = ["(function() { if (typeof CKEDITOR != 'undefined') {"]
-
-        if options && !options.keys.empty?
-          js_options = ActiveSupport::JSON.encode(options)
-          js << "if (CKEDITOR.instances['#{dom_id}'] == undefined) { CKEDITOR.replace('#{dom_id}', #{js_options}); }"
-        else
-          js << "if (CKEDITOR.instances['#{dom_id}'] == undefined) { CKEDITOR.replace('#{dom_id}'); }"
-        end
+        replace = if options && !options.keys.empty?
+                    js_options = ActiveSupport::JSON.encode(options)
+                    "CKEDITOR.replace('#{dom_id}', #{js_options});"
+                  else
+                    "CKEDITOR.replace('#{dom_id}');"
+                  end
+
+        js_init_ckeditor(dom_id, replace)
+      end
 
-        js << "} else { setTimeout(arguments.callee, 50); } })();"
-        js.join(" ").html_safe
+      def js_init_ckeditor(dom_id, replace)
+        %((function() {
+            if (typeof CKEDITOR != 'undefined') {
+              if (CKEDITOR.instances['#{dom_id}']) { CKEDITOR.instances['#{dom_id}'].destroy(); }
+              #{replace}
+            }
+          })();)
       end
 
       def js_fileuploader(uploader_type, options = {})
-        options = { :multiple => true, :element => "fileupload" }.merge(options)
+        options = { multiple: true, element: 'fileupload' }.merge!(options)
 
         case uploader_type.to_s.downcase
-          when "image" then
-            options[:action] = JavascriptCode.new("EDITOR.config.filebrowserImageUploadUrl")
-            options[:allowedExtensions] = Ckeditor.image_file_types
-          when "flash" then
-            options[:action] = JavascriptCode.new("EDITOR.config.filebrowserFlashUploadUrl")
-            options[:allowedExtensions] = ["swf"]
-          else
-            options[:action] = JavascriptCode.new("EDITOR.config.filebrowserUploadUrl")
-            options[:allowedExtensions] = Ckeditor.attachment_file_types
+        when 'image' then
+          options[:action] = JavascriptCode.new('EDITOR.config.filebrowserImageUploadUrl')
+          options[:allowedExtensions] = Ckeditor.image_file_types
+        when 'flash' then
+          options[:action] = JavascriptCode.new('EDITOR.config.filebrowserFlashUploadUrl')
+          options[:allowedExtensions] = Ckeditor.flash_file_types
+        else
+          options[:action] = JavascriptCode.new('EDITOR.config.filebrowserUploadUrl')
+          options[:allowedExtensions] = Ckeditor.attachment_file_types
         end
 
         js_options = ActiveSupport::JSON.encode(options)
@@ -56,22 +54,30 @@ module Ckeditor
       end
 
       def filethumb(filename)
-        extname = filename.blank? ? "unknown" : File.extname(filename).gsub(/^\./, '')
+        extname = filename.blank? ? 'unknown' : File.extname(filename).gsub(/^\./, '')
         image = "#{extname}.gif"
-        source = Ckeditor.root_path.join("app/assets/javascripts/ckeditor/filebrowser/images/thumbs")
+        source = Ckeditor.root_path.join('app/assets/images/ckeditor/filebrowser/thumbs')
 
-        unless File.exists?(File.join(source, image))
-          image = "unknown.gif"
-        end
+        image = 'unknown.gif' unless File.exist?(File.join(source, image))
 
-        File.join(Ckeditor.relative_path, "filebrowser/images/thumbs", image)
+        File.join(Ckeditor.relative_path, 'filebrowser/thumbs', image)
+      end
+
+      def assets_pipeline_enabled?
+        if Gem::Version.new(::Rails.version.to_s) >= Gem::Version.new('4.0.0')
+          defined?(Sprockets::Rails)
+        elsif Gem::Version.new(::Rails.version.to_s) >= Gem::Version.new('3.0.0')
+          Rails.application.config.assets.enabled
+        else
+          false
+        end
       end
 
       def select_assets(path, relative_path)
         relative_folder = Ckeditor.root_path.join(relative_path)
         folder = relative_folder.join(path)
-        extensions = '*.{js,css,png,gif,jpg}'
-        languages = (Ckeditor.assets_languages || ['en', 'ru'])
+        extensions = '*.{js,css,png,gif,jpg,html}'
+        languages = (Ckeditor.assets_languages || [])
 
         # Files at root
         files = Dir[folder.join(extensions)]
@@ -96,7 +102,7 @@ module Ckeditor
           file = Pathname.new(name)
           base = file.basename('.*').to_s
 
-          if !name.include?('/lang/') || languages.include?(base)
+          if !name.include?('/lang/') || languages.include?(base) || languages.empty?
             items << file.relative_path_from(relative_folder).to_s
           end