ckeditor 3.6.3 → 3.7.0.rc1

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec
 
-gem "rails", "3.0.9"
+gem "rails", "3.1.3"
 
 platforms :mri_18 do
   group :test do

data/README.rdoc

@@ -5,7 +5,7 @@ the results users have when publishing it. It brings to the web common editing f
 
 == Features
 
-* Rails 3 integration
+* Rails 3.1 integration
 * Files browser
 * HTML5 files uploader
 * Hooks for formtastic and simple_form forms generators
@@ -14,23 +14,13 @@ the results users have when publishing it. It brings to the web common editing f
 
 == Install
 
-  gem install ckeditor
+Rails 3.1:
 
-Or via bundler:
+  gem "ckeditor", "3.7.0.rc1"
 
-  gem "ckeditor"
+Rails <= 3.0:
 
-=== Download ckeditor
-  
-  rails generate ckeditor:install
-
-You can pass version of ckeditor to download (http://ckeditor.com/download/releases):
-
-  rails generate ckeditor:install --version=3.5.4
-
-=== Install destination
-
-  rails generate ckeditor:install --path=public/assets
+  gem "ckeditor", "3.6.3"
 
 === Now generate models for store uploading files
 
@@ -40,27 +30,27 @@ For active_record orm is used paperclip gem (it's by default).
 
   gem "paperclip"
   
-  rails generate ckeditor:models --orm=active_record --backend=paperclip
+  rails generate ckeditor:install --orm=active_record --backend=paperclip
   
 ==== ActiveRecord + carrierwave
 
   gem "carrierwave"
   gem "mini_magick"
 
-  rails generate ckeditor:models --orm=active_record --backend=carrierwave
+  rails generate ckeditor:install --orm=active_record --backend=carrierwave
 
 ==== Mongoid + paperclip
 
   gem 'mongoid-paperclip', :require => 'mongoid_paperclip'
   
-  rails generate ckeditor:models --orm=mongoid --backend=paperclip
+  rails generate ckeditor:install --orm=mongoid --backend=paperclip
 
 ==== Mongoid + carrierwave
 
   gem "carrierwave-mongoid", :require => 'carrierwave/mongoid'
   gem "mini_magick"
 
-  rails generate ckeditor:models --orm=mongoid --backend=carrierwave
+  rails generate ckeditor:install --orm=mongoid --backend=carrierwave
 
 Available orms:
 * active_record
@@ -74,14 +64,14 @@ Autoload ckeditor models folder (application.rb):
 
 == Usage
 
-Include ckeditor javascripts:
+Include ckeditor javascripts rails 3.1:
 
-  <%= javascript_include_tag :ckeditor %>
+  //= require ckeditor/ckeditor
 
-or (for rails 3.1):
+Rails <= 3.0:
+
+  <%= javascript_include_tag :ckeditor %>
 
-  <%= javascript_include_tag "/javascripts/ckeditor/ckeditor.js" %>
-  
 Form helpers:
 
   cktext_area_tag("test_area", "Ckeditor is the best")

data/app/assets/javascripts/ckeditor/application.js

@@ -0,0 +1,5 @@
+//= require ckeditor/filebrowser/javascripts/jquery.min.js
+//= require ckeditor/filebrowser/javascripts/jquery.tmpl.min.js
+//= require ckeditor/filebrowser/javascripts/fileuploader.js
+//= require ckeditor/filebrowser/javascripts/rails.js
+//= require ckeditor/filebrowser/javascripts/application.js

data/app/assets/stylesheets/ckeditor/application.css

@@ -0,0 +1,6 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require ckeditor/filebrowser/stylesheets/uploader.css
+*/

data/app/controllers/ckeditor/{base_controller.rb → application_controller.rb}

@@ -1,6 +1,5 @@
-class Ckeditor::BaseController < ApplicationController
+class Ckeditor::ApplicationController < ::ApplicationController
   respond_to :html, :json
-  layout "ckeditor"
   
   before_filter :set_locale
   before_filter :find_asset, :only => [:destroy]

data/app/controllers/ckeditor/attachment_files_controller.rb

@@ -1,4 +1,4 @@
-class Ckeditor::AttachmentFilesController < Ckeditor::BaseController
+class Ckeditor::AttachmentFilesController < Ckeditor::ApplicationController
 
   def index
     @attachments = Ckeditor.attachment_file_model.find_all(ckeditor_attachment_files_scope)
@@ -12,7 +12,7 @@ class Ckeditor::AttachmentFilesController < Ckeditor::BaseController
   
   def destroy
     @attachment.destroy
-    respond_with(@attachment, :location => ckeditor_attachment_files_path)
+    respond_with(@attachment, :location => attachment_files_path)
   end
   
   protected

data/app/controllers/ckeditor/pictures_controller.rb

@@ -1,4 +1,4 @@
-class Ckeditor::PicturesController < Ckeditor::BaseController
+class Ckeditor::PicturesController < Ckeditor::ApplicationController
 
   def index
     @pictures = Ckeditor.picture_model.find_all(ckeditor_pictures_scope)
@@ -12,7 +12,7 @@ class Ckeditor::PicturesController < Ckeditor::BaseController
   
   def destroy
     @picture.destroy
-    respond_with(@picture, :location => ckeditor_pictures_path)
+    respond_with(@picture, :location => pictures_path)
   end
   
   protected

data/app/views/ckeditor/shared/_asset.html.erb

@@ -1,5 +1,5 @@
 <%= content_tag(:div, :id => dom_id(asset), :class => "gal-item", :"data-url" => asset.url_content) do %>
-  <%= link_to image_tag("#{Ckeditor.relative_path}/ckeditor/filebrowser/images/gal_del.png", 
+  <%= link_to image_tag("/assets/ckeditor/filebrowser/images/gal_del.png", 
     :title => I18n.t('ckeditor.buttons.delete')), 
           polymorphic_path(asset, :format => :json), 
           :remote => true,
@@ -13,7 +13,7 @@
 			<div class="img-name"><%= asset.filename %></div>
 			<div class="time-size">
 				<div class="time"><%= asset.format_created_at %></div>
-				<div class="fileupload-size size"><%= number_to_human_size(asset.size) %></div>
+				<div class="fileupload-size size"><%= number_to_human_size(asset.size) if asset.size %></div>
 			</div>
 		</div>
 	</div>

data/app/views/ckeditor/shared/_asset_tmpl.html.erb

@@ -1,6 +1,6 @@
 <script id="fileupload_tmpl" type="text/x-jquery-tmpl">
 <div id="asset_${id}" class="gal-item" data-url="${url_content}">
-  <%= link_to image_tag("#{Ckeditor.relative_path}/ckeditor/filebrowser/images/gal_del.png", 
+  <%= link_to image_tag("/assets/ckeditor/filebrowser/images/gal_del.png", 
     :title => I18n.t('ckeditor.buttons.delete')), 
           "/ckeditor/${controller}/${id}.json", 
           :remote => true,

data/app/views/layouts/{ckeditor.html.erb → ckeditor/application.html.erb}

@@ -6,18 +6,10 @@
 	<%= csrf_meta_tag %>
 	<%= tag(:meta, :name => "ckeditor-path", :content => Ckeditor.relative_path) %>
   <title><%= I18n.t('page_title', :scope => [:ckeditor]) %></title>
-  <link href="<%= Ckeditor.relative_path %>/ckeditor/filebrowser/stylesheets/uploader.css" type="text/css" rel="stylesheet">
-  <style type="text/css">
-    .gal-holder .gal-item .gal-upload-holder .add {
-	    background: url(<%= Ckeditor.relative_path %>/ckeditor/filebrowser/images/gal_add.png) no-repeat left center;
-    }
-    .gal-more a {
-	    background: url(<%= Ckeditor.relative_path %>/ckeditor/filebrowser/images/gal_more.gif) no-repeat left center;
-    }
-  </style>
-  <% ["jquery.js", "jquery.tmpl.js", "fileuploader.js", "rails.js", "application.js"].each do |js| %>
-    <script src="<%= Ckeditor.relative_path %>/ckeditor/filebrowser/javascripts/<%= js %>" type="text/javascript"></script>
-  <% end %>
+  
+  <%= stylesheet_link_tag "ckeditor/application" %>
+  <%= javascript_include_tag "ckeditor/application" %>
+  
   <script type="text/javascript">
     var CKEditorFuncNum = $.QueryString["CKEditorFuncNum"];
 	  var CKEditorName = $.QueryString["CKEditor"];

data/config/locales/sv-SE.ckeditor.yml

@@ -0,0 +1,8 @@
+"sv-SE":
+  ckeditor:
+    page_title: "CKEditor filhanterare"
+    confirm_delete: "Ta bort fil?"
+    buttons:
+      cancel: "Avbryt"
+      upload: "Ladda upp"
+      delete: "Ta bort"

data/config/locales/zh-CN.ckeditor.yml

@@ -0,0 +1,8 @@
+zh-CN:
+  ckeditor:
+    page_title: "CKEditor - 文件管理"
+    confirm_delete: "删除文件?"
+    buttons:
+      cancel: "取消"
+      upload: "上传"
+      delete: "删除"

data/config/routes.rb

@@ -1,6 +1,4 @@
-Rails.application.routes.draw do
-  namespace :ckeditor, :only => [:index, :create, :destroy] do
-    resources :pictures
-    resources :attachment_files
-  end
+Ckeditor::Engine.routes.draw do
+  resources :pictures, :only => [:index, :create, :destroy]
+  resources :attachment_files, :only => [:index, :create, :destroy]
 end

data/lib/ckeditor.rb

@@ -14,7 +14,6 @@ module Ckeditor
   end
   
   module Hooks
-    autoload :FormtasticBuilder, 'ckeditor/hooks/formtastic'
     autoload :SimpleFormBuilder, 'ckeditor/hooks/simple_form'
   end
   
@@ -34,8 +33,8 @@ module Ckeditor
   @@attachment_file_types = ["doc", "docx", "xls", "odt", "ods", "pdf", "rar", "zip", "tar", "tar.gz", "swf"]
   
   # Ckeditor files destination path
-  mattr_accessor :path
-  @@path = 'public/javascripts'
+  mattr_accessor :relative_path
+  @@relative_path = '/assets/ckeditor'
   
   # Default way to setup Ckeditor. Run rails generate ckeditor to create
   # a fresh initializer with all configuration values.
@@ -50,19 +49,6 @@ module Ckeditor
   def self.attachment_file_model
     Ckeditor::AttachmentFile.to_adapter
   end
-  
-  def self.relative_path
-    @@relative_path ||= File.join("/", Rails.root.join(path).relative_path_from(public_path).to_s)
-  end
-  
-  def self.public_path
-    Rails.root.join('public')
-  end
-  
-  def self.path=(value)
-    @@relative_path = nil
-    @@path = value
-  end
 end
 
 require 'ckeditor/engine'

data/lib/ckeditor/engine.rb

@@ -1,7 +1,10 @@
 require 'rails'
+require 'ckeditor'
 
 module Ckeditor
   class Engine < ::Rails::Engine
+    isolate_namespace Ckeditor
+    
     config.action_view.javascript_expansions[:ckeditor] = "ckeditor/ckeditor"
     
     initializer "ckeditor.helpers" do
@@ -18,7 +21,7 @@ module Ckeditor
     
     initializer "ckeditor.hooks" do
       if Object.const_defined?("Formtastic")
-        ::Formtastic::SemanticFormBuilder.send :include, Ckeditor::Hooks::FormtasticBuilder
+        require "ckeditor/hooks/formtastic"
       end
       
       if Object.const_defined?("SimpleForm")

data/lib/ckeditor/hooks/formtastic.rb

@@ -1,15 +1,12 @@
-module Ckeditor
-  module Hooks
-    module FormtasticBuilder
-      def self.included(base)
-        base.send(:include, InstanceMethods)
-      end
-    
-      module InstanceMethods
-        def ckeditor_input(method, options)
-          basic_input_helper(:cktext_area, :text, method, options)
-        end
-      end
+require "formtastic"
+
+class CkeditorInput
+  include ::Formtastic::Inputs::Base
+  
+  def to_html
+    input_wrapping do
+      label_html <<
+      builder.cktext_area(method, input_html_options)
     end
   end
 end

data/lib/ckeditor/orm/active_record.rb

@@ -12,7 +12,7 @@ module Ckeditor
         module ClassMethods
           def self.extended(base)
             base.class_eval do
-              set_table_name "ckeditor_assets"
+              self.table_name = "ckeditor_assets"
               
               belongs_to :assetable, :polymorphic => true
               

data/lib/ckeditor/utils.rb

@@ -13,11 +13,6 @@ module Ckeditor
         [basename.parameterize('_'), extension].join.downcase
       end
       
-      def extract(filepath, output)
-        # TODO: need check system OS
-        system("tar --exclude=*.php --exclude=*.asp -C '#{output}' -xzf '#{filepath}' ckeditor/")
-      end
-      
       def js_replace(dom_id, options = {})
         js_options = applay_options(options)
         js = ["if (CKEDITOR.instances['#{dom_id}']) {CKEDITOR.remove(CKEDITOR.instances['#{dom_id}']);}"]
@@ -48,7 +43,7 @@ module Ckeditor
         
         js_options = applay_options(options)
         
-        "$(document).ready(function(){ new qq.FileUploaderInput({ #{js_options} }); });"
+        "$(document).ready(function(){ new qq.FileUploaderInput({ #{js_options} }); });".html_safe
       end
       
       def applay_options(options)
@@ -66,11 +61,23 @@ module Ckeditor
             else value
           end
           
-          str << "#{key}: #{item}"
+          str << %Q{"#{key}": #{item}}
         end
         
         str.sort.join(',')
       end
+      
+      def filethumb(filename)
+        extname = filename.blank? ? "unknown" : File.extname(filename).gsub(/^\./, '')
+	      image = "#{extname}.gif"
+	      source = File.expand_path("../../../vendor/assets/javascripts/ckeditor/filebrowser/images/thumbs", __FILE__)
+	      
+	      unless File.exists?(File.join(source, image))
+	        image = "unknown.gif"
+	      end
+	      
+	      File.join(Ckeditor.relative_path, "filebrowser/images/thumbs", image)
+      end
     end
   end
 end

data/lib/ckeditor/version.rb

@@ -1,6 +1,6 @@
 module Ckeditor
   module Version
-    GEM = "3.6.3".freeze
+    GEM = "3.7.0.rc1".freeze
     EDITOR = "3.6.2".freeze
   end
 end

data/lib/generators/ckeditor/install_generator.rb

@@ -1,85 +1,78 @@
 require 'rails/generators'
-require 'fileutils'
+require 'rails/generators/migration'
 
 module Ckeditor
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      class_option :version, :type => :string, :default => Ckeditor::Version::EDITOR,
-                   :desc => "Version of ckeditor which be install (by default #{Ckeditor::Version::EDITOR})"
+      include Rails::Generators::Migration
 
-      class_option :orm, :type => :string, :default => 'active_record',
-                   :desc => "Backend processor for upload support (by default active_record)"
+      desc "Generates migration for Asset (Picture, AttachmentFile) models"
+      
+      # ORM configuration
+      class_option :orm, :type => :string, :default => "active_record",
+        :desc => "Backend processor for upload support"
+      
+      class_option :backend, :type => :string, :default => 'paperclip',
+        :desc => "Paperclip (by default) or carrierwave"
       
-      class_option :path, :type => :string, :default => Ckeditor.path,
-                   :desc => "Ckeditor install directory destination (by default #{Ckeditor.path})"
-
-      desc "Download and install ckeditor into destination folder"
-
       def self.source_root
         @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
       end
 
+      def self.next_migration_number(dirname)
+        Time.now.strftime("%Y%m%d%H%M%S")
+      end
+
       # copy configuration
       def copy_initializer
         template "ckeditor.rb", "config/initializers/ckeditor.rb"
       end
+      
+      def mount_engine
+        route "mount Ckeditor::Engine => '/ckeditor'"
+      end
 
-      # copy ckeditor files
-      def install_ckeditor
-        say_status("fetching #{filename}", "", :green)
-        
-        in_root do
-          filepath = "tmp/#{filename}"
-          get(download_url, filepath)
-
-          if File.exist?(filepath)
-            FileUtils.mkdir_p(install_dir)
-            Ckeditor::Utils.extract(filepath, install_dir)
-            FileUtils.rm_rf(filepath)
-          end
+      def create_models
+        [:asset, :picture, :attachment_file].each do |filename|
+          template "#{generator_dir}/ckeditor/#{filename}.rb",
+                   File.join('app/models', ckeditor_dir, "#{filename}.rb")
         end
-      end
-      
-      def update_javascripts      
-        in_root do
-          directory "ckeditor/filebrowser", "#{install_dir}/ckeditor/filebrowser"
-          directory "ckeditor/plugins", "#{install_dir}/ckeditor/plugins"
-          copy_file "ckeditor/config.js", "#{install_dir}/ckeditor/config.js", :force => true
+        
+        if backend == "carrierwave"
+          template "#{uploaders_dir}/uploaders/ckeditor_attachment_file_uploader.rb",
+                   File.join("app/uploaders", "ckeditor_attachment_file_uploader.rb")
           
-          gsub_file "#{install_dir}/ckeditor/plugins/image/dialogs/image.js", 
-                    /id\:\'uploadButton\'\,filebrowser\:\'info:txtUrl\'/,
-                    "id:'uploadButton',filebrowser:{target:'info:txtUrl',action:'QuickUpload',params:b.config.filebrowserParams()}"
-        end	
+          template "#{uploaders_dir}/uploaders/ckeditor_picture_uploader.rb",
+                   File.join("app/uploaders", "ckeditor_picture_uploader.rb")
+        end
       end
 
-      def download_javascripts
-        js_dir = "#{install_dir}/ckeditor/filebrowser/javascripts"
-
-        say_status("fetching rails.js", "", :green)
-        get "https://github.com/rails/jquery-ujs/raw/master/src/rails.js", "#{js_dir}/rails.js"
-
-        say_status("fetching fileuploader.js", "", :green)
-        get "https://raw.github.com/galetahub/file-uploader/master/client/fileuploader.js", "#{js_dir}/fileuploader.js"
-
-        say_status("fetching jquery-1.6.2.min.js", "", :green)
-        get "https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js", "#{js_dir}/jquery.js"
-
-        say_status("fetching jquery.tmpl.min.js", "", :green)
-        get "https://raw.github.com/jquery/jquery-tmpl/master/jquery.tmpl.min.js", "#{js_dir}/jquery.tmpl.js"
+      def create_migration
+        if ["active_record"].include?(orm)
+          migration_template "#{generator_dir}/migration.rb", File.join('db/migrate', "create_ckeditor_assets.rb")
+        end
       end
-
+      
       protected
 
-        def download_url
-          "http://download.cksource.com/CKEditor/CKEditor/CKEditor%20#{options[:version]}/#{filename}"
+        def ckeditor_dir
+          'ckeditor'
         end
 
-        def filename
-          "ckeditor_#{options[:version]}.tar.gz"
+        def generator_dir
+          @generator_dir ||= [orm, backend].join('/')
+        end
+        
+        def uploaders_dir
+          @uploaders_dir ||= ['base', 'carrierwave'].join('/')
+        end
+        
+        def orm
+          options[:orm] || "active_record"
         end
         
-        def install_dir
-          options[:path] || Ckeditor.path
+        def backend
+          options[:backend] || "paperclip"
         end
     end
   end