ckeditor 3.5.0 → 3.5.1

data/README.rdoc

@@ -6,31 +6,38 @@ the results users have when publishing it. It brings to the web common editing f
 Because CKEditor is licensed under flexible Open Source and commercial licenses, you'll be able to integrate and use it inside any kind of application. 
 This is the ideal editor for developers, created to provide easy and powerful solutions to their users.
 
-CKEditor version: 3.5 (http://ckeditor.com)
+CKEditor version: any (http://ckeditor.com/download/releases)
 
 SWFUpload version: 2.2.0.1 Core (http://swfupload.org)
 
-Rails version: 3.0.3
+Rails version: 3.x
 
 Demo appication (Rails 2.3.8):
 http://github.com/galetahub/rails-ckeditor-demo-app
 
+Demo appication (Rails 3.x):
+http://github.com/galetahub/ckeditor-demo-app
+
 == Install
 
 === Rails 3
 
 In your appication "Gemfile":
 
-  gem 'ckeditor', '3.5.0'
+  gem 'ckeditor', '3.5.1'
   
 or
   gem 'ckeditor', :git => 'git://github.com/galetahub/rails-ckeditor.git', :branch => 'rails3'
 
-Next step is generate ckeditor js files and configuration file
+Next step is download ckeditor core files and generate configuration file
 Check "config/initializers/ckeditor.rb" for more configuration options:
 
   rails generate ckeditor:base
 
+You can pass version of ckeditor to download (http://ckeditor.com/download/releases):
+
+  rails generate ckeditor:base --version=3.5.2
+
 Generate ckeditor models for file upload support:
 For paperclip:
 
@@ -123,9 +130,12 @@ For S3 storage look at "../ckeditor/examples/s3"
 
 == Formtastic integration
 
-Ckeditor detects if your use Formtastic and appends "Ckeditor::CustomFormBuilder".
-
   <%= form.input :content, :as => :ckeditor %>
+  <%= form.input :content, :as => :ckeditor, :input_html => { :height => 400, :swf_params => { ... } } %>
+
+== SimpleForm integration
+
+  <%= form.ckeditor :content, :label => false, :input_html => { :height => 400, :toolbar=>'Full' } %>
 
 == Middleware
 
@@ -134,6 +144,20 @@ support swf upload with AuthenticityToken.
 
   rake middleware
 
+== I18n
+
+  en:
+    ckeditor:
+      page_title: "CKEditor Files Manager"
+      upload_files: "Upload New Files"
+      buttons:
+        refresh:
+          title: "Refresh"
+          hint: "Refresh page"
+        upload:
+          title: "Upload"
+          hint: "Upload New File"
+
 == TODOs
 
 1. Add support for choose filemanager storage

data/app/controllers/ckeditor/attachments_controller.rb

@@ -12,7 +12,7 @@ class Ckeditor::AttachmentsController < Ckeditor::BaseController
   
   def destroy
     @attachment.destroy
-    respond_with(@attachment)
+    respond_with(@attachment, :location => ckeditor_attachments_path)
   end
   
   protected

data/app/controllers/ckeditor/base_controller.rb

@@ -4,7 +4,7 @@ class Ckeditor::BaseController < ApplicationController
   before_filter :swf_options, :only => [:index, :create]
   before_filter :find_asset, :only => [:destroy]
   
-  respond_to :html, :xml, :json
+  respond_to :html, :json
   
   layout "ckeditor"
 

data/app/controllers/ckeditor/pictures_controller.rb

@@ -12,7 +12,7 @@ class Ckeditor::PicturesController < Ckeditor::BaseController
   
   def destroy
     @picture.destroy
-    respond_with(@picture)
+    respond_with(@picture, :location => ckeditor_pictures_path)
   end
   
   protected

data/app/helpers/ckeditor/base_helper.rb

@@ -3,7 +3,7 @@ module Ckeditor::BaseHelper
     path = case kind
       when :image then Ckeditor.file_manager_image_upload_uri
       when :file  then Ckeditor.file_manager_upload_uri
-      else '/ckeditor/create/default'
+      else '/ckeditor/attachments'
     end
     
     session_key = Rails.application.config.send(:session_options)[:key]

data/app/views/ckeditor/_asset.html.erb

@@ -1,15 +1,20 @@
 <div class="FCKThumb">
-  <table border="0" cellpadding="0" cellspacing="0" height="100" width="100">
-    <tbody>
-      <tr>
-        <td align="center" valign="middle">
-          <%= image_tag(asset.url_thumb, :alt => asset.url_content, :title => asset.filename, :onerror=>"this.src='/javascripts/ckeditor/images/ckfnothumb.gif'", :class=>'image') %>
-        </td>
-       </tr>
-     </tbody>
-   </table>
-   
-   <div class="FCKFileName"><%= asset.filename %></div>
-   <div class="FCKFileDate"><%= asset.format_created_at %></div>
-   <div class="FCKFileSize"><%= number_to_human_size(asset.size, :precision => 2) %></div>
+  <%= link_to('&nbsp'.html_safe, polymorphic_path(asset, :format => :json), 
+    :method => :delete, :remote => true, :class => 'FCKFileDelete') %>
+  
+  <div class='FCKAsset'>
+    <table border="0" cellpadding="0" cellspacing="0" height="100" width="100">
+      <tbody>
+        <tr>
+          <td align="center" valign="middle">
+            <%= image_tag(asset.url_thumb, :alt => asset.url_content, :title => asset.filename, :onerror=>"this.src='/javascripts/ckeditor/images/ckfnothumb.gif'", :class=>'image') %>
+          </td>
+         </tr>
+       </tbody>
+    </table>
+     
+    <div class="FCKFileName"><%= asset.filename %></div>
+    <div class="FCKFileDate"><%= asset.format_created_at %></div>
+    <div class="FCKFileSize"><%= number_to_human_size(asset.size, :precision => 2) %></div>
+  </div>
 </div>

data/app/views/ckeditor/_swfupload.html.erb

@@ -1,5 +1,27 @@
 <script type="text/javascript">
 		var swfu = null;
+		
+		window.onload = function()
+    {
+      var f = new FileThumb('qu');
+      var t = new ToolBar('nv');
+      
+      var b1 = new Button('<%= I18n.t("upload.hint", :scope => [:ckeditor, :buttons]) %>', '<%= I18n.t("upload.title", :scope => [:ckeditor, :buttons]) %>', 'add.gif');
+      var b2 = new Button('<%= I18n.t("refresh.hint", :scope => [:ckeditor, :buttons]) %>', '<%= I18n.t("refresh.title", :scope => [:ckeditor, :buttons]) %>', 'refresh.gif');
+      
+      b1.callback = uploadButton;
+      b2.callback = function(){ window.location.reload(); }
+      
+      t.buttons.push(b1);
+      t.buttons.push(b2);
+      
+      t.init();
+      init_swfupload();
+      
+      $('a.FCKFileDelete').bind('ajax:complete', function(){
+        $(this).parents('div.FCKThumb').remove();
+      });
+    }
 	
 		function init_swfupload() {
 		  var params = editor.config['swf_params'];

data/app/views/ckeditor/attachments/index.html.erb

@@ -1,43 +1,5 @@
-<script type="text/javascript">	  
+<script type="text/javascript">
   var upload_path = "<%=raw ckeditor_attachment_path(:file) %>";
-  
-  function setUrl(url) 
-  {  
-    CKEDITOR.tools.callFunction(CKEditorFuncNum, url);
-    window.close();
-  }
-  
-  function uploadButton(button)
-  {
-    var element = $('fj');
-    
-    if (element.style.display == '')
-    {
-      element.style.display = 'none';
-    }
-    else
-    {
-      element.style.display = '';
-    }
-  }
-  
-  window.onload = function()
-  {
-    init_swfupload();
-    var f = new FileThumb('qu');
-    var t = new ToolBar('nv');
-    
-    var b1 = new Button('Upload New File', 'Upload', 'add.gif');
-    var b2 = new Button('Refresh', 'Refresh', 'refresh.gif');
-    
-    b1.callback = uploadButton;
-    b2.callback = function(){ window.location.reload(); }
-    
-    t.buttons.push(b1);
-    t.buttons.push(b2);
-    
-    t.init();
-  }
 </script>
 
 <table width="100%" cellspacing="0" cellpadding="0">
@@ -49,7 +11,7 @@
 	<tr id="fj" style='display:none;'>
 		<td style="white-space: normal;" class="FCKUploadArea">
 			<div class="PopupTitle">
-				<span>Upload New Files</span>
+				<span><%= I18n.t('upload_files', :scope => [:ckeditor]) %></span>
 			</div>
 			<div id="cY">
 				<table cellspacing="0" cellpadding="0" style="padding: 10px;">

data/app/views/ckeditor/pictures/index.html.erb

@@ -1,43 +1,5 @@
 <script type="text/javascript">	  
   var upload_path = "<%=raw ckeditor_attachment_path(:image) %>";
-  
-  function setUrl(url) 
-  {  
-    CKEDITOR.tools.callFunction(CKEditorFuncNum, url);
-    window.close();
-  }
-  
-  function uploadButton(button)
-  {
-    var element = $('fj');
-    
-    if (element.style.display == '')
-    {
-      element.style.display = 'none';
-    }
-    else
-    {
-      element.style.display = '';
-    }
-  }
-  
-  window.onload = function()
-  {
-    init_swfupload();
-    var f = new FileThumb('qu');
-    var t = new ToolBar('nv');
-    
-    var b1 = new Button('Upload New File', 'Upload', 'add.gif');
-    var b2 = new Button('Refresh', 'Refresh', 'refresh.gif');
-    
-    b1.callback = uploadButton;
-    b2.callback = function(){ window.location.reload(); }
-    
-    t.buttons.push(b1);
-    t.buttons.push(b2);
-    
-    t.init();
-  }
 </script>
 
 <table width="100%" cellspacing="0" cellpadding="0">
@@ -49,7 +11,7 @@
 	<tr id="fj" style='display:none;'>
 		<td style="white-space: normal;" class="FCKUploadArea">
 			<div class="PopupTitle">
-				<span>Upload New Files</span>
+				<span><%= I18n.t('upload_files', :scope => [:ckeditor]) %></span>
 			</div>
 			<div id="cY">
 				<table cellspacing="0" cellpadding="0" style="padding: 10px;">

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

@@ -1,19 +1,22 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>CKEditor Files Manager</title>
+	<title><%= I18n.t('page_title', :scope => [:ckeditor]) %></title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<meta name="robots" content="noindex, nofollow">
+	<%= csrf_meta_tag %>
+	
 	<link href="/javascripts/ckeditor/css/fck_editor.css" type="text/css" rel="stylesheet">
 	<link href="/javascripts/ckeditor/css/fck_dialog.css" type="text/css" rel="stylesheet">
 	<link href="/javascripts/ckeditor/css/ckfinder.css" type="text/css" rel="stylesheet">
 	<link href="/javascripts/ckeditor/css/swfupload.css" type="text/css" rel="stylesheet">
 	
-	<script src="/javascripts/ckeditor/swfupload/mootools-1.2.3-core-yc.js" type="text/javascript"></script>
+	<script src="/javascripts/ckeditor/swfupload/jquery-1.5.1.min.js" type="text/javascript"></script>
 	<script src="/javascripts/ckeditor/swfupload/swfupload.js" type="text/javascript"></script>
 	<script src="/javascripts/ckeditor/swfupload/swfupload.queue.js" type="text/javascript"></script>
 	<script src="/javascripts/ckeditor/swfupload/fileprogress.js" type="text/javascript"></script>
 	<script src="/javascripts/ckeditor/swfupload/handlers.js" type="text/javascript"></script>
 	<script src="/javascripts/ckeditor/swfupload/querystring.js" type="text/javascript"></script>
+	<script src="/javascripts/ckeditor/swfupload/rails.js" type="text/javascript"></script>
   
   <script type="text/javascript">
     var params = new Querystring();

data/config/locales/en.ckeditor.yml

@@ -0,0 +1,11 @@
+en:
+  ckeditor:
+    page_title: "CKEditor Files Manager"
+    upload_files: "Upload New Files"
+    buttons:
+      refresh:
+        title: "Refresh"
+        hint: "Refresh page"
+      upload:
+        title: "Upload"
+        hint: "Upload New File"

data/config/locales/ru.ckeditor.yml

@@ -0,0 +1,11 @@
+ru:
+  ckeditor:
+    page_title: "CKEditor Files Manager"
+    upload_files: "Загрузка новых файлов"
+    buttons:
+      refresh:
+        title: "Обновить"
+        hint: "Обновить страницу"
+      upload:
+        title: "Загрузить"
+        hint: "Загрузить файл"

data/config/locales/uk.ckeditor.yml

@@ -0,0 +1,11 @@
+uk:
+  ckeditor:
+    page_title: "CKEditor Files Manager"
+    upload_files: "Завантаження нових файлів"
+    buttons:
+      refresh:
+        title: "Оновити"
+        hint: "Оновити сторінку"
+      upload:
+        title: "Завантажити"
+        hint: "Завантажити новий файл"

data/lib/ckeditor.rb

@@ -1,10 +1,14 @@
 module Ckeditor
   autoload :ViewHelper,        'ckeditor/view_helper'
   autoload :FormBuilder,       'ckeditor/form_builder'
-  autoload :CustomFormBuilder, 'ckeditor/formtastic'
   autoload :Middleware,        'ckeditor/middleware'
   autoload :Utils,             'ckeditor/utils'
   
+  module Hooks
+    autoload :FormtasticBuilder, 'ckeditor/hooks/formtastic'
+    autoload :SimpleFormBuilder, 'ckeditor/hooks/simple_form'
+  end
+  
   mattr_accessor :swf_file_post_name
   @@swf_file_post_name = "data"
   

data/lib/ckeditor/engine.rb

@@ -14,7 +14,11 @@ module Ckeditor
       ActionView::Helpers::AssetTagHelper.register_javascript_expansion :ckeditor => ["ckeditor/ckeditor"]
       
       if Object.const_defined?("Formtastic")
-        Formtastic::SemanticFormHelper.builder = Ckeditor::CustomFormBuilder
+        ::Formtastic::SemanticFormBuilder.send :include, Ckeditor::Hooks::FormtasticBuilder
+      end
+      
+      if Object.const_defined?("SimpleForm")
+        ::SimpleForm::FormBuilder.send :include, Ckeditor::Hooks::SimpleFormBuilder
       end
     end
   end

data/lib/ckeditor/hooks/formtastic.rb

@@ -0,0 +1,15 @@
+module Ckeditor
+  module Hooks
+    module FormtasticBuilder
+      def self.included(base)
+        base.send(:include, InstanceMethods)
+      end
+    
+      module InstanceMethods
+        def ckeditor_input(method, options)
+          basic_input_helper(:cktext_area, :text, method, options)
+        end
+      end
+    end
+  end
+end

data/lib/ckeditor/hooks/simple_form.rb

@@ -0,0 +1,28 @@
+module Ckeditor
+  module Hooks
+    module SimpleFormBuilder
+      class CkeditorInput < ::SimpleForm::Inputs::Base
+        def input
+          @builder.send(:cktext_area, attribute_name, input_html_options)
+        end
+      end
+      
+      def self.included(base)
+        base.send(:include, InstanceMethods)
+      end
+    
+      module InstanceMethods
+        def ckeditor(attribute_name, options={}, &block)
+          column     = find_attribute_column(attribute_name)
+          input_type = default_input_type(attribute_name, column, options)
+
+          if block_given?
+            SimpleForm::Inputs::BlockInput.new(self, attribute_name, column, input_type, options, &block).render
+          else
+            CkeditorInput.new(self, attribute_name, column, input_type, options).render
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ckeditor/utils.rb

@@ -1,25 +1,54 @@
 require 'fileutils'
+require 'net/http'
+require 'uri'
 
 module Ckeditor
   module Utils
-
-    # remove the existing install (if any)
-    def self.destroy
-      directory = Rails.root.join('public', 'javascripts', 'ckeditor')
-      if File.exist?(directory)
-        FileUtils.rm_r(directory, :force => true)
+    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
+      
+      def parameterize_filename(filename)
+        extension = File.extname(filename)
+        basename = filename.gsub(/#{extension}$/, "")
+        
+        [basename.parameterize('_'), extension].join.downcase
+      end
+      
+      def download(url, output)
+        uri = URI.parse(url)
+        file = File.open(output, 'w')
+        
+        Net::HTTP.start(uri.host, uri.port) do |http|
+          begin
+            http.request_get(uri.path) do |resp|
+              resp.read_body { |segment| file.write(segment) }
+            end
+          ensure
+            file.close
+          end
+        end
+      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)
       end
-    end
-    
-    def self.escape_single_quotes(str)
-      str.gsub('\\','\0\0').gsub('</','<\/').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }
-    end
-    
-    def self.parameterize_filename(filename)
-      extension = File.extname(filename)
-      basename = filename.gsub(/#{extension}$/, "")
       
-      [basename.parameterize('_'), extension].join.downcase
     end
     
   end