refile-mini_magick 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10851b9908e5028f56547ef5f88631c42c8833d6
-  data.tar.gz: 5675f42a9d038b1129c8f7c606ee464a7ee217b8
+  metadata.gz: 280ae54ec408e3287c8eadc03c3365fb6b7438a3
+  data.tar.gz: 673c76451b95246a20e57edca25c927bc54f62c3
 SHA512:
-  metadata.gz: 9eb1c20278a5f1772aaf60e6d39f98e2940f65fb79f9d31f134fc0f45cd896f6063254b5cd21f247a863c801b6960ae0b645ec4076914eca878e4eb2f83fdeb4
-  data.tar.gz: e926a3da9fdfa501630297b702815c560eb776c3075d37a911038786bc6522f086214865580edaccdb961d8defc40bdb0f2f89f04e0ad2ea93e069a5f4946b85
+  metadata.gz: 2235368076577c96821e38582c97e8c3efdcc011bf591ee2323ef977a6cd6dff6251a29f46ab01907d27e82e6b055d6ebda34a89d378f0fad8bf976ceb6dd427
+  data.tar.gz: 0bc6f650318f17fc6bc7e4bc6b3b1d9af552ab58bd2449e5aacebf44aebc46e70d3338b3afab354b4f6f6a36fcbdf49407196e70bba9537af40905aaa6bd3cb9

data/lib/refile/mini_magick.rb

@@ -15,9 +15,10 @@ module Refile
     # @see http://www.imagemagick.org/script/command-line-options.php#format
     # @param [MiniMagick::Image] img      the image to convert
     # @param [String] format              the format to convert to
+    # @yield [MiniMagick::Tool::Mogrify, MiniMagick::Tool::Convert]
     # @return [void]
-    def convert(img, format)
-      img.format(format.to_s.downcase, nil)
+    def convert(img, format, &block)
+      img.format(format.to_s.downcase, nil, &block)
     end
 
     # Resize the image to fit within the specified dimensions while retaining
@@ -29,9 +30,13 @@ module Refile
     # @param [MiniMagick::Image] img      the image to convert
     # @param [#to_s] width                the maximum width
     # @param [#to_s] height               the maximum height
+    # @yield [MiniMagick::Tool::Mogrify, MiniMagick::Tool::Convert]
     # @return [void]
     def limit(img, width, height)
-      img.resize "#{width}x#{height}>"
+      img.combine_options do |cmd|
+        yield cmd if block_given?
+        cmd.resize "#{width}x#{height}>"
+      end
     end
 
     # Resize the image to fit within the specified dimensions while retaining
@@ -42,9 +47,13 @@ module Refile
     # @param [MiniMagick::Image] img      the image to convert
     # @param [#to_s] width                the width to fit into
     # @param [#to_s] height               the height to fit into
+    # @yield [MiniMagick::Tool::Mogrify, MiniMagick::Tool::Convert]
     # @return [void]
     def fit(img, width, height)
-      img.resize "#{width}x#{height}"
+      img.combine_options do |cmd|
+        yield cmd if block_given?
+        cmd.resize "#{width}x#{height}"
+      end
     end
 
     # Resize the image so that it is at least as large in both dimensions as
@@ -60,13 +69,17 @@ module Refile
     # @param [#to_s] width                the width to fill out
     # @param [#to_s] height               the height to fill out
     # @param [String] gravity             which part of the image to focus on
+    # @yield [MiniMagick::Tool::Mogrify, MiniMagick::Tool::Convert]
     # @return [void]
     # @see http://www.imagemagick.org/script/command-line-options.php#gravity
     def fill(img, width, height, gravity = "Center")
-      img.combine_options do |cmd|
+      # We use `convert` to work around GraphicsMagick's absence of "gravity"
+      ::MiniMagick::Tool::Convert.new do |cmd|
+        yield cmd if block_given?
         cmd.resize "#{width}x#{height}^"
         cmd.gravity gravity
         cmd.extent "#{width}x#{height}"
+        cmd.merge! [img.path, img.path]
       end
     end
 
@@ -87,11 +100,14 @@ module Refile
     # @param [#to_s] height               the height to fill out
     # @param [string] background          the color to use as a background
     # @param [string] gravity             which part of the image to focus on
+    # @yield [MiniMagick::Tool::Mogrify, MiniMagick::Tool::Convert]
     # @return [void]
     # @see http://www.imagemagick.org/script/color.php
     # @see http://www.imagemagick.org/script/command-line-options.php#gravity
     def pad(img, width, height, background = "transparent", gravity = "Center")
-      img.combine_options do |cmd|
+      # We use `convert` to work around GraphicsMagick's absence of "gravity"
+      ::MiniMagick::Tool::Convert.new do |cmd|
+        yield cmd if block_given?
         cmd.thumbnail "#{width}x#{height}>"
         if background == "transparent"
           cmd.background "rgba(255, 255, 255, 0.0)"
@@ -100,6 +116,7 @@ module Refile
         end
         cmd.gravity gravity
         cmd.extent "#{width}x#{height}"
+        cmd.merge! [img.path, img.path]
       end
     end
 
@@ -112,10 +129,10 @@ module Refile
     # @param [Tempfile] file        the file to manipulate
     # @param [String] format        the file format to convert to
     # @return [File]                the processed file
-    def call(file, *args, format: nil)
+    def call(file, *args, format: nil, &block)
       img = ::MiniMagick::Image.new(file.path)
       img.format(format.to_s.downcase, nil) if format
-      send(@method, img, *args)
+      send(@method, img, *args, &block)
 
       ::File.open(img.path, "rb")
     end

data/lib/refile/mini_magick/version.rb

@@ -1,5 +1,5 @@
 module Refile
   class MiniMagick
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/spec/refile/mini_magick_spec.rb

@@ -2,124 +2,157 @@ require "pry"
 require "refile/mini_magick"
 require "phashion"
 
-describe Refile::MiniMagick do
-  let(:portrait) { Tempfile.new(["portrait", ".jpg"]) }
-  let(:landscape) { Tempfile.new(["landscape", ".jpg"]) }
-
-  matcher :be_similar_to do |expected|
-    match do |actual|
-      a = Phashion::Image.new(expected)
-      b = Phashion::Image.new(actual)
-      @distance = a.distance_from(b).abs
-      @distance < allowed_distance
-    end
-
-    failure_message do
-      "perceptual hash distance between images should be < #{allowed_distance} but was #{@distance}"
-    end
-
-    def allowed_distance
-      2
-    end
-  end
-
-  def fixture_path(name)
-    File.expand_path("./fixtures/#{name}", File.dirname(__FILE__))
-  end
-
-  before do
-    FileUtils.cp(fixture_path("portrait.jpg"), portrait.path)
-    FileUtils.cp(fixture_path("landscape.jpg"), landscape.path)
-  end
-
-  describe "#convert" do
-    it "changes the image format" do
-      file = Refile::MiniMagick.new(:convert).call(portrait, "png")
-      expect(::MiniMagick::Image.new(file.path).identify).to match(/PNG/)
-    end
-  end
-
-  describe "#limit" do
-    it "resizes the image up to a given limit" do
-      file = Refile::MiniMagick.new(:limit).call(portrait, "400", "400")
-      result = ::MiniMagick::Image.new(file.path)
-      expect(result.width).to eq(300)
-      expect(result.height).to eq(400)
-    end
-
-    it "does not resize the image if it is smaller than the limit" do
-      file = Refile::MiniMagick.new(:limit).call(portrait, "1000", "1000")
-      result = ::MiniMagick::Image.new(file.path)
-      expect(result.width).to eq(600)
-      expect(result.height).to eq(800)
-    end
-
-    it "produces correct image" do
-      file = Refile::MiniMagick.new(:limit).call(portrait, "400", "400")
-      expect(file.path).to be_similar_to(fixture_path("limit.jpg"))
-    end
-  end
-
-  describe "#fit" do
-    it "resizes the image to fit given dimensions" do
-      file = Refile::MiniMagick.new(:fit).call(portrait, "400", "400")
-      result = ::MiniMagick::Image.new(file.path)
-      expect(result.width).to eq(300)
-      expect(result.height).to eq(400)
-    end
-
-    it "enlarges image if it is smaller than given dimensions" do
-      file = Refile::MiniMagick.new(:fit).call(portrait, "1000", "1000")
-      result = ::MiniMagick::Image.new(file.path)
-      expect(result.width).to eq(750)
-      expect(result.height).to eq(1000)
-    end
-
-    it "produces correct image" do
-      file = Refile::MiniMagick.new(:fit).call(portrait, "400", "400")
-      expect(file.path).to be_similar_to(fixture_path("fit.jpg"))
-    end
-  end
-
-  describe "#fill" do
-    it "resizes and crops the image to fill out the given dimensions" do
-      file = Refile::MiniMagick.new(:fill).call(portrait, "400", "400")
-      result = ::MiniMagick::Image.new(file.path)
-      expect(result.width).to eq(400)
-      expect(result.height).to eq(400)
-    end
-
-    it "enlarges image and crops it if it is smaller than given dimensions" do
-      file = Refile::MiniMagick.new(:fill).call(portrait, "1000", "1000")
-      result = ::MiniMagick::Image.new(file.path)
-      expect(result.width).to eq(1000)
-      expect(result.height).to eq(1000)
-    end
-
-    it "produces correct image" do
-      file = Refile::MiniMagick.new(:fill).call(portrait, "400", "400")
-      expect(file.path).to be_similar_to(fixture_path("fill.jpg"))
-    end
-  end
-
-  describe "#fill" do
-    it "resizes and fills out the remaining space to fill out the given dimensions" do
-      file = Refile::MiniMagick.new(:pad).call(portrait, "400", "400", "red")
-      result = ::MiniMagick::Image.new(file.path)
-      expect(result.width).to eq(400)
-      expect(result.height).to eq(400)
-    end
-
-    it "enlarges image and fills out the remaining space to fill out the given dimensions" do
-      file = Refile::MiniMagick.new(:pad).call(portrait, "1000", "1000", "red")
-      result = ::MiniMagick::Image.new(file.path)
-      expect(result.width).to eq(1000)
-      expect(result.height).to eq(1000)
-    end
-
-    it "produces correct image" do
-      file = Refile::MiniMagick.new(:pad).call(portrait, "400", "400")
-      expect(file.path).to be_similar_to(fixture_path("pad.jpg"))
+["ImageMagick", "GraphicsMagick"].each do |cli|
+  RSpec.context "With #{cli}", cli: cli.downcase.to_sym do
+    describe Refile::MiniMagick do
+      let(:portrait) { Tempfile.new(["portrait", ".jpg"]) }
+      let(:landscape) { Tempfile.new(["landscape", ".jpg"]) }
+
+      matcher :be_similar_to do |expected|
+        match do |actual|
+          a = Phashion::Image.new(expected)
+          b = Phashion::Image.new(actual)
+          @distance = a.distance_from(b).abs
+          @distance < allowed_distance
+        end
+
+        failure_message do
+          "perceptual hash distance between images should be < #{allowed_distance} but was #{@distance}"
+        end
+
+        def allowed_distance
+          2
+        end
+      end
+
+      def fixture_path(name)
+        File.expand_path("./fixtures/#{name}", File.dirname(__FILE__))
+      end
+
+      around do |example|
+        MiniMagick.with_cli(example.metadata[:cli]) { example.run }
+      end
+
+      before do
+        FileUtils.cp(fixture_path("portrait.jpg"), portrait.path)
+        FileUtils.cp(fixture_path("landscape.jpg"), landscape.path)
+      end
+
+      describe "#convert" do
+        it "changes the image format" do
+          file = Refile::MiniMagick.new(:convert).call(portrait, "png")
+          expect(::MiniMagick::Image.new(file.path).identify).to match(/PNG/)
+        end
+
+        it "yields the command object" do
+          expect { |b| Refile::MiniMagick.new(:convert).call(portrait, "png", &b) }
+            .to yield_with_args(MiniMagick::Tool)
+        end
+      end
+
+      describe "#limit" do
+        it "resizes the image up to a given limit" do
+          file = Refile::MiniMagick.new(:limit).call(portrait, "400", "400")
+          result = ::MiniMagick::Image.new(file.path)
+          expect(result.width).to eq(300)
+          expect(result.height).to eq(400)
+        end
+
+        it "does not resize the image if it is smaller than the limit" do
+          file = Refile::MiniMagick.new(:limit).call(portrait, "1000", "1000")
+          result = ::MiniMagick::Image.new(file.path)
+          expect(result.width).to eq(600)
+          expect(result.height).to eq(800)
+        end
+
+        it "produces correct image" do
+          file = Refile::MiniMagick.new(:limit).call(portrait, "400", "400")
+          expect(file.path).to be_similar_to(fixture_path("limit.jpg"))
+        end
+
+        it "yields the command object" do
+          expect { |b| Refile::MiniMagick.new(:limit).call(portrait, "400", "400", &b) }
+            .to yield_with_args(MiniMagick::Tool)
+        end
+      end
+
+      describe "#fit" do
+        it "resizes the image to fit given dimensions" do
+          file = Refile::MiniMagick.new(:fit).call(portrait, "400", "400")
+          result = ::MiniMagick::Image.new(file.path)
+          expect(result.width).to eq(300)
+          expect(result.height).to eq(400)
+        end
+
+        it "enlarges image if it is smaller than given dimensions" do
+          file = Refile::MiniMagick.new(:fit).call(portrait, "1000", "1000")
+          result = ::MiniMagick::Image.new(file.path)
+          expect(result.width).to eq(750)
+          expect(result.height).to eq(1000)
+        end
+
+        it "produces correct image" do
+          file = Refile::MiniMagick.new(:fit).call(portrait, "400", "400")
+          expect(file.path).to be_similar_to(fixture_path("fit.jpg"))
+        end
+
+        it "yields the command object" do
+          expect { |b| Refile::MiniMagick.new(:fit).call(portrait, "400", "400", &b) }
+            .to yield_with_args(MiniMagick::Tool)
+        end
+      end
+
+      describe "#fill" do
+        it "resizes and crops the image to fill out the given dimensions" do
+          file = Refile::MiniMagick.new(:fill).call(portrait, "400", "400")
+          result = ::MiniMagick::Image.new(file.path)
+          expect(result.width).to eq(400)
+          expect(result.height).to eq(400)
+        end
+
+        it "enlarges image and crops it if it is smaller than given dimensions" do
+          file = Refile::MiniMagick.new(:fill).call(portrait, "1000", "1000")
+          result = ::MiniMagick::Image.new(file.path)
+          expect(result.width).to eq(1000)
+          expect(result.height).to eq(1000)
+        end
+
+        it "produces correct image" do
+          file = Refile::MiniMagick.new(:fill).call(portrait, "400", "400")
+          expect(file.path).to be_similar_to(fixture_path("fill.jpg"))
+        end
+
+        it "yields the command object" do
+          expect { |b| Refile::MiniMagick.new(:fill).call(portrait, "400", "400", &b) }
+            .to yield_with_args(MiniMagick::Tool)
+        end
+      end
+
+      describe "#pad" do
+        it "resizes and fills out the remaining space to fill out the given dimensions" do
+          file = Refile::MiniMagick.new(:pad).call(portrait, "400", "400", "red")
+          result = ::MiniMagick::Image.new(file.path)
+          expect(result.width).to eq(400)
+          expect(result.height).to eq(400)
+        end
+
+        it "enlarges image and fills out the remaining space to fill out the given dimensions" do
+          file = Refile::MiniMagick.new(:pad).call(portrait, "1000", "1000", "red")
+          result = ::MiniMagick::Image.new(file.path)
+          expect(result.width).to eq(1000)
+          expect(result.height).to eq(1000)
+        end
+
+        it "produces correct image" do
+          file = Refile::MiniMagick.new(:pad).call(portrait, "400", "400")
+          expect(file.path).to be_similar_to(fixture_path("pad.jpg"))
+        end
+
+        it "yields the command object" do
+          expect { |b| Refile::MiniMagick.new(:pad).call(portrait, "400", "400", &b) }
+            .to yield_with_args(MiniMagick::Tool)
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: refile-mini_magick
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refile
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Image processing via MiniMagick for Refile
@@ -92,3 +92,4 @@ test_files:
 - spec/refile/fixtures/pad.jpg
 - spec/refile/fixtures/portrait.jpg
 - spec/refile/mini_magick_spec.rb
+has_rdoc: