leifcr-refile-mini_magick 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73967411699252c6e946a016ed98ba58125243c7
-  data.tar.gz: ab8981685fa3822069962f2b343c7905fa1a6bc9
+  metadata.gz: d7a205a530752fc9b909fa15a168a3aea6046b6c
+  data.tar.gz: d8d66c11ca574ed633f77d73d2a19bba3bd2e4b2
 SHA512:
-  metadata.gz: 269097afcf4239922b2460c29904c4bec486ab97738c33d3295b83249040dc85d77d231f6f7c2a4b04b758e2ca74e8de2088efb482f7179ff94935e993fb3c80
-  data.tar.gz: 7ccbca17ac880a52f155993b28ad576d22fc1fbeffd7f45c6c1a0431bd6bc2d23eab62128bd7eefed591292eaa9f55a4ab8c7db38f6adaa8bc2a4124fd3fed84
+  metadata.gz: 757c16cc18b7e9e0b9c512724eaf8b6cb9bd3349ff3b1ce7a45d556cc62b173391657692f63aef39c70a6e0d3a6164aa5e2e533341e6a2ca05e59d1dafd2b202
+  data.tar.gz: 03b68ee2bb606d5d34080b0c8bdbadca1ed8d09f7df3adcd1f418c1a3a800b3e0713946ffed8de22e1c2ebcf7decba19c1dc9847f5aa6ffaab7de49955bafdd3

data/lib/refile/mini_magick.rb

@@ -13,12 +13,11 @@ module Refile
     # Changes the image encoding format to the given format
     #
     # @see http://www.imagemagick.org/script/command-line-options.php#format
-    # @param [File] img        the image to convert
-    # @param [String] format   the format to convert to
-    # @yield [MiniMagick::Tool::Mogrify, MiniMagick::Tool::Convert]
-    # @return [File, Tempfile]
-    def convert(img, format, &block)
-      processor.convert!(img, format, &block)
+    # @param [ImageProcesing::Pipeline] pipeline   processing pipeline to call
+    # @param [String] format                       the format to convert to
+    # @return [Tempfile]
+    def convert(pipeline, format)
+      pipeline.convert!(format)
     end
 
     # Resize the image to fit within the specified dimensions while retaining
@@ -27,13 +26,13 @@ module Refile
     # narrower than specified in either dimension but will not be larger than
     # the specified values.
     #
-    # @param [File] 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 [File, Tempfile]
-    def limit(img, width, height, &block)
-      processor.resize_to_limit!(img, width, height, &block)
+    # @param [ImageProcesing::Pipeline] pipeline   processing pipeline to call
+    # @param [#to_s] width                         the maximum width
+    # @param [#to_s] height                        the maximum height
+    # @yield [MiniMagick::Tool::Convert]
+    # @return [Tempfile]
+    def limit(pipeline, width, height)
+      pipeline.resize_to_limit!(width || "!", height || "!")
     end
 
     # Resize the image to fit within the specified dimensions while retaining
@@ -41,13 +40,12 @@ module Refile
     # specified in the smaller dimension but will not be larger than the
     # specified values.
     #
-    # @param [File] 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 [File, Tempfile]
-    def fit(img, width, height, &block)
-      processor.resize_to_fit!(img, width, height, &block)
+    # @param [ImageProcesing::Pipeline] pipeline   processing pipeline to call
+    # @param [#to_s] width                         the width to fit into
+    # @param [#to_s] height                        the height to fit into
+    # @return [Tempfile]
+    def fit(pipeline, width, height)
+      pipeline.resize_to_fit!(width, height)
     end
 
     # Resize the image so that it is at least as large in both dimensions as
@@ -59,15 +57,14 @@ module Refile
     # By default, the center part of the image is kept, and the remainder
     # cropped off, but this can be changed via the `gravity` option.
     #
-    # @param [File] img         the image to convert
-    # @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 [File, Tempfile]
+    # @param [ImageProcesing::Pipeline] pipeline   processing pipeline to call
+    # @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
+    # @return [Tempfile]
     # @see http://www.imagemagick.org/script/command-line-options.php#gravity
-    def fill(img, width, height, gravity = "Center", &block)
-      processor.resize_to_fill!(img, width, height, gravity: gravity, &block)
+    def fill(pipeline, width, height, gravity = "Center")
+      pipeline.resize_to_fill!(width, height, gravity: gravity)
     end
 
     # Resize the image to fit within the specified dimensions while retaining
@@ -82,17 +79,16 @@ module Refile
     # By default, the image will be placed in the center but this can be
     # changed via the `gravity` option.
     #
-    # @param [MiniMagick::image] img      the image to convert
-    # @param [#to_s] width                the width to fill out
-    # @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 [File, Tempfile]
+    # @param [ImageProcesing::Pipeline] pipeline   processing pipeline to call
+    # @param [#to_s] width                         the width to fill out
+    # @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
+    # @return [Tempfile]
     # @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", &block)
-      processor.resize_and_pad!(img, width, height, background: background, gravity: gravity, &block)
+    def pad(pipeline, width, height, background = "transparent", gravity = "Center")
+      pipeline.resize_and_pad!(width, height, gravity: gravity, background: background)
     end
 
     # Resample the image to fit within the specified resolution while retaining
@@ -101,14 +97,13 @@ module Refile
     # The resulting image will always be the same pixel size as the source with
     # an adjusted resolution dimensions.
     #
-    # @param [minimagick::image] img      the image to convert
-    # @param [#to_s] width                the dpi width
-    # @param [#to_s] height               the dpi height
-    # @yield [MiniMagick::Tool::Mogrify, MiniMagick::Tool::Convert]
-    # @return [File, Tempfile]
+    # @param [ImageProcesing::Pipeline] pipeline   processing pipeline to call
+    # @param [#to_s] width                         the dpi width
+    # @param [#to_s] height                        the dpi height
+    # @return [Tempfile]
     # @see http://www.imagemagick.org/script/command-line-options.php#resample
-    def resample(img, width, height, &block)
-      processor.resample!(img, width, height, &block)
+    def resample(pipeline, width, height)
+      pipeline.resample!("#{width}x#{height}")
     end
 
     # Process the given file. The file will be processed via one of the
@@ -117,18 +112,16 @@ module Refile
     #
     # If the format is given it will convert the image to the given file format.
     #
-    # @param [Tempfile] file        the file to manipulate
-    # @param [String] format        the file format to convert to
-    # @return [File]                the processed file
+    # @param [File] file                  the file to manipulate
+    # @param [String] format              the file format to convert to
+    # @yield [MiniMagick::Tool::Convert]
+    # @return [Tempfile]                  the processed file
     def call(file, *args, format: nil, &block)
-      file = processor.convert!(file, format) if format
-      send(@method, file, *args, &block)
-    end
-
-    private
+      pipeline = ImageProcessing::MiniMagick.source(file)
+      pipeline = pipeline.convert(format) if format
+      pipeline = pipeline.custom(&block)
 
-    def processor
-      ImageProcessing::MiniMagick
+      send(@method, pipeline, *args)
     end
   end
 end

data/lib/refile/mini_magick/version.rb

@@ -1,5 +1,5 @@
 module Refile
   class MiniMagick
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/refile-mini_magick.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "refile", "~> 0.5"
-  spec.add_dependency "image_processing", ">= 0.4.1", "< 1.0"
-  spec.add_dependency "mini_magick", ">= 4.3.5"
+  spec.add_dependency "refile", "~> 0.6"
+  spec.add_dependency "image_processing", "~> 1.1"
+  spec.add_dependency "mini_magick", "~> 4.0"
 end

data/spec/refile/mini_magick_spec.rb

@@ -38,6 +38,45 @@ RSpec.describe Refile::MiniMagick do
       expect { |b| Refile::MiniMagick.new(:limit).call(portrait, "400", "400", &b) }
         .to yield_with_args(MiniMagick::Tool)
     end
+
+    context "when width or height is nil" do
+      it "resizes the image up to only a width limit" do
+        file = Refile::MiniMagick.new(:limit).call(portrait, "400", nil)
+        result = ::MiniMagick::Image.new(file.path)
+        expect(result.width).to eq(400)
+        expect(result.height).to eq(800)
+      end
+
+      it "resizes the image up to only a height limit" do
+        file = Refile::MiniMagick.new(:limit).call(portrait, nil, "400")
+        result = ::MiniMagick::Image.new(file.path)
+        expect(result.width).to eq(600)
+        expect(result.height).to eq(400)
+      end
+    end
+
+    context "when use '!' to limit a exact width or height" do
+      it "resizes the image up to only a width limit" do
+        file = Refile::MiniMagick.new(:limit).call(portrait, "400", "800!")
+        result = ::MiniMagick::Image.new(file.path)
+        expect(result.width).to eq(400)
+        expect(result.height).to eq(800)
+      end
+
+      it "resizes the image up to only a height limit" do
+        file = Refile::MiniMagick.new(:limit).call(portrait, "600!", "400")
+        result = ::MiniMagick::Image.new(file.path)
+        expect(result.width).to eq(600)
+        expect(result.height).to eq(400)
+      end
+
+      it "resizes the image but it doesn't go beyong the image dimensions" do
+        file = Refile::MiniMagick.new(:limit).call(portrait, "300", "1000!")
+        result = ::MiniMagick::Image.new(file.path)
+        expect(result.width).to eq(300)
+        expect(result.height).to eq(800)
+      end
+    end
   end
 
   describe "#fit" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leifcr-refile-mini_magick
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refile
@@ -16,48 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: image_processing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.5
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.5
+        version: '4.0'
 description: 
 email:
 - jonas.nicklas@gmail.com
@@ -96,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Image processing via MiniMagick for Refile