Backport static-file-to-json from #6273 to 3.5-stable

jekyll · Aug 12, 2017 · 27e4f75 · 27e4f75
1 parent 50453d2
commit 27e4f75
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
@@ -1,7 +1,11 @@
 module Jekyll
   class StaticFile
+    extend Forwardable
+
     attr_reader :relative_path, :extname, :name, :data
 
+    def_delegator :to_liquid, :to_json, :to_json
+
     class << self
       # The cache of last modification times [path] -> mtime.
       def mtimes

diff --git a/test/test_static_file.rb b/test/test_static_file.rb
@@ -174,5 +174,9 @@ def setup_static_file_with_defaults(base, dir, name, defaults)
       }
       assert_equal expected, @static_file.to_liquid.to_h
     end
+
+    should "jsonify its liquid drop instead of itself" do
+      assert_equal @static_file.to_liquid.to_json, @static_file.to_json
+    end
   end
 end