ckeditor 3.4.3 → 3.5.0

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

@@ -1,4 +1,4 @@
-=Rails CKEditor integration plugin with SWFUpload support
+= Rails CKEditor integration plugin with SWFUpload support
 
 CKEditor is a text editor to be used inside web pages. It's a WYSIWYG editor, which means that the text being edited on it looks as similar as possible to 
 the results users have when publishing it. It brings to the web common editing features found on desktop editing applications like Microsoft Word and OpenOffice.
@@ -6,49 +6,24 @@ 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.2 (http://ckeditor.com)
+CKEditor version: 3.5 (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.3
 
-==Install
+Demo appication (Rails 2.3.8):
+http://github.com/galetahub/rails-ckeditor-demo-app
 
-===Rails 2.3.8
+== Install
 
-Via gem:
-  config.gem 'ckeditor', '3.4.3'
+=== Rails 3
 
-Via plugin
-  ./script/plugin install git://github.com/galetahub/rails-ckeditor.git
+In your appication "Gemfile":
 
-Next step is generate ckeditor js files and configuration file
-Check "config/initializers/ckeditor.rb" for more configuration options:
+  gem 'ckeditor', '3.5.0'
   
-  ./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
-
-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'
-
-Or
-
+or
   gem 'ckeditor', :git => 'git://github.com/galetahub/rails-ckeditor.git', :branch => 'rails3'
 
 Next step is generate ckeditor js files and configuration file
@@ -67,18 +42,16 @@ For attachment_fu:
 
 Don't forget about migration:
 
-  rake db:migrate
-  
-In your application.rb:
-
-  config.autoload_paths += %W( #{config.root}/app/models/ckeditor )
+  rake db:migarte
 
-==Usage
+== Usage
 
 Basically include this in the page you wish to use the editor in:
+
   <%= javascript_include_tag :ckeditor %>
 
 Then instead of the normal textarea helper from Rails use this one:
+
   <%= ckeditor_textarea("object", "field", :width => '100%', :height => '200px') %>
 
 FormBuilder helper for more usefully:
@@ -91,7 +64,8 @@ FormBuilder helper for more usefully:
     ...
   <% end -%>
   
-===Support options
+=== Support options
+
   :cols         # Textarea cols (default: 70)
   :rows         # Textarea rows (default: 20)
   :width        # Editor width (default: 100%)
@@ -105,12 +79,14 @@ FormBuilder helper for more usefully:
   :index        # element id index 
 
 For configure ckeditor default options check:
+
   public/javascripts/ckeditor/config.js
   
 This stylesheet use editor for displaying edit area:
+
   public/javascripts/ckeditor/contents.css
   
-===AJAX
+=== AJAX
 
 To use a remote form you need to call "ckeditor_ajax_script" helper method:
 
@@ -120,6 +96,8 @@ To use a remote form you need to call "ckeditor_ajax_script" helper method:
     <%= form.cktext_area("note", "about") %>
     ...
     <%= ckeditor_ajax_script %>
+    ...
+    <%= form.submit "Save" %>
   <% end %>
 
 Helper "ckeditor_ajax_script" generate next script (jquery):
@@ -134,7 +112,7 @@ Helper "ckeditor_ajax_script" generate next script (jquery):
     });
   </script>
 
-==File uploads
+== File uploads
 
 We recommend using a paperclip plugin for file storage and processing images. Controller @../rails-ckeditor/app/controllers/ckeditor_controller.rb@ has actions 
 for displaying and uploading files. It uses classes Picture and AttachmentFile, who are descendants of the Asset class. So, your project must have these classes.
@@ -143,19 +121,20 @@ for displaying and uploading files. It uses classes Picture and AttachmentFile,
 
 For S3 storage look at "../ckeditor/examples/s3"
 
-==Formtastic integration
+== Formtastic integration
+
 Ckeditor detects if your use Formtastic and appends "Ckeditor::CustomFormBuilder".
 
   <%= form.input :content, :as => :ckeditor %>
 
-==Middleware
+== Middleware
 
 Ckeditor appends middleware ("Ckeditor::Middleware") before session store to 
 support swf upload with AuthenticityToken.
 
   rake middleware
 
-==TODOs
+== TODOs
 
 1. Add support for choose filemanager storage
 2. More integration upload system

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/attachments_controller.rb

@@ -0,0 +1,23 @@
+class Ckeditor::AttachmentsController < Ckeditor::BaseController
+
+  def index
+    @attachments = Ckeditor.file_model.order("id DESC")
+    respond_with(@attachments)
+  end
+  
+  def create
+    @attachment = Ckeditor.file_model.new
+	  respond_with_asset(@attachment)
+  end
+  
+  def destroy
+    @attachment.destroy
+    respond_with(@attachment)
+  end
+  
+  protected
+  
+    def find_asset
+      @attachment = Ckeditor.file_model.find(params[:id])
+    end
+end

data/app/controllers/ckeditor/base_controller.rb

@@ -0,0 +1,60 @@
+class Ckeditor::BaseController < ApplicationController
+  skip_before_filter :verify_authenticity_token, :only => [:create]
+  
+  before_filter :swf_options, :only => [:index, :create]
+  before_filter :find_asset, :only => [:destroy]
+  
+  respond_to :html, :xml, :json
+  
+  layout "ckeditor"
+
+  protected
+    
+    def swf_options
+      @swf_file_post_name = Ckeditor.swf_file_post_name
+      
+      if params[:controller] == 'ckeditor/pictures'
+        @file_size_limit        = Ckeditor.swf_image_file_size_limit
+			  @file_types             = Ckeditor.swf_image_file_types
+			  @file_types_description = Ckeditor.swf_image_file_types_description
+			  @file_upload_limit      = Ckeditor.swf_image_file_upload_limit
+		  else
+		    @file_size_limit        = Ckeditor.swf_file_size_limit
+		    @file_types             = Ckeditor.swf_file_types
+		    @file_types_description = Ckeditor.swf_file_types_description
+		    @file_upload_limit      = Ckeditor.swf_file_upload_limit
+		  end
+      
+      @swf_file_post_name ||= 'data'
+      @file_size_limit ||= "5 MB"
+      @file_types ||= "*.jpg;*.jpeg;*.png;*.gif"
+      @file_types_description ||= "Images"
+      @file_upload_limit ||= 10
+    end
+    
+    def respond_with_asset(record)
+      unless params[:CKEditor].blank?	  
+	      params[@swf_file_post_name] = params.delete(:upload)
+	    end
+	    
+	    options = {}
+	    
+	    params.each do |k, v|
+	      key = k.to_s.downcase
+	      options[key] = v if record.respond_to?("#{key}=")
+	    end
+      
+      record.attributes = options
+      record.user ||= current_user if respond_to?(:current_user)
+      
+      if record.valid? && record.save
+        body = 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)}');
+        </script>"
+        
+        render :text => body
+      else
+        render :nothing => true
+      end
+    end
+end

data/app/controllers/ckeditor/pictures_controller.rb

@@ -0,0 +1,23 @@
+class Ckeditor::PicturesController < Ckeditor::BaseController
+
+  def index
+    @pictures = Ckeditor.image_model.order("id DESC")
+    respond_with(@pictures) 
+  end
+  
+  def create
+    @picture = Ckeditor.image_model.new
+	  respond_with_asset(@picture)
+  end
+  
+  def destroy
+    @picture.destroy
+    respond_with(@picture)
+  end
+  
+  protected
+  
+    def find_asset
+      @picture = Ckeditor.image_model.find(params[:id])
+    end
+end

data/app/helpers/ckeditor/base_helper.rb

@@ -0,0 +1,21 @@
+module Ckeditor::BaseHelper
+  def ckeditor_attachment_path(kind)
+    path = case kind
+      when :image then Ckeditor.file_manager_image_upload_uri
+      when :file  then Ckeditor.file_manager_upload_uri
+      else '/ckeditor/create/default'
+    end
+    
+    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])
+    
+    if protect_against_forgery?
+      options[request_forgery_protection_token] = Rack::Utils.escape(form_authenticity_token)
+    end
+    
+    url_for(options)
+  end
+end

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

@@ -0,0 +1,91 @@
+<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">
+	<tbody>
+	<tr>
+		<td class="TB_ToolbarSet" id="nv"></td>
+	</tr>
+
+	<tr id="fj" style='display:none;'>
+		<td style="white-space: normal;" class="FCKUploadArea">
+			<div class="PopupTitle">
+				<span>Upload New Files</span>
+			</div>
+			<div id="cY">
+				<table cellspacing="0" cellpadding="0" style="padding: 10px;">
+					<tbody>
+					<tr>
+						<td>
+              <span id='spanButtonPlaceholder'></span>
+              <div id="divFileProgressContainer" style="clear:both;"></div>
+              
+							<%= render :partial => "ckeditor/swfupload" %>
+						</td>
+					</tr>
+				  </tbody>
+			  </table>
+			  <div class="PopupButtons">
+				  <div style="width: 100%;">
+					  <table width="100%" cellspacing="0" cellpadding="0">
+						  <tbody><tr>
+							  <td width="100%"></td>
+							  <td nowrap="nowrap">
+								  <button onclick="uploadButton()" class="Button"><span ckf:lang="CancelBtn">Cancel</span></button>
+							  </td>
+						  </tr>
+					  </tbody></table>
+				  </div>
+			  </div>
+			</div>
+		</td>
+	</tr>
+
+	<tr>
+		<td style="height: 100%;" id="qu">
+		  <div style="overflow:auto; height:550px;" id='container'>
+			 <%= render :partial => "ckeditor/asset", :collection => @attachments, :as => :asset %>
+		  </div>
+		</td>
+	</tr>
+</tbody>
+</table>

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

@@ -0,0 +1,91 @@
+<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">
+	<tbody>
+	<tr>
+		<td class="TB_ToolbarSet" id="nv"></td>
+	</tr>
+
+	<tr id="fj" style='display:none;'>
+		<td style="white-space: normal;" class="FCKUploadArea">
+			<div class="PopupTitle">
+				<span>Upload New Files</span>
+			</div>
+			<div id="cY">
+				<table cellspacing="0" cellpadding="0" style="padding: 10px;">
+					<tbody>
+					<tr>
+						<td>
+              <span id='spanButtonPlaceholder'></span>
+              <div id="divFileProgressContainer" style="clear:both;"></div>
+              
+							<%= render :partial => "ckeditor/swfupload" %>
+						</td>
+					</tr>
+				  </tbody>
+			  </table>
+			  <div class="PopupButtons">
+				  <div style="width: 100%;">
+					  <table width="100%" cellspacing="0" cellpadding="0">
+						  <tbody><tr>
+							  <td width="100%"></td>
+							  <td nowrap="nowrap">
+								  <button onclick="uploadButton()" class="Button"><span ckf:lang="CancelBtn">Cancel</span></button>
+							  </td>
+						  </tr>
+					  </tbody></table>
+				  </div>
+			  </div>
+			</div>
+		</td>
+	</tr>
+
+	<tr>
+		<td style="height: 100%;" id="qu">
+		  <div style="overflow:auto; height:550px;" id='container'>
+			 <%= render :partial => "ckeditor/asset", :collection => @pictures, :as => :asset %>
+		  </div>
+		</td>
+	</tr>
+</tbody>
+</table>