mini_magick 3.8.1 → 4.0.0

data/lib/mini_magick.rb

@@ -1,75 +1,53 @@
-require 'mini_magick/command_builder'
-require 'mini_magick/errors'
+require 'mini_magick/configuration'
+require 'mini_magick/tool'
 require 'mini_magick/image'
-require 'mini_magick/utilities'
 
 module MiniMagick
-  @validate_on_create = true
-  @validate_on_write = true
 
-  class << self
-    attr_accessor :processor
-    attr_accessor :processor_path
-    attr_accessor :timeout
-    attr_accessor :debug
-    attr_accessor :validate_on_create
-    attr_accessor :validate_on_write
-
-    ##
-    # Tries to detect the current processor based if any of the processors
-    # exist. Mogrify have precedence over gm by default.
-    #
-    # === Returns
-    # * [Symbol] The detected procesor
-    def processor
-      @processor ||= [:mogrify, :gm].detect do |processor|
-        MiniMagick::Utilities.which(processor.to_s)
-      end
-    end
+  extend MiniMagick::Configuration
+
+  ##
+  # You might want to execute only certain blocks of processing with a
+  # different CLI, because for example that CLI does that particular thing
+  # faster. After the block CLI resets to its previous value.
+  #
+  # @example
+  #   MiniMagick.with_cli :graphicsmagick do
+  #     # operations that are better done with GraphicsMagick
+  #   end
+  def self.with_cli(cli)
+    old_cli = self.cli
+    self.cli = cli
+    yield
+    self.cli = old_cli
+  end
 
-    ##
-    # Discovers the imagemagick version based on mogrify's output.
-    #
-    # === Returns
-    # * The imagemagick version
-    def image_magick_version
-      @@version ||= Gem::Version.create(`mogrify --version`.split(' ')[2].split('-').first)
-    end
+  ##
+  # Checks whether the CLI used is ImageMagick.
+  #
+  # @return [Boolean]
+  def self.imagemagick?
+    cli == :imagemagick
+  end
 
-    ##
-    # The minimum allowed imagemagick version
-    #
-    # === Returns
-    # * The minimum imagemagick version
-    def minimum_image_magick_version
-      @@minimum_version ||= Gem::Version.create('6.6.3')
-    end
+  ##
+  # Checks whether the CLI used is GraphicsMagick.
+  #
+  # @return [Boolean]
+  def self.graphicsmagick?
+    cli == :graphicsmagick
+  end
 
-    ##
-    # Checks whether the imagemagick's version is valid
-    #
-    # === Returns
-    # * [Boolean]
-    def valid_version_installed?
-      image_magick_version >= minimum_image_magick_version
-    end
+  ##
+  # Returns ImageMagick's/GraphicsMagick's version.
+  #
+  # @return [String]
+  def self.cli_version
+    output = MiniMagick::Tool::Identify.new(&:version)
+    output[/\d+\.\d+\.\d+(-\d+)?/]
+  end
 
-    ##
-    # Checks whether the current processory is mogrify.
-    #
-    # === Returns
-    # * [Boolean]
-    def mogrify?
-      processor && processor.to_sym == :mogrify
-    end
+  class Error < RuntimeError; end
+  class Invalid < StandardError; end
 
-    ##
-    # Checks whether the current processor is graphicsmagick.
-    #
-    # === Returns
-    # * [Boolean]
-    def gm?
-      processor && processor.to_sym == :gm
-    end
-  end
 end

data/spec/fixtures/not_an_image.rb

@@ -0,0 +1 @@
+expect(__FILE__).not_to be_an_image

data/spec/lib/mini_magick/configuration_spec.rb

@@ -0,0 +1,66 @@
+require "spec_helper"
+
+RSpec.describe MiniMagick::Configuration do
+  subject { Object.new.extend(MiniMagick::Configuration) }
+
+  describe "#configure" do
+    it "yields self" do
+      expect { |b| subject.configure(&b) }
+        .to yield_with_args(subject)
+    end
+  end
+
+  describe "#cli" do
+    it "can be assigned" do
+      subject.cli = :imagemagick
+      expect(subject.cli).to eq :imagemagick
+    end
+
+    it "returns :imagemagick if #processor is mogrify" do
+      allow(subject).to receive(:processor).and_return("mogrify")
+      expect(subject.cli).to eq :imagemagick
+    end
+
+    it "returns :graphicsmagick if #processor is gm" do
+      allow(subject).to receive(:processor).and_return("gm")
+      expect(subject.cli).to eq :graphicsmagick
+    end
+
+    it "returns nil of #processor is nil" do
+      allow(subject).to receive(:processor).and_return(nil)
+      expect(subject.cli).to eq nil
+    end
+  end
+
+  describe "#cli=" do
+    it "raises an error when set to an invalid value" do
+      expect { subject.cli = :grapicsmagick }
+        .to raise_error(ArgumentError)
+    end
+  end
+
+  describe "#processor" do
+    it "assigns :mogrify by default" do
+      expect(subject.processor).to eq "mogrify"
+    end
+
+    it "assigns :gm if ImageMagick is not available" do
+      allow(MiniMagick::Utilities).to receive(:which).with("mogrify").and_return(nil)
+      allow(MiniMagick::Utilities).to receive(:which).with("gm").and_return(true)
+      expect(subject.processor).to eq "gm"
+    end
+
+    it "returns nil if neither ImageMagick nor GraphicsMagick are available" do
+      allow(MiniMagick::Utilities).to receive(:which).with("mogrify").and_return(nil)
+      allow(MiniMagick::Utilities).to receive(:which).with("gm").and_return(nil)
+      expect(subject.processor).to eq nil
+    end
+  end
+
+  describe "#processor=" do
+    it "raises an error when set to an invalid value" do
+      expect { subject.processor = "mogrfy" }
+        .to raise_error(ArgumentError)
+    end
+  end
+end