tinymce-rails 3.5.8 → 3.5.8.1

data/Rakefile

@@ -49,3 +49,8 @@ task :process do
     end
   end
 end
+
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/app/assets/javascripts/tinymce/preinit.js.erb

@@ -1,5 +1,5 @@
 window.tinyMCEPreInit = window.tinyMCEPreInit || {
-  base:   '<%= TinyMCE::Rails::Engine.config.tinymce.base || asset_path("tinymce", :digest => false) %>',
+  base:   '<%= TinyMCE::Rails::Engine.base %>',
   query:  '<%= TinyMCE::Rails::VERSION %>',
   suffix: ''
 };

data/lib/tasks/tinymce-assets.rake

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

data/lib/tinymce/rails.rb

@@ -8,5 +8,9 @@ module TinyMCE
     def self.configuration
       @configuration ||= Configuration.load(::Rails.root.join("config/tinymce.yml"))
     end
+
+    def self.configuration=(configuration)
+      @configuration = configuration
+    end
   end
 end

data/lib/tinymce/rails/asset_installer.rb

@@ -0,0 +1,66 @@
+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)
+        @target = target
+        @manifest_path = manifest_path || target
+      end
+      
+      def install
+        cleanup_assets
+        copy_assets
+        append_to_manifest
+        
+        manifest.write
+      end
+    
+    private
+      def manifest
+        @manifest ||= AssetManifest.load(@manifest_path)
+      end
+      
+      def cleanup_assets
+        manifest.each(/^tinymce\//) do |asset|
+          manifest.remove(asset) if index_asset?(asset)
+          
+          manifest.remove_digest(asset) do |src, dest|
+            move_asset(src, dest)
+          end
+        end
+      end
+      
+      def copy_assets
+        FileUtils.cp_r(ASSETS, @target, :preserve => true)
+      end
+      
+      def append_to_manifest
+        asset_files.each do |file|
+          manifest.append(logical_path(file), file)
+        end
+      end
+      
+      def asset_files
+        Pathname.glob("#{ASSETS}/**/*").select(&:file?)
+      end
+      
+      def logical_path(file)
+        file.relative_path_from(ASSETS.parent).to_s
+      end
+      
+      def move_asset(src, dest)
+        src = File.join(@target, src)
+        dest = File.join(@target, dest)
+        
+        FileUtils.mv(src, dest, :force => true) if src != dest && File.exists?(src)
+      end
+      
+      def index_asset?(asset)
+        asset =~ /\/index\.js$/
+      end
+    end
+  end
+end

data/lib/tinymce/rails/asset_manifest.rb

@@ -0,0 +1,122 @@
+require "multi_json"
+
+module TinyMCE
+  module Rails
+    class AssetManifest
+      def self.load(manifest_path)
+        YamlManifest.try(manifest_path) ||
+          JsonManifest.try(manifest_path) ||
+          NullManifest.new
+      end
+    end
+  end
+  
+  class YamlManifest
+    def self.try(manifest_path)
+      yaml_file = File.join(manifest_path, "manifest.yml")
+      new(yaml_file) if File.exists?(yaml_file)
+    end
+    
+    def initialize(file)
+      @file = file
+      @manifest = YAML.load_file(file)
+    end
+    
+    def append(logical_path, file)
+      @manifest[logical_path] = logical_path
+    end
+    
+    def remove(logical_path)
+      @manifest.delete(logical_path)
+    end
+    
+    def remove_digest(logical_path)
+      if digested = @manifest[logical_path]
+        @manifest[logical_path] = logical_path
+        yield digested, logical_path if block_given?
+      end
+    end
+    
+    def each(pattern)
+      @manifest.each_key do |asset|
+        yield asset if asset =~ pattern
+      end
+    end
+    
+    def to_s
+      dump
+    end
+    
+    def dump(io=nil)
+      YAML.dump(@manifest, io)
+    end
+    
+    def write
+      File.open(@file, "wb") { |f| dump(f) }
+    end
+  end
+  
+  class JsonManifest
+    def self.try(manifest_path)
+      paths = Dir[File.join(manifest_path, "manifest*.json")]
+      new(paths.first) if paths.any?
+    end
+    
+    def initialize(file)
+      @file = file
+      @manifest = MultiJson.load(File.read(file))
+    end
+    
+    def append(logical_path, file)
+      stat = File.stat(file)
+      
+      @manifest["assets"][logical_path] = logical_path
+      @manifest["files"][logical_path] = {
+        "logical_path" => logical_path,
+        "mtime"        => stat.mtime.iso8601,
+        "size"         => stat.size,
+        "digest"       => nil
+      }
+    end
+    
+    def remove(logical_path)
+      if digested = @manifest["assets"].delete(logical_path)
+        @manifest["files"].delete(digested)
+      end
+    end
+    
+    def remove_digest(logical_path)
+      if digested = @manifest["assets"][logical_path]
+        @manifest["assets"][logical_path] = logical_path
+        @manifest["files"][logical_path] = @manifest["files"].delete(digested).tap { |f| f["digest"] = nil }
+        yield digested, logical_path if block_given?
+      end
+    end
+    
+    def each(pattern)
+      @manifest["assets"].each_key do |asset|
+        yield asset if asset =~ pattern
+      end
+    end
+    
+    def to_s
+      dump
+    end
+    
+    def dump
+      MultiJson.dump(@manifest)
+    end
+    
+    def write
+      File.open(@file, "wb") { |f| f.write(dump) }
+    end
+  end
+  
+  class NullManifest
+    def append(*); end
+    def remove(*); end
+    def remove_digest(*); end
+    def each(*); end
+    def write; end
+  end
+end

data/lib/tinymce/rails/engine.rb

@@ -14,5 +14,13 @@ module TinyMCE::Rails
         include Helper
       end
     end
+
+    def self.base
+      config.tinymce.base || default_base
+    end
+
+    def self.default_base
+      File.join(Rails.application.config.relative_url_root || "", Rails.application.config.assets.prefix || "/", "tinymce")
+    end
   end
 end

data/lib/tinymce/rails/helper.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/hash/keys'
+
 module TinyMCE::Rails
   module Helper
     # Initializes TinyMCE on the current page based on the global configuration.
@@ -20,6 +22,7 @@ module TinyMCE::Rails
     # Returns the JavaScript code required to initialize TinyMCE.
     def tinymce_javascript(config=:default, options={})
       options, config = config, :default if config.is_a?(Hash)
+      options.stringify_keys!
       
       base_configuration = TinyMCE::Rails.configuration
       

data/lib/tinymce/rails/version.rb

@@ -1,6 +1,6 @@
 module TinyMCE
   module Rails
-    VERSION = "3.5.8"
+    VERSION = "3.5.8.1"
     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
+  version: 3.5.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-23 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -41,6 +41,8 @@ files:
 - app/assets/javascripts/tinymce-jquery.js
 - app/assets/javascripts/tinymce.js
 - lib/tasks/tinymce-assets.rake
+- lib/tinymce/rails/asset_installer.rb
+- lib/tinymce/rails/asset_manifest.rb
 - lib/tinymce/rails/configuration.rb
 - lib/tinymce/rails/engine.rb
 - lib/tinymce/rails/helper.rb
@@ -331,4 +333,3 @@ signing_key:
 specification_version: 3
 summary: Rails asset pipeline integration for TinyMCE.
 test_files: []
-has_rdoc: