glebtv-ckeditor 4.2.1.5 → 4.3.2.0

data/lib/ckeditor/http.rb

@@ -36,7 +36,7 @@ module Ckeditor
         @tempfile.size
       end
     end
-    
+
     # Usage (paperclip example)
     # @asset.data = QqFile.new(params[:qqfile], request)
     class QqFile < ::Tempfile
@@ -44,26 +44,27 @@ module Ckeditor
       def initialize(filename, request, tmpdir = Dir::tmpdir)
         @original_filename  = filename
         @request = request
-        
+
         super Digest::SHA1.hexdigest(filename), tmpdir
+        binmode
         fetch
       end
-     
+
       def fetch
         self.write(body)
         self.rewind
         self
       end
-     
+
       def original_filename
         @original_filename
       end
-     
+
       def content_type
         types = MIME::Types.type_for(original_filename)
         types.empty? ? @request.content_type : types.first.to_s
       end
-      
+
       def body
         if @request.raw_post.respond_to?(:force_encoding)
           @request.raw_post.force_encoding("UTF-8")
@@ -72,7 +73,7 @@ module Ckeditor
         end
       end
     end
-    
+
     # Convert nested Hash to HashWithIndifferentAccess and replace
     # file upload hash with UploadedFile objects
     def self.normalize_param(*args)

data/lib/ckeditor/orm/active_record.rb

@@ -8,13 +8,13 @@ module Ckeditor
           base.send(:include, Base::AssetBase::InstanceMethods)
           base.send(:extend, ClassMethods)
         end
-        
+
         module ClassMethods
           def self.extended(base)
             base.class_eval do
               self.table_name = "ckeditor_assets"
-              
-              belongs_to :assetable, :polymorphic => true              
+
+              belongs_to :assetable, :polymorphic => true
             end
           end
         end

data/lib/ckeditor/orm/base.rb

@@ -10,11 +10,11 @@ module Ckeditor
           def size
             data_file_size
           end
-          
+
           def has_dimensions?
             respond_to?(:width) && respond_to?(:height)
           end
-          
+
           def image?
             Ckeditor::IMAGE_TYPES.include?(data_content_type)
           end
@@ -30,7 +30,7 @@ module Ckeditor
           def url_thumb
             url(:thumb)
           end
-          
+
           def as_json_methods
             [:url_content, :url_thumb, :size, :filename, :format_created_at]
           end
@@ -41,9 +41,7 @@ module Ckeditor
               :root => "asset"
             }.merge(options || {})
 
-            ret = super(options)
-            ret['asset']['id'] = ret['asset']['id'].to_s
-            ret
+            super options
           end
         end
       end

data/lib/ckeditor/orm/mongoid.rb

@@ -12,12 +12,12 @@ module Ckeditor
           base.send(:include, InstanceMethods)
           base.send(:extend, ClassMethods)
         end
-        
+
         module InstanceMethods
           def type
             _type
           end
-          
+
           def as_json_methods
             [:id, :type] + super
           end
@@ -30,8 +30,8 @@ module Ckeditor
               field :data_file_size, :type => Integer
               field :width, :type => Integer
               field :height, :type => Integer
-              
-              belongs_to :assetable, :polymorphic => true              
+
+              belongs_to :assetable, :polymorphic => true
             end
           end
         end

data/lib/ckeditor/paginatable.rb

@@ -0,0 +1,56 @@
+module Ckeditor
+  # Simple paginate relation
+  class Paginatable
+    attr_reader :limit_value, :offset_value
+
+    def initialize(scope, options = {})
+      @scope = scope
+      @limit_value = (options[:limit] || Ckeditor.default_per_page).to_i
+    end
+
+    def page(num = 1)
+      @offset_value = limit_value * ([num.to_i, 1].max - 1)
+      self
+    end
+
+    def scoped
+      @scope.limit(limit_value).offset(offset_value)
+    end
+
+    # Next page number in the collection
+    def next_page
+      current_page + 1 unless last_page?
+    end
+
+    # Previous page number in the collection
+    def prev_page
+      current_page - 1 unless first_page?
+    end
+
+    # First page of the collection?
+    def first_page?
+      current_page == 1
+    end
+
+    # Last page of the collection?
+    def last_page?
+      current_page >= total_pages
+    end
+
+    # Total number of pages
+    def total_pages
+      (total_count.to_f / limit_value).ceil
+    end
+
+    # total item numbers of scope
+    def total_count
+      @total_count ||= @scope.count
+    end
+
+    # Current page number
+    def current_page
+      offset = (offset_value < 0 ? 0 : offset_value)
+      (offset / limit_value) + 1
+    end
+  end
+end

data/lib/ckeditor/text_area.rb

@@ -0,0 +1,52 @@
+require 'active_support'
+require 'action_view/helpers/tag_helper'
+require 'action_view/helpers/form_tag_helper'
+
+module Ckeditor
+  class TextArea
+    include ActionView::Helpers::TagHelper
+    include ActionView::Helpers::FormTagHelper
+    include ActionView::Helpers::JavaScriptHelper
+
+    attr_reader :template, :options, :ck_options
+
+    def initialize(template, options)
+      @template = template
+      @options = options.stringify_keys
+      @ck_options = (@options.delete('ckeditor') || {}).stringify_keys
+    end
+
+    def render_instance_tag(object_name, method)
+      tag = build_tag(object_name, method)
+      tag.send(:add_default_name_and_id, options) if options['id'].blank?
+
+      render tag.respond_to?(:to_text_area_tag) ? tag.to_text_area_tag(options) : tag.render
+    end
+
+    def render_tag(name, content)
+      options['id'] = sanitize_to_id(options['id'] || name)
+
+      render text_area_tag(name, content, options)
+    end
+
+    protected
+
+      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 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

@@ -3,30 +3,20 @@ require 'active_support/json/encoding'
 
 module Ckeditor
   module Utils
-    class JavascriptCode < String
-      def to_json(options = nil)
-        self
-      end
-      
-      def as_json(options = nil)
-        ActiveSupport::JSON::Variable.new(to_s).freeze
-      end
-    end
-
     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
       end
-      
+
       def js_replace(dom_id, options = nil)
         js = ["if (typeof CKEDITOR != 'undefined') {"]
 
@@ -40,47 +30,75 @@ module Ckeditor
         js << "}"
         js.join(" ").html_safe
       end
-      
+
       def js_fileuploader(uploader_type, 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[:action] = "EDITOR.config.filebrowserImageUploadUrl"
             options[:allowedExtensions] = Ckeditor.image_file_types
           when "flash" then
-            options[:action] = JavascriptCode.new("EDITOR.config.filebrowserFlashUploadUrl")
+            options[:action] = "EDITOR.config.filebrowserFlashUploadUrl"
             options[:allowedExtensions] = ["swf"]
           else
-            options[:action] = JavascriptCode.new("EDITOR.config.filebrowserUploadUrl")
+            options[:action] = "EDITOR.config.filebrowserUploadUrl"
             options[:allowedExtensions] = Ckeditor.attachment_file_types
         end
-        
-        js_options = ActiveSupport::JSON.encode(options)
-        
+
+        js_options = ActiveSupport::JSON.encode(options).gsub /"EDITOR.config.filebrowser(.*)UploadUrl"/, 'EDITOR.config.filebrowser\1UploadUrl'
+
         "(function() { new qq.FileUploaderInput(#{js_options}); }).call(this);".html_safe
       end
-      
+
       def filethumb(filename)
         extname = filename.blank? ? "unknown" : File.extname(filename).gsub(/^\./, '')
-	      image = "#{extname}.gif"
-	      source = Ckeditor.root_path.join("app/assets/javascripts/ckeditor/filebrowser/images/thumbs")
-	      
-	      unless File.exists?(File.join(source, image))
-	        image = "unknown.gif"
-	      end
-	      
-	      File.join(Ckeditor.relative_path, "filebrowser/images/thumbs", image)
+        image = "#{extname}.gif"
+        source = Ckeditor.root_path.join("app/assets/javascripts/ckeditor/filebrowser/images/thumbs")
+
+        unless File.exists?(File.join(source, image))
+          image = "unknown.gif"
+        end
+
+        File.join(Ckeditor.relative_path, "filebrowser/images/thumbs", image)
       end
 
       def select_assets(path, relative_path)
-        folder = File.join(relative_path, path, '**')
-        relative_folder = Ckeditor.root_path.join(relative_path)
-      
-        Dir[Ckeditor.root_path.join(folder, '*.{js,css}')].inject([]) do |list, file|
-          list << Pathname.new(file).relative_path_from(relative_folder).to_s
-          list
+        relative_folder = Ckeditor.root_path.join relative_path
+        folder = relative_folder.join path
+        extensions = '*.{js,css,png,gif,jpg,scss}'
+
+        # Files at root
+        files = Dir[folder.join(extensions)]
+
+        # Plugins
+        if Ckeditor.assets_plugins.nil?
+          files += Dir[folder.join('plugins', '**', extensions)]
+        else
+          Ckeditor.assets_plugins.each do |plugin|
+            files += Dir[folder.join('plugins', plugin, '**', extensions)]
+          end
         end
+
+        # Other folders
+        Dir[folder.join('*/')].each do |subfolder|
+          path = Pathname.new(subfolder)
+          unless path.basename.to_s == 'plugins'
+            files += Dir[path.join('**', extensions)]
+          end
+        end
+
+        paths = files.map { |file| Pathname.new(file) }
+
+        # 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])
+          end
+        end
+
+        paths.map { |path| path.relative_path_from(relative_folder).to_s.gsub('.scss', '') }.select { |path| path != 'ckeditor/ckeditor.js' }
       end
     end
   end

data/lib/ckeditor/version.rb

@@ -1,6 +1,3 @@
 module Ckeditor
-  module Version
-    GEM = "4.2.1.5".freeze
-    EDITOR = "4.2.1".freeze
-  end
+  VERSION="4.3.2.0".freeze
 end

data/lib/generators/ckeditor/install_generator.rb

@@ -7,14 +7,14 @@ module Ckeditor
       include Rails::Generators::Migration
 
       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 :backend, :type => :string, :default => 'paperclip',
         :desc => "paperclip (default), carrierwave, or dragonfly"
-      
+
       def self.source_root
         @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
       end
@@ -31,7 +31,7 @@ module Ckeditor
           template File.join("base", "dragonfly", "initializer.rb"), "config/initializers/ckeditor_dragonfly.rb"
         end
       end
-      
+
       def mount_engine
         route "mount Ckeditor::Engine => '/ckeditor'"
       end
@@ -41,11 +41,11 @@ module Ckeditor
           template "#{generator_dir}/ckeditor/#{filename}.rb",
                    File.join('app/models', ckeditor_dir, "#{filename}.rb")
         end
-        
+
         if backend == "carrierwave"
           template "#{uploaders_dir}/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")
         end
@@ -56,7 +56,7 @@ module Ckeditor
           migration_template "#{generator_dir}/migration.rb", File.join('db/migrate', "create_ckeditor_assets.rb")
         end
       end
-      
+
       protected
 
         def ckeditor_dir
@@ -66,15 +66,15 @@ module Ckeditor
         def generator_dir
           @generator_dir ||= [orm, backend].join('/')
         end
-        
+
         def uploaders_dir
           @uploaders_dir ||= ['base', 'carrierwave'].join('/')
         end
-        
+
         def orm
           (options[:orm] || "active_record").to_s
         end
-        
+
         def backend
           (options[:backend] || "paperclip").to_s
         end