bcms_fckeditor 1.0.2 → 1.0.3

data/lib/bcms_fckeditor.rb

@@ -1,2 +1,88 @@
 require 'bcms_fckeditor/routes'
 Cms.wysiwig_js = ['/bcms/fckeditor/fckeditor.js', '/bcms/fckeditor/editor.js']
+
+# FCKeditor's file browser functionality is handled by SectionController#file_browser.
+# However, the current implementation does not handle file uploads or cerating
+# new sections or 'folders'.
+# This patch implements a FCKeditor connector that plays well with BrowserCMS.
+Cms::SectionsController.class_eval do
+
+  protect_from_forgery :except => :file_browser
+
+  # All requests generated by the file browser are handled by this controller
+  # action. Currently, there are 3 commands implemented:
+  #  a) Uploading a new image, which creates a new ImageBlock
+  #  b) Creating a new CMS Section
+  #  c) Displaying file browser contents
+  def file_browser
+    @section = Section.find_by_name_path(params[:CurrentFolder])
+    if request.post? && params[:NewFile]
+      handle_file_browser_upload
+    elsif params[:NewFolderName]
+      create_section
+    else
+      render_file_browser
+    end
+  end
+
+  protected
+
+  # Sections created through FCKeditor's file browser, are assigned to groups
+  # "guest", "cms-admin" and "content-editor" and are hidden from menues by
+  # default.
+  def create_section
+    section_path = build_path(params[:NewFolderName].to_slug)
+
+    begin
+      Section.create!(:name => params[:NewFolderName],
+                      :path => section_path,
+                      :parent_id => @section.id,
+                      :group_ids => [1, 2, 3],
+                      :hidden => true)
+      @result = "0"
+    rescue Exception => e
+      build_error_string(e)
+    end
+
+    render_response
+  end
+
+  # According to FCKeditor's documentation, server side connectors should rename
+  # a file when a file with the same name exists on the filesystem.
+  # This connector does not behave that way. If a filename exists, an error is
+  # returned. The rationale behind this decision is that uploading a file through the
+  # FCKeditor's file browser is essentially just another interface to creating a FileBlock
+  # or an ImageBlock.
+  def handle_file_browser_upload
+    upfile = params[:NewFile]
+    klass = params[:Type] == "File" ? FileBlock : ImageBlock
+    file_path =  build_path(upfile.original_filename)
+
+    begin
+      klass.create!(:attachment_section => @section,
+                    :attachment_file => upfile,
+                    :attachment_file_path => file_path,
+                    :publish_on_save => true,
+                    :name => upfile.original_filename.capitalize)
+      @result = "0"
+    rescue Exception => e
+      build_error_string(e)
+    end
+
+    render_response
+  end
+
+  private
+
+  def error_string(e)
+    @result = "1, '#{escape_javascript(e.message.to_sentence)}'"
+  end
+
+  def build_path(resource_name)
+    "%s%s%s" % [@section.path, @section.path == "/" ? "" : "/", resource_name]
+  end
+
+  def render_response
+    render :text => %Q{<script type="text/javascript">window.parent.frames['frmUpload'].OnUploadCompleted(#{@result});</script>}, :layout => false
+  end
+end

data/public/bcms/fckeditor/editor/filemanager/browser/default/browser.html

@@ -187,7 +187,7 @@ function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )
 			<frame src="frmresourcetype.html" scrolling="no" frameborder="0">
 			<frame name="frmFolders" src="frmfolders.html" scrolling="auto" frameborder="1">
 		</frameset>
-		<frameset rows="50,*,0" framespacing="0">
+		<frameset rows="50,*,50" framespacing="0">
 			<frame name="frmActualFolder" src="frmactualfolder.html" scrolling="no" frameborder="0">
 			<frame name="frmResourcesList" src="frmresourceslist.html" scrolling="auto" frameborder="1">
 			<frameset cols="150,*,0" framespacing="0" frameborder="0">

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bcms_fckeditor
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  hash: 17
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - BrowserMedia
@@ -9,19 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 -05:00
+date: 2010-12-20 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: browsercms
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
         version: 3.1.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: A module for replacing the default WYSIWIG editor of browsercms with FCKEditor 2.6.3.
 email: github@browsermedia.com
 executables: []
@@ -356,6 +368,11 @@ files:
 - LICENSE.txt
 - README
 - README.markdown
+- test/custom_assertions.rb
+- test/integration/cms/fckeditor_test.rb
+- test/performance/browsing_test.rb
+- test/test_helper.rb
+- test/test_logging.rb
 has_rdoc: true
 homepage: http://github.com/browsermedia/bcms_fckeditor
 licenses: []
@@ -366,21 +383,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: bcms_fckeditor
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A WYSIWIG editor for browsercms