ckeditor 3.5.2 → 3.5.3

data/README.rdoc

@@ -161,5 +161,4 @@ support swf upload with AuthenticityToken.
 
 == TODOs
 
-1. Add support for choose filemanager storage
-2. More integration upload system
+1. HTML5 File uploads

data/app/controllers/ckeditor/{attachments_controller.rb → attachment_files_controller.rb}

@@ -1,4 +1,4 @@
-class Ckeditor::AttachmentsController < Ckeditor::BaseController
+class Ckeditor::AttachmentFilesController < Ckeditor::BaseController
 
   def index
     @attachments = Ckeditor.file_model.order("id DESC")

data/app/helpers/ckeditor/base_helper.rb

@@ -1,9 +1,9 @@
 module Ckeditor::BaseHelper
-  def ckeditor_attachment_path(kind)
+  def ckeditor_asset_path(kind)
     path = case kind
       when :image then Ckeditor.file_manager_image_upload_uri
       when :file  then Ckeditor.file_manager_upload_uri
-      else '/ckeditor/attachments'
+      else '/ckeditor/attachment_files'
     end
     
     session_key = Rails.application.config.send(:session_options)[:key]

data/app/views/ckeditor/{attachments → attachment_files}/index.html.erb

@@ -1,5 +1,5 @@
 <script type="text/javascript">
-  var upload_path = "<%=raw ckeditor_attachment_path(:file) %>";
+  var upload_path = "<%=raw ckeditor_asset_path(:file) %>";
 </script>
 
 <table width="100%" cellspacing="0" cellpadding="0">

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

@@ -1,5 +1,5 @@
 <script type="text/javascript">	  
-  var upload_path = "<%=raw ckeditor_attachment_path(:image) %>";
+  var upload_path = "<%=raw ckeditor_asset_path(:image) %>";
 </script>
 
 <table width="100%" cellspacing="0" cellpadding="0">

data/config/routes.rb

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

data/lib/ckeditor.rb

@@ -43,10 +43,10 @@ module Ckeditor
   @@public_path = "public/uploads"
   
   mattr_accessor :file_manager_uri
-  @@file_manager_uri = "/ckeditor/attachments"
+  @@file_manager_uri = "/ckeditor/attachment_files"
   
   mattr_accessor :file_manager_upload_uri
-  @@file_manager_upload_uri = "/ckeditor/attachments"
+  @@file_manager_upload_uri = "/ckeditor/attachment_files"
   
   mattr_accessor :file_manager_image_upload_uri
   @@file_manager_image_upload_uri = "/ckeditor/pictures"
@@ -73,7 +73,7 @@ module Ckeditor
   
   # Get the file class from the file reference object.
   def self.file_model
-    if self.class_variables.include?('@@file_model_ref')
+    if self.class_variable_defined?('@@file_model_ref')
       @@file_model_ref.get 
     else
       self.file_manager_file_model = "Ckeditor::AttachmentFile"

data/lib/ckeditor/version.rb

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

data/lib/ckeditor/view_helper.rb

@@ -1,7 +1,8 @@
 module Ckeditor
   module ViewHelper
-    include ActionView::Helpers
-    
+    include ActionView::Helpers::JavaScriptHelper
+    include ActionView::Helpers::TagHelper 
+
     # Ckeditor helper:
     # <%= ckeditor_textarea("object", "field", :width => '100%', :height => '200px') %>
     #

data/lib/generators/ckeditor/base/base_generator.rb

@@ -2,7 +2,7 @@ require 'rails/generators'
 
 module Ckeditor
   class BaseGenerator < Rails::Generators::Base
-    class_option :version, :type => :string, :default => '3.5.2',
+    class_option :version, :type => :string, :default => '3.5.3',
                  :desc => "Version of ckeditor which be install"
 
     def self.source_root

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ckeditor
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 3
   - 5
-  - 2
-  version: 3.5.2
+  - 3
+  version: 3.5.3
 platform: ruby
 authors: 
 - Igor Galeta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 +02:00
+date: 2011-05-01 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,13 +45,13 @@ files:
 - CHANGELOG
 - README.rdoc
 - Rakefile
-- app/controllers/ckeditor/attachments_controller.rb
+- app/controllers/ckeditor/attachment_files_controller.rb
 - app/controllers/ckeditor/base_controller.rb
 - app/controllers/ckeditor/pictures_controller.rb
 - app/helpers/ckeditor/base_helper.rb
 - app/views/ckeditor/_asset.html.erb
 - app/views/ckeditor/_swfupload.html.erb
-- app/views/ckeditor/attachments/index.html.erb
+- app/views/ckeditor/attachment_files/index.html.erb
 - app/views/ckeditor/pictures/index.html.erb
 - app/views/layouts/ckeditor.html.erb
 - config/locales/en.ckeditor.yml
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ckeditor
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Rails plugin for integration ckeditor 3.x