tinymce-rails 6.8.6.1 → 7.0.0.1

data/lib/tinymce/rails/asset_installer/copy_no_preserve.rb

@@ -1,4 +1,4 @@
-require_relative "copy"
+require "tinymce/rails/asset_installer/copy"
 
 module TinyMCE
   module Rails

data/lib/tinymce/rails/asset_installer.rb

@@ -1,8 +1,8 @@
-require_relative "asset_manifest"
+require "tinymce/rails/asset_manifest"
 
-require_relative "asset_installer/copy"
-require_relative "asset_installer/copy_no_preserve"
-require_relative "asset_installer/compile"
+require "tinymce/rails/asset_installer/copy"
+require "tinymce/rails/asset_installer/copy_no_preserve"
+require "tinymce/rails/asset_installer/compile"
 
 module TinyMCE
   module Rails

data/lib/tinymce/rails/asset_manifest.rb

@@ -4,9 +4,7 @@ module TinyMCE
       attr_reader :file
 
       def self.load(manifest_path)
-        NewPropshaftManifest.try(manifest_path) ||
-          PropshaftManifest.try(manifest_path) ||
-          JsonManifest.try(manifest_path, ".sprockets-manifest*.json") ||
+        JsonManifest.try(manifest_path, ".sprockets-manifest*.json") ||
           JsonManifest.try(manifest_path, "manifest*.json") ||
           JsonManifest.try(manifest_path) ||
           YamlManifest.try(manifest_path) ||
@@ -37,10 +35,112 @@ module TinyMCE
       end
     end
 
-    require_relative "asset_manifest/json_manifest"
-    require_relative "asset_manifest/null_manifest"
-    require_relative "asset_manifest/new_propshaft_manifest"
-    require_relative "asset_manifest/propshaft_manifest"
-    require_relative "asset_manifest/yaml_manifest"
+    class YamlManifest < AssetManifest
+      def self.try(manifest_path)
+        yaml_file = File.join(manifest_path, "manifest.yml")
+        new(yaml_file) if File.exist?(yaml_file)
+      end
+
+      def initialize(file)
+        @file = file
+        @manifest = YAML.load_file(file)
+      end
+
+      def append(logical_path, file)
+        assets[logical_path] = logical_path
+      end
+
+      def remove(logical_path)
+        assets.delete(logical_path)
+      end
+
+      def remove_digest(logical_path)
+        asset_path(logical_path) do |digested, logical_path|
+          assets[logical_path] = logical_path
+
+          yield digested, logical_path if block_given?
+        end
+      end
+
+      def assets
+        @manifest
+      end
+
+      def dump(io=nil)
+        YAML.dump(@manifest, io)
+      end
+
+      def write
+        File.open(@file, "wb") { |f| dump(f) }
+      end
+    end
+
+    class JsonManifest < AssetManifest
+      def self.try(manifest_path, pattern=nil)
+        if pattern
+          paths = Dir[File.join(manifest_path, pattern)]
+          new(paths.first) if paths.any?
+        elsif File.file?(manifest_path)
+          new(manifest_path)
+        end
+      end
+
+      def initialize(file)
+        @file = file
+        @manifest = JSON.parse(File.read(file))
+      end
+
+      def append(logical_path, file)
+        stat = File.stat(file)
+
+        assets[logical_path] = logical_path
+        files[logical_path] = {
+          "logical_path" => logical_path,
+          "mtime"        => stat.mtime.iso8601,
+          "size"         => stat.size,
+          "digest"       => nil
+        }
+      end
+
+      def remove(logical_path)
+        if digested = assets.delete(logical_path)
+          files.delete(digested)
+        end
+      end
+
+      def remove_digest(logical_path)
+        asset_path(logical_path) do |digested, logical_path|
+          assets[logical_path] = logical_path
+          files[logical_path] = files.delete(digested).tap { |f| f["digest"] = nil }
+
+          yield digested, logical_path if block_given?
+        end
+      end
+
+      def assets
+        @manifest["assets"]
+      end
+
+      def files
+        @manifest["files"]
+      end
+
+      def dump
+        JSON.generate(@manifest)
+      end
+
+      def write
+        File.open(@file, "wb") { |f| f.write(dump) }
+      end
+    end
+
+    class NullManifest < AssetManifest
+      def append(*); end
+      def remove(*); end
+      def remove_digest(*); end
+      def assets; {}; end
+      def each(*); end
+      def write; end
+    end
   end
 end

data/lib/tinymce/rails/engine.rb

@@ -13,27 +13,14 @@ module TinyMCE::Rails
     #   :copy    - copies across the TinyMCE assets statically
     config.tinymce.install = :compile
 
-    # Set default attributes for script source tags (defaults to data-turbolinks-track="reload" for backwards compatibility)
-    config.tinymce.default_script_attributes = { "data-turbolinks-track" => "reload" }
-
     initializer "precompile", :group => :all do |app|
       if config.tinymce.install == :compile
         app.config.assets.precompile << "tinymce-rails.manifest.js" # Sprockets 4 manifest
         app.config.assets.precompile << "tinymce/*"                 # Sprockets 3
       end
 
-      app.config.assets.precompile << "tinymce.js" << "tinymce-jquery.js"
-    end if defined?(Sprockets)
-
-    initializer "propshaft" do |app|
-      config.assets.excluded_paths << root.join("app/assets/sprockets")
-
-      if config.assets.server
-        # Monkey-patch Propshaft::Asset to enable access
-        # of TinyMCE assets without a hash digest.
-        require_relative "propshaft/asset"
-      end
-    end if defined?(Propshaft)
+      app.config.assets.precompile << "tinymce.js"
+    end
 
     initializer "helper" do |app|
       ActiveSupport.on_load(:action_view) do

data/lib/tinymce/rails/helper.rb

@@ -1,4 +1,4 @@
-require "active_support/core_ext/hash/keys"
+require 'active_support/core_ext/hash/keys'
 
 module TinyMCE::Rails
   module Helper
@@ -63,27 +63,13 @@ module TinyMCE::Rails
     end
 
     # Includes TinyMCE javascript assets via a script tag.
-    def tinymce_assets(options=Rails.application.config.tinymce.default_script_attributes)
-      if defined?(Sprockets)
-        javascript_include_tag("tinymce", options)
-      else
-        safe_join([
-          tinymce_preinit,
-          javascript_include_tag("tinymce/tinymce", options),
-          javascript_include_tag("tinymce/rails", options)
-        ], "\n")
-      end
-    end
-
-    # Configures where dynamically loaded TinyMCE assets are located and named
-    def tinymce_preinit(base=TinyMCE::Rails::Engine.base)
-      js = "window.tinymce = window.tinymce || { base: '#{base}', suffix: '' };"
-      javascript_tag(js, nonce: true)
+    def tinymce_assets
+      javascript_include_tag "tinymce", "data-turbolinks-track" => "reload"
     end
 
     # Allow methods to be called as module functions:
     #  e.g. TinyMCE::Rails.tinymce_javascript
-    module_function :tinymce, :tinymce_javascript, :tinymce_configurations_javascript, :tinymce_configuration, :tinymce_preinit
-    public :tinymce, :tinymce_javascript, :tinymce_configurations_javascript, :tinymce_configuration, :tinymce_preinit
+    module_function :tinymce, :tinymce_javascript, :tinymce_configurations_javascript, :tinymce_configuration
+    public :tinymce, :tinymce_javascript, :tinymce_configurations_javascript, :tinymce_configuration
   end
 end

data/lib/tinymce/rails/version.rb

@@ -1,6 +1,6 @@
 module TinyMCE
   module Rails
-    VERSION = "6.8.6.1"
-    TINYMCE_VERSION = "6.8.6"
+    VERSION = "7.0.0.1"
+    TINYMCE_VERSION = "7.0.0"
   end
 end

data/lib/tinymce/rails.rb

@@ -1,7 +1,7 @@
 module TinyMCE
   module Rails
-    require "tinymce/rails/engine"
-    require "tinymce/rails/version"
+    require 'tinymce/rails/engine'
+    require 'tinymce/rails/version'
     require "tinymce/rails/configuration"
     require "tinymce/rails/configuration_file"
     require "tinymce/rails/helper"