RubyGems - glebtv-ckeditor - Versions diffs - 4.6.0 → 4.7.3 - Mend

glebtv-ckeditor 4.6.0 → 4.7.3

Files changed (456) hide show

data/app/views/ckeditor/shared/_asset_tmpl.html.erb CHANGED

@@ -1,24 +1,21 @@
 <script id="fileupload_tmpl" type="text/x-jquery-tmpl">
 <div id="asset_${id}" class="gal-item" data-url="${url_content}">
-  <% if Ckeditor.can_delete then %>
-  <%= link_to image_tag('ckeditor/filebrowser/images/gal_del.png',
-    :title => I18n.t('ckeditor.buttons.delete')),
-          "/ckeditor/${controller}/${id}.json",
-          :remote => true,
-          :method => :delete,
-          :data => {:confirm => t('ckeditor.confirm_delete')},
-          :class => "fileupload-cancel gal-del" %>
-  <% end %>
-	<div class="fileupload-file gal-inner-holder">
-		<div class="img"><img src="${url_thumb}" title="${filename}"></div>
-		<div class="img-data">
-			<div class="img-name">${filename}</div>
-			<div class="time-size">
-				<div class="time">${format_created_at}</div>
-				<div class="fileupload-size size">${size}</div>
-			</div>
-		</div>
-	</div>
+  <%= link_to '', "/ckeditor/${controller}/${id}.json",
+          remote: true,
+          method: :delete,
+          title: I18n.t('ckeditor.buttons.delete'),
+          data: { confirm: t('ckeditor.confirm_delete') },
+          class: "fileupload-cancel gal-del" %>
+  <div class="fileupload-file gal-inner-holder">
+    <div class="img"><img src="${url_thumb}" title="${filename}"></div>
+    <div class="img-data">
+      <div class="img-name">${filename}</div>
+      <div class="time-size">
+        <div class="time">${format_created_at}</div>
+        <div class="fileupload-size size">${size}</div>
+      </div>
+    </div>
+  </div>
 </div>
 </script>

data/app/views/layouts/ckeditor/application.html.erb CHANGED

@@ -4,10 +4,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <meta name="robots" content="noindex, nofollow">
   <%= csrf_meta_tag %>
-  <title><%= I18n.t('page_title', :scope => [:ckeditor]) %></title>
+  <title><%= I18n.t('page_title', scope: [:ckeditor]) %></title>
   <script src="//code.jquery.com/jquery-1.11.3.min.js" type="text/javascript"></script>
-  <% if assets_pipeline_enabled? -%>
+  <% if Ckeditor.assets_pipeline_enabled? -%>
     <%= stylesheet_link_tag "ckeditor/application" %>
     <%= javascript_include_tag "ckeditor/application" %>
   <% else -%>
@@ -26,6 +26,6 @@
 </head>
 <body>
   <%= yield %>
-  <%= render :partial => 'ckeditor/shared/asset_tmpl' %>
+  <%= render partial: 'ckeditor/shared/asset_tmpl' %>
 </body>
 </html>

data/config/locales/en.ckeditor.yml CHANGED

File without changes

data/config/locales/ru.ckeditor.yml CHANGED

File without changes

data/config/routes.rb CHANGED

@@ -1,4 +1,4 @@
 Ckeditor::Engine.routes.draw do
-  resources :pictures, :only => [:index, :create, :destroy]
-  resources :attachment_files, :only => [:index, :create, :destroy]
+  resources :pictures, only: [:index, :create, :destroy]
+  resources :attachment_files, only: [:index, :create, :destroy]
 end

data/lib/ckeditor.rb CHANGED

@@ -28,28 +28,30 @@ module Ckeditor
     autoload :Refile, 'ckeditor/backend/refile'
   end
-  IMAGE_TYPES = %w(image/jpeg image/png image/gif image/jpg image/pjpeg image/tiff image/x-png)
+  IMAGE_TYPES = %w[image/jpeg image/png image/gif image/jpg image/pjpeg image/tiff image/x-png].freeze
-  DEFAULT_AUTHORIZE = Proc.new {}
+  DEFAULT_AUTHORIZE = -> {}
   AUTHORIZATION_ADAPTERS = {}
-  DEFAULT_CURRENT_USER = Proc.new do
-    request.env["warden"].try(:user) || respond_to?(:current_user) && current_user
+  DEFAULT_CURRENT_USER = lambda do
+    request.env['warden'].try(:user) || respond_to?(:current_user) && current_user
   end
-  mattr_accessor :can_delete
-  @@can_delete = true
   # Allowed image file types for upload.
   # Set to nil or [] (empty array) for all file types
   mattr_accessor :image_file_types
-  @@image_file_types = %w(jpg jpeg png gif tiff)
+  @@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
+  mattr_accessor :flash_file_types
+  @@flash_file_types = %w[swf]
   # Allowed attachment file types for upload.
   # Set to nil or [] (empty array) for all file types
   mattr_accessor :attachment_file_types
-  @@attachment_file_types = %w(doc docx xls odt ods pdf rar zip tar tar.gz swf)
+  @@attachment_file_types = %w[doc docx xls odt ods pdf rar zip tar tar.gz swf]
   # Ckeditor files destination path
   mattr_accessor :relative_path
@@ -59,18 +61,10 @@ module Ckeditor
   mattr_accessor :asset_path
   @@asset_path = nil
-  # Ckeditor assets for precompilation
-  mattr_accessor :assets
-  @@assets = nil
   # Remove digest from ckeditor asset files while running assets:precompile task?
   mattr_accessor :run_on_precompile
   @@run_on_precompile = true
-  # Turn on/off filename parameterize
-  mattr_accessor :parameterize_filenames
-  @@parameterize_filenames = true
   # Paginate assets
   mattr_accessor :default_per_page
   @@default_per_page = 24
@@ -87,7 +81,7 @@ module Ckeditor
   # Url to ckeditor config, used when CDN enabled
   mattr_accessor :js_config_url
-  @@js_config_url = '/assets/ckeditor/config.js'
+  @@js_config_url = 'ckeditor/config.js'
   # Model classes
   @@picture_model = nil
@@ -97,12 +91,21 @@ module Ckeditor
   mattr_accessor :parent_controller
   @@parent_controller = 'ApplicationController'
+  # Configurable controller layout
+  mattr_accessor :controller_layout
+  @@controller_layout = 'ckeditor/application'
+  # Turn on/off assets pipeline
+  # By default ckeditor will check assets pipeline
+  mattr_accessor :assets_pipeline_enabled
+  @@assets_pipeline_enabled = nil
   # Default way to setup Ckeditor. Run rails generate ckeditor to create
   # a fresh initializer with all configuration values.
   #
   # @example
   #   Ckeditor.setup do |config|
-  #     config.parameterize_filenames = false
+  #     config.default_per_page = 30
   #     config.attachment_file_types += ["xml"]
   #   end
   #
@@ -120,15 +123,15 @@ module Ckeditor
   # All css and js files from ckeditor folder
   def self.assets
-    @@assets ||= if Ckeditor.cdn_enabled?
-      ["ckeditor/config.js"]
-    else
-      assets = Utils.select_assets("ckeditor", "vendor/assets/javascripts")
-      assets << "ckeditor/init.js"
-      assets << "ckeditor/config.js"
-      assets << 'ckeditor/filebrowser/images/gal_del.png'
-      assets
-    end
+    @assets ||= if Ckeditor.cdn_enabled?
+                  ['ckeditor/config.js']
+                else
+                  Utils.select_assets('ckeditor', 'vendor/assets/javascripts') << 'ckeditor/init.js'
+                end
+  end
+  def self.assets=(value)
+    @assets = value.nil? ? nil : Array(value)
   end
   def self.run_on_precompile?
@@ -209,11 +212,11 @@ module Ckeditor
     extension = args.shift
     if extension
-      @authorize = Proc.new {
+      @authorize = lambda do
         @authorization_adapter = Ckeditor::AUTHORIZATION_ADAPTERS[extension].new(*([self] + args).compact)
-      }
-    else
-      @authorize = block if block
+      end
+    elsif block_given?
+      @authorize = block
     end
     @authorize || DEFAULT_AUTHORIZE
@@ -232,12 +235,17 @@ module Ckeditor
   #   end
   #
   def self.current_user_method(&block)
-    @current_user = block if block
+    @current_user = block if block_given?
     @current_user || DEFAULT_CURRENT_USER
   end
+  def self.assets_pipeline_enabled?
+    @@assets_pipeline_enabled = Utils.assets_pipeline_enabled? if @@assets_pipeline_enabled.nil?
+    @@assets_pipeline_enabled
+  end
 end
-require 'ckeditor/engine'
+require 'ckeditor/rails'
 require 'ckeditor/version'
 if Object.const_defined?("RailsAdmin")

data/lib/ckeditor/asset_response.rb CHANGED

@@ -1,5 +1,14 @@
+require 'action_view/helpers/tag_helper'
+require 'action_view/helpers/javascript_helper'
 module Ckeditor
   class AssetResponse
+    include ActionView::Helpers::TagHelper
+    include ActionView::Helpers::JavaScriptHelper
+    FUNCTION = 'window.parent.CKEDITOR.tools.callFunction'.freeze
+    JSON_TYPE = 'json'.freeze
     attr_reader :asset, :params
     def initialize(asset, request)
@@ -11,7 +20,7 @@ module Ckeditor
     end
     def json?
-      params[:responseType] == 'json'
+      params[:responseType] == JSON_TYPE
     end
     def ckeditor?
@@ -22,38 +31,78 @@ module Ckeditor
       !(ckeditor? || json?) ? params[:qqfile] : params[:upload]
     end
+    def current_mode
+      @current_mode ||= extract_mode
+    end
     def success(relative_url_root = nil)
-      if json?
-        {
-          json: { "uploaded" => 1, "fileName" => asset.filename, "url" => asset.url }.to_json
-        }
-      elsif ckeditor?
-        {
-          text: %Q"<script type='text/javascript'>
-            window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, '#{relative_url_root}#{Ckeditor::Utils.escape_single_quotes(asset.url_content)}');
-          </script>"
-        }
+      send("success_#{current_mode}", relative_url_root)
+    end
+    def errors
+      send("errors_#{current_mode}")
+    end
+    private
+    def success_json(_relative_url_root = nil)
+      {
+        json: { uploaded: 1, fileName: asset.filename, url: asset.url }.to_json
+      }
+    end
+    def success_ckeditor(relative_url_root = nil)
+      {
+        html: javascript_tag("#{FUNCTION}(#{params[:CKEditorFuncNum]}, '#{asset_url(relative_url_root)}');")
+      }
+    end
+    def success_default(_relative_url_root = nil)
+      {
+        json: asset.to_json(only: [:id, :type])
+      }
+    end
+    def errors_json
+      {
+        json: { uploaded: 0, error: { message: error_message } }.to_json
+      }
+    end
+    def errors_ckeditor
+      {
+        html: javascript_tag("#{FUNCTION}(#{params[:CKEditorFuncNum]}, null, '#{error_message}');")
+      }
+    end
+    def errors_default
+      {
+        json: { message: error_message }.to_json
+      }
+    end
+    def error_message
+      Ckeditor::Utils.escape_single_quotes(asset.errors.full_messages.first)
+    end
+    def asset_url(relative_url_root)
+      url = Ckeditor::Utils.escape_single_quotes(asset.url_content)
+      if URI(url).relative?
+        "#{relative_url_root}#{url}"
       else
-        {
-          json: asset.to_json(only: [:id, :type])
-        }
+        url
       end
     end
-    def errors
+    def extract_mode
       if json?
-        {
-          json: { "uploaded" => 0, "error" => { "message" => "Upload failed"} }.to_json
-        }
+        :json
       elsif ckeditor?
-        {
-          text: %Q"<script type='text/javascript'>
-            window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, null, '#{Ckeditor::Utils.escape_single_quotes(asset.errors.full_messages.first)}');
-          </script>"
-        }
+        :ckeditor
       else
-        {nothing: true, format: :json}
+        :default
       end
     end
   end
-end
+end

data/lib/ckeditor/backend/carrierwave.rb CHANGED

@@ -12,7 +12,7 @@ module Ckeditor
         def self.extended(base)
           base.class_eval do
             process :extract_content_type
-            process :set_size
+            process :extract_size
           end
         end
       end
@@ -40,17 +40,20 @@ module Ckeditor
           model.data_content_type = Utils::ContentTypeDetector.new(file.path).detect
         end
-        def set_size
+        def extract_size
           model.data_file_size = file.size
         end
-        def read_dimensions
+        def extract_dimensions
           if model.image? && model.has_dimensions?
-            magick = ::MiniMagick::Image.new(current_path)
-            model.width, model.height = magick[:width], magick[:height]
+            model.width = magick[:width]
+            model.height = magick[:height]
           end
         end
+        def magick
+          @magick ||= ::MiniMagick::Image.new(current_path)
+        end
       end
     end
   end

data/lib/ckeditor/backend/dragonfly.rb CHANGED

@@ -1,6 +1,8 @@
 module Ckeditor
   module Backend
     module Dragonfly
+      FORMATS = %w[bz2 gz lzma xz].freeze
       def self.included(base)
         base.send(:extend, ::Dragonfly::Model)
         base.send(:extend, ::Dragonfly::Model::Validations)
@@ -14,7 +16,7 @@ module Ckeditor
             # 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.each do |f|
               formats << f if formats.include?("tar.#{f}")
             end
           end
@@ -26,7 +28,7 @@ module Ckeditor
       end
       module InstanceMethods
-        delegate :url, :path, :size, :image?, :width, :height, :to => :data
+        delegate :url, :path, :image?, :width, :height, to: :data
         alias_attribute :data_file_name, :data_name
         alias_attribute :data_content_type, :"data.mime_type"
@@ -36,7 +38,7 @@ module Ckeditor
         def url_thumb_options
           if data.basename.present?
-            { :basename => "thumb_#{data.basename}" }
+            { basename: "thumb_#{data.basename}" }
           else
             {}
           end

data/lib/ckeditor/backend/paperclip.rb CHANGED

@@ -9,10 +9,10 @@ module Ckeditor
       module ClassMethods
         def self.extended(base)
           base.class_eval do
-            # before_validation :extract_content_type
-            before_create :read_dimensions, :parameterize_filename
+            before_validation :extract_content_type
+            before_create :extract_dimensions
-            delegate :url, :path, :styles, :size, :content_type, :to => :data
+            delegate :url, :path, :styles, :content_type, to: :data
           end
         end
       end
@@ -24,28 +24,21 @@ module Ckeditor
         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)
-              self.data.instance_write(:file_name, filename)
-            end
-          end
+        def file
+          @file ||= data.respond_to?(:queued_for_write) ? data.queued_for_write[:original] : data.to_file
+        end
-          def read_dimensions
-            if image? && has_dimensions?
-              self.width = geometry.width
-              self.height = geometry.height
-            end
+        def extract_dimensions
+          if image? && has_dimensions?
+            self.width = geometry.width
+            self.height = geometry.height
           end
+        end
-          def extract_content_type
-            path = file.nil? ? nil : file.path
-            self.data_content_type = Utils::ContentTypeDetector.new(path).detect
-          end
+        def extract_content_type
+          path = file.nil? ? nil : file.path
+          self.data_content_type = Utils::ContentTypeDetector.new(path).detect
+        end
       end
     end
   end