tinymce-rails 3.5.8.2 → 3.5.8.3

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2011-12 by Sam Pohlenz
+Copyright (C) 2011-13 by Sam Pohlenz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -3,7 +3,9 @@ Rails Integration for TinyMCE
 
 The `tinymce-rails` gem integrates the [TinyMCE](http://www.tinymce.com/) editor with the Rails asset pipeline.
 
-This gem is compatible with Rails 3.1.1 and higher. Support for TinyMCE 4 is currently under development in the [tinymce-4 branch](https://github.com/spohlenz/tinymce-rails/tree/tinymce-4).
+This gem is compatible with Rails 3.1.1 and higher (including Rails 4).
+
+Support for TinyMCE 4 is currently available in the [tinymce-4 branch](https://github.com/spohlenz/tinymce-rails/tree/tinymce-4). For the time being, parallel versions of TinyMCE (3.5.x and 4.x) will be maintained. However TinyMCE 4 will eventually be promoted to the master branch.
 
 [![Build Status](https://travis-ci.org/spohlenz/tinymce-rails.png?branch=master)](https://travis-ci.org/spohlenz/tinymce-rails)
 
@@ -30,6 +32,8 @@ Be sure to add to the global group, not the `assets` group. Then run `bundle ins
       - table
       - fullscreen
 
+The Rails server no longer needs to be restarted when this file is updated in development mode.
+
 To define multiple configuration sets, follow this syntax (a default configuration must be specified):
 
     default:
@@ -47,7 +51,7 @@ To define multiple configuration sets, follow this syntax (a default configurati
       plugins:
         - table
 
-See the [TinyMCE Documentation](http://www.tinymce.com/wiki.php/Configuration) for a full list of configuration options.
+See the [TinyMCE 3 Documentation](http://www.tinymce.com/wiki.php/Configuration3x) for a full list of configuration options.
 
 
 **3. Include the TinyMCE assets**
@@ -87,12 +91,6 @@ Alternate configurations defined in 'config/tinymce.yml' can be used with:
     <%= tinymce :alternate %>
 
 
-Language Packs
---------------
-
-See the [tinymce-rails-langs](https://github.com/spohlenz/tinymce-rails-langs) gem for additional language packs for TinyMCE. The `tinymce` helper will use the current locale as the language if available, falling back to English if the core language files are missing.
-
-
 Manual Initialization
 ---------------------
 
@@ -108,6 +106,12 @@ Using the `tinymce` helper and global configuration file is entirely optional. T
     </script>
 
 
+Language Packs
+--------------
+
+See the [tinymce-rails-langs](https://github.com/spohlenz/tinymce-rails-langs) gem for additional language packs for TinyMCE. The `tinymce` helper will use the current locale as the language if available, falling back to English if the core language files are missing.
+
+
 Custom Plugins & Skins
 ----------------------
 

data/lib/tasks/tinymce-assets.rake

@@ -3,9 +3,11 @@ assets_task = Rake::Task.task_defined?('assets:precompile:primary') ? 'assets:pr
 Rake::Task[assets_task].enhance do
   require "tinymce/rails/asset_installer"
   
+  assets = Pathname.new(File.expand_path(File.dirname(__FILE__) + "/../../vendor/assets/javascripts/tinymce"))
+
   config   = Rails.application.config
   target   = File.join(Rails.public_path, config.assets.prefix)
   manifest = config.assets.manifest
   
-  TinyMCE::Rails::AssetInstaller.new(target, manifest).install
+  TinyMCE::Rails::AssetInstaller.new(assets, target, manifest).install
 end

data/lib/tinymce/rails.rb

@@ -3,10 +3,12 @@ module TinyMCE
     require 'tinymce/rails/engine'
     require 'tinymce/rails/version'
     require "tinymce/rails/configuration"
+    require "tinymce/rails/configuration_file"
     require "tinymce/rails/helper"
 
     def self.configuration
-      @configuration ||= Configuration.load(::Rails.root.join("config/tinymce.yml"))
+      @configuration ||= ConfigurationFile.new(::Rails.root.join("config/tinymce.yml"))
+      @configuration.respond_to?(:configuration) ? @configuration.configuration : @configuration
     end
 
     def self.configuration=(configuration)

data/lib/tinymce/rails/asset_installer.rb

@@ -3,9 +3,8 @@ require "tinymce/rails/asset_manifest"
 module TinyMCE
   module Rails
     class AssetInstaller
-      ASSETS = Pathname.new(File.expand_path(File.dirname(__FILE__) + "/../../../vendor/assets/javascripts/tinymce"))
-      
-      def initialize(target, manifest_path)
+      def initialize(assets, target, manifest_path)
+        @assets = assets
         @target = target
         @manifest_path = manifest_path || target
       end
@@ -34,7 +33,7 @@ module TinyMCE
       end
       
       def copy_assets
-        FileUtils.cp_r(ASSETS, @target, :preserve => true)
+        FileUtils.cp_r(@assets, @target, :preserve => true)
       end
       
       def append_to_manifest
@@ -44,11 +43,11 @@ module TinyMCE
       end
       
       def asset_files
-        Pathname.glob("#{ASSETS}/**/*").select(&:file?)
+        Pathname.glob("#{@assets}/**/*").select(&:file?)
       end
       
       def logical_path(file)
-        file.relative_path_from(ASSETS.parent).to_s
+        file.relative_path_from(@assets.parent).to_s
       end
       
       def move_asset(src, dest)

data/lib/tinymce/rails/configuration.rb

@@ -50,18 +50,6 @@ module TinyMCE::Rails
       self.class.new(self.options.merge(options))
     end
     
-    def self.load(filename)
-      return new_with_defaults if !File.exists?(filename)
-      
-      options = load_yaml(filename)
-      
-      if options.has_key?('default')
-        MultipleConfiguration.new(options)
-      else
-        new_with_defaults(options)
-      end
-    end
-    
     # Default language falls back to English if current locale is not available.
     def self.default_language
       available_languages.include?(I18n.locale.to_s) ? I18n.locale.to_s : "en"
@@ -81,10 +69,6 @@ module TinyMCE::Rails
     def self.assets
       Rails.application.assets
     end
-    
-    def self.load_yaml(filename)
-      YAML::load(ERB.new(IO.read(filename)).result)
-    end
   end
   
   class MultipleConfiguration < ActiveSupport::HashWithIndifferentAccess

data/lib/tinymce/rails/configuration_file.rb

@@ -0,0 +1,49 @@
+module TinyMCE::Rails
+  class ConfigurationFile
+    attr_reader :path
+    
+    def initialize(path)
+      @path = path
+    end
+    
+    def configuration
+      @configuration = load_configuration if reload?
+      @configuration
+    end
+    
+    def reload?
+      @configuration.nil? || (reloadable? && changed?)
+    end
+    
+    def changed?
+      @last_loaded != last_updated
+    end
+    
+  private
+    def reloadable?
+      !::Rails.application.config.cache_classes
+    end
+    
+    def last_updated
+      File.exists?(path) && File.mtime(path)
+    end
+    
+    def load_configuration
+      @last_loaded = last_updated
+      
+      return Configuration.new_with_defaults if !File.exists?(path)
+      
+      options = load_yaml(path)
+      
+      if options && options.has_key?('default')
+        MultipleConfiguration.new(options)
+      else
+        Configuration.new_with_defaults(options)
+      end
+    end
+    
+    def load_yaml(path)
+      YAML::load(ERB.new(IO.read(path)).result)
+    end
+  end
+end

data/lib/tinymce/rails/helper.rb

@@ -21,6 +21,12 @@ module TinyMCE::Rails
     
     # Returns the JavaScript code required to initialize TinyMCE.
     def tinymce_javascript(config=:default, options={})
+      "tinyMCE.init(#{tinymce_configuration(config, options).to_json});".html_safe
+    end
+    
+    # Returns the TinyMCE configuration as a hash.
+    # It should be converted to JSON (via #to_json) for use within JavaScript.
+    def tinymce_configuration(config=:default, options={})
       options, config = config, :default if config.is_a?(Hash)
       options.stringify_keys!
       
@@ -30,9 +36,7 @@ module TinyMCE::Rails
         base_configuration = base_configuration.fetch(config)
       end
       
-      configuration = base_configuration.merge(options)
-      
-      "tinyMCE.init(#{configuration.options_for_tinymce.to_json});".html_safe
+      base_configuration.merge(options).options_for_tinymce
     end
     
     # Includes TinyMCE javascript assets via a script tag.

data/lib/tinymce/rails/version.rb

@@ -1,6 +1,6 @@
 module TinyMCE
   module Rails
-    VERSION = "3.5.8.2"
+    VERSION = "3.5.8.3"
     TINYMCE_VERSION = "3.5.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tinymce-rails
 version: !ruby/object:Gem::Version
-  version: 3.5.8.2
+  version: 3.5.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -44,6 +44,7 @@ files:
 - lib/tinymce/rails/asset_installer.rb
 - lib/tinymce/rails/asset_manifest.rb
 - lib/tinymce/rails/configuration.rb
+- lib/tinymce/rails/configuration_file.rb
 - lib/tinymce/rails/engine.rb
 - lib/tinymce/rails/helper.rb
 - lib/tinymce/rails/version.rb