use_tinymce 0.0.10 → 0.0.11

data/README.markdown

@@ -1,10 +1,11 @@
-UseTinyMCE - 0.0.10
+UseTinyMCE - 0.0.11
 ==========
 
 **UseTinyMCE** is yet another (as if we needed another) hack for including
 TinyMCE in a Rails 3.0 or 3.1 app.
 
-**NOTE:** Rails 3.1.0 broke version 0.0.8. The current version works (for me)
+**NOTE:** Rails 3.1.0 broke version 0.0.8. The current version has been tested
+on both Rails 3.1.0 & 3.0.10. All installations work properly.
 
 It differs from the others that I looked at on rubygems in that:
 
@@ -15,13 +16,21 @@ TinyMCE. You just use the config stuff which comes with TinyMCE - in javascript.
 
 ## Rails 3.0 & 3.1 Integration
 
-It's the same in both cases. See [Step By Step](#step_by_step) below
+It's almost the same in both cases. See [Step By Step](#step_by_step) below.
+
+**Rails 3.0 Note:** Rails 3.0 defaults to `prototype` for javascript, so `use_tinymce`
+supports both *raw* TinyMCE (which works well with Prototype) and the *jquery* version,
+which works with 'jquery'. It also supports both *simple* and *advanced* editor
+installations for the *raw* type.
 
 **Rails 3.1 Note:** TinyMCE doesn't play well with the asset pipeline, so it is installed
 in public. This has to do with the way TinyMCE is architected: it is plugin based
 and scatters javascript, css, and html all through it's plugin directory. It manages it's
 own loading.
 
+Also, **Rails 3.1** defaults to jQuery for javascript, so `use_tinymce` does not support
+installing the *raw* version of TinyMCE.
+
 ## Selectively adding TinyMCE to selected text areas
 
 TinyMCE supports selectively using TinyMCE in or not in different textareas within
@@ -37,6 +46,9 @@ Or read the TinyMCE code.
 
 1. You will need to install *TinyMCE* in your /public/javascript directory.
 Do that by running one of these rake tasks:
+
+  Rails 3.0:
+  
   * `rake use_tinymce:install_jquery` - if you are using jQuery (Rails 3.1 default)
   * `rake use_tinymce:install_simple` - if you are using Prototype (Rails 3.0 default)
   * `rake use_tinymce:install_advanced` - if you are using Prototype (Rails 3.0 default)
@@ -44,10 +56,21 @@ Do that by running one of these rake tasks:
   If you don't need much and aren't familiar with *TinyMCE*, then `rake use_tinymce:install_simple`
   should be fine. The *advanced* version configures *TinyMCE* with many more features. Go to
   the ["TinyMCE website for details"](http://tinymce.moxiecode.com/)
+  
+  Rails 3.1
+
+  * rake use_tinymce:install - installs the jQuery version of TinyMCE
+  
+  This creates an `advanced` editor. See the *TinyMCE* website for configuration information:
+  ["TinyMCE website for details"](http://tinymce.moxiecode.com/)
+
 2. Add `use_tinymce args` to all the controllers for views containing **textarea** fields
 in which you want to run *TinyMCE*. `args` should be:
   * `:all` - to enable *TinyMCE* for all actions
   * `:foo, :bar` - to enable *TinyMCE* only for views rendered by `foo` and `bar` actions
+  [usually this is something like `use_tinymce :new, :edit`].
+  
+  **Note:** you should *not* have to 'require use_tinymce` anyplace. If you do, please let me know.
 3. Add `<%= use_tinymce_link %>` to the `HEAD` section of you application layout - for *at least*
 all pages which should use *TinyMCE*
 4. (Optional) Edit `/public/javascript/use_tinymce_init.js` to customize your *TinyMCE* feature
@@ -85,7 +108,7 @@ by a previous call to `use_tinymce` [or if you included `use_tinymce :all` in yo
 `action` will usually come from `params[:action]`, so it's easier to use
 `use_tinymce_link` which already does that.
 
-## Four rake tasks:
+## Rake Tasks:
 
 **NOTE** `assets` here refers to the `assets` directory in the `use_tinymce`
 gem - **not** the Rails 3.1 asset pipeline directory.
@@ -94,6 +117,8 @@ This initialization scripts were copied literally from the TinyMCE website
 ["For Dummies" page](http://tinymce.moxiecode.com/wiki.php/%22For_Dummies%22) 
 - that is: *http://tinymce.moxiecode.com/wiki.php/%22For_Dummies%22*
 
+### Rails 3.0
+
 Prototype Versions:
 
 * `rake use_tinymce:install_advanced` copies `use_tinymce/assets/use_tinymce_init_advanced.js`
@@ -116,8 +141,27 @@ Maintenance: if you want to get rid of `use_tinymce`, then:
 * `rake use_tinymce:uninstall` removes use_tinymce_init.js and the TinyMCE
 directory from your applications `public/javascripts`
 
-Relocating *TinyMCE* or Something Else
-==================
+**Note:** `rake use_tinymce::uninstall` is called automatically when running any
+`rake use_tinymce::install_*` to insure you get a clean installation. This will also
+*clean* out any customization you have done.
+
+### Rails 3.1
+
+`use_tinymce` only supports installing the jQuery version of TinyMCE on Rails 3.1.
+
+There are two Rake tasks:
+
+* rake use_tinymce:install - copies `assets/use_tinymce_init_jquery.js` 
+and the contents of `use_tinymce/tinymce_jquery` -
+which attaches an 'advanced' TinyMCE configuration to textareas.
+* `rake use_tinymce:uninstall` removes use_tinymce_init.js and the TinyMCE
+directory from your applications `public/javascripts`
+
+**Note:** `rake use_tinymce::uninstall` is called automatically when running
+`rake use_tinymce::install` to insure you get a clean installation. This will also
+*clean* out any customization you have done.
+
+## Relocating *TinyMCE* or Something Else
 
 This gem is pretty simple, so if you want to change the location and/or names of some files,
 go ahead and hack it.
@@ -127,8 +171,7 @@ turned out to be more trouble than it was worth.
 
 So, if you want to do it, have a blast - but please don't send me the patches.
 
-Upgrading *TinyMCE*
-==================
+## Upgrading *TinyMCE*
 
 `use_tinymce` ships with version 3.4.2 of *TinyMCE* - which I downloaded from the Moxiecode
 website. You *should* be able to upgrade your *TinyMCE* if you want by doing the exact

data/Rakefile

@@ -13,35 +13,16 @@ task :default => :test
 
 desc "Run use_tinymce unit tests"
 task :test do
-  require "./test/#{gem_name}_base_test"
-end
-
-desc "run rdoc to create doc"
-task :doc do
-  system 'rdoc'
+  require "./test/test_#{gem_name}_base"
 end
 
 desc "build gem"
 task :gem do
   system "gem build #{gem_name}.gemspec"
-end
-
-desc "commit changes - use Env Var MSG to add comment"
-task :commit do
-  system 'git add .'
-  system "git commit -m \"checkin version #{gem_version}: ${MSG}\""
-end
-
-desc "commit changes and tag as #{gem_version} - add Env Var MSG to add tag message"
-task :tag => :commit do
-  tag_message = "version #{gem_version}"
-  tag_message += ENV['MSG'] if ENV.keys.include? 'MSG'
-  system "git tag #{gem_version} -m '#{tag_message}'"
-end
-
-desc "push to github"
-task :git_push  do
-  system 'git push'
+  if 'mike.local' == IO.popen('hostname').read.chomp
+    system "cp #{gem_name}-#{gem_version}.gem ~/Rails/GemCache/gems/"
+    system "(cd ~/Rails/GemCache ; gem generate_index -d . )"
+  end
 end
 
 desc "push to rubygems"

data/lib/tasks/use_tinymce.rake

@@ -35,18 +35,27 @@ module UseTinyMCE
     # This MODE_STRING will configure to NOT USE TinyMCE in textareas unless the 'editor_selector'
     #  class is present.
     # MODE_STRING = [ 'mode: "specific_textareas"', '        editor_selector: "tinymce"' ].join(",\n")
-    JQUERY_SELECTOR = '"textarea.tinymce"'
+    # JQUERY_SELECTOR = '"textarea.tinymce"'
+    JQUERY_SELECTOR = '"textarea"'
 
     def self.copy_init_script(source)
       source_path = File.join(ASSETS_ROOT, source)
       source_text = File.new(source_path).read.sub(/{mode_string}/, MODE_STRING).sub(/{jquery_selector}/, JQUERY_SELECTOR)
 
       dest_path = File.join(JAVASCRIPT_ROOT, 'use_tinymce_init.js')
+      mkdir_tree(JAVASCRIPT_ROOT)
       dest_file = File.new(dest_path, "w")
       dest_file.write(source_text)
       dest_file.close
     end
 
+    # returns true if all directories from 'base' on up exist or can be created; else false
+    def self.mkdir_tree(base)
+      return File.directory?(base) if File.exists? base
+      Dir.mkdir(base) if mkdir_tree File.dirname(base)
+      return File.directory? base
+    end
+
     def self.rmdir_tree(root)
       Dir.entries(root).each do |fname|
         if fname[0] == '.'
@@ -74,25 +83,43 @@ namespace :use_tinymce do
     tinymce_root_path = File.join(UseTinyMCE::RakeSupport::JAVASCRIPT_ROOT, 'tinymce')
     UseTinyMCE::RakeSupport::rmdir_tree(tinymce_root_path) if File.exists? tinymce_root_path
   end
-  task :install_tinymce_advanced => :uninstall do
-    FileUtils.cp_r File.join(UseTinyMCE::RakeSupport::ASSETS_ROOT, 'tinymce_no_jquery', 'tinymce'), UseTinyMCE::RakeSupport::JAVASCRIPT_ROOT
-  end
-  task :install_tinymce_jquery => :uninstall do
-    FileUtils.cp_r File.join(UseTinyMCE::RakeSupport::ASSETS_ROOT, 'tinymce_jquery', 'tinymce'), UseTinyMCE::RakeSupport::JAVASCRIPT_ROOT
-  end
 
-  desc "Install tinymce with 'simple' initialization"
-  task :install_simple => :install_tinymce_advanced do
-    UseTinyMCE::RakeSupport::copy_init_script('use_tinymce_init_simple.js')
-  end
+  case Rails.version
+  when /^3.0/
+    # common task - this undescribed task installs the non-jquery version of TinyMCE, but not the initialization script
+    task :install_tinymce_advanced => :uninstall do
+      raise Exception.new("Cannot install: #{UseTinyMCE::RakeSupport::JAVASCRIPT_ROOT} does not exist") unless UseTinyMCE::RakeSupport.mkdir_tree UseTinyMCE::RakeSupport::JAVASCRIPT_ROOT
+      FileUtils.cp_r File.join(UseTinyMCE::RakeSupport::ASSETS_ROOT, 'tinymce_no_jquery', 'tinymce'), UseTinyMCE::RakeSupport::JAVASCRIPT_ROOT
+    end
+    # common task - this undescribed task installs the jquery version of TinyMCE, but not the initialization script
+    task :install_tinymce_jquery => :uninstall do
+      raise Exception.new("Cannot install: #{UseTinyMCE::RakeSupport::JAVASCRIPT_ROOT} does not exist") unless UseTinyMCE::RakeSupport.mkdir_tree UseTinyMCE::RakeSupport::JAVASCRIPT_ROOT
+      FileUtils.cp_r File.join(UseTinyMCE::RakeSupport::ASSETS_ROOT, 'tinymce_jquery', 'tinymce'), UseTinyMCE::RakeSupport::JAVASCRIPT_ROOT
+    end
 
-  desc "Install tinymce with 'advanced' initialization"
-  task :install_advanced => :install_tinymce_advanced do
-    UseTinyMCE::RakeSupport::copy_init_script('use_tinymce_init_advanced.js')
-  end
+    desc "Install tinymce with 'simple' initialization"
+    task :install_simple => :install_tinymce_advanced do
+      UseTinyMCE::RakeSupport::copy_init_script('use_tinymce_init_simple.js')
+    end
+
+    desc "Install tinymce with 'advanced' initialization"
+    task :install_advanced => :install_tinymce_advanced do
+      UseTinyMCE::RakeSupport::copy_init_script('use_tinymce_init_advanced.js')
+    end
 
-  desc "Install tinymce jquery plugin with 'advanced' initialization"
-  task :install_jquery => :install_tinymce_jquery do
-    UseTinyMCE::RakeSupport::copy_init_script('use_tinymce_init_jquery.js')
+    desc "Install tinymce jquery plugin with 'advanced' initialization"
+    task :install_jquery => :install_tinymce_jquery do
+      UseTinyMCE::RakeSupport::copy_init_script('use_tinymce_init_jquery.js')
+    end
+  when /^3.1/
+    desc "Install tinymce jquery plugin with 'advanced' initialization"
+    task :install => :uninstall do
+      raise Exception.new("Cannot install: #{UseTinyMCE::RakeSupport::JAVASCRIPT_ROOT} does not exist") unless UseTinyMCE::RakeSupport.mkdir_tree UseTinyMCE::RakeSupport::JAVASCRIPT_ROOT
+      FileUtils.cp_r File.join(UseTinyMCE::RakeSupport::ASSETS_ROOT, 'tinymce_jquery', 'tinymce'), UseTinyMCE::RakeSupport::JAVASCRIPT_ROOT
+      UseTinyMCE::RakeSupport::copy_init_script('use_tinymce_init_jquery.js')
+    end
+  else
+    puts "Don't know how to install in Rails #{Rails.version}"
+    exit 1
   end
 end

data/lib/use_tinymce/use_tinymce.rb

@@ -30,7 +30,7 @@ module UseTinymce
           if defined?(params) && use_tinymce?(params[:action])
             jq_path = File.join(Rails.root, 'public', 'javascripts', 'tinymce', 'jscripts', 'tiny_mce', 'jquery.tinymce.js')
             if File.exists? jq_path
-              javascript_include_tag( '/javascripts/tinymce/jscripts/tiny_mce/jquery.tinymce', '/javascripts/use_tinymce_init' )
+              javascript_include_tag( '/javascripts/tinymce/jscripts/tiny_mce/jquery.tinymce.js', '/javascripts/use_tinymce_init' )
             else
               javascript_include_tag( '/javascripts/tinymce/jscripts/tiny_mce/tiny_mce', '/javascripts/use_tinymce_init' )
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: use_tinymce
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000Z
+date: 2011-09-13 00:00:00.000000000Z
 dependencies: []
 description: ! 'UseTinymce - Yet Another tinyMCE integrations gem for Rails 3