From 25f6136b275148a74e0c04f11f4a5f2376bdbd47 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 27 Jul 2020 12:59:56 -0400
Subject: [PATCH] Upgrade fastimage and remove our freedom patch

---
 Gemfile.lock                                  |  2 +-
 lib/freedom_patches/fast_image.rb             | 21 ----------
 .../freedom_patches/fast_image_spec.rb        | 40 -------------------
 3 files changed, 1 insertion(+), 62 deletions(-)
 delete mode 100644 lib/freedom_patches/fast_image.rb
 delete mode 100644 spec/components/freedom_patches/fast_image_spec.rb

diff --git a/Gemfile.lock b/Gemfile.lock
index ec2a4be932f..3f6304e9f65 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -133,7 +133,7 @@ GEM
       rake
       rake-compiler
     fast_xs (0.8.0)
-    fastimage (2.1.7)
+    fastimage (2.2.0)
     ffi (1.13.1)
     flamegraph (0.9.5)
     fspath (3.1.2)
diff --git a/lib/freedom_patches/fast_image.rb b/lib/freedom_patches/fast_image.rb
deleted file mode 100644
index 836791b977e..00000000000
--- a/lib/freedom_patches/fast_image.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-# Remove when https://github.com/sdsykes/fastimage/pull/115
-# has been merged. Please remove the specs as well.
-class FastImage
-  attr_reader :original_type
-
-  private
-
-  old_parse_type = instance_method(:parse_type)
-
-  define_method(:parse_type) do
-    @original_type = old_parse_type.bind(self).()
-
-    if @original_type == :svg && @stream.peek(2) == "<s"
-      raise UnknownImageType if @stream.peek(4) != "<svg"
-    end
-
-    @original_type
-  end
-end
diff --git a/spec/components/freedom_patches/fast_image_spec.rb b/spec/components/freedom_patches/fast_image_spec.rb
deleted file mode 100644
index f8643230be0..00000000000
--- a/spec/components/freedom_patches/fast_image_spec.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe FastImage do
-  let(:svg_file) do
-    StringIO.new(<<~SVG)
-      <svg width="100" height="100">
-        <circle cx="50" cy="50" r="40" stroke="green" stroke-width="4" fill="yellow" />
-      </svg>
-    SVG
-  end
-
-  let(:xml_file) do
-    StringIO.new(<<~XML)
-      <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-        <soap:Body>
-          <foo />
-        </soap:Body>
-      </soap:Envelope>
-    XML
-  end
-
-  it "correctly detects SVG" do
-    expect(FastImage.new(svg_file).type).to eq(:svg)
-  end
-
-  it "doesn't detect XML starting with <s as SVG" do
-    expect(FastImage.new(xml_file).type).to be_nil
-  end
-
-  it "still needs to be monkey patched" do
-    expect(FastImage.new(xml_file).original_type).to eq(:svg), <<~MESSAGE
-      The fast_image monkey patch isn't needed anymore.
-      Please remove the following files:
-        * lib/freedom_patches/fast_image.rb
-        * spec/components/freedom_patches/fast_image_spec.rb
-    MESSAGE
-  end
-end