mini_magick 3.8.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7708f032a0b010ff31ed437bd5f28c5bdf4b269b
-  data.tar.gz: 866153c83f7e87dfe3d1564ca32821221240d6a4
+  metadata.gz: 65e1d54473e9a429c269d44123e8a6977bf489fe
+  data.tar.gz: 7b2b4762e6ee9d6d47ade148b65df993c3b9e08e
 SHA512:
-  metadata.gz: f1af9965e59c483a1566299d984f1657a2fc673c398a07e2fc07fb8e3d821eb9ec4f4f6fbcbcbb2f4497714f703f410ab64bc2b02ded74cb952b019171663ef7
-  data.tar.gz: efe209dfdd7bedd32e7d44dc49cdda24e339a68e49fe4cfbfa900edb60c7a7b9c9627316df330d8ab90a6054e03f6db213c6360313d4ce26d35c925094437a11
+  metadata.gz: 4852bcf9522da52f7603a2ef96635312b91fef2e72dbcaa77dbec94dddd8e949e4c34d3e6ccc3da8588e42efe6c43b01cace0166d840f40c478966252f0390d0
+  data.tar.gz: 77bd9eac7c1a015ad7e6cc6de77657a210fc6b7bbb907928aafb08a0bb0b0c237e85a2ca4cd7ecd75cdfda7b55732352ebda096f46adb699ea62b52695385feb

data/lib/mini_gmagick.rb

@@ -1,2 +1,3 @@
 require 'mini_magick'
-MiniMagick.processor = :gm
+
+MiniMagick.processor = :graphicsmagick

data/lib/mini_magick/configuration.rb

@@ -0,0 +1,136 @@
+require 'mini_magick/utilities'
+
+module MiniMagick
+  module Configuration
+
+    ##
+    # Set whether you want to use [ImageMagick](http://www.imagemagick.org) or
+    # [GraphicsMagick](http://www.graphicsmagick.org).
+    #
+    # @return [Symbol] `:imagemagick` or `:minimagick`
+    #
+    attr_accessor :cli
+    # @private (for backwards compatibility)
+    attr_accessor :processor
+
+    ##
+    # If you don't have the CLI tools in your PATH, you can set the path to the
+    # executables.
+    #
+    # @return [String]
+    #
+    attr_accessor :cli_path
+    # @private (for backwards compatibility)
+    attr_accessor :processor_path
+
+    ##
+    # If you don't want commands to take too long, you can set a timeout (in
+    # seconds).
+    #
+    # @return [Integer]
+    #
+    attr_accessor :timeout
+    ##
+    # When set to `true`, it outputs each command to STDOUT in their shell
+    # version.
+    #
+    # @return [Boolean]
+    #
+    attr_accessor :debug
+    ##
+    # Logger for {#debug}, default is `MiniMagick::Logger.new(STDOUT)`, but
+    # you can override it, for example if you want the logs to be written to
+    # a file.
+    #
+    # @return [Logger]
+    #
+    attr_accessor :logger
+    ##
+    # If set to `true`, it will `identify` every newly created image, and raise
+    # `MiniMagick::Invalid` if the image is not valid. Useful for validating
+    # user input, although it adds a bit of overhead. Defaults to `true`.
+    #
+    # @return [Boolean]
+    #
+    attr_accessor :validate_on_create
+    ##
+    # If set to `true`, it will `identify` every image that gets written (with
+    # {MiniMagick::Image#write}), and raise `MiniMagick::Invalid` if the image
+    # is not valid. Useful for validating that processing was sucessful,
+    # although it adds a bit of overhead. Defaults to `true`.
+    #
+    # @return [Boolean]
+    #
+    attr_accessor :validate_on_write
+
+    def self.extended(base)
+      base.validate_on_create = true
+      base.validate_on_write = true
+    end
+
+    ##
+    # @yield [self]
+    # @example
+    #   MiniMagick.configure do |config|
+    #     config.cli = :graphicsmagick
+    #     config.timeout = 5
+    #   end
+    #
+    def configure
+      yield self
+    end
+
+    def processor
+      @processor ||= ["mogrify", "gm"].detect do |processor|
+        MiniMagick::Utilities.which(processor)
+      end
+    end
+
+    def processor=(processor)
+      @processor = processor.to_s
+
+      unless ["mogrify", "gm"].include?(@processor)
+        raise ArgumentError,
+          "processor has to be set to either \"mogrify\" or \"gm\"" \
+          ", was set to #{@processor.inspect}"
+      end
+
+      reload_tools
+    end
+
+    def cli
+      @cli ||
+        case processor.to_s
+        when "mogrify" then :imagemagick
+        when "gm"      then :graphicsmagick
+        end
+    end
+
+    def cli=(value)
+      @cli = value
+
+      unless [:imagemagick, :graphicsmagick].include?(@cli)
+        raise ArgumentError,
+          "CLI has to be set to either :imagemagick or :graphicsmagick" \
+          ", was set to #{@cli.inspect}"
+      end
+
+      reload_tools
+    end
+
+    def cli_path
+      @cli_path || @processor_path
+    end
+
+    def logger
+      @logger || MiniMagick::Logger.new($stdout)
+    end
+
+    private
+
+    def reload_tools
+      MiniMagick::Tool::OptionMethods.instances.each(&:reload_methods)
+    end
+
+  end
+end

data/lib/mini_magick/image/info.rb

@@ -0,0 +1,122 @@
+module MiniMagick
+  class Image
+    # @private
+    class Info
+      ASCII_ENCODED_EXIF_KEYS = %w[ExifVersion FlashPixVersion]
+
+      def initialize(path)
+        @path = path
+        @info = {}
+      end
+
+      def [](value, *args)
+        case value
+        when "format", "width", "height", "dimensions", "size"
+          cheap_info(value)
+        when "colorspace"
+          colorspace
+        when "mime_type"
+          mime_type
+        when "resolution"
+          resolution(*args)
+        when "signature"
+          signature
+        when /^EXIF\:/i
+          raw_exif(value)
+        when "exif"
+          exif
+        else
+          raw(value)
+        end
+      end
+
+      def clear
+        @info.clear
+      end
+
+      private
+
+      def cheap_info(value)
+        @info.fetch(value) do
+          format, width, height, size = self["%m %w %h %b"].split(" ")
+
+          @info.update(
+            "format"     => format,
+            "width"      => Integer(width),
+            "height"     => Integer(height),
+            "dimensions" => [Integer(width), Integer(height)],
+            "size"       => size.to_i,
+          )
+
+          @info.fetch(value)
+        end
+      end
+
+      def colorspace
+        @info.fetch("colorspace") do
+          @info["colorspace"] = self["%r"]
+        end
+      end
+
+      def mime_type
+        "image/#{self["format"].downcase}"
+      end
+
+      def resolution(unit = nil)
+        output = identify do |b|
+          b.units unit if unit
+          b.format "%x %y"
+        end
+        output.split(" ").map(&:to_i)
+      end
+
+      def raw_exif(value)
+        self["%[#{value}]"]
+      end
+
+      def exif
+        @info.fetch("exif") do
+          output = self["%[EXIF:*]"]
+          pairs = output.gsub(/^exif:/, "").split("\n").map { |line| line.split("=") }
+          exif = Hash[pairs].tap do |hash|
+            ASCII_ENCODED_EXIF_KEYS.each do |key|
+              next unless hash.has_key?(key)
+
+              value = hash[key]
+              hash[key] = decode_comma_separated_ascii_characters(value)
+            end
+          end
+
+          @info["exif"] = exif
+        end
+      end
+
+      def raw(value)
+        key = "raw:#{value}"
+        @info.fetch(key) do
+          @info[key] = identify { |b| b.format(value) }
+        end
+      end
+
+      def signature
+        @info.fetch("signature") do
+          @info["signature"] = self["%#"]
+        end
+      end
+
+      def identify
+        MiniMagick::Tool::Identify.new do |builder|
+          yield builder if block_given?
+          builder << "#{@path}[0]"
+        end
+      end
+
+      def decode_comma_separated_ascii_characters(encoded_value)
+        return encoded_value unless encoded_value.include?(',')
+
+        encoded_value.scan(/\d+/).map(&:to_i).map(&:chr).join
+      end
+
+    end
+  end
+end