Add support for WebP

Gemfile.lock

@@ -223,4 +223,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.17.2
+   2.1.2

README.md

@@ -15,9 +15,9 @@ uploaded, DynamicImage stores the original file and generates images
 on demand. It handles cropping, resizing, format and colorspace
 conversion.
 
-Supported formats at the moment are JPEG, PNG, GIF, BMP and TIFF. The
-latter will automatically be converted to JPG. CMYK images will be
-converted to RGB, and RGB images will be converted to the sRGB
+Supported formats at the moment are JPEG, PNG, GIF, BMP, WebP and TIFF.
+BMP, WebP and TIFF images will automatically be converted to JPG. CMYK
+images will be converted to RGB, and RGB images will be converted to the sRGB
 colorspace for consistent appearance in all browsers.
 
 DynamicImage is built on [Dis](https://github.com/elektronaut/dis)

lib/dynamic_image/controller.rb

@@ -59,7 +59,7 @@ def render_image(options)
           render(file: File.join(File.dirname(__FILE__), "templates/show"),
                  layout: false, locals: { options: options })
         end
-        format.any(:gif, :jpeg, :png, :tiff) do
+        format.any(:gif, :jpeg, :png, :tiff, :webp) do
           send_image(DynamicImage::ProcessedImage.new(@record, options))
         end
       end
@@ -69,7 +69,7 @@ def render_raw_image(disposition: "inline", filename: nil)
       return unless stale?(@record)
 
       respond_to do |format|
-        format.any(:gif, :jpeg, :png, :tiff) do
+        format.any(:gif, :jpeg, :png, :tiff, :webp) do
           send_data(@record.data,
                     filename: filename,
                     content_type: @record.content_type,

lib/dynamic_image/image_reader.rb

@@ -11,7 +11,8 @@ def magic_bytes
           "\xff\xd8",                         # JPEG
           "\x49\x49\x2a\x00",                 # TIFF
           "\x4d\x4d\x00\x2a",
-          "\x42\x4d"                          # BMP
+          "\x42\x4d",                         # BMP
+          "\x52\x49\x46\x46"                  # WEBP
         ].map { |s| s.dup.force_encoding("binary") }
       end
     end

lib/dynamic_image/model/validations.rb

@@ -69,7 +69,8 @@ def allowed_content_types
              image/jpeg
              image/pjpeg
              image/png
-             image/tiff]
+             image/tiff
+             image/webp]
         end
       end
 

lib/dynamic_image/processed_image.rb

@@ -141,7 +141,8 @@ def record_format
         "image/gif" => "GIF",
         "image/jpeg" => "JPEG",
         "image/pjpeg" => "JPEG",
-        "image/tiff" => "TIFF" }[record.content_type]
+        "image/tiff" => "TIFF",
+        "image/webp" => "WEBP" }[record.content_type]
     end
 
     def require_valid_image!

spec/dynamic_image/images_controller_spec.rb

@@ -219,6 +219,23 @@ def digested(action, options = {})
         expect(metadata.format).to eq("TIFF")
       end
     end
+
+    context "when format is WEBP" do
+      before do
+        get(
+          :show,
+          params: digested(:show, id: image.id, size: "100x100", format: :webp)
+        )
+      end
+
+      it "sets the content type" do
+        expect(response.media_type).to eq("image/webp")
+      end
+
+      it "returns a TIFF image" do
+        expect(metadata.format).to eq("WEBP")
+      end
+    end
   end
 
   describe "GET uncropped" do

spec/dynamic_image/metadata_spec.rb

@@ -18,6 +18,7 @@ def read_image(filename)
   let(:png_image)  { source_image.tap { |o| o.format("PNG") } }
   let(:tiff_image) { read_image("image.tif") }
   let(:bmp_image) { source_image.tap { |o| o.format("BMP") } }
+  let(:webp_image) { read_image("image.webp") }
 
   let(:rgb_image) { source_image }
   let(:cmyk_image) { jpeg_image.tap { |o| o.colorspace("CMYK") } }
@@ -88,6 +89,12 @@ def read_image(filename)
       it { is_expected.to eq("image/bmp") }
     end
 
+    context "when image is WEBP" do
+      let(:image) { webp_image }
+
+      it { is_expected.to eq("image/webp") }
+    end
+
     context "with invalid data" do
       let(:image_data) { "invalid" }
 
@@ -164,6 +171,12 @@ def read_image(filename)
       it { is_expected.to eq("BMP") }
     end
 
+    context "when image is WEBP" do
+      let(:image) { webp_image }
+
+      it { is_expected.to eq("WEBP") }
+    end
+
     context "with invalid data" do
       let(:image_data) { "invalid" }
 

spec/dynamic_image/model_spec.rb

@@ -100,6 +100,12 @@
 
       it { is_expected.to eq("image/jpeg") }
     end
+
+    context "when image is WEBP" do
+      let(:image) { Image.new(content_type: "image/webp") }
+
+      it { is_expected.to eq("image/jpeg") }
+    end
   end
 
   describe "metadata parsing" do

spec/dynamic_image/processed_image_spec.rb

@@ -18,6 +18,7 @@ def read_image(filename)
   let(:png_image)  { source_image.tap { |o| o.format("PNG") } }
   let(:tiff_image) { read_image("image.tif") }
   let(:bmp_image) { source_image.tap { |o| o.format("BMP") } }
+  let(:webp_image) { read_image("image.webp") }
 
   let(:rgb_image)  { source_image }
   let(:cmyk_image) { jpeg_image.tap { |o| o.colorspace("CMYK") } }
@@ -72,6 +73,14 @@ def read_image(filename)
 
       it { is_expected.to eq("image/bmp") }
     end
+
+    context "when format is WEBP" do
+      let(:processed) do
+        described_class.new(record, format: :webp)
+      end
+
+      it { is_expected.to eq("image/webp") }
+    end
   end
 
   describe "#cropped_and_resized" do
@@ -178,6 +187,14 @@ def read_image(filename)
       end
     end
 
+    context "when image is WEBP" do
+      let(:image) { webp_image }
+
+      it "returns a WEBP" do
+        expect(content_type).to eq("image/webp")
+      end
+    end
+
     context "when converting BMP to JPEG" do
       let(:image) { bmp_image }
       let(:processed) do
@@ -189,6 +206,17 @@ def read_image(filename)
       end
     end
 
+    context "when converting WEBP to JPEG" do
+      let(:image) { webp_image }
+      let(:processed) do
+        described_class.new(record, format: :jpeg)
+      end
+
+      it "returns a JPEG" do
+        expect(content_type).to eq("image/jpeg")
+      end
+    end
+
     context "when converting PNG to GIF" do
       let(:processed) do
         described_class.new(record, format: :gif)

spec/internal/config/initializers/mime_types.rb

@@ -4,3 +4,5 @@
 
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
+
+Mime::Type.register "image/webp", :webp