ckeditor 3.3.2 → 3.4.0.pre

data/CHANGELOG

@@ -0,0 +1,15 @@
+0.9.0 - Replaced FCKeditor with CKEditor
+
+0.8.1 - Remove plugin files on uninstall
+
+0.8.0 - Added uninstall rake task
+
+0.8.0 - Refactoring for fckeditor controller
+
+0.8.0 - Added Easy upload plugin http://martinezdelizarrondo.com/easyupload/
+
+0.8.0 - Change for works with FCKeditor 2.6.3
+
+0.2.2 - Added fckeditor_form_remote_tag helper to allow multiple editors in a single form
+
+0.2.1 - Added spell check from Ken Pratt

data/README.rdoc

@@ -6,43 +6,56 @@ 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.3.2 (http://ckeditor.com)
+CKEditor version: 3.4 (http://ckeditor.com)
 
 SWFUpload version: 2.2.0.1 Core (http://swfupload.org)
 
-Rails version: 2.3.8
+Rails version: 3.0.0.rc
 
-Demo appication (Rails 2.3.8):
+Demo appication (Rails 2.3.x):
 http://github.com/galetahub/rails-ckeditor-demo-app
 
 ==Install
 
-Via gem:
-  config.gem 'ckeditor', '3.3.2'
+===Rails 3
 
-Via plugin
-  ./script/plugin install git://github.com/galetahub/rails-ckeditor.git
+In your appication "Gemfile":
+  gem 'ckeditor', '3.4.0.pre'
+or
+  gem 'ckeditor', :git => 'git://github.com/galetahub/rails-ckeditor.git', :branch => 'rails3'
 
 Next step is generate ckeditor js files and configuration file
 Check "config/initializers/ckeditor.rb" for more configuration options:
-  
-  ./script/generate ckeditor_install
+
+  rails generate ckeditor:base
 
 Generate ckeditor models for file upload support:
 For paperclip:
 
-  ./script/generate ckeditor_migration
+  rails generate ckeditor:migration
 
 For attachment_fu:
-  ./script/generate ckeditor_migration --backend=attachment_fu
+
+  rails generate ckeditor:migration --backend=attachment_fu
 
 Don't forget about migration:
 
   rake db:migarte
 
-In your environment:
+===Rails 2.3.x
+
+Install plugin:
+
+  ./script/plugin install git://github.com/galetahub/rails-ckeditor.git
+
+Generate ckeditor core files:
+
+  rake ckeditor:install
+
+This rake generated file config/ckeditor.yml:
+  rake ckeditor:config
 
-  config.load_paths += %W( #{RAILS_ROOT}/app/models/ckeditor )
+For attachment_fu option "swf_file_post_name" must be "uploaded_data".
 
 ==Usage
 

data/Rakefile

@@ -7,19 +7,20 @@ require File.join(File.dirname(__FILE__), 'lib', 'ckeditor', 'version')
 desc 'Default: run unit tests.'
 task :default => :test
 
-desc 'Test the ckeditor plugin.'
+desc 'Test the rails-ckeditor plugin.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
+  t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
 
-desc 'Generate documentation for the ckeditor plugin.'
+desc 'Generate documentation for the rails-ckeditor plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Ckeditor'
+  rdoc.title    = 'Rails Ckeditor'
   rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('README.textile')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
@@ -33,10 +34,8 @@ begin
     gemspec.email = "galeta.igor@gmail.com"
     gemspec.homepage = "http://github.com/galetahub/rails-ckeditor"
     gemspec.authors = ["Igor Galeta"]
-    gemspec.files = FileList["[A-Z]*", "{app,config,lib,generators,examples}/**/*"]
+    gemspec.files = FileList["[A-Z]*", "{app,config,lib}/**/*"]
     gemspec.rubyforge_project = "ckeditor"
-    
-    gemspec.add_dependency('mime-types', '>= 1.16')
   end
   
   Jeweler::GemcutterTasks.new

data/app/controllers/ckeditor_controller.rb

@@ -27,19 +27,14 @@ class CkeditorController < ApplicationController
   def create
     @kind = params[:kind] || 'file'
     
-    unless params[:CKEditor].blank?	  
-	    params[@swf_file_post_name] = params.delete(:upload)
+    @record = case @kind.downcase
+      when 'file'  then Ckeditor.file_model.new
+			when 'image' then Ckeditor.image_model.new
 	  end
 	  
-    klass = case @kind.downcase
-      # TODO: fix issue TypeError (can't dup NilClass)
-      #when 'file'  then Ckeditor.file_model
-			#when 'image' then Ckeditor.image_model
-			when 'file' then Ckeditor::AttachmentFile
-			when 'image' then Ckeditor::Picture
-	  end 
-  
-	  @record = klass.new
+	  unless params[:CKEditor].blank?	  
+	    params[@swf_file_post_name] = params.delete(:upload)
+	  end
 	  
 	  options = {}
 	  
@@ -53,7 +48,7 @@ class CkeditorController < ApplicationController
     
     if @record.valid? && @record.save
       @text = params[:CKEditor].blank? ? @record.to_json(:only=>[:id, :type], :methods=>[:url, :content_type, :size, :filename, :format_created_at], :root => "asset") : %Q"<script type='text/javascript'>
-        window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, '#{Ckeditor::Utils.escape_single_quotes(@record.url_content)}');
+        window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, '#{escape_single_quotes(@record.url_content)}');
       </script>"
       
       render :text => @text
@@ -85,4 +80,9 @@ class CkeditorController < ApplicationController
       @file_types_description ||= "Images"
       @file_upload_limit ||= 10
     end
+    
+    def escape_single_quotes(str)
+      str.gsub('\\','\0\0').gsub('</','<\/').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }
+    end
+  
 end

data/app/helpers/ckeditor_helper.rb

@@ -6,10 +6,9 @@ module CkeditorHelper
       else '/ckeditor/create/default'
     end
     
-    session_key = ActionController::Base.session_options[:key]
-    
-    options = ActionController::Routing::Routes.recognize_path(path, :method => :post)
+    session_key = Rails.application.config.send(:session_options)[:key]
     
+    options = Rails.application.routes.recognize_path(path, :method => :post)
     options[:protocol] = "http://"
     options[session_key] = Rack::Utils.escape(cookies[session_key])
     
@@ -19,20 +18,4 @@ module CkeditorHelper
     
     url_for(options)
   end
-  
-  def file_image_tag(filename, path)
-    extname = File.extname(filename)
-    
-    image = case extname.to_s
-      when '.swf' then '/javascripts/ckeditor/images/swf.gif'
-      when '.pdf' then '/javascripts/ckeditor/images/pdf.gif'
-      when '.doc', '.txt' then '/javascripts/ckeditor/images/doc.gif'
-      when '.mp3' then '/javascripts/ckeditor/images/mp3.gif'
-      when '.rar', '.zip', '.tg' then '/javascripts/ckeditor/images/rar.gif'
-      when '.xls' then '/javascripts/ckeditor/images/xls.gif'
-      else '/javascripts/ckeditor/images/ckfnothumb.gif'
-    end
-    
-    image_tag(image, :alt=>path, :title=>filename, :onerror=>"this.src='/javascripts/ckeditor/images/ckfnothumb.gif'", :class=>'image')
-  end
 end

data/config/routes.rb

@@ -1,5 +1,5 @@
-ActionController::Routing::Routes.draw do |map|
-  map.connect 'ckeditor/images', :controller => 'ckeditor', :action => 'images'
-  map.connect 'ckeditor/files',  :controller => 'ckeditor', :action => 'files'
-  map.connect 'ckeditor/create/:kind', :controller => 'ckeditor', :action => 'create'
+Rails.application.routes.draw do |map|
+  match 'ckeditor/images', :to => 'ckeditor#images'
+  match 'ckeditor/files',  :to => 'ckeditor#files'
+  match 'ckeditor/create/:kind', :to => 'ckeditor#create'
 end

data/lib/ckeditor.rb

@@ -1,13 +1,8 @@
-unless ActiveSupport.const_defined?("SafeBuffer")
-  require 'ckeditor/safe_buffer'
-end
-
 module Ckeditor
   autoload :ViewHelper,        'ckeditor/view_helper'
   autoload :FormBuilder,       'ckeditor/form_builder'
   autoload :CustomFormBuilder, 'ckeditor/formtastic'
   autoload :Middleware,        'ckeditor/middleware'
-  autoload :Utils,             'ckeditor/utils'
   
   mattr_accessor :swf_file_post_name
   @@swf_file_post_name = "data"
@@ -61,12 +56,12 @@ module Ckeditor
   @@file_manager_file_model = "Ckeditor::AttachmentFile"
   
   def self.image_model
-    @@image_model ||= @@file_manager_image_model.to_s.classify.constantize
+    @@image_model ||= @@file_manager_image_model.to_s.constantize
     @@image_model
   end
   
   def self.file_model
-    @@file_model ||= @@file_manager_file_model.to_s.classify.constantize
+    @@file_model ||= @@file_manager_file_model.to_s.constantize
     @@file_model
   end
   
@@ -75,15 +70,6 @@ module Ckeditor
   def self.setup
     yield self
   end
-  
-  def self.insert
-    ActionView::Base.send(:include, Ckeditor::ViewHelper)
-    ActionView::Helpers::FormBuilder.send(:include, Ckeditor::FormBuilder)
-    
-    ActionView::Helpers::AssetTagHelper.register_javascript_expansion :ckeditor => ["ckeditor/ckeditor"]
-    
-    if Object.const_defined?("Formtastic")
-      Formtastic::SemanticFormHelper.builder = Ckeditor::CustomFormBuilder
-    end
-  end
 end
+
+require 'ckeditor/engine'

data/lib/ckeditor/engine.rb

@@ -0,0 +1,21 @@
+module Ckeditor
+  class Engine < ::Rails::Engine
+    initializer "ckeditor_engine.add_middleware" do |app|
+      app.middleware.insert_before(
+        ActionDispatch::Cookies,
+        "Ckeditor::Middleware",
+        app.config.send(:session_options)[:key])
+    end
+
+    config.after_initialize do
+      ActionView::Base.send :include, Ckeditor::ViewHelper
+      ActionView::Helpers::FormBuilder.send :include, Ckeditor::FormBuilder
+      
+      ActionView::Helpers::AssetTagHelper.register_javascript_expansion :ckeditor => ["ckeditor/ckeditor"]
+      
+      if Object.const_defined?("Formtastic")
+        Formtastic::SemanticFormHelper.builder = Ckeditor::CustomFormBuilder
+      end
+    end
+  end
+end

data/lib/ckeditor/utils.rb

@@ -2,8 +2,8 @@ require 'fileutils'
 
 module Ckeditor
   module Utils
-    CKEDITOR_INSTALL_DIRECTORY = File.join(RAILS_ROOT, '/public/javascripts/ckeditor/')
-    
+    CKEDITOR_INSTALL_DIRECTORY = Rails.root.join('/public/javascripts/ckeditor/')
+
     ##################################################################
     # remove the existing install (if any)
     def  self.destroy
@@ -11,9 +11,5 @@ module Ckeditor
         FileUtils.rm_r(CKEDITOR_INSTALL_DIRECTORY)
       end
     end
-    
-    def self.escape_single_quotes(str)
-      str.gsub('\\','\0\0').gsub('</','<\/').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }
-    end
   end
 end

data/lib/ckeditor/version.rb

@@ -1,11 +1,11 @@
 module Ckeditor
   module Version
     MAJOR = 3
-    MINOR = 3
-    RELEASE = 2
+    MINOR = 4
+    RELEASE = 0
 
     def self.dup
-      "#{MAJOR}.#{MINOR}.#{RELEASE}"
+      "#{MAJOR}.#{MINOR}.#{RELEASE}.pre"
     end
   end
 end

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/USAGE

@@ -4,4 +4,4 @@ CKEditor
 # Copy ckeditor's core files into 'public/javascripts' 
 # and generate configuration file in 'config/initializers/ckeditor.rb'
 
-./script/generate ckeditor_install
+rails generate ckeditor:base

data/lib/generators/ckeditor/base/base_generator.rb

@@ -0,0 +1,20 @@
+require 'rails/generators'
+
+module Ckeditor
+  class BaseGenerator < Rails::Generators::Base
+
+    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
+      directory "ckeditor", "public/javascripts/ckeditor"
+    end
+  end
+end

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor.rb

@@ -51,6 +51,4 @@ if Object.const_defined?("Ckeditor")
     #config.file_manager_image_model = "Ckeditor::Picture"
     #config.file_manager_file_model = "Ckeditor::AttachmentFile"
   end
-  
-  Ckeditor.insert
 end

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/CHANGES.html

@@ -34,6 +34,37 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	<h1>
 		CKEditor Changelog
 	</h1>
+	<h3>
+			CKEditor 3.4</h3>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.fckeditor.net/ticket/6118">#6118</a> : Initial focus is now set to the tabs in the table properties dialog.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/6135">#6135</a> : The dialogadvtab plugin now uses the correct label.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/6125">#6125</a> : Focus was lost after applying commands in Opera.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/6137">#6137</a> : The table dialog was missing the default width value on second opening.</li>
+	</ul>
+	<h3>
+			CKEditor 3.4 Beta</h3>
+	<p>
+			New features:</p>
+	<ul>
+		<li><a href="http://dev.fckeditor.net/ticket/5909">#5909</a> : New BiDi feature, making it possible to switch the base language direction of block elements.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5268">#5268</a> : Introducing the "tableresize" plugin, which makes it possible to resize tables columns by mouse drag. It's not enabled by default, so it must be enabled in the configurations file.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/979">#979</a> : New <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.enableTabKeyTools">enableTabKeyTools</a> configuration to allow using the TAB key to navigate through table cells.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/4606">#4606</a> : Introduce the "autogrow" plugin, which makes the editor resize automatically, based on the contents size.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5737">#5737</a> : Added support for the <a href="http://www.w3.org/TR/html5/editing.html#contenteditable">HTML5 contenteditable attribute</a>, making it possible to define read only regions into the editor contents.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5418">#5418</a> : New "Advanced" tab introduced on the Table Properties dialog. It's based on the new dialogadvtab plugin.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/6082">#6082</a> : Introduced the <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.useComputedState">useComputedState</a> setting, making it possible to control whether toolbar features, like alignment and direction, should reflect the "computed" selection states, even when the effective feature value is not applied.</li>
+	</ul>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.fckeditor.net/ticket/5911">#5911</a> : BiDi: List items should support and retain correct base language direction</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5689">#5689</a> : Make it possible to run CKEditor inside of Firefox chrome.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/6042">#6042</a> : It wasn't possible to align a paragraph with the dir attribute to the opposite direction.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/6058">#6058</a> : Fixed a small style glitch with file upload fields in IE+Quirks.</li>
+	</ul>
 	<h3>
 			CKEditor 3.3.2</h3>
 	<p>

data/lib/generators/ckeditor/base/templates/ckeditor/_samples/autogrow.html

@@ -0,0 +1,75 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>AutoGrow Plugin - CKEditor Sample</title>
+	<meta content="text/html; charset=utf-8" http-equiv="content-type" />
+	<script type="text/javascript" src="../ckeditor.js"></script>
+	<script src="sample.js" type="text/javascript"></script>
+	<link href="sample.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+	<h1>
+		CKEditor Sample
+	</h1>
+	<!-- This <div> holds alert messages to be display in the sample page. -->
+	<div id="alerts">
+		<noscript>
+			<p>
+				<strong>CKEditor requires JavaScript to run</strong>. In a browser with no JavaScript
+				support, like yours, you should still see the contents (HTML data) and you should
+				be able to edit it normally, without a rich editor interface.
+			</p>
+		</noscript>
+	</div>
+	<form action="sample_posteddata.php" method="post">
+		<p>
+			In this sample the AutoGrow plugin is available. It makes the editor grow to fit the size of the content.</p>
+		<p>
+			<label for="editor1">
+				With default configuration:</label><br />
+			<textarea cols="80" id="editor1" name="editor1" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+			<script type="text/javascript">
+			//<![CDATA[
+
+				CKEDITOR.replace( 'editor1', {
+					extraPlugins : 'autogrow'
+				});
+
+			//]]>
+			</script>
+		</p>
+		<p>
+			<label for="editor2">
+				With maximum height set to 400:</label><br />
+			<textarea cols="80" id="editor2" name="editor2" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+			<script type="text/javascript">
+			//<![CDATA[
+
+				CKEDITOR.replace( 'editor2', {
+					extraPlugins : 'autogrow',
+					autoGrow_maxHeight : 400
+				});
+
+			//]]>
+			</script>
+		</p>
+		<p>
+			<input type="submit" value="Submit" />
+		</p>
+	</form>
+	<div id="footer">
+		<hr />
+		<p>
+			CKEditor - The text editor for Internet - <a href="http://ckeditor.com/">http://ckeditor.com</a>
+		</p>
+		<p id="copy">
+			Copyright &copy; 2003-2010, <a href="http://cksource.com/">CKSource</a> - Frederico
+			Knabben. All rights reserved.
+		</p>
+	</div>
+</body>
+</html>