mini_magick 3.8.0 → 4.2.0

data/lib/mini_magick.rb

@@ -1,89 +1,53 @@
-require 'tempfile'
-require 'subexec'
-require 'stringio'
-require 'pathname'
-require 'shellwords'
-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 :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
-    # * [String] The detected procesor
-    def choose_processor
-      self.processor = if MiniMagick::Utilities.which('mogrify')
-                         :mogrify
-                       elsif MiniMagick::Utilities.which('gm')
-                         :gm
-                       else
-                         nil
-                       end
-    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
-
-    ##
-    # The minimum allowed imagemagick version
-    #
-    # === Returns
-    # * The minimum imagemagick version
-    def minimum_image_magick_version
-      @@minimum_version ||= Gem::Version.create('6.6.3')
-    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
 
-    ##
-    # Checks whether the imagemagick's version is valid
-    #
-    # === Returns
-    # * [Boolean]
-    def valid_version_installed?
-      image_magick_version >= minimum_image_magick_version
-    end
+  ##
+  # Checks whether the CLI used is ImageMagick.
+  #
+  # @return [Boolean]
+  def self.imagemagick?
+    cli == :imagemagick
+  end
 
-    ##
-    # Picks the right processor if it isn't set and returns whether it's mogrify or not.
-    #
-    # === Returns
-    # * [Boolean]
-    def mogrify?
-      choose_processor if processor.nil?
+  ##
+  # Checks whether the CLI used is GraphicsMagick.
+  #
+  # @return [Boolean]
+  def self.graphicsmagick?
+    cli == :graphicsmagick
+  end
 
-      return processor.to_s.downcase.to_sym == :mogrify unless processor.nil?
-      false
-    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
 
-    ##
-    # Picks the right processor if it isn't set and returns whether it's graphicsmagick or not.
-    #
-    # === Returns
-    # * [Boolean]
-    def gm?
-      choose_processor if processor.nil?
+  class Error < RuntimeError; end
+  class Invalid < StandardError; end
 
-      return processor.to_s.downcase.to_sym == :gm unless processor.nil?
-      false
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_magick
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Corey Johnson
@@ -9,25 +9,12 @@ authors:
 - Peter Kieltyka
 - James Miller
 - Thiago Fernandes Massa
+- Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2015-03-20 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,36 +29,22 @@ 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: '0'
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: posix-spawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -84,13 +57,14 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick
 email:
 - probablycorey@gmail.com
 - hcatlin@gmail.com
 - peter@nulayer.com
 - bensie@gmail.com
 - thiagown@gmail.com
+- janko.marohnic@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -99,9 +73,23 @@ 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
 homepage: https://github.com/minimagick/minimagick
@@ -125,8 +113,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - You must have ImageMagick or GraphicsMagick installed
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick
 test_files: []
+has_rdoc: 

data/lib/mini_magick/command_builder.rb

@@ -1,110 +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 unless MiniMagick.processor_path.nil?
-      com.strip
-    end
-
-    def args
-      if !MiniMagick::Utilities.windows?
-        @args.map(&:shellescape)
-      else
-        @args.map { |arg| Utilities.windows_escape(arg) }
-      end
-    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(/^-/, '+'))
-      if options.any?
-        options.each do |o|
-          push o
-        end
-      end
-    end
-
-    def add_command(command, *options)
-      push "-#{command}"
-      if options.any?
-        options.each do |o|
-          push o
-        end
-      end
-    end
-
-    def add_creation_operator(command, *options)
-      creation_command = command
-      if options.any?
-        options.each do |option|
-          creation_command << ":#{option}"
-        end
-      end
-      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