glebtv-ckeditor 4.4.7.4 → 4.5.7

data/lib/ckeditor/backend/carrierwave.rb

@@ -1,4 +1,3 @@
-require 'mime/types'
 require 'mini_magick'
 
 module Ckeditor
@@ -38,13 +37,7 @@ module Ckeditor
         end
 
         def extract_content_type
-          if file.content_type == 'application/octet-stream' || file.content_type.blank?
-            content_type = MIME::Types.type_for(original_filename).first
-          else
-            content_type = file.content_type
-          end
-
-          model.data_content_type = content_type.to_s
+          model.data_content_type = Utils::ContentTypeDetector.new(file.path).detect
         end
 
         def set_size

data/lib/ckeditor/backend/dragonfly.rb

@@ -2,24 +2,26 @@ module Ckeditor
   module Backend
     module Dragonfly
       def self.included(base)
-        base.send(:include, InstanceMethods)
+        base.send(:extend, ::Dragonfly::Model)
+        base.send(:extend, ::Dragonfly::Model::Validations)
         base.send(:extend, ClassMethods)
+        base.send(:include, InstanceMethods)
       end
 
       module ClassMethods
         def attachment_file_types
-          @attachment_file_types ||= Ckeditor.attachment_file_types.map(&:to_sym).tap do |formats|
+          @attachment_file_types ||= Ckeditor.attachment_file_types.map(&:to_s).tap do |formats|
             # This is not ideal but Dragonfly doesn't return double
             # extensions. Having said that, the other backends
             # currently don't use attachment_file_types at all.
-            [ :bz2, :gz, :lzma, :xz ].each do |f|
-              formats << f if formats.include?("tar.#{f}".to_sym)
+            [ 'bz2', 'gz', 'lzma', 'xz' ].each do |f|
+              formats << f if formats.include?("tar.#{f}")
             end
           end
         end
 
         def image_file_types
-          @image_file_types ||= Ckeditor.image_file_types.map(&:to_sym)
+          @image_file_types ||= Ckeditor.image_file_types.map(&:to_s)
         end
       end
 
@@ -27,7 +29,7 @@ module Ckeditor
         delegate :url, :path, :size, :image?, :width, :height, :to => :data
 
         alias_attribute :data_file_name, :data_name
-        alias_attribute :data_content_type, :data_mime_type
+        alias_attribute :data_content_type, :"data.mime_type"
         alias_attribute :data_file_size, :data_size
 
         private

data/lib/ckeditor/backend/paperclip.rb

@@ -1,5 +1,3 @@
-require 'mime/types'
-
 module Ckeditor
   module Backend
     module Paperclip
@@ -21,14 +19,15 @@ module Ckeditor
 
       module InstanceMethods
         def geometry
-          @geometry ||= begin
-            file = data.respond_to?(:queued_for_write) ? data.queued_for_write[:original] : data.to_file
-            ::Paperclip::Geometry.from_file(file)
-          end
+          @geometry ||= ::Paperclip::Geometry.from_file(file)
         end
 
         protected
 
+          def file
+            @file ||= data.respond_to?(:queued_for_write) ? data.queued_for_write[:original] : data.to_file
+          end
+
           def parameterize_filename
             unless data_file_name.blank?
               filename = Ckeditor::Utils.parameterize_filename(data_file_name)
@@ -43,12 +42,9 @@ module Ckeditor
             end
           end
 
-          # Extract content_type from filename using mime/types gem
           def extract_content_type
-            if data_content_type == "application/octet-stream" && !data_file_name.blank?
-              content_types = MIME::Types.type_for(data_file_name)
-              self.data_content_type = content_types.first.to_s unless content_types.empty?
-            end
+            path = file.nil? ? nil : file.path
+            self.data_content_type = Utils::ContentTypeDetector.new(path).detect
           end
       end
     end

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/engine.rb

@@ -38,5 +38,9 @@ module Ckeditor
         require "ckeditor/hooks/pundit"
       end
     end
+
+    rake_tasks do
+      load Ckeditor.root_path.join("lib/tasks/ckeditor.rake")
+    end
   end
 end

data/lib/ckeditor/hooks/cancan.rb

@@ -19,7 +19,10 @@ module Ckeditor
       # action as a symbol (:create, :destroy, etc.). The second argument is the actual model
       # instance if it is available.
       def authorize(action, model_object = nil)
-        @controller.authorize!(action.to_sym, model_object) if action
+        if action
+          @controller.instance_variable_set(:@_authorized, true)
+          @controller.current_ability.authorize!(action.to_sym, model_object)
+        end
       end
 
       # This method is called primarily from the view to determine whether the given user

data/lib/ckeditor/hooks/simple_form.rb

@@ -2,7 +2,7 @@ require 'simple_form'
 
 module Ckeditor::Hooks::SimpleForm
   class CkeditorInput < ::SimpleForm::Inputs::Base
-    def input
+    def input(wrapper_options = nil)
       @builder.cktext_area(attribute_name, input_html_options)
     end
   end

data/lib/ckeditor/http.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'digest/sha1'
-require 'mime/types'
 
 module Ckeditor
   module Http
@@ -61,8 +60,7 @@ module Ckeditor
       end
 
       def content_type
-        types = MIME::Types.type_for(original_filename)
-        types.empty? ? @request.content_type : types.first.to_s
+        @request.content_type
       end
 
       def body

data/lib/ckeditor/text_area.rb

@@ -14,6 +14,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?
     end
 
     def render_instance_tag(object_name, method)
@@ -49,4 +50,4 @@ module Ckeditor
         end
       end
   end
-end
+end

data/lib/ckeditor/utils.rb

@@ -3,6 +3,9 @@ require 'active_support/json/encoding'
 
 module Ckeditor
   module Utils
+    autoload :JavascriptCode, 'ckeditor/utils/javascript_code'
+    autoload :ContentTypeDetector, 'ckeditor/utils/content_type_detector'
+
     class << self
       def escape_single_quotes(str)
         str.gsub('\\','\0\0').gsub('</','<\/').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }
@@ -18,16 +21,16 @@ module Ckeditor
       end
 
       def js_replace(dom_id, options = nil)
-        js = ["if (typeof CKEDITOR != 'undefined') {"]
+        js = ["(function() { if (typeof CKEDITOR != 'undefined') {"]
 
         if options && !options.keys.empty?
           js_options = ActiveSupport::JSON.encode(options)
-          js << "CKEDITOR.replace('#{dom_id}', #{js_options});"
+          js << "if (CKEDITOR.instances['#{dom_id}'] == undefined) { CKEDITOR.replace('#{dom_id}', #{js_options}); }"
         else
-          js << "CKEDITOR.replace('#{dom_id}');"
+          js << "if (CKEDITOR.instances['#{dom_id}'] == undefined) { CKEDITOR.replace('#{dom_id}'); }"
         end
 
-        js << "}"
+        js << "} else { setTimeout(arguments.callee, 50); } })();"
         js.join(" ").html_safe
       end
 
@@ -36,17 +39,18 @@ module Ckeditor
 
         case uploader_type.to_s.downcase
           when "image" then
-            options[:action] = "EDITOR.config.filebrowserImageUploadUrl"
+            options[:action] = JavascriptCode.new("EDITOR.config.filebrowserImageUploadUrl")
             options[:allowedExtensions] = Ckeditor.image_file_types
           when "flash" then
-            options[:action] = "EDITOR.config.filebrowserFlashUploadUrl"
+            options[:action] = JavascriptCode.new("EDITOR.config.filebrowserFlashUploadUrl")
             options[:allowedExtensions] = ["swf"]
           else
-            options[:action] = "EDITOR.config.filebrowserUploadUrl"
+            options[:action] = JavascriptCode.new("EDITOR.config.filebrowserUploadUrl")
             options[:allowedExtensions] = Ckeditor.attachment_file_types
         end
 
-        js_options = ActiveSupport::JSON.encode(options).gsub /"EDITOR.config.filebrowser(.*)UploadUrl"/, 'EDITOR.config.filebrowser\1UploadUrl'
+        js_options = ActiveSupport::JSON.encode(options)
+        js_options.gsub!(/"(EDITOR\.config\.filebrowser(Image|Flash|)UploadUrl)"/, '\1')
 
         "(function() { new qq.FileUploaderInput(#{js_options}); }).call(this);".html_safe
       end
@@ -64,14 +68,15 @@ module Ckeditor
       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,scss}'
+        relative_folder = Ckeditor.root_path.join(relative_path)
+        folder = relative_folder.join(path)
+        extensions = '*.{js,css,png,gif,jpg}'
+        languages = (Ckeditor.assets_languages || [])
 
         # Files at root
         files = Dir[folder.join(extensions)]
 
-        # Plugins
+        # Filter plugins
         if Ckeditor.assets_plugins.nil?
           files += Dir[folder.join('plugins', '**', extensions)]
         else
@@ -83,22 +88,20 @@ module Ckeditor
         # Other folders
         Dir[folder.join('*/')].each do |subfolder|
           path = Pathname.new(subfolder)
-          unless path.basename.to_s == 'plugins'
-            files += Dir[path.join('**', extensions)]
-          end
+          next if ['plugins'].include?(path.basename.to_s)
+          files += Dir[path.join('**', extensions)]
         end
 
-        paths = files.map { |file| Pathname.new(file) }
+        files.inject([]) do |items, name|
+          file = Pathname.new(name)
+          base = file.basename('.*').to_s
 
-        # Filter languages
-        if Ckeditor.assets_languages.present?
-          paths.select! do |path|
-            path.dirname.basename.to_s != 'lang' ||
-            Ckeditor.assets_languages.include?(path.basename.to_s.split('.')[0])
+          if !name.include?('/lang/') || languages.include?(base)
+            items << file.relative_path_from(relative_folder).to_s
           end
-        end
 
-        paths.map { |path| path.relative_path_from(relative_folder).to_s.gsub('.scss', '') }.select { |path| path != 'ckeditor/ckeditor.js' }
+          items
+        end
       end
     end
   end

data/lib/ckeditor/utils/content_type_detector.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+require 'cocaine'
+
+module Ckeditor
+  module Utils
+    class ContentTypeDetector
+      EMPTY_CONTENT_TYPE = 'inode/x-empty'
+      DEFAULT_CONTENT_TYPE = 'application/octet-stream'
+
+      def initialize(file_path)
+        @file_path = file_path
+      end
+
+      # content type detection strategy:
+      #
+      # 1. empty file: returns 'inode/x-empty'
+      # 2. nonempty file: if the file is not empty then returns the content type using file command
+      # 3. invalid file: file command raises error and returns 'application/octet-stream'
+
+      def detect
+        empty_file? ? EMPTY_CONTENT_TYPE : content_type_from_file_command
+      end
+
+      private
+
+      def empty_file?
+        return true if @file_path.blank?
+        File.exists?(@file_path) && File.size(@file_path) == 0
+      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
+      end
+    end
+  end
+end

data/lib/ckeditor/utils/javascript_code.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+
+module Ckeditor
+  module Utils
+    class JavascriptCode < String
+      def as_json(options = nil) self end #:nodoc:
+      def encode_json(encoder) self end #:nodoc:
+    end
+  end
+end

data/lib/ckeditor/version.rb

@@ -1,4 +1,6 @@
 module Ckeditor
-  VERSION="4.4.7.4".freeze
+  module Version
+    GEM = "4.5.7".freeze
+    EDITOR = "4.5.7".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/dragonfly/ckeditor/asset.rb

@@ -2,6 +2,6 @@ class Ckeditor::Asset < ActiveRecord::Base
   include Ckeditor::Orm::ActiveRecord::AssetBase
   include Ckeditor::Backend::Dragonfly
 
-  ckeditor_file_accessor :data
+  dragonfly_accessor :data, app: :ckeditor
   validates_presence_of :data
 end

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

@@ -1,5 +1,5 @@
 class Ckeditor::AttachmentFile < Ckeditor::Asset
-  validates_property :format, :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/paperclip/ckeditor/attachment_file.rb

@@ -2,12 +2,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"
-  
-  if respond_to?(:do_not_validate_attachment_file_type)
-    do_not_validate_attachment_file_type :data, if: :data?
-  end
-  validates_attachment_size :data, :less_than => 100.megabytes
+
   validates_attachment_presence :data
+  validates_attachment_size :data, :less_than => 100.megabytes
+  do_not_validate_attachment_file_type :data
 
   def url_thumb
     @url_thumb ||= Ckeditor::Utils.filethumb(filename)