Load classes by ActiveSupport::Dependencies.ref

Author: galetahub

app/controllers/ckeditor_controller.rb

@@ -1,26 +1,19 @@
 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
@@ -48,7 +41,7 @@ def create
 
     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]}, '#{escape_single_quotes(@record.url_content)}');
+        window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, '#{Ckeditor::Utils.escape_single_quotes(@record.url_content)}');
       </script>"
 
       render :text => @text
@@ -80,9 +73,4 @@ def swf_options
       @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

ckeditor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ckeditor}
-  s.version = "3.4.0.pre"
+  s.version = "3.4.1.pre"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Galeta"]
-  s.date = %q{2010-08-20}
+  s.date = %q{2010-08-31}
   s.description = %q{CKEditor is a WYSIWYG editor to be used inside web pages}
   s.email = %q{[email protected]}
   s.extra_rdoc_files = [

lib/ckeditor.rb

@@ -49,21 +49,27 @@ 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.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.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.

lib/ckeditor/utils.rb

@@ -2,14 +2,17 @@
 
 module Ckeditor
   module Utils
-    CKEDITOR_INSTALL_DIRECTORY = Rails.root.join('/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
+    
+    def self.escape_single_quotes(str)
+      str.gsub('\\','\0\0').gsub('</','<\/').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }
+    end
   end
 end

lib/ckeditor/version.rb

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