tinymce-rails 6.1.0 → 7.6.0

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

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

data/lib/tinymce/rails/asset_installer.rb

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

data/lib/tinymce/rails/asset_manifest/json_manifest.rb

@@ -0,0 +1,62 @@
+module TinyMCE
+  module Rails
+    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
+  end
+end

data/lib/tinymce/rails/asset_manifest/null_manifest.rb

@@ -0,0 +1,12 @@
+module TinyMCE
+  module Rails
+    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/asset_manifest/propshaft_manifest.rb

@@ -0,0 +1,43 @@
+module TinyMCE
+  module Rails
+    class PropshaftManifest < AssetManifest
+      def self.try(manifest_path)
+        json_file = File.join(manifest_path, ".manifest.json")
+        new(json_file) if File.exist?(json_file)
+      end
+
+      def initialize(file)
+        @file = file
+        @manifest = JSON.parse(File.read(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
+        JSON.generate(@manifest)
+      end
+
+      def write
+        File.open(@file, "wb") { |f| f.write(dump) }
+      end
+    end
+  end
+end

data/lib/tinymce/rails/asset_manifest/yaml_manifest.rb

@@ -0,0 +1,43 @@
+module TinyMCE
+  module Rails
+    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
+  end
+end

data/lib/tinymce/rails/asset_manifest.rb

@@ -4,8 +4,10 @@ module TinyMCE
       attr_reader :file
 
       def self.load(manifest_path)
-        JsonManifest.try(manifest_path, ".sprockets-manifest*.json") ||
+        PropshaftManifest.try(manifest_path) ||
+          JsonManifest.try(manifest_path, ".sprockets-manifest*.json") ||
           JsonManifest.try(manifest_path, "manifest*.json") ||
+          JsonManifest.try(manifest_path) ||
           YamlManifest.try(manifest_path) ||
           NullManifest.new
       end
@@ -34,108 +36,9 @@ module TinyMCE
       end
     end
 
-    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)
-        paths = Dir[File.join(manifest_path, pattern)]
-        new(paths.first) if paths.any?
-      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
+    require_relative "asset_manifest/json_manifest"
+    require_relative "asset_manifest/null_manifest"
+    require_relative "asset_manifest/propshaft_manifest"
+    require_relative "asset_manifest/yaml_manifest"
   end
 end

data/lib/tinymce/rails/configuration.rb

@@ -15,7 +15,7 @@ module TinyMCE::Rails
       }
     end
 
-    FUNCTION_REGEX = /^function\s*\(/
+    FUNCTION_REGEX = /^function\s*\(([\w\d\s_,]*)\)\s*\{([^}]*)\}|\(([\w\d\s_,]*)\)\s*=>\s*\{([^}]*)\}/
     RELATIVE_PATH_REGEX = /^(\/|\.{1,2})\S*/
 
     COMMA = ",".freeze
@@ -98,10 +98,15 @@ module TinyMCE::Rails
       FUNCTION_REGEX =~ value.to_s
     end
 
+    def valid_property_name?(key)
+      key =~ /^(?![0-9])[a-zA-Z0-9$_]+$/
+    end
+
     def preprocess_options(options)
       result = {}
 
       options.each do |key, value|
+        key = "'#{key}'" unless valid_property_name?(key)
         result[key] = preprocess_option(key, value)
       end
 

data/lib/tinymce/rails/configuration_file.rb

@@ -43,7 +43,8 @@ module TinyMCE::Rails
     end
 
     def load_yaml(path)
-      YAML::load(ERB.new(IO.read(path)).result)
+      result = ERB.new(IO.read(path)).result
+      YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(result) : YAML.load(result)
     end
   end
 end

data/lib/tinymce/rails/engine.rb

@@ -13,14 +13,27 @@ 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"
-    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)
 
     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,13 +63,27 @@ module TinyMCE::Rails
     end
 
     # Includes TinyMCE javascript assets via a script tag.
-    def tinymce_assets
-      javascript_include_tag "tinymce", "data-turbolinks-track" => "reload"
+    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)
     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
-    public :tinymce, :tinymce_javascript, :tinymce_configurations_javascript, :tinymce_configuration
+    module_function :tinymce, :tinymce_javascript, :tinymce_configurations_javascript, :tinymce_configuration, :tinymce_preinit
+    public :tinymce, :tinymce_javascript, :tinymce_configurations_javascript, :tinymce_configuration, :tinymce_preinit
   end
 end

data/lib/tinymce/rails/propshaft/asset.rb

@@ -0,0 +1,11 @@
+require "propshaft/asset"
+
+class Propshaft::Asset
+  alias fresh_without_tinymce_exception? fresh?
+
+  # Allow TinyMCE assets to be accessed (in development mode) without a digest
+  def fresh?(digest)
+    fresh_without_tinymce_exception?(digest) ||
+      (digest.blank? && logical_path.to_s.starts_with?("tinymce/"))
+  end
+end

data/lib/tinymce/rails/version.rb

@@ -1,6 +1,6 @@
 module TinyMCE
   module Rails
-    VERSION = "6.1.0"
-    TINYMCE_VERSION = "6.1.0"
+    VERSION = "7.6.0"
+    TINYMCE_VERSION = "7.6.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"