Fix asset manifest loading when a specific JSON manifest path is provided

Author: spohlenz

lib/tinymce/rails/asset_manifest.rb

@@ -6,6 +6,7 @@ class AssetManifest
       def self.load(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
@@ -75,9 +76,13 @@ def write
     end
 
     class JsonManifest < AssetManifest
-      def self.try(manifest_path, pattern)
-        paths = Dir[File.join(manifest_path, pattern)]
-        new(paths.first) if paths.any?
+      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)

spec/fixtures/json_manifest.json

@@ -0,0 +1 @@
+{}

spec/lib/asset_manifest_spec.rb

@@ -8,19 +8,25 @@ def fixture(path)
       end
 
       describe ".load" do
-        it "returns a YamlManifest if a YAML manifest file exists" do
+        it "returns a YamlManifest if a YAML manifest file exists within the given path" do
           manifest = AssetManifest.load(fixture("yaml_manifest"))
           expect(manifest).to be_an_instance_of(YamlManifest)
           expect(manifest.file).to eq fixture("yaml_manifest/manifest.yml")
         end
 
-        it "returns a JsonManifest if a JSON manifest file exists" do
+        it "returns a JsonManifest if a JSON manifest file exists within the given path" do
           manifest = AssetManifest.load(fixture("json_manifest"))
           expect(manifest).to be_an_instance_of(JsonManifest)
           expect(manifest.file).to eq fixture("json_manifest/.sprockets-manifest-18802ea98f713a419dac90694dd5b6c4.json")
         end
 
-        it "returns a JsonManifest if a legacy JSON manifest file exists" do
+        it "returns a JsonManifest if a specific JSON manifest file is provided" do
+          manifest = AssetManifest.load(fixture("json_manifest.json"))
+          expect(manifest).to be_an_instance_of(JsonManifest)
+          expect(manifest.file).to eq fixture("json_manifest.json")
+        end
+
+        it "returns a JsonManifest if a legacy JSON manifest file exists within the given path" do
           manifest = AssetManifest.load(fixture("legacy_manifest"))
           expect(manifest).to be_an_instance_of(JsonManifest)
           expect(manifest.file).to eq fixture("legacy_manifest/manifest-18802ea98f713a419dac90694dd5b6c4.json")