ckeditor_rails 3.6.4.1 → 4.0

data/CONTRIBUTORS

@@ -0,0 +1,7 @@
+Contributors
+============
+
+list by commit order.
+
+* Rafe Rosen
+* Eric Anderson

data/README.md

@@ -10,7 +10,7 @@ The `ckeditor_rails` gem integrates the `CKEditor` with the Rails asset pipeline
 
 Include `ckeditor_rails` in Gemefile
 
-    gem 'ckeditor_rails', :require => 'ckeditor-rails'
+    gem 'ckeditor_rails'
 
 Then run `bundle install`
 
@@ -55,7 +55,7 @@ Maintain `ckeditor_rails` gem with `Rake` commands.
 
 Update origin CKEditor source files.
 
-    rake update-ckeditor VERSION=3.6.4
+    rake update-ckeditor VERSION=4.0
 
 Publish gem.
 

data/Rakefile

@@ -6,8 +6,7 @@ desc "Update CKEditor Library, VERSION is required."
 task "update-ckeditor" do
   files = SourceFile.new
   files.fetch ENV['VERSION']
+  files.destination_root = "vendor/assets"
   files.move
-  files.fix_css
-  files.fix_js
   files.cleanup
 end

data/{vendor → lib}/assets/javascripts/ckeditor-jquery.js

@@ -1,3 +1,3 @@
 //= require ckeditor/basepath
 //= require ckeditor/ckeditor
-//= require ckeditor/adapters/jquery
+//= require ckeditor/jquery

data/lib/ckeditor-rails/source_file.rb

@@ -5,18 +5,17 @@ class SourceFile < Thor
   source_root 'tmp'
 
   desc "fetch VERSION", "fetch source files from http://ckeditor.com/"
-  def fetch(version)
-    download_url = file_url(version)
-    extract_path = self.class.source_root
-    archive_file = "#{extract_path}/#{filename(version)}"
+  def fetch version
+    download_url = file_url version
+    archive_file = "#{source_root}/#{filename(version)}"
 
     in_root do
-      say_status("       fetch", archive_file, :green)
-      get(download_url, archive_file)
-      if File.exist?(archive_file)
-        FileUtils.mkdir_p(extract_path)
-        extract(archive_file, extract_path)
-        FileUtils.rm_rf(archive_file)
+      say_status "       fetch", archive_file, :green
+      get download_url, archive_file
+      if File.exist? archive_file
+        FileUtils.mkdir_p source_root
+        extract archive_file, source_root
+        FileUtils.rm_rf archive_file
       end
     end
 
@@ -24,117 +23,77 @@ class SourceFile < Thor
       gsub_file "ckeditor-rails/version.rb", /VERSION\s=\s"(\d|\.)+"$/ do |match|
         %Q{VERSION = "#{version}"}
       end
-    end if File.exist?(extract_path)
+    end if File.exist? source_root
   end
 
-  desc "move", "move source files to vendor/assets"
+  desc "move", "move source files"
   def move
-    self.destination_root = "vendor/assets"
-
-    copy_file "ckeditor/adapters/jquery.js", "javascripts/ckeditor/adapters/jquery.js"
-    copy_file "ckeditor/ckeditor.js", "javascripts/ckeditor/ckeditor.js"
-    copy_file "ckeditor/ckeditor_basic.js", "javascripts/ckeditor/ckeditor_basic.js"
-    copy_file "ckeditor/config.js", "javascripts/ckeditor/config.js"
-    copy_file "ckeditor/contents.css", "stylesheets/ckeditor/contents.css"
-
-    directory "ckeditor/images", "images/ckeditor/images"
-    directory "ckeditor/lang", "javascripts/ckeditor/lang"
-
-    copy_file "ckeditor/LICENSE.html", "javascripts/ckeditor/LICENSE.html"
-
-    directory "ckeditor/plugins", "javascripts/ckeditor/plugins"
-    move_image_files_of_plugins
-
-    copy_image_files_of_skin(%w{kama office2003 v2})
-
-    directory "ckeditor/themes", "javascripts/ckeditor/themes"
-  end
-
-  desc "fix_css", "fix some css caused precompilation error"
-  def fix_css
-    self.destination_root = "vendor/assets"
-    inside destination_root do
-      skin_names = %w{kama office2003 v2}
-      skin_names.each do |name|
-        gsub_file "stylesheets/ckeditor/skins/#{name}/dialog.css", /\+margin/, "margin"
-        gsub_file "stylesheets/ckeditor/skins/#{name}/editor.css", /filter\:\;/, ""
+    FileUtils.rm_rf destination_root
+
+    [
+      ['js', 'javascripts'],
+      ['css', 'stylesheets'],
+    ].each do |(type, asset_path)|
+      Dir["#{source_root}/ckeditor/*.#{type}"].each do |file|
+        file = File.basename file
+        copy_file "ckeditor/#{file}", "#{asset_path}/ckeditor/#{file}"
       end
-      gsub_file "stylesheets/ckeditor/skins/office2003/editor.css", /\!height\:28px\;\!line-height\:28px\;/, ""
-      gsub_file "javascripts/ckeditor/plugins/uicolor/yui/assets/yui.css", /\*html/, "* html"
     end
-  end
-
-  desc 'fix_js', 'fix some js caused execution error'
-  def fix_js
-    self.destination_root = "vendor/assets"
-    inside destination_root do
-      # Change the way IE detected to avoid compilation bug in production
-      %w{ckeditor ckeditor_basic}.each do |name|
-        gsub_file "javascripts/ckeditor/#{name}.js", "/*@cc_on!@*/false", "b.indexOf('msie')>-1"
-      end
-    end
-  end
 
-  desc "convert", "convert css to sass file by sass-convert"
-  def convert
-    self.destination_root = "vendor/assets"
-    inside destination_root do
-      skin_names = %w{kama office2003 v2}
-      skin_names.each do |name|
-        path = "stylesheets/ckeditor/skins/#{name}"
-        run("sass-convert -F css -T sass #{path}/dialog.css #{path}/dialog.css.sass")
-        run("sass-convert -F css -T sass #{path}/editor.css #{path}/editor.css.sass")
-        run("sass-convert -F css -T sass #{path}/templates.css #{path}/templates.css.sass")
-        remove_file "#{path}/dialog.css"
-        remove_file "#{path}/editor.css"
-        remove_file "#{path}/templates.css"
-      end
-    end
+    copy_file "ckeditor/LICENSE.md", "javascripts/ckeditor/LICENSE.md"
+    directory "ckeditor/lang", "javascripts/ckeditor/lang"
+    copy_plugins
+    copy_skins
   end
 
   desc "clean", "clean up useless files"
   def cleanup
-    self.destination_root = "vendor/assets"
-    FileUtils.rm_rf(self.class.source_root)
+    FileUtils.rm_rf source_root
   end
 
   protected
 
-  def file_url(version)
+  def file_url version
     "http://download.cksource.com/CKEditor/CKEditor/CKEditor%20#{version}/#{filename(version)}"
   end
 
-  def filename(version)
-    "ckeditor_#{version}.tar.gz"
+  def filename version
+    "ckeditor_#{version}_full.tar.gz"
   end
 
-  def extract(file_path, output_path)
-    system("tar --exclude=*.php --exclude=*.asp -C '#{output_path}' -xzf '#{file_path}' ckeditor")
+  def extract file_path, output_path
+    system "tar -x -f '#{file_path}' -C '#{output_path}' ckeditor"
   end
 
-  def move_image_files_of_plugins
-    files = Dir.glob("#{destination_root}/javascripts/ckeditor/plugins/*/*/*")
-    files.each do |file|
-      if file =~ /\.(png|gif)$/
-        filename = file.sub("#{destination_root}/javascripts/", '')
-        destination_path = filename.sub(/\/\w+\.\w+$/, '')
-        in_root do
-          FileUtils.mkdir_p("#{destination_root}/images/#{destination_path}")
-          FileUtils.mv(file, "#{destination_root}/images/#{filename}")
-        end
-      end
+  def copy_plugins
+    Dir["#{source_root}/ckeditor/plugins/*"].each do |plugin|
+      copy_all "plugins/#{File.basename plugin}"
     end
   end
 
-  def copy_image_files_of_skin(skin_names = %w{kama office2003 v2})
-    skin_names.each do |name|
-      copy_file "ckeditor/skins/#{name}/dialog.css", "stylesheets/ckeditor/skins/#{name}/dialog.css"
-      copy_file "ckeditor/skins/#{name}/editor.css", "stylesheets/ckeditor/skins/#{name}/editor.css"
-      copy_file "ckeditor/skins/#{name}/icons.png", "images/ckeditor/skins/#{name}/icons.png"
-      copy_file "ckeditor/skins/#{name}/icons_rtl.png", "images/ckeditor/skins/#{name}/icons_rtl.png"
-      directory "ckeditor/skins/#{name}/images", "images/ckeditor/skins/#{name}/images"
-      copy_file "ckeditor/skins/#{name}/skin.js", "javascripts/ckeditor/skins/#{name}/skin.js"
-      copy_file "ckeditor/skins/#{name}/templates.css", "stylesheets/ckeditor/skins/#{name}/templates.css"
+  def copy_skins
+    Dir["#{source_root}/ckeditor/skins/*"].each do |skin|
+      copy_all "skins/#{File.basename skin}"
     end
   end
+
+  def copy_all path
+    copy_type path, 'css', 'stylesheets'
+    copy_type path, 'js', 'javascripts'
+    copy_type path, 'png', 'images'
+    copy_type path, 'gif', 'images'
+    copy_type path, 'jpg', 'images'
+  end
+
+  def copy_type path, type, asset_path
+    files = Dir["#{source_root}/ckeditor/#{path}/**/*.#{type}"]
+    files.each do |file|
+      file = file.sub /^#{Regexp.escape source_root}\//, ''
+      copy_file file, "#{asset_path}/#{file}"
+    end
+  end
+
+  def source_root
+    self.class.source_root
+  end
 end

data/lib/ckeditor-rails/version.rb

@@ -1,6 +1,6 @@
 module Ckeditor
   module Rails
-    VERSION = "3.6.4.1"
-    EDITOR_VERSION = "3.6.4"
+    VERSION = "4.0"
+    EDITOR_VERSION = "4.0"
   end
 end

data/lib/ckeditor_rails.rb

@@ -0,0 +1 @@
+require 'ckeditor-rails'

data/vendor/assets/javascripts/ckeditor/{LICENSE.html → LICENSE.md}

@@ -1,8 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
-== BEGIN TEXT ONLY VERSION ==
-
 Software License Agreement
 ==========================
 
@@ -28,10 +23,12 @@ You are not required to, but if you want to explicitly declare the
 license you have chosen to be bound to when using, reproducing,
 modifying and distributing this software, just include a text file
 titled "legal.txt" in your version of this software, indicating your
-license choice.
+license choice. In any case, your choice will not restrict any
+recipient of your version of this software to use, reproduce, modify
+and distribute this software under any of the above licenses.
 
 Sources of Intellectual Property Included in CKEditor
-=====================================================
+-----------------------------------------------------
 
 Where not otherwise indicated, all CKEditor content is authored by
 CKSource engineers and consists of CKSource-owned intellectual
@@ -39,24 +36,26 @@ property. In some specific instances, CKEditor will incorporate work
 done by developers outside of CKSource with their express permission.
 
 Trademarks
-==========
+----------
 
 CKEditor is a trademark of CKSource - Frederico Knabben. All other brand
 and product names are trademarks, registered trademarks or service
 marks of their respective holders.
 
+---
+
 Appendix A: The GPL License
-===========================
+---------------------------
 
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+GNU GENERAL PUBLIC LICENSE
+Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -106,8 +105,8 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+GNU GENERAL PUBLIC LICENSE
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
 a notice placed by the copyright holder saying it may be distributed
@@ -305,7 +304,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -327,14 +326,14 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+END OF TERMS AND CONDITIONS
 
 
 Appendix B: The LGPL License
-============================
+----------------------------
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
+GNU LESSER GENERAL PUBLIC LICENSE
+Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
      59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -345,7 +344,7 @@ Appendix B: The LGPL License
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-			    Preamble
+Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -447,8 +446,8 @@ modification follow.  Pay close attention to the difference between a
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+GNU LESSER GENERAL PUBLIC LICENSE
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
 program which contains a notice placed by the copyright holder or
@@ -767,7 +766,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -790,16 +789,14 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+END OF TERMS AND CONDITIONS
 
 
 Appendix C: The MPL License
-===========================
+---------------------------
 
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ===============
+MOZILLA PUBLIC LICENSE
+Version 1.1
 
 1. Definitions.
 
@@ -1265,63 +1262,3 @@ EXHIBIT A -Mozilla Public License.
      the notices in the Source Code files of the Original Code. You should
      use the text of this Exhibit A rather than the text found in the
      Original Code Source Code for Your Modifications.]
-
-== END TEXT ONLY VERSION ==
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>License - CKEditor</title>
-</head>
-<body>
-	<h1>
-		Software License Agreement
-	</h1>
-	<p>
-		<strong>CKEditor&trade;</strong> - The text editor for Internet&trade; - <a href="http://ckeditor.com">
-			http://ckeditor.com</a><br />
-		Copyright &copy; 2003-2012, <a href="http://cksource.com/">CKSource</a> - Frederico Knabben. All rights reserved.
-	</p>
-	<p>
-		Licensed under the terms of any of the following licenses at your choice:
-	</p>
-	<ul>
-		<li><a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a> Version
-			2 or later (the "GPL");</li>
-		<li><a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License</a>
-			Version 2.1 or later (the "LGPL");</li>
-		<li><a href="http://www.mozilla.org/MPL/MPL-1.1.html">Mozilla Public License</a> Version
-			1.1 or later (the "MPL").</li>
-	</ul>
-	<p>
-		You are not required to, but if you want to explicitly declare the license you have
-		chosen to be bound to when using, reproducing, modifying and distributing this software,
-		just include a text file titled "LEGAL" in your version of this software, indicating
-		your license choice. In any case, your choice will not restrict any recipient of
-		your version of this software to use, reproduce, modify and distribute this software
-		under any of the above licenses.
-	</p>
-	<h2>
-		Sources of Intellectual Property Included in CKEditor
-	</h2>
-	<p>
-		Where not otherwise indicated, all CKEditor content is authored by CKSource engineers
-		and consists of CKSource-owned intellectual property. In some specific instances,
-		CKEditor will incorporate work done by developers outside of CKSource with their
-		express permission.
-	</p>
-	<p>
-		<a href="http://developer.yahoo.com/yui/yuitest/">YUI Test</a>: At _source/tests/yuitest.js
-		can be found part of the source code of YUI, which is licensed under the terms of
-		the <a href="http://developer.yahoo.com/yui/license.txt">BSD License</a>. YUI is
-		Copyright &copy; 2008, Yahoo! Inc.
-	</p>
-	<h2>
-		Trademarks
-	</h2>
-	<p>
-		CKEditor is a trademark of CKSource - Frederico Knabben. All other brand and product
-		names are trademarks, registered trademarks or service marks of their respective
-		holders.
-	</p>
-</body>
-</html>