ckeditor 3.4.2 → 3.4.3.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,49 +6,22 @@ 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.4.1 (http://ckeditor.com)
+CKEditor version: 3.4.2 (http://ckeditor.com)
 
 SWFUpload version: 2.2.0.1 Core (http://swfupload.org)
 
-{Demo appication (Rails 2.3.8)}[http://github.com/galetahub/rails-ckeditor-demo-app]
+Rails version: 3.0.1
 
-==Install
-
-===Rails 2.3.8
-
-Via gem:
-  config.gem 'ckeditor', '3.4.2'
-
-Via plugin
-  ./script/plugin install git://github.com/galetahub/rails-ckeditor.git
-
-Next step is generate ckeditor js files and configuration file
-Check "config/initializers/ckeditor.rb" for more configuration options:
-  
-  ./script/generate ckeditor_install
-
-Generate ckeditor models for file upload support:
-For paperclip:
-
-  ./script/generate ckeditor_migration
-
-For attachment_fu:
-  ./script/generate ckeditor_migration --backend=attachment_fu
+Demo appication (Rails 2.3.8):
+http://github.com/galetahub/rails-ckeditor-demo-app
 
-Don't forget about migration:
-
-  rake db:migrate
-
-In your environment:
-
-  config.load_paths += %W( #{RAILS_ROOT}/app/models/ckeditor )
-
-===Rails 3.0.0
-
-  gem 'ckeditor', '3.4.2.pre'
+==Install
 
-Or
+===Rails 3
 
+In your appication "Gemfile":
+  gem 'ckeditor', '3.4.3.pre'
+or
   gem 'ckeditor', :git => 'git://github.com/galetahub/rails-ckeditor.git', :branch => 'rails3'
 
 Next step is generate ckeditor js files and configuration file
@@ -67,11 +40,22 @@ For attachment_fu:
 
 Don't forget about migration:
 
-  rake db:migrate
-  
-In your application.rb:
+  rake db:migarte
+
+===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.autoload_paths += %W( #{config.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,7 +34,7 @@ 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')

data/app/controllers/ckeditor_controller.rb

@@ -1,42 +1,33 @@
 class CkeditorController < ApplicationController
   skip_before_filter :verify_authenticity_token, :only => [:create]
   before_filter :swf_options, :only => [:images, :files, :create]
+  respond_to :html, :xml, :json
   layout "ckeditor"
   
   # GET /ckeditor/images
   def images
-    @images = Ckeditor.image_model.find(:all, :order=>"id DESC")
-    
-    respond_to do |format|
-      format.html {}
-      format.xml { render :xml=>@images }
-    end
+    @images = Ckeditor.image_model.order("id DESC")
+    respond_with(@images)
   end
   
   # GET /ckeditor/files
   def files
-    @files = Ckeditor.file_model.find(:all, :order=>"id DESC")
-    
-    respond_to do |format|
-      format.html {}
-      format.xml { render :xml=>@files }
-    end
+    @files = Ckeditor.file_model.order("id DESC")
+    respond_with(@files)
   end
   
   # POST /ckeditor/create/:kind
   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
-      when 'file'  then Ckeditor.file_model
-			when 'image' then Ckeditor.image_model
+	  unless params[:CKEditor].blank?	  
+	    params[@swf_file_post_name] = params.delete(:upload)
 	  end
-  
-	  @record = klass.new
 	  
 	  options = {}
 	  

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
+  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,7 +1,3 @@
-unless ActiveSupport.const_defined?("SafeBuffer")
-  require 'ckeditor/safe_buffer'
-end
-
 module Ckeditor
   autoload :ViewHelper,        'ckeditor/view_helper'
   autoload :FormBuilder,       'ckeditor/form_builder'
@@ -54,20 +50,34 @@ module Ckeditor
   mattr_accessor :file_manager_image_uri
   @@file_manager_image_uri = "/ckeditor/images"
   
-  mattr_accessor :file_manager_image_model
-  @@file_manager_image_model = "Ckeditor::Picture"
-  
-  mattr_accessor :file_manager_file_model
-  @@file_manager_file_model = "Ckeditor::AttachmentFile"
-  
   # Get the image class from the image reference object.
   def self.image_model
-    @@file_manager_image_model.to_s.classify.constantize
+    if self.class_variables.include?(:@@image_model_ref)
+      @@image_model_ref.get 
+    else
+      self.file_manager_image_model = "Ckeditor::Picture"
+      @@image_model_ref.get
+    end
+  end
+  
+  # Set the image model reference object to access the images.
+  def self.file_manager_image_model=(class_name)
+    @@image_model_ref = ActiveSupport::Dependencies.ref(class_name)
   end
   
   # Get the file class from the file reference object.
   def self.file_model
-    @@file_manager_file_model.to_s.classify.constantize
+    if self.class_variables.include?(:@@file_model_ref)
+      @@file_model_ref.get 
+    else
+      self.file_manager_file_model = "Ckeditor::AttachmentFile"
+      @@file_model_ref.get
+    end
+  end
+  
+  # Set the file model reference object to access the files.
+  def self.file_manager_file_model=(class_name)
+    @@file_model_ref = ActiveSupport::Dependencies.ref(class_name)
   end
   
   # Default way to setup Ckeditor. Run rails generate ckeditor to create
@@ -75,15 +85,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,13 +2,12 @@ require 'fileutils'
 
 module Ckeditor
   module Utils
-    CKEDITOR_INSTALL_DIRECTORY = File.join(RAILS_ROOT, '/public/javascripts/ckeditor/')
-    
-    ##################################################################
+
     # remove the existing install (if any)
-    def  self.destroy
-      if File.exist?(CKEDITOR_INSTALL_DIRECTORY)
-        FileUtils.rm_r(CKEDITOR_INSTALL_DIRECTORY)
+    def self.destroy
+      directory = Rails.root.join('public', 'javascripts', 'ckeditor')
+      if File.exist?(directory)
+        FileUtils.rm_r(directory, :force => true)
       end
     end
     

data/lib/ckeditor/version.rb

@@ -2,10 +2,10 @@ module Ckeditor
   module Version
     MAJOR = 3
     MINOR = 4
-    RELEASE = 2
+    RELEASE = 3
 
     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,76 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	<h1>
 		CKEditor Changelog
 	</h1>
+	<h3>
+			CKEditor 3.4.2</h3>
+	<p>
+			New features:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/5024">#5024</a> : Added a sample that shows how to output HTML that is valid for Flash.</li>
+	</ul>
+	<p>
+			Fixed issues:</p>
+	<ul>
+		<li><a href="http://dev.ckeditor.com/ticket/5237">#5237</a> : English text in dialogs' title was flipped when using RTL language (office2003 and v2 skins).</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6289">#6289</a> : Deleting nested table removed the parent cell.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6341">#6341</a> : The editor contents now have the text cursor.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6153">#6153</a> : Chrome: tab focus is wrong.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6261">#6261</a> : Focus and infinite loop between multiple editors.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6170">#6170</a> : Dedicated class names are removed from floating panels when opening another panel.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6339">#6339</a> : Autogrow plugin now doesn't work on maximized editors.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6237">#6237</a> : BIDI: Applying same language direction to all paragraphs not working.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6353">#6353</a> : [IE] Resize was broken with office2003 and v2 skins.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6375">#6375</a> : Avoiding errors when hiding the editor after the blur event.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6133">#6133</a> : Styled paragraphs result on buggy list creation.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5074">#5074</a> : Link target is not removed when changing to popup.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6408">#6408</a> : [IE] Autogrow now works correctly on Quirks.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6420">#6420</a> : [IE] The table properties dialog now correctly retrieves the caption text.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6141">#6141</a> : It was impossible to outdent a list when indentOffset was set to 0.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6377">#6377</a> : FF width and height are not shown for smiley in Image properties dialog.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5399">#5399</a> : Lists pasted from Word do not maintain their nesting.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6225">#6225</a> : [FF] Cannot transform several lines to list with enterMode BR.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6467">#6467</a> : [FF] It is now possible to disable the plugin command on "mode" event.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6461">#6461</a> : Attributes are now being kept when changing block formatting.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6226">#6226</a> : BIDI: Language direction applied to a Paragraph is removed when we apply one of Paragraph formatting options.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5395">#5395</a> : [Opera] Native context menu incorrectly opened after Opera 10.2.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6444">#6444</a> : [Opera] Close panels and dialogs don't return focus to wysiwyg frame.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6332">#6332</a> : IE: V2 skin bottom dialog's border broken.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5646">#5646</a> : Parser incorrectly removes inline element when there's only one comment node enclosed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6189">#6189</a> : Minor code size reduction.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5045">#5045</a> : uiColor behaved wrong if multiple editors were used with period in their names.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5766">#5766</a> : Config entry "ignoreEmptyParagraph" should only remove one single empty paragraph in document.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5931">#5931</a> : Unable to apply inline style because of nested elements with same style name.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6083">#6083</a> : Dialog close sometimes cause collapsed editor selection before the insertion.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6253">#6253</a> : BIDI: creating a Numbered/Bulleted list causing improper behavior on bidi.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4023">#4023</a> : [Opera] Maximize plugin.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6403">#6403</a> : [Opera] Font name options are not correctly marked in dropdown list.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/4534">#4534</a> : [Opera] Arrow key to navigate through combo list has side effects of window scrolling.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6534">#6534</a> : [Opera] Menu key brings up both CKEditor and browser context menu.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6534">#6534</a> : [Opera] Menu key brings up both CKEditor and browser context menu.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6416">#6416</a> : [IE9] Unable to make text selection with mouse in source area.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6417">#6417</a> : [IE9] Context menu opens at the upper-left corner always.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6501">#6501</a> : [IE9] Context menu item layout is broken.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6099">#6099</a> : BIDI: when we apply explicit language direction to Numbered/Bulleted List the corresponding BIDI Tool bar icon is not highlighted in the Toolbar.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6100">#6100</a> : BIDI: when we change Table language direction indentation of text in Table cells is not applied correctly.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6376">#6376</a> : BIDI: buttons should not toggle the base language direction.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6235">#6235</a> : BIDI: Applying direction to multi-paragraph selection within a div.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6187">#6187</a> : [IE6] Multi-instance loading produces 404s on background images.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5446">#5446</a> : Setting config.filebrowserImageBrowseUrl results in displaying also Browser Server on links.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5626">#5626</a> : CKeditor 3.2.1 : html content attached makes ckeditor crash the browser FF/IE.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6508">#6508</a> : BiDi: Margin mirroring logic doesn't honor CSS direction.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6043">#6043</a> : BIDI: When we apply RTL direction to a right aligned Paragraph, Paragraph is not moved to the left & Alignment of Paragraph is not changed.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6485">#6485</a> : BIDI: When direction is applied on partial selected list, the style is been incorrectly applied to the entire list.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6087">#6087</a> : Cursor of input fields in dialog isn't visible in RTL.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5595">#5595</a> : Extra leading spaces added in preformatted block.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6094">#6094</a> : Match full word option doesn't stop on block boundaries.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5730">#5730</a> : [Safari] Continual pastes (holding paste key) breaks document contents.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/5850">#5850</a> : [IE] Inline style misbehaviors at the beginning of numbered/bulleted list.</li>
+		<li>Updated the following language files:<ul>
+			<li><a href="http://dev.ckeditor.com/ticket/6427">#6427</a> : Ukrainian;</li>
+			<li><a href="http://dev.ckeditor.com/ticket/6464">#6464</a> : Finnish;</li>
+			<li>Hebrew;</li>
+		</ul></li>
+	</ul>
 	<h3>
 			CKEditor 3.4.1</h3>
 	<p>