ckeditor 3.4.0.pre → 3.4.0

data/README.rdoc

@@ -10,18 +10,45 @@ CKEditor version: 3.4 (http://ckeditor.com)
 
 SWFUpload version: 2.2.0.1 Core (http://swfupload.org)
 
-Rails version: 3.0.0.rc
-
-Demo appication (Rails 2.3.x):
-http://github.com/galetahub/rails-ckeditor-demo-app
+{Demo appication (Rails 2.3.8)}[http://github.com/galetahub/rails-ckeditor-demo-app]
 
 ==Install
 
-===Rails 3
+===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:
+
+  ./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
 
-In your appication "Gemfile":
   gem 'ckeditor', '3.4.0.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
@@ -41,21 +68,10 @@ For attachment_fu:
 Don't forget about migration:
 
   rake db:migarte
+  
+In your application.rb:
 
-===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".
+  config.autoload_paths += %W( #{config.root}/app/models/ckeditor )
 
 ==Usage
 

data/Rakefile

@@ -7,20 +7,19 @@ require File.join(File.dirname(__FILE__), 'lib', 'ckeditor', 'version')
 desc 'Default: run unit tests.'
 task :default => :test
 
-desc 'Test the rails-ckeditor plugin.'
+desc 'Test the 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 rails-ckeditor plugin.'
+desc 'Generate documentation for the ckeditor plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Rails Ckeditor'
+  rdoc.title    = 'Ckeditor'
   rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.textile')
+  rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
@@ -34,8 +33,10 @@ 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}/**/*"]
+    gemspec.files = FileList["[A-Z]*", "{app,config,lib,generators,examples}/**/*"]
     gemspec.rubyforge_project = "ckeditor"
+    
+    gemspec.add_dependency('mime-types', '>= 1.16')
   end
   
   Jeweler::GemcutterTasks.new

data/app/controllers/ckeditor_controller.rb

@@ -27,15 +27,20 @@ class CkeditorController < ApplicationController
   def create
     @kind = params[:kind] || 'file'
     
-    @record = case @kind.downcase
-      when 'file'  then Ckeditor.file_model.new
-			when 'image' then Ckeditor.image_model.new
-	  end
-	  
-	  unless params[:CKEditor].blank?	  
+    unless params[:CKEditor].blank?	  
 	    params[@swf_file_post_name] = params.delete(:upload)
 	  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
+	  
 	  options = {}
 	  
 	  params.each do |k, v|
@@ -48,7 +53,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]}, '#{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 +85,4 @@ 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,9 +6,10 @@ module CkeditorHelper
       else '/ckeditor/create/default'
     end
     
-    session_key = Rails.application.config.send(:session_options)[:key]
+    session_key = ActionController::Base.session_options[:key]
+    
+    options = ActionController::Routing::Routes.recognize_path(path, :method => :post)
     
-    options = Rails.application.routes.recognize_path(path, :method => :post)
     options[:protocol] = "http://"
     options[session_key] = Rack::Utils.escape(cookies[session_key])
     
@@ -18,4 +19,20 @@ 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 @@
-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'
+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'
 end

data/examples/s3/s3.yml

@@ -0,0 +1,2 @@
+access_key_id: "YOUR KEY ID"
+secret_access_key: "YOUR SECRET KEY"

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

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

data/generators/ckeditor_install/ckeditor_install_generator.rb

@@ -0,0 +1,28 @@
+require 'fileutils'
+
+class CkeditorInstallGenerator < Rails::Generator::Base
+
+  def manifest
+    record do |m|
+      copy_initializer(m)
+      copy_javascripts(m)
+      
+      m.readme "README"
+    end
+  end
+
+  private
+  
+    def copy_initializer(m)
+      m.directory "config/initializers"
+      m.template  "ckeditor.rb", "config/initializers/ckeditor.rb"
+    end
+    
+    def copy_javascripts(m)
+      src_dir = File.join(@source_root, 'ckeditor')
+      dst_dir = File.join(RAILS_ROOT, 'public', 'javascripts')
+      
+      FileUtils.cp_r src_dir, dst_dir, :verbose => true
+    end
+
+end

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

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