ckeditor 3.4.0 → 3.4.1.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

@@ -10,45 +10,18 @@ CKEditor version: 3.4 (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.0.rc
 
-==Install
-
-===Rails 2.3.8
-
-Via gem:
-  config.gem 'ckeditor', '3.4.0'
-
-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:
+Demo appication (Rails 2.3.x):
+http://github.com/galetahub/rails-ckeditor-demo-app
 
-  ./script/generate ckeditor_migration
-
-For attachment_fu:
-  ./script/generate ckeditor_migration --backend=attachment_fu
-
-Don't forget about migration:
-
-  rake db:migarte
-
-In your environment:
-
-  config.load_paths += %W( #{RAILS_ROOT}/app/models/ckeditor )
-
-===Rails 3.0.0
-
-  gem 'ckeditor', '3.4.0.pre'
+==Install
 
-Or
+===Rails 3
 
+In your appication "Gemfile":
+  gem 'ckeditor', '3.4.1.pre'
+or
   gem 'ckeditor', :git => 'git://github.com/galetahub/rails-ckeditor.git', :branch => 'rails3'
 
 Next step is generate ckeditor js files and configuration file
@@ -68,10 +41,21 @@ For attachment_fu:
 Don't forget about migration:
 
   rake db:migarte
-  
-In your application.rb:
 
-  config.autoload_paths += %W( #{config.root}/app/models/ckeditor )
+===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
+
+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,45 +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
-      # 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 = {}
 	  

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,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"
@@ -54,36 +49,33 @@ 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
-    @@image_model ||= @@file_manager_image_model.to_s.classify.constantize
-    @@image_model
+    @@image_model_ref.get
+  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
+  self.file_manager_image_model = "Ckeditor::Picture"
   
+  # Get the file class from the file reference object.
   def self.file_model
-    @@file_model ||= @@file_manager_file_model.to_s.classify.constantize
-    @@file_model
+    @@file_model_ref.get
   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
+  self.file_manager_file_model = "Ckeditor::AttachmentFile"
+  
   # Default way to setup Ckeditor. Run rails generate ckeditor to create
   # a fresh initializer with all configuration values.
   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 = 0
+    RELEASE = 1
 
     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