glebtv-ckeditor 4.2.1.5 → 4.3.2.0

data/config/locales/ru.ckeditor.yml

@@ -6,3 +6,4 @@ ru:
       cancel: "Отмена"
       upload: "Загрузить"
       delete: "Удалить"
+      next: "Показать еще"

data/config/locales/sv-SE.ckeditor.yml

@@ -6,3 +6,4 @@
       cancel: "Avbryt"
       upload: "Ladda upp"
       delete: "Ta bort"
+      next: "Next"

data/config/locales/uk.ckeditor.yml

@@ -6,3 +6,4 @@ uk:
       cancel: "Відміна"
       upload: "Завантажити"
       delete: "Видалити"
+      next: "Показати більше"

data/config/locales/zh-CN.ckeditor.yml

@@ -6,3 +6,4 @@ zh-CN:
       cancel: "取消"
       upload: "上传"
       delete: "删除"
+      next: "Next"

data/lib/ckeditor.rb

@@ -4,6 +4,8 @@ require 'pathname'
 module Ckeditor
   autoload :Utils, 'ckeditor/utils'
   autoload :Http, 'ckeditor/http'
+  autoload :TextArea, 'ckeditor/text_area'
+  autoload :Paginatable, 'ckeditor/paginatable'
 
   module Helpers
     autoload :ViewHelper, 'ckeditor/helpers/view_helper'
@@ -15,6 +17,7 @@ module Ckeditor
   module Hooks
     autoload :SimpleFormBuilder, 'ckeditor/hooks/simple_form'
     autoload :CanCanAuthorization, 'ckeditor/hooks/cancan'
+    autoload :PunditAuthorization, 'ckeditor/hooks/pundit'
   end
 
   module Backend
@@ -23,7 +26,7 @@ module Ckeditor
     autoload :Dragonfly, 'ckeditor/backend/dragonfly'
   end
 
-  IMAGE_TYPES = ['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)
 
   DEFAULT_AUTHORIZE = Proc.new {}
 
@@ -36,17 +39,21 @@ module Ckeditor
   # Allowed image file types for upload.
   # Set to nil or [] (empty array) for all file types
   mattr_accessor :image_file_types
-  @@image_file_types = ["jpg", "jpeg", "png", "gif", "tiff"]
+  @@image_file_types = %w(jpg jpeg png gif tiff)
 
   # Allowed attachment file types for upload.
   # Set to nil or [] (empty array) for all file types
   mattr_accessor :attachment_file_types
-  @@attachment_file_types = ["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
   @@relative_path = '/assets/ckeditor'
 
+  # Ckeditor assets path
+  mattr_accessor :asset_path
+  @@asset_path = (Rails::VERSION::MAJOR == 4 ? 'assets/ckeditor' : 'ckeditor')
+
   # Ckeditor assets for precompilation
   mattr_accessor :assets
   @@assets = nil
@@ -55,6 +62,20 @@ module Ckeditor
   mattr_accessor :parameterize_filenames
   @@parameterize_filenames = true
 
+  # Paginate assets
+  mattr_accessor :default_per_page
+  @@default_per_page = 24
+
+  # Asset restrictions
+  mattr_accessor :assets_languages
+  mattr_accessor :assets_plugins
+  @@assets_languages = nil
+  @@assets_plugins = nil
+
+  # Model classes
+  @@picture_model = nil
+  @@attachment_file_model = nil
+
   # Default way to setup Ckeditor. Run rails generate ckeditor to create
   # a fresh initializer with all configuration values.
   #
@@ -74,24 +95,53 @@ module Ckeditor
 
   # All css and js files from ckeditor folder
   def self.assets
-    @@assets ||= begin
-      ['ckeditor/config.js', 'ckeditor/init.js', 'ckcontent.css'] +
-      Dir[root_path.join('app/assets/javascripts/ckeditor/**/**', '*.{js,css}')].inject([]) do |list, path|
-        unless path.include?("/ckeditor/filebrowser/")
-          list << Pathname.new(path).relative_path_from(root_path.join('app/assets/javascripts')).to_s
+    @@assets ||= Utils.select_assets("ckeditor", "vendor/assets/javascripts") + ["ckeditor/init.js", 'ckcontent.css']
+  end
+
+  def self.picture_model(&block)
+    if block_given?
+      self.picture_model = block
+    else
+      @@picture_model_class ||= begin
+        if @@picture_model.respond_to? :call
+          @@picture_model.call
+        else
+          @@picture_model || Ckeditor::Picture
         end
+      end
+    end
+  end
+
+  def self.picture_model=(value)
+    @@picture_model_class = nil
+    @@picture_model = value
+  end
 
-        list
+  def self.picture_adapter
+    picture_model.to_adapter
+  end
+
+  def self.attachment_file_model(&block)
+    if block_given?
+      self.attachment_file_model = block
+    else
+      @@attachment_file_model_class ||= begin
+        if @@attachment_file_model.respond_to? :call
+          @@attachment_file_model.call
+        else
+          @@attachment_file_model || Ckeditor::AttachmentFile
+        end
       end
     end
   end
 
-  def self.picture_model
-    Ckeditor::Picture.to_adapter
+  def self.attachment_file_model=(value)
+    @@attachment_file_model_class = nil
+    @@attachment_file_model = value
   end
 
-  def self.attachment_file_model
-    Ckeditor::AttachmentFile.to_adapter
+  def self.attachment_file_adapter
+    attachment_file_model.to_adapter
   end
 
   # Setup authorization to be run as a before filter

data/lib/ckeditor/backend/carrierwave.rb

@@ -8,7 +8,7 @@ module Ckeditor
         base.send(:include, InstanceMethods)
         base.send(:extend, ClassMethods)
       end
-      
+
       module ClassMethods
         def self.extended(base)
           base.class_eval do
@@ -17,7 +17,7 @@ module Ckeditor
           end
         end
       end
-      
+
       module InstanceMethods
         # process :strip
         def strip
@@ -27,7 +27,7 @@ module Ckeditor
             img
           end
         end
-        
+
         # process :quality => 85
         def quality(percentage)
           manipulate! do |img|
@@ -36,28 +36,28 @@ module Ckeditor
             img
           end
         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
-        end 
-        
+        end
+
         def set_size
           model.data_file_size = file.size
         end
-        
+
         def read_dimensions
           if model.image? && model.has_dimensions?
             magick = ::MiniMagick::Image.new(current_path)
             model.width, model.height = magick[:width], magick[:height]
           end
         end
-        
+
       end
     end
   end

data/lib/ckeditor/backend/dragonfly.rb

@@ -5,7 +5,7 @@ module Ckeditor
         base.send(:include, InstanceMethods)
         base.send(:extend, ClassMethods)
       end
-      
+
       module ClassMethods
         def attachment_file_types
           @attachment_file_types ||= Ckeditor.attachment_file_types.map(&:to_sym).tap do |formats|
@@ -22,7 +22,7 @@ module Ckeditor
           @image_file_types ||= Ckeditor.image_file_types.map(&:to_sym)
         end
       end
-      
+
       module InstanceMethods
         delegate :url, :path, :size, :image?, :width, :height, :to => :data
 

data/lib/ckeditor/backend/paperclip.rb

@@ -7,18 +7,18 @@ module Ckeditor
         base.send(:include, InstanceMethods)
         base.send(:extend, ClassMethods)
       end
-      
+
       module ClassMethods
         def self.extended(base)
           base.class_eval do
             before_validation :extract_content_type
             before_create :read_dimensions, :parameterize_filename
-            
+
             delegate :url, :path, :styles, :size, :content_type, :to => :data
           end
         end
       end
-      
+
       module InstanceMethods
         def geometry
           @geometry ||= begin
@@ -26,7 +26,7 @@ module Ckeditor
             ::Paperclip::Geometry.from_file(file)
           end
         end
-                
+
         protected
 
           def parameterize_filename

data/lib/ckeditor/engine.rb

@@ -13,7 +13,7 @@ module Ckeditor
       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
@@ -21,15 +21,11 @@ module Ckeditor
       end
     end
 
-    rake_tasks do
-      load "ckeditor/tasks.rake"
-    end
-
     initializer "ckeditor.hooks" do
       if Object.const_defined?("Formtastic")
         require "ckeditor/hooks/formtastic"
       end
-      
+
       if Object.const_defined?("SimpleForm")
         require "ckeditor/hooks/simple_form"
       end
@@ -37,6 +33,10 @@ module Ckeditor
       if Object.const_defined?("CanCan")
         require "ckeditor/hooks/cancan"
       end
+
+      if Object.const_defined?("Pundit")
+        require "ckeditor/hooks/pundit"
+      end
     end
   end
 end

data/lib/ckeditor/helpers/controllers.rb

@@ -2,9 +2,9 @@ module Ckeditor
   module Helpers
     module Controllers
       extend ActiveSupport::Concern
-      
+
       protected
-        
+
         def ckeditor_current_user
           instance_eval &Ckeditor.current_user_method
         end
@@ -12,20 +12,20 @@ module Ckeditor
         def ckeditor_authorize!
           instance_eval &Ckeditor.authorize_with
         end
-        
+
         def ckeditor_before_create_asset(asset)
-          asset.assetable = ckeditor_current_user
+          asset.assetable = ckeditor_current_user if ckeditor_current_user
           return true
         end
-        
+
         def ckeditor_pictures_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

data/lib/ckeditor/helpers/form_builder.rb

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

data/lib/ckeditor/helpers/form_helper.rb

@@ -3,28 +3,9 @@ module Ckeditor
     module FormHelper
       extend ActiveSupport::Concern
 
-      include ActionView::Helpers::TagHelper
-      include ActionView::Helpers::JavaScriptHelper
-
       def cktext_area(object_name, method, options = {})
-        options = (options || {}).stringify_keys
-        ck_options = (options.delete('ckeditor') || {}).stringify_keys
-
-        if ActionView::Helpers.const_defined?('Tags')
-          instance_tag = ActionView::Helpers::Tags::TextArea.new(object_name, method, self, options)
-          instance_tag.send(:add_default_name_and_id, options) if options['id'].blank?
-          output = instance_tag.render
-        else
-          instance_tag = ActionView::Base::InstanceTag.new(object_name, method, self, options.delete('object'))
-          instance_tag.send(:add_default_name_and_id, options) if options['id'].blank?
-          output = instance_tag.to_text_area_tag(options)
-        end
-
-        output_buffer = ActiveSupport::SafeBuffer.new
-        output_buffer << output
-        output_buffer << javascript_tag(Utils.js_replace(options['id'], ck_options))
-        output_buffer
+        TextArea.new(self, options).render_instance_tag(object_name, method)
       end
     end
   end
-end
+end

data/lib/ckeditor/helpers/view_helper.rb

@@ -2,20 +2,9 @@ module Ckeditor
   module Helpers
     module ViewHelper
       extend ActiveSupport::Concern
-      
+
       def cktext_area_tag(name, content = nil, options = {})
-        element_id = sanitize_to_id(options[:id] || name)
-        options = { :language => I18n.locale.to_s }.merge(options)
-        input_html = { :id => element_id }.merge( options.delete(:input_html) || {} )
-        js_content_for_section = options.delete(:js_content_for)
-        
-        output_buffer = ActiveSupport::SafeBuffer.new
-        output_buffer << text_area_tag(name, content, input_html)
-        
-        js = Utils.js_replace(element_id, options)
-        
-        output_buffer << (js_content_for_section ? content_for(js_content_for_section, js) : javascript_tag(js))
-        output_buffer
+        TextArea.new(self, options).render_tag(name, content)
       end
     end
   end

data/lib/ckeditor/hooks/cancan.rb

@@ -19,7 +19,7 @@ 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.current_ability.authorize!(action.to_sym, model_object) if action
+        @controller.authorize!(action.to_sym, model_object) if action
       end
 
       # This method is called primarily from the view to determine whether the given user
@@ -43,4 +43,4 @@ module Ckeditor
   end
 end
 
-Ckeditor::AUTHORIZATION_ADAPTERS[:cancan] = Ckeditor::Hooks::CanCanAuthorization
+Ckeditor::AUTHORIZATION_ADAPTERS[:cancan] = Ckeditor::Hooks::CanCanAuthorization

data/lib/ckeditor/hooks/formtastic.rb

@@ -2,7 +2,7 @@ require "formtastic"
 
 class CkeditorInput
   include ::Formtastic::Inputs::Base
-  
+
   def to_html
     input_wrapping do
       label_html <<

data/lib/ckeditor/hooks/pundit.rb

@@ -0,0 +1,47 @@
+require 'pundit'
+
+module Ckeditor
+  module Hooks
+    # This adapter is for the Pundit[https://github.com/elabs/pundit] authorization library.
+    # 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.
+      def initialize(controller)
+        @controller = controller
+        @controller.extend ControllerExtension
+      end
+
+      # This method is called in every controller action and should raise an exception
+      # when the authorization fails. The first argument is the name of the controller
+      # 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)
+        raise Pundit::NotAuthorizedError unless authorized?(action, model_object)
+      end
+
+      # This method is called primarily from the view to determine whether the given user
+      # has access to perform the action on a given model. It should return true when authorized.
+      # 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
+      end
+
+      private
+
+      module ControllerExtension
+        def current_user_for_pundit
+          # use ckeditor_current_user instead of default current_user so it works with
+          # whatever current user method is defined with Ckeditor
+          ckeditor_current_user
+        end
+      end
+    end
+  end
+end
+
+Ckeditor::AUTHORIZATION_ADAPTERS[:pundit] = Ckeditor::Hooks::PunditAuthorization