tiny_mce 0.0.1 → 0.0.2

data/Rakefile

@@ -38,3 +38,6 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+desc "Bump patch version and release to github and gemcutter"
+task :bump => %w(version:bump:patch release gemcutter:release install)

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/init.rb

@@ -1,13 +1 @@
-# Require all the necessary files to run TinyMCE
 require 'tiny_mce'
-require 'options_validator'
-require 'spellchecker'
-require 'tiny_mce_helpers'
-
-# Load up the available configuration options (we do it here because
-# the result doesn't, so we don't want to load it per request)
-TinyMCE::OptionValidator.load
-
-# Include the TinyMCE methods and TinyMCE Helpers into ActionController::Base
-ActionController::Base.send(:include, TinyMCE)
-ActionController::Base.send(:helper, TinyMCEHelpers)

data/lib/tiny_mce.rb

@@ -1,40 +1,19 @@
-# The base module we include into ActionController::Base
 module TinyMCE
+end
 
-  # When this module is included, extend it with the available class methods
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
-
-  module ClassMethods
-
-    # The controller declaration to enable tiny_mce on certain actions.
-    # Takes options hash, raw_options string, and any normal params you
-    # can send to a before_filter (only, except etc)
-    def uses_tiny_mce(options = {})
-      tiny_mce_options = options.delete(:options) || {}
-      raw_tiny_mce_options = options.delete(:raw_options) || ''
-
-      # If the tiny_mce plugins includes the spellchecker, then form a spellchecking path,
-      # add it to the tiny_mce_options, and include the SpellChecking module
-      if !tiny_mce_options[:plugins].blank? && tiny_mce_options[:plugins].include?('spellchecker')
-        tiny_mce_options.reverse_merge!(:spellchecker_rpc_url => "/" + self.controller_name + "/spellchecker")
-        self.class_eval do
-          include TinyMCE::SpellChecker
-        end
-      end
-
-      # Set instance vars in the current class
-      proc = Proc.new do |c|
-        c.instance_variable_set(:@tiny_mce_options, tiny_mce_options)
-        c.instance_variable_set(:@raw_tiny_mce_options, raw_tiny_mce_options)
-        c.instance_variable_set(:@uses_tiny_mce, true)
-      end
+# Require all the necessary files to run TinyMCE
+require 'tiny_mce/controller.rb'
+require 'tiny_mce/options_validator'
+require 'tiny_mce/spellchecker'
+require 'tiny_mce/helpers'
 
-      # Run the above proc before each page load this method is declared in
-      before_filter(proc, options)
-    end
+# Load up the available configuration options (we do it here because
+# the result doesn't, so we don't want to load it per request)
+TinyMCE::OptionValidator.load
 
-  end
+# Include the TinyMCE methods and TinyMCE Helpers into ActionController::Base
 
+if defined?(Rails) && defined?(ActionController)
+  ActionController::Base.send(:include, TinyMCE::Controller)
+  ActionController::Base.send(:helper, TinyMCEHelpers)
 end

data/lib/tiny_mce/controller.rb

@@ -0,0 +1,40 @@
+module TinyMCE
+  # The base module we include into ActionController::Base
+  module Controller
+    # When this module is included, extend it with the available class methods
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      # The controller declaration to enable tiny_mce on certain actions.
+      # Takes options hash, raw_options string, and any normal params you
+      # can send to a before_filter (only, except etc)
+      def uses_tiny_mce(options = {})
+        tiny_mce_options = options.delete(:options) || {}
+        raw_tiny_mce_options = options.delete(:raw_options) || ''
+
+        # If the tiny_mce plugins includes the spellchecker, then form a spellchecking path,
+        # add it to the tiny_mce_options, and include the SpellChecking module
+        if !tiny_mce_options[:plugins].blank? && tiny_mce_options[:plugins].include?('spellchecker')
+          tiny_mce_options.reverse_merge!(:spellchecker_rpc_url => "/" + self.controller_name + "/spellchecker")
+          self.class_eval do
+            include TinyMCE::SpellChecker
+          end
+        end
+
+        # Set instance vars in the current class
+        proc = Proc.new do |c|
+          c.instance_variable_set(:@tiny_mce_options, tiny_mce_options)
+          c.instance_variable_set(:@raw_tiny_mce_options, raw_tiny_mce_options)
+          c.instance_variable_set(:@uses_tiny_mce, true)
+        end
+
+        # Run the above proc before each page load this method is declared in
+        before_filter(proc, options)
+      end
+
+    end
+
+  end
+end

data/lib/tiny_mce/helpers.rb

@@ -0,0 +1,91 @@
+module TinyMCE
+  # The helper module we include into ActionController::Base
+  module Helpers
+    # Setup a couple of Exception classes that we use later on
+    class TinyMCEInvalidOption < Exception; end
+    class TinyMCEInvalidOptionType < Exception; end
+
+    # Has uses_tiny_mce method been declared in the controller for this page?
+    def using_tiny_mce?
+      !@uses_tiny_mce.blank?
+    end
+
+    # Parse @tiny_mce_options and @raw_tiny_mce_options to create a raw JS string
+    # used by TinyMCE. Returns errors if the option or options type is invalid
+    def raw_tiny_mce_init(options = {}, raw_options = '')
+      # first we set some defaults, then we merge in the controller level options
+      # and finally merge in the view level options (to give presidence)
+      @tiny_mce_options ||= {}
+      default_options = { 'mode' => 'textareas',
+                  'editor_selector' => 'mceEditor',
+                  'theme' => 'simple',
+                  'language' => (defined?(I18n) ? I18n.locale : :en) }
+      options = default_options.merge(@tiny_mce_options.stringify_keys).merge(options.stringify_keys)
+      raw_options = @raw_tiny_mce_options + raw_options unless @raw_tiny_mce_options.nil?
+
+      unless options['plugins'].nil?
+        raise TinyMCEInvalidOptionType.new("Invalid value of type #{options['plugins'].class} passed for TinyMCE option plugins") unless options['plugins'].kind_of?(Array)
+        
+        # Append the plugins we have enabled for this field to the OptionsValidator
+        TinyMCE::OptionValidator.plugins += options['plugins']
+      end
+
+      tinymce_js = "tinyMCE.init({\n"
+      options.sort.each_with_index do |values, index|
+        key, value = values[0], values[1]
+        raise TinyMCEInvalidOption.new("Invalid option #{key} passed to tinymce") unless TinyMCE::OptionValidator.valid?(key)
+        tinymce_js += "#{key} : "
+        case value
+        when String, Symbol, Fixnum
+          tinymce_js += "'#{value.to_s}'"
+        when Array
+          tinymce_js += '"' + value.join(',') + '"'
+        when TrueClass
+          tinymce_js += 'true'
+        when FalseClass
+          tinymce_js += 'false'
+        else
+          raise TinyMCEInvalidOptionType.new("Invalid value of type #{value.class} passed for TinyMCE option #{key}")
+        end
+        if (index < options.size - 1)
+          # there are more options in this array
+          tinymce_js += ",\n"
+        else
+          # no more options in this array. Finish it by adding the addition JS
+          tinymce_js += ",\n#{raw_options}" unless raw_options.blank?
+          tinymce_js += "\n"
+        end
+      end
+      tinymce_js += "\n});"
+    end
+
+    # Form the raw JS and wrap in in a <script> tag for inclusion in the <head>
+    def tiny_mce_init(options = {}, raw_options = '')
+      javascript_tag raw_tiny_mce_init(options, raw_options)
+    end
+    # Form the raw JS and wrap in in a <script> tag for inclusion in the <head>
+    # (only if tiny mce is actually being used)
+    def tiny_mce_init_if_needed(options = {}, raw_options = '')
+      tiny_mce_init(options, raw_options) if using_tiny_mce?
+    end
+
+    # Form a JS include tag for the TinyMCE JS src for inclusion in the <head>
+    def include_tiny_mce_js
+      javascript_include_tag (Rails.env.development? ? "tiny_mce/tiny_mce_src" : "tiny_mce/tiny_mce")
+    end
+    # Form a JS include tag for the TinyMCE JS src for inclusion in the <head>
+    # (only if tiny mce is actually being used)
+    def include_tiny_mce_js_if_needed
+      include_tiny_mce_js if using_tiny_mce?
+    end
+
+    # Form a JS include tag for the TinyMCE JS src, and form the raw JS and wrap
+    # in in a <script> tag for inclusion in the <head> for inclusion in the <head>
+    # (only if tiny mce is actually being used)
+    def include_tiny_mce_if_needed(options = {}, raw_options = '')
+      if using_tiny_mce?
+        include_tiny_mce_js + tiny_mce_init(options, raw_options)
+      end
+    end
+  end
+end

data/tiny_mce.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tiny_mce}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Blake Watters", "Kieran Pilkington", "Alexander Semyonov"]
@@ -26,10 +26,11 @@ Gem::Specification.new do |s|
      "VERSION",
      "init.rb",
      "install.rb",
-     "lib/options_validator.rb",
-     "lib/spellchecker.rb",
      "lib/tiny_mce.rb",
-     "lib/tiny_mce_helpers.rb",
+     "lib/tiny_mce/controller.rb",
+     "lib/tiny_mce/helpers.rb",
+     "lib/tiny_mce/options_validator.rb",
+     "lib/tiny_mce/spellchecker.rb",
      "public/javascripts/tiny_mce/langs/ar.js",
      "public/javascripts/tiny_mce/langs/az.js",
      "public/javascripts/tiny_mce/langs/be.js",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tiny_mce
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Blake Watters
@@ -34,10 +34,11 @@ files:
 - VERSION
 - init.rb
 - install.rb
-- lib/options_validator.rb
-- lib/spellchecker.rb
 - lib/tiny_mce.rb
-- lib/tiny_mce_helpers.rb
+- lib/tiny_mce/controller.rb
+- lib/tiny_mce/helpers.rb
+- lib/tiny_mce/options_validator.rb
+- lib/tiny_mce/spellchecker.rb
 - public/javascripts/tiny_mce/langs/ar.js
 - public/javascripts/tiny_mce/langs/az.js
 - public/javascripts/tiny_mce/langs/be.js

data/lib/tiny_mce_helpers.rb

@@ -1,91 +0,0 @@
-# The helper module we include into ActionController::Base
-module TinyMCEHelpers
-
-  # Setup a couple of Exception classes that we use later on
-  class TinyMCEInvalidOption < Exception; end
-  class TinyMCEInvalidOptionType < Exception; end
-
-  # Has uses_tiny_mce method been declared in the controller for this page?
-  def using_tiny_mce?
-    !@uses_tiny_mce.blank?
-  end
-
-  # Parse @tiny_mce_options and @raw_tiny_mce_options to create a raw JS string
-  # used by TinyMCE. Returns errors if the option or options type is invalid
-	def raw_tiny_mce_init(options = {}, raw_options = '')
-    # first we set some defaults, then we merge in the controller level options
-    # and finally merge in the view level options (to give presidence)
-	  @tiny_mce_options ||= {}
-    default_options = { 'mode' => 'textareas',
-                'editor_selector' => 'mceEditor',
-                'theme' => 'simple',
-                'language' => (defined?(I18n) ? I18n.locale : :en) }
-    options = default_options.merge(@tiny_mce_options.stringify_keys).merge(options.stringify_keys)
-    raw_options = @raw_tiny_mce_options + raw_options unless @raw_tiny_mce_options.nil?
-
-    unless options['plugins'].nil?
-      raise TinyMCEInvalidOptionType.new("Invalid value of type #{options['plugins'].class} passed for TinyMCE option plugins") unless options['plugins'].kind_of?(Array)
-      
-      # Append the plugins we have enabled for this field to the OptionsValidator
-      TinyMCE::OptionValidator.plugins += options['plugins']
-    end
-
-    tinymce_js = "tinyMCE.init({\n"
-    options.sort.each_with_index do |values, index|
-      key, value = values[0], values[1]
-      raise TinyMCEInvalidOption.new("Invalid option #{key} passed to tinymce") unless TinyMCE::OptionValidator.valid?(key)
-      tinymce_js += "#{key} : "
-      case value
-      when String, Symbol, Fixnum
-        tinymce_js += "'#{value.to_s}'"
-      when Array
-        tinymce_js += '"' + value.join(',') + '"'
-      when TrueClass
-        tinymce_js += 'true'
-      when FalseClass
-        tinymce_js += 'false'
-      else
-        raise TinyMCEInvalidOptionType.new("Invalid value of type #{value.class} passed for TinyMCE option #{key}")
-      end
-      if (index < options.size - 1)
-        # there are more options in this array
-        tinymce_js += ",\n"
-      else
-        # no more options in this array. Finish it by adding the addition JS
-        tinymce_js += ",\n#{raw_options}" unless raw_options.blank?
-        tinymce_js += "\n"
-      end
-    end
-    tinymce_js += "\n});"
-	end
-
-  # Form the raw JS and wrap in in a <script> tag for inclusion in the <head>
-  def tiny_mce_init(options = {}, raw_options = '')
-    javascript_tag raw_tiny_mce_init(options, raw_options)
-  end
-  # Form the raw JS and wrap in in a <script> tag for inclusion in the <head>
-  # (only if tiny mce is actually being used)
-  def tiny_mce_init_if_needed(options = {}, raw_options = '')
-    tiny_mce_init(options, raw_options) if using_tiny_mce?
-  end
-
-  # Form a JS include tag for the TinyMCE JS src for inclusion in the <head>
-  def include_tiny_mce_js
-    javascript_include_tag (Rails.env.development? ? "tiny_mce/tiny_mce_src" : "tiny_mce/tiny_mce")
-  end
-  # Form a JS include tag for the TinyMCE JS src for inclusion in the <head>
-  # (only if tiny mce is actually being used)
-  def include_tiny_mce_js_if_needed
-    include_tiny_mce_js if using_tiny_mce?
-  end
-
-  # Form a JS include tag for the TinyMCE JS src, and form the raw JS and wrap
-  # in in a <script> tag for inclusion in the <head> for inclusion in the <head>
-  # (only if tiny mce is actually being used)
-  def include_tiny_mce_if_needed(options = {}, raw_options = '')
-    if using_tiny_mce?
-      include_tiny_mce_js + tiny_mce_init(options, raw_options)
-    end
-  end
-
-end