mini_magick 3.8.1 → 4.0.0

data/spec/lib/mini_magick/shell_spec.rb

@@ -0,0 +1,66 @@
+require "spec_helper"
+
+RSpec.describe MiniMagick::Shell do
+  subject { described_class.new }
+
+  describe "#run" do
+    it "calls #execute with the command" do
+      expect(subject).to receive(:execute).and_call_original
+      subject.run(%W[identify #{image_path}])
+    end
+
+    it "returns stdout" do
+      allow(subject).to receive(:execute).and_return(["stdout", "stderr", 0])
+      output = subject.run(%W[foo])
+      expect(output).to eq "stdout"
+    end
+
+    it "uses stderr for error messages" do
+      allow(subject).to receive(:execute).and_return(["", "stderr", 1])
+      expect { subject.run(%W[foo]) }
+        .to raise_error(MiniMagick::Error, /`foo`.*stderr/m)
+    end
+
+    it "raises an error when executable wasn't found" do
+      allow(subject).to receive(:execute).and_return(["", "not found", 127])
+      expect { subject.run(%W[foo]) }
+        .to raise_error(MiniMagick::Error, /not found/)
+    end
+
+    it "raises errors only in whiny mode" do
+      subject = described_class.new(false)
+      allow(subject).to receive(:execute).and_return(["stdout", "", 127])
+      expect(subject.run(%W[foo])).to eq "stdout"
+    end
+
+    it "prints to stderr output to $stderr in non-whiny mode" do
+      subject = described_class.new(false)
+      allow(subject).to receive(:execute).and_return(["", "stderr", 1])
+      expect { subject.run(%W[foo]) }.to output("stderr").to_stderr
+    end
+  end
+
+  describe "#execute" do
+    it "executes the command in the shell" do
+      stdout, * = subject.execute(%W[identify #{image_path(:gif)}])
+      expect(stdout).to match("GIF")
+    end
+
+    it "logs the command and execution time in debug mode" do
+      allow(MiniMagick).to receive(:debug).and_return(true)
+      expect { subject.execute(%W[identify #{image_path(:gif)}]) }.
+        to output(/\[\d+.\d+s\] identify #{image_path(:gif)}/).to_stdout
+    end
+
+    it "returns an appropriate response when command wasn't found" do
+      stdout, stderr, code = subject.execute(%W[unexisting command])
+      expect(code).to eq 127
+      expect(stderr).to match(/not found/)
+    end
+
+    it "doesn't break on spaces" do
+      stdout, * = subject.execute(["identify", "-format", "%w %h", image_path])
+      expect(stdout).to match(/\d+ \d+/)
+    end
+  end
+end

data/spec/lib/mini_magick/tool_spec.rb

@@ -0,0 +1,107 @@
+require "spec_helper"
+
+RSpec.describe MiniMagick::Tool do
+  subject { MiniMagick::Tool::Identify.new }
+
+  describe "#call" do
+    it "calls the shell to run the command" do
+      subject << image_path(:gif)
+      output = subject.call
+      expect(output).to match("GIF")
+    end
+
+    it "strips the output" do
+      subject << image_path
+      output = subject.call
+      expect(output).not_to end_with("\n")
+    end
+  end
+
+  describe ".new" do
+    it "accepts a block, and immediately executes the command" do
+      output = described_class.new("identify") do |builder|
+        builder << image_path(:gif)
+      end
+      expect(output).to match("GIF")
+    end
+  end
+
+  describe "#command" do
+    it "includes the executable and the arguments" do
+      allow(subject).to receive(:args).and_return(%W[-list Command])
+      expect(subject.command).to include(*%W[identify -list Command])
+    end
+  end
+
+  describe "#executable" do
+    it "prepends 'gm' to the command list when using GraphicsMagick" do
+      allow(MiniMagick).to receive(:cli).and_return(:graphicsmagick)
+      expect(subject.executable).to eq %W[gm identify]
+    end
+
+    it "respects #cli_path" do
+      allow(MiniMagick).to receive(:cli).and_return(:imagemagick)
+      allow(MiniMagick).to receive(:cli_path).and_return("path/to/cli")
+      expect(subject.executable).to eq %W[path/to/cli/identify]
+    end
+  end
+
+  describe "#<<" do
+    it "adds argument to the args list" do
+      subject << "foo" << "bar" << 123
+      expect(subject.args).to eq %W[foo bar 123]
+    end
+  end
+
+  describe "#merge!" do
+    it "adds arguments to the args list" do
+      subject << "pre-existing"
+      subject.merge! ["foo", 123]
+      expect(subject.args).to eq %W[pre-existing foo 123]
+    end
+  end
+
+  describe "#+" do
+    it "switches the last option to + form" do
+      subject.help
+      subject.help.+
+      subject.debug.+ "foo"
+      subject.debug.+ 8, "bar"
+      expect(subject.args).to eq %W[-help +help +debug foo +debug 8 bar]
+    end
+  end
+
+  ["ImageMagick", "GraphicsMagick"].each do |cli|
+    context "with #{cli}", cli: cli.downcase.to_sym do
+      it "adds dynamically generated operator methods" do
+        subject.help.depth(8)
+        expect(subject.args).to eq %W[-help -depth 8]
+      end
+
+      it "doesn't just delegate to #method_missing" do
+        expect(subject.class.instance_methods).to include(:help)
+      end
+
+      it "adds dynamically generated creation operator methods" do
+        subject.radial_gradient.canvas "khaki"
+        expect(subject.args).to eq %W[radial-gradient: canvas:khaki]
+      end
+    end
+  end
+
+  it "resets the dynamically generated operator methods on CLI change" do
+    MiniMagick.cli = :imagemagick
+    expect(subject).to respond_to(:quiet)
+
+    MiniMagick.cli = :graphicsmagick
+    expect(subject).not_to respond_to(:quiet)
+    expect(subject).to respond_to(:ping)
+  end
+
+  it "doesn't raise errors when false is passed to the constructor" do
+    subject.help
+    subject.call(false)
+
+    MiniMagick::Tool::Identify.new(false, &:help)
+  end
+end

data/spec/lib/mini_magick/utilities_spec.rb

@@ -0,0 +1,17 @@
+require "spec_helper"
+
+RSpec.describe MiniMagick::Utilities do
+  describe ".which" do
+    it "identifies when mogrify exists" do
+      expect(MiniMagick::Utilities.which('mogrify')).not_to be_nil
+    end
+
+    it "identifies when gm exists" do
+      expect(MiniMagick::Utilities.which('gm')).not_to be_nil
+    end
+
+    it "returns nil on nonexistent executables" do
+      expect(MiniMagick::Utilities.which('yogrify')).to be_nil
+    end
+  end
+end

data/spec/lib/mini_magick_spec.rb

@@ -1,63 +1,39 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe MiniMagick do
-  context 'which util' do
-    it 'identifies when mogrify exists' do
-      expect(MiniMagick::Utilities.which('mogrify')).not_to be_nil
+RSpec.describe MiniMagick do
+  describe ".imagemagick?" do
+    it "returns true if CLI is minimagick" do
+      allow(described_class).to receive(:cli).and_return(:imagemagick)
+      expect(described_class.imagemagick?).to eq true
     end
 
-    it 'identifies when gm exists' do
-      expect(MiniMagick::Utilities.which('gm')).not_to be_nil
-    end
-
-    it 'returns nil on nonexistent executables' do
-      expect(MiniMagick::Utilities.which('yogrify')).to be_nil
+    it "returns false if CLI isn't minimagick" do
+      allow(described_class).to receive(:cli).and_return(:graphicsmagick)
+      expect(described_class.imagemagick?).to eq false
     end
   end
 
-  context '.mogrify?' do
-    it 'returns true if minimagick is using mogrify' do
-      described_class.processor = :mogrify
-      expect(described_class.mogrify?).to eq true
-    end
-
-    it 'returns false if minimagick is not using mogrify' do
-      described_class.processor = :gm
-      expect(described_class.mogrify?).to eq false
-    end
-
-    it 'sets the processor if not set' do
-      described_class.processor = nil
-      described_class.mogrify?
-      expect(described_class.processor).to eq :mogrify
-    end
-  end
-
-  context '.gm?' do
-    it 'returns true if minimagick is using gm' do
-      described_class.processor = :gm
-      expect(described_class).to be_gm
-    end
-
-    it 'returns false if minimagick is not using gm' do
-      described_class.processor = :mogrify
-      expect(described_class).not_to be_gm
+  describe ".graphicsmagick?" do
+    it "returns true if CLI is graphicsmagick" do
+      allow(described_class).to receive(:cli).and_return(:graphicsmagick)
+      expect(described_class.graphicsmagick?).to eq true
     end
 
-    it 'sets the processor if not set' do
-      described_class.processor = nil
-      described_class.gm?
-      expect(described_class.processor).to eq :mogrify
+    it "returns false if CLI isn't graphicsmagick" do
+      allow(described_class).to receive(:cli).and_return(:imagemagick)
+      expect(described_class.graphicsmagick?).to eq false
     end
   end
 
-  context 'validation' do
-    it 'validates on create' do
-      expect(MiniMagick.validate_on_create).to eq(true)
+  describe ".cli_version" do
+    it "returns ImageMagick's version" do
+      allow(described_class).to receive(:cli).and_return(:imagemagick)
+      expect(described_class.cli_version).to match(/^\d+\.\d+\.\d+-\d+$/)
     end
 
-    it 'validates on write' do
-      expect(MiniMagick.validate_on_write).to eq(true)
+    it "returns GraphicsMagick's version" do
+      allow(described_class).to receive(:cli).and_return(:graphicsmagick)
+      expect(described_class.cli_version).to match(/^\d+\.\d+\.\d+$/)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,29 +1,21 @@
-require 'rubygems'
-require 'bundler/setup'
-require 'rspec'
-require 'mocha/api'
+require "bundler/setup"
+require "mini_magick"
+require "pry"
 
-require 'mini_magick'
+require_relative "support/helpers"
 
 RSpec.configure do |config|
-  config.mock_framework = :mocha
-  config.color          = true
-  config.formatter      = 'documentation'
-  config.raise_errors_for_deprecations!
-end
+  config.disable_monkey_patching!
+  config.formatter = "documentation"
+  config.color = true
+  config.fail_fast = true unless ENV["CI"]
 
-# Image files from testunit port to RSpec
-test_files = File.expand_path(File.dirname(__FILE__) + '/files')
-TEST_FILES_PATH          = test_files
-SIMPLE_IMAGE_PATH        = test_files + '/simple.gif'
-MINUS_IMAGE_PATH         = test_files + '/simple-minus.gif'
-TIFF_IMAGE_PATH          = test_files + '/leaves (spaced).tiff'
-NOT_AN_IMAGE_PATH        = test_files + '/not_an_image.php'
-GIF_WITH_JPG_EXT         = test_files + '/actually_a_gif.jpg'
-EXIF_IMAGE_PATH          = test_files + '/trogdor.jpg'
-CAP_EXT_PATH             = test_files + '/trogdor_capitalized.JPG'
-ANIMATION_PATH           = test_files + '/animation.gif'
-PNG_PATH                 = test_files + '/png.png'
-COMP_IMAGE_PATH          = test_files + '/composited.jpg'
-ERRONEOUS_IMAGE_PATH     = test_files + '/erroneous.jpg'
-PSD_IMAGE_PATH           = test_files + '/layers.psd'
+  [:imagemagick, :graphicsmagick].each do |cli|
+    config.around(cli: cli) do |example|
+      MiniMagick.with_cli(cli) { example.run }
+    end
+    config.around(skip_cli: cli) do |example|
+      example.run unless example.metadata[:cli] == cli
+    end
+  end
+end

data/spec/support/helpers.rb

@@ -0,0 +1,37 @@
+require "tempfile"
+
+module Helpers
+  def image_path(type = :default)
+    if type != :without_extension
+      File.join("spec/fixtures",
+        case type
+        when :default, :jpg   then "default.jpg"
+        when :animation, :gif then "animation.gif"
+        when :pdf             then "document.pdf"
+        when :psd             then "image.psd"
+        when :exif            then "exif.jpg"
+        when :not             then "not_an_image.rb"
+        else
+          fail "image #{type.inspect} doesn't exist"
+        end
+      )
+    else
+      path = random_path
+      FileUtils.cp image_path, path
+      path
+    end
+  end
+
+  def image_url
+    "https://avatars2.githubusercontent.com/u/795488?v=2&s=40"
+  end
+
+  def random_path(basename = "")
+    @tempfile = Tempfile.open(basename)
+    @tempfile.path
+  end
+end
+
+RSpec.configure do |config|
+  config.include Helpers
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_magick
 version: !ruby/object:Gem::Version
-  version: 3.8.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Corey Johnson
@@ -12,22 +12,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: subexec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -42,48 +28,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
 description: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick
 email:
 - probablycorey@gmail.com
@@ -99,27 +57,38 @@ files:
 - Rakefile
 - lib/mini_gmagick.rb
 - lib/mini_magick.rb
-- lib/mini_magick/command_builder.rb
-- lib/mini_magick/errors.rb
+- lib/mini_magick/configuration.rb
 - lib/mini_magick/image.rb
+- lib/mini_magick/image/info.rb
+- lib/mini_magick/logger.rb
+- lib/mini_magick/shell.rb
+- lib/mini_magick/tool.rb
+- lib/mini_magick/tool/animate.rb
+- lib/mini_magick/tool/compare.rb
+- lib/mini_magick/tool/composite.rb
+- lib/mini_magick/tool/conjure.rb
+- lib/mini_magick/tool/convert.rb
+- lib/mini_magick/tool/display.rb
+- lib/mini_magick/tool/identify.rb
+- lib/mini_magick/tool/import.rb
+- lib/mini_magick/tool/mogrify.rb
+- lib/mini_magick/tool/montage.rb
+- lib/mini_magick/tool/stream.rb
 - lib/mini_magick/utilities.rb
 - lib/mini_magick/version.rb
-- spec/files/actually_a_gif.jpg
-- spec/files/animation.gif
-- spec/files/composited.jpg
-- spec/files/erroneous.jpg
-- spec/files/layers.psd
-- spec/files/leaves (spaced).tiff
-- spec/files/not_an_image.php
-- spec/files/png.png
-- spec/files/simple-minus.gif
-- spec/files/simple.gif
-- spec/files/trogdor.jpg
-- spec/files/trogdor_capitalized.JPG
-- spec/lib/mini_magick/command_builder_spec.rb
+- spec/fixtures/animation.gif
+- spec/fixtures/default.jpg
+- spec/fixtures/exif.jpg
+- spec/fixtures/image.psd
+- spec/fixtures/not_an_image.rb
+- spec/lib/mini_magick/configuration_spec.rb
 - spec/lib/mini_magick/image_spec.rb
+- spec/lib/mini_magick/shell_spec.rb
+- spec/lib/mini_magick/tool_spec.rb
+- spec/lib/mini_magick/utilities_spec.rb
 - spec/lib/mini_magick_spec.rb
 - spec/spec_helper.rb
+- spec/support/helpers.rb
 homepage: https://github.com/minimagick/minimagick
 licenses:
 - MIT
@@ -146,19 +115,16 @@ signing_key:
 specification_version: 4
 summary: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick
 test_files:
-- spec/files/actually_a_gif.jpg
-- spec/files/animation.gif
-- spec/files/composited.jpg
-- spec/files/erroneous.jpg
-- spec/files/layers.psd
-- spec/files/leaves (spaced).tiff
-- spec/files/not_an_image.php
-- spec/files/png.png
-- spec/files/simple-minus.gif
-- spec/files/simple.gif
-- spec/files/trogdor.jpg
-- spec/files/trogdor_capitalized.JPG
-- spec/lib/mini_magick/command_builder_spec.rb
+- spec/fixtures/animation.gif
+- spec/fixtures/default.jpg
+- spec/fixtures/exif.jpg
+- spec/fixtures/image.psd
+- spec/fixtures/not_an_image.rb
+- spec/lib/mini_magick/configuration_spec.rb
 - spec/lib/mini_magick/image_spec.rb
+- spec/lib/mini_magick/shell_spec.rb
+- spec/lib/mini_magick/tool_spec.rb
+- spec/lib/mini_magick/utilities_spec.rb
 - spec/lib/mini_magick_spec.rb
 - spec/spec_helper.rb
+- spec/support/helpers.rb

data/lib/mini_magick/command_builder.rb

@@ -1,94 +0,0 @@
-module MiniMagick
-  class CommandBuilder
-    MOGRIFY_COMMANDS = %w(adaptive-blur adaptive-resize adaptive-sharpen adjoin affine alpha annotate antialias append attenuate authenticate auto-gamma auto-level auto-orient backdrop background bench bias black-point-compensation black-threshold blend blue-primary blue-shift blur border bordercolor borderwidth brightness-contrast cache caption cdl channel charcoal chop clamp clip clip-mask clip-path clone clut coalesce colorize colormap color-matrix colors colorspace combine comment compose composite compress contrast contrast-stretch convolve crop cycle debug decipher deconstruct define delay delete density depth descend deskew despeckle direction displace display dispose dissimilarity-threshold dissolve distort dither draw duplicate edge emboss encipher encoding endian enhance equalize evaluate evaluate-sequence extent extract family features fft fill filter flatten flip floodfill flop font foreground format frame function fuzz fx gamma gaussian-blur geometry gravity green-primary hald-clut help highlight-color iconGeometry iconic identify ift immutable implode insert intent interlace interpolate interline-spacing interword-spacing kerning label lat layers level level-colors limit linear-stretch linewidth liquid-rescale list log loop lowlight-color magnify map mask mattecolor median metric mode modulate monitor monochrome morph morphology mosaic motion-blur name negate noise normalize opaque ordered-dither orient page paint path pause pen perceptible ping pointsize polaroid poly posterize precision preview print process profile quality quantize quiet radial-blur raise random-threshold red-primary regard-warnings region remap remote render repage resample resize respect-parentheses reverse roll rotate sample sampling-factor scale scene screen seed segment selective-blur separate sepia-tone set shade shadow shared-memory sharpen shave shear sigmoidal-contrast silent size sketch smush snaps solarize sparse-color splice spread statistic stegano stereo stretch strip stroke strokewidth style subimage-search swap swirl synchronize taint text-font texture threshold thumbnail tile tile-offset tint title transform transparent transparent-color transpose transverse treedepth trim type undercolor unique-colors units unsharp update verbose version view vignette virtual-pixel visual watermark wave weight white-point white-threshold window window-group write)
-    IMAGE_CREATION_OPERATORS = %w(canvas caption gradient label logo pattern plasma radial radient rose text tile xc)
-
-    def initialize(tool, *options)
-      @tool = tool
-      @args = []
-      options.each { |arg| push(arg) }
-    end
-
-    def command
-      com = "#{@tool} #{args.join(' ')}".strip
-      com = "#{MiniMagick.processor} #{com}" unless MiniMagick.mogrify?
-
-      com = File.join MiniMagick.processor_path, com if MiniMagick.processor_path
-      com.strip
-    end
-
-    def args
-      @args.map { |arg| Utilities.escape(arg) }
-    end
-
-    # Add each mogrify command in both underscore and dash format
-    MOGRIFY_COMMANDS.each do |mogrify_command|
-
-      # Example of what is generated here:
-      #
-      # def auto_orient(*options)
-      #   add_command("auto-orient", *options)
-      #   self
-      # end
-      # alias_method :"auto-orient", :auto_orient
-
-      dashed_command      = mogrify_command.to_s.gsub('_', '-')
-      underscored_command = mogrify_command.to_s.gsub('-', '_')
-
-      define_method(underscored_command) do |*options|
-        options[1] = Utilities.windows_escape(options[1]) if mogrify_command == 'annotate'
-        add_command(__method__.to_s.gsub('_', '-'), *options)
-        self
-      end
-
-      alias_method dashed_command, underscored_command
-      alias_method "mogrify_#{underscored_command}", underscored_command
-    end
-
-    def format(*options)
-      fail Error, "You must call 'format' on the image object directly!"
-    end
-
-    IMAGE_CREATION_OPERATORS.each do |operator|
-      define_method operator do |*options|
-        add_creation_operator(__method__.to_s, *options)
-        self
-      end
-
-      alias_method "operator_#{operator}", operator
-    end
-
-    (MOGRIFY_COMMANDS & IMAGE_CREATION_OPERATORS).each do |command_or_operator|
-      define_method command_or_operator do |*options|
-        if @tool == 'mogrify'
-          method = self.method("mogrify_#{command_or_operator}")
-        else
-          method = self.method("operator_#{command_or_operator}")
-        end
-        method.call(*options)
-      end
-
-    end
-
-    def +(*options)
-      push(@args.pop.gsub(/\A-/, '+'))
-      options.to_a.each { |option| push(option) }
-    end
-
-    def add_command(command, *options)
-      push "-#{command}"
-      options.to_a.each { |option| push(option) }
-    end
-
-    def add_creation_operator(command, *options)
-      creation_command = command
-      options.to_a.each { |option| creation_command << ":#{option}" }
-      push creation_command
-    end
-
-    def push(arg)
-      @args << arg.to_s.strip
-    end
-    alias_method :<<, :push
-  end
-end

data/lib/mini_magick/errors.rb

@@ -1,4 +0,0 @@
-module MiniMagick
-  class Error < RuntimeError; end
-  class Invalid < StandardError; end
-end

data/spec/files/not_an_image.php

@@ -1 +0,0 @@
-<?php I am so not an image ?>