ckeditor 3.5.4 → 3.6.0.pre

data/lib/ckeditor/helpers/controllers.rb

@@ -0,0 +1,30 @@
+module Ckeditor
+  module Helpers
+    module Controllers
+      extend ActiveSupport::Concern
+      
+      protected
+        
+        def ckeditor_authenticate
+          return true
+        end
+        
+        def ckeditor_before_create_asset(asset)
+          asset.assetable = current_user if respond_to?(: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
+    end
+  end
+end

data/lib/ckeditor/helpers/form_builder.rb

@@ -0,0 +1,11 @@
+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
+    end
+  end
+end

data/lib/ckeditor/helpers/form_helper.rb

@@ -0,0 +1,25 @@
+module Ckeditor
+  module Helpers
+    module FormHelper
+      extend ActiveSupport::Concern
+      
+      include ActionView::Helpers::TagHelper
+      include ActionView::Helpers::JavaScriptHelper
+      
+      def cktext_area(object_name, method, options = {})
+        options = { :language => I18n.locale.to_s }.merge(options)
+        input_html = (options.delete(:input_html) || {})
+        hash = input_html.stringify_keys
+        
+        instance_tag = ActionView::Base::InstanceTag.new(object_name, method, self, options.delete(:object))
+        instance_tag.send(:add_default_name_and_id, hash)
+        
+        output_buffer = ActiveSupport::SafeBuffer.new
+        output_buffer << instance_tag.to_text_area_tag(input_html)
+        output_buffer << javascript_tag(Utils.js_replace(hash['id'], options))
+        
+        output_buffer
+      end
+    end
+  end
+end

data/lib/ckeditor/helpers/view_helper.rb

@@ -0,0 +1,19 @@
+module Ckeditor
+  module Helpers
+    module ViewHelper
+      extend ActiveSupport::Concern
+      
+      def cktext_area_tag(name, content = nil, options = {})
+        element_id = sanitize_to_id(name)
+        options = { :language => I18n.locale.to_s }.merge(options)
+        input_html = { :id => element_id }.merge( options.delete(:input_html) || {} )
+        
+        output_buffer = ActiveSupport::SafeBuffer.new
+        output_buffer << text_area_tag(name, content, input_html)
+        output_buffer << javascript_tag(Utils.js_replace(element_id, options))
+        
+        output_buffer
+      end
+    end
+  end
+end

data/lib/ckeditor/http.rb

@@ -0,0 +1,81 @@
+# encoding: utf-8
+require 'digest/sha1'
+require 'mime/types'
+
+module Ckeditor
+  module Http
+    # Create tempfile from hash
+    class UploadedFile
+      attr_accessor :original_filename, :content_type, :tempfile, :headers
+
+      def initialize(hash)
+        @original_filename = hash[:filename]
+        @content_type      = hash[:type]
+        @headers           = hash[:head]
+        @tempfile          = hash[:tempfile]
+        raise(ArgumentError, ':tempfile is required') unless @tempfile
+      end
+
+      def open
+        @tempfile.open
+      end
+
+      def path
+        @tempfile.path
+      end
+
+      def read(*args)
+        @tempfile.read(*args)
+      end
+
+      def rewind
+        @tempfile.rewind
+      end
+
+      def size
+        @tempfile.size
+      end
+    end
+    
+    # Usage (paperclip example)
+    # @asset.data = QqFile.new(params[:qqfile], request)
+    class QqFile < ::Tempfile
+
+      def initialize(filename, request, tmpdir = Dir::tmpdir)
+        @original_filename  = filename
+        @request = request
+        
+        super Digest::SHA1.hexdigest(filename), tmpdir
+        fetch
+      end
+     
+      def fetch
+        self.write @request.raw_post
+        self.rewind
+        self
+      end
+     
+      def original_filename
+        @original_filename
+      end
+     
+      def content_type
+        types = MIME::Types.type_for(@request.content_type)
+        types.empty? ? @request.content_type : types.first.to_s
+      end
+    end
+    
+    # Convert nested Hash to HashWithIndifferentAccess and replace
+    # file upload hash with UploadedFile objects
+    def self.normalize_param(*args)
+      value = args.first
+      if Hash === value && value.has_key?(:tempfile)
+        UploadedFile.new(value)
+      elsif value.is_a?(String)
+        QqFile.new(*args)
+      else
+        value
+      end
+    end
+  end
+end

data/lib/ckeditor/orm/active_record.rb

@@ -0,0 +1,91 @@
+module Ckeditor
+  module Orm
+    module ActiveRecord
+      module AssetBase
+        def self.included(base)
+          base.send(:include, InstanceMethods)
+          base.send(:extend, ClassMethods)
+        end
+        
+        module ClassMethods
+          def self.extended(base)
+            base.class_eval do
+              set_table_name "ckeditor_assets"
+              
+              belongs_to :assetable, :polymorphic => true
+  
+              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 filename
+            data_file_name
+          end
+          
+          def format_created_at
+            I18n.l(created_at, :format => "%d.%m.%Y")
+          end
+          
+          def has_dimensions?
+            respond_to?(:width) && respond_to?(:height)
+          end
+          
+          def image?
+            Ckeditor::IMAGE_TYPES.include?(data_content_type)
+          end
+          
+          def geometry
+            @geometry ||= Paperclip::Geometry.from_file(data.to_file)
+            @geometry
+          end
+          
+          def url_content
+	          url
+	        end
+	
+	        def url_thumb
+	          url(:thumb)
+	        end
+          
+          def as_json(options = nil)
+            options = {
+              :methods => [:url_content, :url_thumb, :size, :filename, :format_created_at],
+              :root => "asset"
+            }.merge(options || {})
+            
+            super options
+          end
+          
+          protected
+            
+            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 read_dimensions
+              if image? && has_dimensions?
+                self.width = geometry.width
+                self.height = geometry.height
+              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
+            end
+        end
+      end
+    end
+  end
+end

data/lib/ckeditor/utils.rb

@@ -1,70 +1,7 @@
 # encoding: utf-8
-require 'fileutils'
-require 'open-uri'
-require 'digest/sha1'
-require 'mime/types'
-
 module Ckeditor
   module Utils
-    # RemoteFile
-    # 
-    # remote_file = RemoteFile.new("http://www.google.com/intl/en_ALL/images/logo.gif")
-    # remote_file.original_filename #=> logo.gif
-    # remote_file.content_type #= image/gif
-    #
-    class RemoteFile < ::Tempfile
-
-      def initialize(path, tmpdir = Dir::tmpdir)
-        @original_filename  = File.basename(path)
-        @remote_path        = path
-     
-        super Digest::SHA1.hexdigest(path), tmpdir
-        fetch
-      end
-     
-      def fetch
-        string_io = OpenURI.send(:open, @remote_path)
-        body = string_io.read
-        
-        # Fix for ruby 1.9.2 (ASCII-8BIT and UTF-8 in hell issue)
-        if body && body.respond_to?(:encoding) && body.encoding.name == 'ASCII-8BIT'
-          body.force_encoding('UTF-8')
-        end
-        
-        self.write body
-        self.rewind
-        self
-      end
-     
-      def original_filename
-        @original_filename
-      end
-     
-      def content_type
-        types = MIME::Types.type_for(self.path)
-    	  types.empty? ? extract_content_type : types.first.to_s
-      end
-      
-      protected
-        
-        def extract_content_type
-          mime = `file --mime -br #{self.path}`.strip
-          mime = mime.gsub(/^.*: */,"")
-          mime = mime.gsub(/;.*$/,"")
-          mime = mime.gsub(/,.*$/,"")
-          mime
-        end
-    end
-  
     class << self
-      # remove the existing install (if any)
-      def destroy
-        directory = Rails.root.join('public', 'javascripts', 'ckeditor')
-        if File.exist?(directory)
-          FileUtils.rm_r(directory, :force => true)
-        end
-      end
-      
       def escape_single_quotes(str)
         str.gsub('\\','\0\0').gsub('</','<\/').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }
       end
@@ -76,20 +13,64 @@ module Ckeditor
         [basename.parameterize('_'), extension].join.downcase
       end
       
-      def download(url)
-        RemoteFile.new(url)
-      end
-      
       def extract(filepath, output)
         # TODO: need check system OS
         system("tar --exclude=*.php --exclude=*.asp -C '#{output}' -xzvf '#{filepath}' ckeditor/")
       end
       
-      def clear_dir(dirpath)
-        FileUtils.rm_r(dirpath, :force => true)
-        FileUtils.mkdir_p(dirpath)
+      def js_replace(dom_id, options = {})
+        js_options = applay_options(options)
+        js = ["if (CKEDITOR.instances['#{dom_id}']) {CKEDITOR.remove(CKEDITOR.instances['#{dom_id}']);}"]
+        
+        if js_options.blank?
+          js << "CKEDITOR.replace('#{dom_id}');"
+        else
+          js << "CKEDITOR.replace('#{dom_id}', { #{js_options} });"
+        end
+        
+        js.join
+      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] = "^EDITOR.config.filebrowserImageUploadUrl"
+            options[:allowedExtensions] = Ckeditor.image_file_types
+          when "flash" then
+            options[:action] = "^EDITOR.config.filebrowserFlashUploadUrl"
+            options[:allowedExtensions] = ["swf"]
+          else
+            options[:action] = "^EDITOR.config.filebrowserUploadUrl"
+            options[:allowedExtensions] = Ckeditor.attachment_file_types
+        end
+        
+        js_options = applay_options(options)
+        
+        "$(document).ready(function(){ new qq.FileUploaderInput({ #{js_options} }); });"
       end
       
+      def applay_options(options)
+        str = []
+        
+        options.each do |key, value|
+          item = case value
+            when String then
+              value.split(//).first == '^' ? value.slice(1..-1) : "'#{value}'"
+            when Hash then 
+              "{ #{applay_options(value)} }"
+            when Array then 
+              arr = value.collect { |v| "'#{v}'" }
+              "[ #{arr.join(',')} ]"
+            else value
+          end
+          
+          str << "#{key}: #{item}"
+        end
+        
+        str.sort.join(',')
+      end
     end
   end
 end

data/lib/ckeditor/version.rb

@@ -1,11 +1,6 @@
 module Ckeditor
   module Version
-    MAJOR = 3
-    MINOR = 5
-    RELEASE = 4
-
-    def self.dup
-      "#{MAJOR}.#{MINOR}.#{RELEASE}"
-    end
+    GEM = "3.6.0.pre".freeze
+    EDITOR = "3.6.1".freeze
   end
 end

data/lib/generators/ckeditor/install_generator.rb

@@ -0,0 +1,62 @@
+require 'rails/generators'
+require 'fileutils'
+
+module Ckeditor
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      class_option :version, :type => :string, :default => Ckeditor::Version::EDITOR,
+                   :desc => "Version of ckeditor which be install"
+      
+      desc "Download and install ckeditor"
+      
+      def self.source_root
+        @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+      end  
+      
+      # copy configuration
+      def copy_initializer
+        template "ckeditor.rb", "config/initializers/ckeditor.rb"
+      end
+      
+      # copy ckeditor files
+      def install_ckeditor
+        say_status("fetching #{filename}", "", :green)
+        get(download_url, "tmp/#{filename}")
+        
+        filepath = Rails.root.join("tmp/#{filename}")
+        
+        if File.exist?(filepath)
+          Ckeditor::Utils.extract(filepath, Rails.root.join('public', 'javascripts'))
+          directory "ckeditor", "public/javascripts/ckeditor"
+          FileUtils.rm_rf(filepath)
+        end
+      end
+      
+      def download_javascripts
+        js_dir = "public/javascripts/ckeditor/filebrowser/javascripts"
+        
+        say_status("fetching rails.js", "", :green)
+        get "https://github.com/rails/jquery-ujs/raw/master/src/rails.js", "#{js_dir}/rails.js"
+        
+        say_status("fetching fileuploader.js", "", :green)
+        get "https://raw.github.com/galetahub/file-uploader/master/client/fileuploader.js", "#{js_dir}/fileuploader.js"
+        
+        say_status("fetching jquery-1.6.1.min.js", "", :green)
+        get "http://code.jquery.com/jquery-1.6.1.min.js", "#{js_dir}/jquery.js"
+        
+        say_status("fetching jquery.tmpl.min.js", "", :green)
+        get "https://raw.github.com/jquery/jquery-tmpl/master/jquery.tmpl.min.js", "#{js_dir}/jquery.tmpl.js"
+      end
+      
+      protected
+      
+        def download_url
+          "http://download.cksource.com/CKEditor/CKEditor/CKEditor%20#{options[:version]}/#{filename}"
+        end
+        
+        def filename
+          "ckeditor_#{options[:version]}.tar.gz"
+        end
+    end
+  end
+end