Merge branch 'kete/experimental'

CHANGELOG_PLUGIN

@@ -1,20 +1,22 @@
 = Plugin Changelog
 
-== Unreleased
-* Upgraded TinyMCE frin 3.2.4 to 3.2.6 (Sergio Cambra)
+== Version 0.1.0
+* tiny_mce is now available as a gem on github under kete-tiny_mce. See README.rdoc (Alexander Semyonov)
+* The TinyMCE sources are now installed automatically by the plugin/gem, so no more rake tasks (Alexander Semyonov)
+(big thanks to Alexander Semyonov for helping to get this release ready)
 
-== Version 3.2.4.1 (2009-06-03)
-* Upgraded TinyMCE to 3.2.3 (see CHANGELOG_TINYMCE) (Maciej Litwiniuk)
-* Upgraded TinyMCE to 3.2.4.1 (see CHANGELOG_TINYMCE) (Sergio Cambra)
+== Version 0.0.6 (2009-06-03)
+* Upgraded TinyMCE from 3.2.2 to 3.2.6 (see CHANGELOG_TINYMCE) (Sergio Cambra & Maciej Litwiniuk)
 * Cleanup tiny_mce_options.yml (Sergio Cambra)
 * Maintaining backwards compatibility with Rails 2.1 or earlier (which do not have I18n)
 
-== Version 3.2.2 (2009-03-12)
+== Version 0.0.5 (2009-03-12)
 * Upgraded TinyMCE to 3.2.2 (see CHANGELOG_TINYMCE)
 * Fixed errors when uses_tiny_mce was used with no options (Joseph Wilk)
 * Further testing for uses_tiny_mce method without any options
 
-== Version 3.2.1.1-1 (2009-02-23)
+== Version 0.0.4 (2009-02-23)
+* Updated TinyMCE to 3.2.1.1 (see CHANGELOG_TINYMCE)
 * Rewrote test suite
 * Added comments throughout the plugin for future developer
   - to all users: feel free to fork this repo, make changes, and send a pull request
@@ -23,29 +25,24 @@
 * Better Regex check for the theme_advanced_container configuration option
 * Console notification on next installation steps when installing plugin via script/plugin
 
-== Version 3.2.1.1 (2009-02-17)
-* Updated TinyMCE to 3.2.1.1
-
-== Version 3.2.1 (2008-11-16)
-* Updated TinyMCE to 3.2.1
+== Version 0.0.3 (2008-11-16)
+* Updated TinyMCE to 3.2.1 (see CHANGELOG_TINYMCE)
 * New raw_tiny_mce_init, which produces raw javascript (without the <script> tags)
 * New ASpell spellchecking functionality (require aspell installed, see SPELLCHECKING_PLUGIN.rdoc for more details)
 * Added ability to pass in additional javascript for complex data needed in places such as the template plugin
 Now in Rails 2.2, thanks for your support: * Help get a patch to a bug, that prevents ampersands in link/image urls, submitted to Rails core
-
-== Version 3.2.0.2-1 (2008-10-10)
 * Updated documentation
-* Bug fixes to tiny_mce helper methods (thanks remvee)
-* Fixed tests to work with the latest changes (thanks remvee)
+* Bug fixes to tiny_mce helper methods (Remco van 't Veer)
+* Fixed tests to work with the latest changes (Remco van 't Veer)
 
-== Version 3.2.0.2 (2008-10-04)
-* Updated TinyMCE to 3.2.0.2
-* Formated README file with RDoc syntax for easier reading on Github
+== Version 0.0.2 (2008-10-04)
+* Updated TinyMCE to 3.2.0.2 (see CHANGELOG_TINYMCE)
+* Formatted README file with RDoc syntax for easier reading on Github
 * Added separate TinyMCE changelog (starting from 3.0 alphas through to now)
 * Rake task refactored (now uses cp_r instead of custom method), and new update task
 * Edited TinyMCE helper methods (single "include_tiny_mce_if_needed" method includes Javascript and initializes TinyMCE)
 * Updated TinyMCE configuration options file (tiny_mce_options.yml)
 
-== Version 3.1.0.1 (2008-07-02)
-* Updated TinyMCE
+== Version 0.0.1 (2008-07-02)
+* Updated TinyMCE based on Blake Watters original TinyMCE plugin (see CHANGELOG_TINYMCE)
 * Replaced old documentation with readme file containing link to online documentation

DEV_UPGRADE_NOTES

@@ -3,11 +3,10 @@ How to update the bundled TinyMCE
 ---------------------------------
 
 1) Download TinyMCE, and extract it to your Desktop
-2) Delete the copy of TinyMCE in the plugin at public/javascripts/tiny_mce (this ensures old/removed files are deleted)
-3) Copy the source files of TinyMCE (not documentation) to public/javascripts/tiny_mce
+2) Delete the copy of TinyMCE in the plugin at lib/tiny_mce/assets/tiny_mce (this ensures old/removed files are deleted)
+3) Copy the source files of TinyMCE (not documentation) to lib/tiny_mce/assets/tiny_mce
 4) Update the CHANGELOG_PLUGIN to say what you upgraded from, what you upgraded to, and your name
 5) Update CHANGELOG_TINYMCE (download and overwrite the file with http://tinymce.moxiecode.com/js/tinymce/changelog.txt)
 6) Update the 'Bundled TinyMCE version' value at the bottom of README.rdoc
-7) Update the version value in tasks/tiny_mce.rake
-8) Update tiny_mce_options.yml with any new options, or remove old ones, as described in the tinymce changelog
-9) Commit, push, and send pull request to http://github.com/kete/tiny_mce
+7) Update lib/tiny_mce/valid_tinymce_options.yml with any new options, or remove old ones, as described in the tinymce changelog
+8) Commit, push, and send pull request to http://github.com/kete/tiny_mce

README.rdoc

@@ -18,17 +18,14 @@ Open a console, and in the root of you Rails application, install the plugin by
 * git submodule add git://github.com/kete/tiny_mce.git vendor/plugins/tiny_mce
 * Download the latest files ( http://github.com/kete/tiny_mce/tarball/master ) and extract to vendor/plugins/tiny_mce
 
-=== Step 2
-
-Then install the necessary files into your public directory by running
-
-  rake tiny_mce:install
+Alternatively, you can use the gem version:
 
-or, if you are updating a previously installed version
+* sudo gem install kete-tiny_mce -s http://gems.github.com
+* Add this to config/environment.rb of your Rails application:
 
-  rake tiny_mce:update
+  config.gem 'kete-tiny_mce', :lib => 'tiny_mce', :source => 'http://gems.github.com'
 
-=== Step 3
+=== Step 2
 
 Add the following to the controller of the page you want to add TinyMCE to.
 
@@ -42,7 +39,8 @@ Lastly, add the following line(s) to the <head> element of your application view
 
   <%= include_tiny_mce_if_needed %>
 
-Now you're all set!
+
+Now you're all set! Start your server. The gem/plugin will automatically copy the sources to the public javascripts directory when the server is started.
 
 
 == Configuration
@@ -53,7 +51,7 @@ There are several ways to configure the plugin to get the desirable effect you'r
 
 You can change the theme, order/choice of buttons, selectors Id, plugins, and many more by passing an :options hash to the uses_tiny_mce declaration.
 
-The options hash can contain any number of settings available in tiny_mce_options.yml  (a copy of the settings available per version).
+The options hash can contain any number of settings available in lib/tiny_mce/valid_tinymce_options.yml  (a copy of the settings available per version).
 
 If an option is misspelled, invalid, or deprecated (no longer in TinyMCE), when you go to a page containing your editor, you will receive an Exception, which must be dealt with before continuing.
 
@@ -127,7 +125,7 @@ The plugin comes with a test suite that can be run once the plugin is installed
 
 Change into the plugins directory and run 'rake' to start them.
 
-Note: The tests require Rails 2.2 or higher, and are currently tested on Rails 2.3 RC1 (so problems in older versions may arise - please see "Reporting an Issue" if they do)
+Note: The tests require Rails 2.2 or higher, and are currently tested on Rails 2.3 (so problems in older versions may arise - please see "Reporting an Issue" if they do)
 
 
 == Reporting an Issue

Rakefile

@@ -7,7 +7,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = 'tiny_mce'
     gem.summary = %Q{TinyMCE editor for your rails applications}
-    gem.description = %Q{gem that allows easy implementation of the TinyMCE editor into your applications.}
+    gem.description = %Q{Gem that allows easy implementation of the TinyMCE editor into your applications.}
     gem.email = 'kieran@katipo.co.nz'
     gem.homepage = 'http://github.com/kete/tiny_mce'
     gem.authors = ['Blake Watters', 'Kieran Pilkington', 'Alexander Semyonov']

lib/tiny_mce.rb

@@ -10,17 +10,18 @@ def self.install_or_update_tinymce
     orig = File.join(File.dirname(__FILE__), 'tiny_mce', 'assets', 'tiny_mce')
     dest = File.join(Rails.public_path, 'javascripts', 'tiny_mce')
     tiny_mce_js = File.join(dest, 'tiny_mce.js')
+
     unless File.exists?(tiny_mce_js) && FileUtils.identical?(File.join(orig, 'tiny_mce.js'), tiny_mce_js)
-      if File.exists?(dest)
+      if File.exists?(tiny_mce_js)
         # upgrade
         begin
           puts "Removing directory #{dest}..."
           FileUtils.rm_rf dest
-          puts "Recreating directory #{dest}..."
+          puts "Creating directory #{dest}..."
           FileUtils.mkdir_p dest
-          puts "Installing TinyMCE version #{VERSION} to #{dest}..."
+          puts "Copying TinyMCE to #{dest}..."
           FileUtils.cp_r "#{orig}/.", dest
-          puts "Successfully updated TinyMCE to version #{VERSION}."
+          puts "Successfully updated TinyMCE."
         rescue
           puts 'ERROR: Problem updating TinyMCE. Please manually copy '
           puts orig
@@ -32,9 +33,9 @@ def self.install_or_update_tinymce
         begin
           puts "Creating directory #{dest}..."
           FileUtils.mkdir_p dest
-          puts "Installing TinyMCE version #{VERSION} to #{dest}..."
+          puts "Copying TinyMCE to #{dest}..."
           FileUtils.cp_r "#{orig}/.", dest
-          puts "Successfully installed TinyMCE version #{VERSION}."
+          puts "Successfully installed TinyMCE."
         rescue
           puts "ERROR: Problem installing TinyMCE. Please manually copy "
           puts orig

tiny_mce.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Blake Watters", "Kieran Pilkington", "Alexander Semyonov"]
-  s.date = %q{2009-09-14}
-  s.description = %q{gem that allows easy implementation of the TinyMCE editor into your applications.}
+  s.date = %q{2009-09-15}
+  s.description = %q{Gem that allows easy implementation of the TinyMCE editor into your applications.}
   s.email = %q{kieran@katipo.co.nz}
   s.extra_rdoc_files = [
     "README.rdoc",
@@ -1312,12 +1312,12 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{TinyMCE editor for your rails applications}
   s.test_files = [
-    "test/functional/slim_tiny_mce_controller_test.rb",
-     "test/functional/full_tiny_mce_controller_test.rb",
+    "test/functional/full_tiny_mce_controller_test.rb",
+     "test/functional/slim_tiny_mce_controller_test.rb",
      "test/test_helper.rb",
      "test/unit/helpers/tiny_mce_helper_test.rb",
-     "test/unit/tiny_mce_test.rb",
-     "test/unit/options_validator_test.rb"
+     "test/unit/options_validator_test.rb",
+     "test/unit/tiny_mce_test.rb"
   ]
 
   if s.respond_to? :specification_version then