Merge pull request rails#50982 from jdelStrother/filename-to-json

Fix JSON-encoding ActiveStorage::Filename

Author: byroot

activestorage/CHANGELOG.md

@@ -1,3 +1,7 @@
+*   Fix JSON-encoding of `ActiveStorage::Filename` instances.
+
+    *Jonathan del Strother*
+
 *   Fix N+1 query when fetching preview images for non-image assets
 
     *Aaron Patterson & Justin Searls*

activestorage/app/models/active_storage/filename.rb

@@ -69,10 +69,6 @@ def as_json(*)
     to_s
   end
 
-  def to_json
-    to_s
-  end
-
   def <=>(other)
     to_s.downcase <=> other.to_s.downcase
   end

activestorage/test/models/filename_test.rb

@@ -53,4 +53,10 @@ class ActiveStorage::FilenameTest < ActiveSupport::TestCase
   test "compare sanitized" do
     assert_operator ActiveStorage::Filename.new("foo-bar.pdf"), :==, ActiveStorage::Filename.new("foo\tbar.pdf")
   end
+
+  test "encoding to json" do
+    assert_equal '"foo.pdf"', ActiveStorage::Filename.new("foo.pdf").to_json
+    assert_equal '{"filename":"foo.pdf"}', { filename: ActiveStorage::Filename.new("foo.pdf") }.to_json
+    assert_equal '{"filename":"foo.pdf"}', JSON.generate(filename: ActiveStorage::Filename.new("foo.pdf"))
+  end
 end