micro_magick 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmJlNTMwZTY3OTVhNmIxZDQwNzE4OWRkZjU1Mzk3NTdmZmY2Nzk1Mw==
+    YmJkMmI2NzI4MTk4ZDBiZTZjNmFkZDc4ZTljNWZjYzkwZTMyYzdmOQ==
   data.tar.gz: !binary |-
-    ZDdmODVlZjMzZjhjNjkzMWIwNmU3YWExMzQwMzJjMzM0YzFlNTBlNA==
-!binary "U0hBNTEy":
+    Yzk2YzEyNTk2OTEzYzkyOWI1MGE4NTc3MGNiNmY0ZWI3OThiZDI0NA==
+SHA512:
   metadata.gz: !binary |-
-    MjljYjdhNDk3MjVhYTlmMzFiNmE5ZDU2YmM5NTJmMDMwZTBmYjNkZDIyNmJi
-    YTE5YWY0Y2NjZGFjYTA1ZDg2NzllMmMwNGQ1YjM3MzhmODAzOWU0M2VjOTgw
-    MjZmNTFmMThkNzUwMmJiMjM1MWE0ZDlhYmFjN2I3N2U3YjFmZjY=
+    OTc4OGExNDUyOGRmMWFlZjIxODk3MGQ4Njg0ODRjMGUyODBlYzNjODQ5MjIy
+    YmJmZGI0ZTY1NTI3Y2U4NDdkN2M1YmY3YzdmMjUyNDgzN2YwYjcxMTE0OThj
+    MWJlNjFlZmUxYTIxMTgyZDQ4ZWVmOWQ3MGQ4YzI5YTg0ZWFkMmY=
   data.tar.gz: !binary |-
-    Y2I5YTAyZGEyYTMzNmE1ZGExOTVkNjAxNDE2ZDBkMzljMzljMDcyMmYyZDNh
-    ZjViOTUyZGZkOTJiMWExNjZkYjY0NTBlZDg1Y2VkNDY0OWE2OTZjNzZjOTAw
-    ZmMzNGZiZWNjNGYyMGE0NzVjNTk3MGIzNGNhN2RiZTY1OWI4OWY=
+    NmI1ZmE4OTBlOTBlMGU4MjAxYzFmYjUzNTE2NGQ1OWE1NjEwMTRhYzAyNzUx
+    NmI3M2EwZDJmMzZmMjM1ZGMyODFkNjhlM2I0OTg1YjZmZjBmNTgxZTdjZDlm
+    NTI4ZWQzYWVhMGUwMjY0MzcyMTg2ZWJiOWViOTM0MjZmMTM2ZWI=

data/lib/micro_magick.rb

@@ -1,49 +1,62 @@
-require "micro_magick/version"
-require "micro_magick/convert"
-require "micro_magick/geometry"
-require "tempfile"
+require 'micro_magick/version'
+require 'micro_magick/identify_parser'
+require 'micro_magick/image'
+require 'open3'
 
 module MicroMagick
 
-  InvalidArgument = Class.new(StandardError)
+  Error = Class.new(StandardError)
+  NoSuchFile = Class.new(Error)
+  MissingBinaries = Class.new(Error)
+  ArgumentError = Class.new(Error)
+  CorruptImageError = Class.new(Error)
 
-  ENGINE2PREFIX = { :imagemagick => nil, :graphicsmagick => "gm" }
+  def self.use_imagemagick
+    @cmd_prefix = ''
+  end
 
-  # @param engine must be :imagemagick, :graphicsmagick, or nil (which means reset to default behavior,
-  # which means the next run will determine if GraphicsMagick or ImageMagick is installed)
-  def self.use(engine)
-    unless engine.nil? || ENGINE2PREFIX.keys.include?(engine)
-      raise InvalidArgument, "Unknown graphics engine #{engine}"
-    end
-    @engine = engine
+  def self.use_graphicsmagick
+    @cmd_prefix = 'gm '
+  end
+
+  def self.reset!
+    @cmd_prefix = nil
   end
 
   def self.cmd_prefix
-    @engine ||= begin
-      if system("hash gm 2>&-")
-        :graphicsmagick
-      elsif system("hash convert 2>&-")
-        :imagemagick
+    @cmd_prefix ||= begin
+      if system('hash gm 2>&-')
+        'gm '
+      elsif system('hash convert 2>&-')
+        ''
       else
-        raise InvalidArgument, "Please install either GraphicsMagick or ImageMagick"
+        raise MissingBinaries, 'Please install either GraphicsMagick or ImageMagick'
       end
     end
-    ENGINE2PREFIX[@engine]
   end
 
-  def self.exec(cmd)
-    stderr_file = Tempfile.new('stderr')
-    stderr_path = stderr_file.path
-    stderr_file.close
-    result = `#{cmd} 2>"#{stderr_path}"`
-    stderr = File.read(stderr_path).strip
-    stderr_file.delete
-    if $?.exitstatus != 0 || !stderr.empty?
-      raise InvalidArgument, "#{cmd} failed: #{stderr}"
+  def self.exec(cmds, return_stdout = false)
+    final_cmd = cmd_prefix + cmds.join(' ')
+    stdout = Open3.popen3(final_cmd) do |stdin, stdout, stderr|
+      err = stderr.read.strip
+      if err.size > 0
+        error = if err =~ /unrecognized option/i
+          ArgumentError
+        elsif err =~ /corrupt/i
+          CorruptImageError
+        elsif err =~ /no such file or directory|unable to open/i
+          NoSuchFile
+        else
+          Error
+        end
+        raise error, "#{final_cmd} failed: #{err}"
+      end
+      stdout.read.strip
     end
-    result
+    return_stdout ? stdout : final_cmd
+  rescue Errno::ENOENT => e
+    raise NoSuchFile, e.message
   end
-
 end
 
 

data/lib/micro_magick/identify_parser.rb

@@ -0,0 +1,54 @@
+module MicroMagick
+  class IdentifyParser
+
+    attr_reader :results
+
+    def initialize(stdout)
+      cleaned = stdout.encode('UTF-8', 'binary', :invalid => :replace, :undef => :replace, :replace => '')
+      @lines = cleaned.split("\n").select { |ea| ea =~ /\S+:/ }
+      if @lines.empty?
+        @results = {}
+      else
+        @results = parse[:image] # < remove the "image" prefix.
+        if (m = /(\d+)x(\d+)/.match(@results[:geometry]))
+          @results[:width], @results[:height] = m[1].to_i, m[2].to_i
+        end
+      end
+    end
+
+    def [](key)
+      results[key_to_sym(key)]
+    end
+
+    def parse
+      result = {}
+      while true
+        line = @lines.shift
+        key, value = split(line)
+        if @lines.first && indent(line) < indent(@lines.first)
+          # The current line has a sub-section.
+          result[key] = parse()
+        else
+          result[key] = value
+        end
+
+        # Next line is indented less than the current line:
+        break if @lines.first.nil? || indent(line) > indent(@lines.first)
+      end
+      result
+    end
+
+    def indent(line)
+      /\S/.match(line).begin(0)
+    end
+
+    def split(line)
+      k, v = line.split(':', 2).map(&:strip)
+      [key_to_sym(k), v]
+    end
+
+    def key_to_sym(key)
+      key.is_a?(Symbol) ? key : key.strip.gsub(/[\b\W_-]+/, '_').downcase.to_sym
+    end
+  end
+end

data/lib/micro_magick/image.rb

@@ -0,0 +1,116 @@
+require 'shellwords'
+require 'yaml'
+
+module MicroMagick
+  class Image
+    attr_reader :input_file
+
+    def initialize(input_file)
+      @input_file = input_file
+      @input_options = []
+      @output_options = []
+    end
+
+    def [](key)
+      identify[key]
+    end
+
+    def width
+      self[:width]
+    end
+
+    def height
+      self[:height]
+    end
+
+    def corrupt?
+      identify && @corrupt
+    end
+
+    # Strip the image of any profiles or comments.
+    # Note that this re-encodes the image, so it should only be used when downsampling
+    # (say, for a thumbnail)
+    # (ImageMagick has the -strip command, but GraphicsMagick doesn't.
+    # It turns out that ```+profile *``` does the same thing.)
+    def strip
+      add_output_option('+profile', '*')
+    end
+
+    # Crop to a square, using the specified gravity.
+    def square_crop(gravity = 'Center')
+      gravity(gravity) unless gravity.nil?
+      d = [width, height].min
+      crop("#{d}x#{d}+0+0!")
+    end
+
+    # For normal options, like -resize or -flip, you can call .resize("32x32") or .flip().
+    # If you need to add an output option that starts with a '+', you can use this method.
+    def add_output_option(option_name, *args)
+      (@output_options ||= []).push(option_name)
+      args.each { |ea| @output_options.push(Shellwords.escape(ea.to_s)) }
+
+      # if we're a resize call, let's give the -size render hint to gm, but only when it's safe:
+      # * we don't have input options yet,
+      # * we're not cropping (because the -size will prevent the crop from working),
+      # * and we have dimensions in the form of NNNxNNN
+      if %w{-geometry -resize -sample -scale}.include?(option_name) &&
+        @input_options.empty? &&
+        !@output_options.include?('-crop')
+        dimensions = args.first
+        if dimensions.to_s =~ /\A(\d+x\d+)\z/
+          @input_options.push('-size', dimensions)
+        end
+      end
+      # Support call chaining:
+      self
+    end
+
+    # Runs "convert"
+    # See http://www.imagemagick.org/script/convert.php
+    def write(output_file)
+      MicroMagick.exec(command('convert', output_file))
+    ensure
+      @input_options.clear
+      @output_options.clear
+    end
+
+    # Runs "mogrify"
+    # See http://www.imagemagick.org/script/mogrify.php
+    def overwrite
+      MicroMagick.exec(command('mogrify'))
+    ensure
+      @input_options.clear
+      @output_options.clear
+    end
+
+    private
+
+    def method_missing(method, *args, &block)
+      add_output_option("-#{method.to_s}", *args)
+    end
+
+    def command(command_name, output_file = nil)
+      cmd = [command_name]
+      cmd.push *@input_options
+      cmd.push Shellwords.escape(@input_file)
+      cmd.push *@output_options
+      cmd.push(Shellwords.escape(output_file)) if output_file
+      cmd
+    end
+
+    def identify
+      @identify || begin
+        cmd = ['identify', '-verbose', Shellwords.escape(input_file)]
+        @identify = IdentifyParser.new(MicroMagick.exec(cmd, true)).results
+        @corrupt = false
+      rescue CorruptImageError => e
+        @identify = {}
+        @corrupt = true
+      end
+      @identify
+    end
+  end
+
+  # Aliases to support < v0.0.6
+  Geometry = Convert = Image
+end

data/lib/micro_magick/version.rb

@@ -1,3 +1,3 @@
 module MicroMagick
-  VERSION = "0.0.6"
+  VERSION = '0.0.7'
 end

data/test/identify_parser_test.rb

@@ -0,0 +1,185 @@
+require 'test_helper'
+
+describe MicroMagick::IdentifyParser do
+  describe 'simple parsing functions' do
+    let(:ip) { MicroMagick::IdentifyParser.new('') }
+    it 'converts keys to expected symbols' do
+      ip.key_to_sym('Image').must_equal :image
+      ip.key_to_sym('Channel Depths').must_equal :channel_depths
+      ip.key_to_sym('JPEG-Quality').must_equal :jpeg_quality
+      ip.key_to_sym('Y Cb Cr Positioning').must_equal :y_cb_cr_positioning
+      ip.key_to_sym('Profile-EXIF').must_equal :profile_exif
+    end
+
+    it 'determines line indent properly' do
+      ip.indent('Image: out.jpeg').must_equal 0
+      ip.indent('  Channel Depths:').must_equal 2
+      ip.indent('    Blue:').must_equal 4
+    end
+  end
+
+  describe 'with expected output' do
+    let(:ip) do
+      MicroMagick::IdentifyParser.new(<<-OUT)
+Image: /tmp/input.jpg
+  Format: JPEG (Joint Photographic Experts Group JFIF format)
+  Mime type: image/jpeg
+  Class: DirectClass
+  Geometry: 1152x2048+0+0
+  Resolution: 72x72
+  Print size: 16x28.4444
+  Units: PixelsPerInch
+  Type: TrueColor
+  Endianess: Undefined
+  Colorspace: sRGB
+  Depth: 8-bit
+  Channel depth:
+    red: 8-bit
+    green: 8-bit
+    blue: 8-bit
+  Channel statistics:
+    Red:
+      min: 0 (0)
+      max: 255 (1)
+      mean: 133.986 (0.525437)
+      standard deviation: 54.1069 (0.212184)
+      kurtosis: -0.874804
+      skewness: -0.488666
+    Green:
+      min: 0 (0)
+      max: 255 (1)
+      mean: 119.681 (0.469337)
+      standard deviation: 64.5707 (0.253218)
+      kurtosis: -1.43104
+      skewness: -0.207503
+    Blue:
+      min: 0 (0)
+      max: 255 (1)
+      mean: 102.697 (0.402734)
+      standard deviation: 75.4283 (0.295797)
+      kurtosis: -1.69738
+      skewness: 0.0278036
+  Image statistics:
+    Overall:
+      min: 0 (0)
+      max: 255 (1)
+      mean: 118.788 (0.465836)
+      standard deviation: 65.2849 (0.256019)
+      kurtosis: -1.25648
+      skewness: -0.301872
+  Rendering intent: Perceptual
+  Gamma: 0.454545
+  Chromaticity:
+    red primary: (0.64,0.33)
+    green primary: (0.3,0.6)
+    blue primary: (0.15,0.06)
+    white point: (0.3127,0.329)
+  Background color: white
+  Border color: srgb(223,223,223)
+  Matte color: grey74
+  Transparent color: black
+  Interlace: None
+  Intensity: Undefined
+  Compose: Over
+  Page geometry: 1152x2048+0+0
+  Dispose: Undefined
+  Iterations: 0
+  Compression: JPEG
+  Quality: 94
+  Orientation: TopLeft
+  Properties:
+    date:create: 2014-02-09T08:59:26-08:00
+    date:modify: 2014-02-09T08:59:25-08:00
+    exif:ApertureValue: 228/100
+    exif:BrightnessValue: 105984/65536
+    exif:ColorSpace: 1
+    exif:ComponentsConfiguration: 1, 2, 3, 0
+    exif:Compression: 6
+    exif:DateTime: 2014:02:07 08:38:21
+    exif:DateTimeDigitized: 2014:02:07 08:38:21
+    exif:DateTimeOriginal: 2014:02:07 08:38:21
+    exif:ExifImageLength: 2048
+    exif:ExifImageWidth: 1152
+    exif:ExifOffset: 230
+    exif:ExifVersion: 48, 50, 50, 48
+    exif:ExposureBiasValue: 0/10
+    exif:ExposureMode: 0
+    exif:ExposureProgram: 2
+    exif:ExposureTime: 1/25
+    exif:Flash: 0
+    exif:FlashPixVersion: 48, 49, 48, 48
+    exif:FNumber: 220/100
+    exif:FocalLength: 420/100
+    exif:FocalLengthIn35mmFilm: 31
+    exif:GPSAltitude: 0/1000
+    exif:GPSAltitudeRef: 0
+    exif:GPSDateStamp: 2014:02:07
+    exif:GPSInfo: 722
+    exif:GPSLatitude: 37/1, 46/1, 341802/10000
+    exif:GPSLatitudeRef: N
+    exif:GPSLongitude: 122/1, 25/1, 6225/10000
+    exif:GPSLongitudeRef: W
+    exif:GPSProcessingMethod: ASCII
+    exif:GPSTimeStamp: 16/1, 38/1, 11/1
+    exif:GPSVersionID: 2, 2, 0, 0
+    exif:ImageLength: 1152
+    exif:ImageUniqueID: 9e6076155a3bd1ce0000000000000000
+    exif:ImageWidth: 2048
+    exif:InteroperabilityIndex: R98
+    exif:InteroperabilityOffset: 948
+    exif:InteroperabilityVersion: 48, 49, 48, 48
+    exif:ISOSpeedRatings: 125
+    exif:JPEGInterchangeFormat: 1072
+    exif:JPEGInterchangeFormatLength: 4729
+    exif:LightSource: 0
+    exif:Make: SAMSUNG
+    exif:MaxApertureValue: 228/100
+    exif:MeteringMode: 1
+    exif:Model: SCH-I545
+    exif:Orientation: 1
+    exif:ResolutionUnit: 2
+    exif:SceneCaptureType: 0
+    exif:SceneType: 1
+    exif:SensingMethod: 2
+    exif:ShutterSpeedValue: 304394/65536
+    exif:Software: Google
+    exif:thumbnail:ResolutionUnit: 2
+    exif:thumbnail:XResolution: 72/1
+    exif:thumbnail:YResolution: 72/1
+    exif:WhiteBalance: 0
+    exif:XResolution: 72/1
+    exif:YCbCrPositioning: 1
+    exif:YResolution: 72/1
+    jpeg:colorspace: 2
+    jpeg:sampling-factor: 2x2,1x1,1x1
+    signature: 2e969ff76481f84c85031e191ee902825bf6c2a12fb6083da57633326cde2bef
+  Profiles:
+    Profile-exif: 5808 bytes
+    Profile-xmp: 325 bytes
+  Artifacts:
+    filename: /Users/mrm/Downloads/20140207_083822.jpg
+    verbose: true
+  Tainted: False
+  Filesize: 227KB
+  Number pixels: 2.359M
+  Pixels per second: 29.49MB
+  User time: 0.070u
+  Elapsed time: 0:01.080
+  Version: ImageMagick 6.8.7-7 Q16 x86_64 2013-11-27 http://www.imagemagick.org
+      OUT
+    end
+
+    it 'extracts width and depth from geometry' do
+      ip[:width].must_equal 1152
+      ip[:height].must_equal 2048
+    end
+
+    it 'extracts sub-sections properly' do
+      ip[:channel_depth][:red].must_equal '8-bit'
+      ip[:channel_depth][:green].must_equal '8-bit'
+      ip[:channel_depth][:blue].must_equal '8-bit'
+      ip[:artifacts][:verbose].must_equal 'true'
+    end
+  end
+
+end

data/test/image_tests.rb

@@ -0,0 +1,82 @@
+require 'test_helper'
+require 'tempfile'
+
+module ImageTests
+  def self.included spec_class
+    spec_class.class_eval do
+
+      let(:img) { MicroMagick::Convert.new('test/480x270.jpg') }
+
+      let(:corrupt) { MicroMagick::Convert.new('test/corrupt.jpg') }
+
+      # By using the block format, the tempfile will be closed and deleted:
+      let(:outfile) { Tempfile.open(%w(out .jpg)) { |ea| ea.path } }
+
+      it 'extracts image geometry correctly' do
+        img.width.must_equal 270
+        img.height.must_equal 480
+        img.corrupt?.must_be_false
+      end
+
+      it 'detects corrupt images properly' do
+        corrupt.width.must_be_nil
+        corrupt.height.must_be_nil
+        corrupt.corrupt?.must_be_true
+      end
+
+      it 'resizes to cropped square' do
+        img.resize('64x64')
+        command = img.write(outfile)
+        command.must_equal "#{MicroMagick.cmd_prefix}convert -size 64x64 test/480x270.jpg -resize 64x64 " + Shellwords.escape(outfile)
+        File.exist?(outfile).must_be_true
+        g = MicroMagick::Geometry.new(outfile)
+        g.width.must_equal 64 * 270 / 480
+        g.height.must_equal 64
+      end
+
+      it 'removes exif headers from .strip' do
+        img.strip
+        command = img.write(outfile)
+        command.must_equal "#{MicroMagick.cmd_prefix}convert test/480x270.jpg +profile \\* " + Shellwords.escape(outfile)
+        i = MicroMagick::Image.new('test/480x270.jpg')
+        i['Profile-EXIF'].must_be_nil
+      end
+
+      it 'crops properly' do
+        command = img.quality(85).square_crop('North').resize('128x128').write(outfile)
+        command.must_equal "#{MicroMagick.cmd_prefix}convert test/480x270.jpg " +
+          "-quality 85 -gravity North -crop 270x270\\+0\\+0\\! -resize 128x128 " +
+          Shellwords.escape(outfile)
+        File.exist?(outfile).must_be_true
+        g = MicroMagick::Image.new(outfile)
+        g.width.must_equal 128
+        g.height.must_equal 128
+
+        # make sure calling previous arguments don't leak into new calls:
+        img.resize("64x64")
+        command = img.write(outfile)
+        command.must_equal "#{MicroMagick.cmd_prefix}convert -size 64x64 test/480x270.jpg -resize 64x64 " +
+          Shellwords.escape(outfile)
+      end
+
+      it 'raises errors from invalid parameters' do
+        img.boing
+        proc { img.write(outfile) }.must_raise MicroMagick::ArgumentError
+      end
+
+      let(:enoent) { MicroMagick::Image.new('nonexistant-file.jpg') }
+
+      it 'raises NoSuchFile when fetching attributes' do
+        proc { enoent.width }.must_raise MicroMagick::NoSuchFile
+      end
+
+      it 'raises NoSuchFile from write' do
+        proc { enoent.overwrite }.must_raise MicroMagick::NoSuchFile
+      end
+
+      it 'raises NoSuchFile from overwrite' do
+        proc { enoent.overwrite }.must_raise MicroMagick::NoSuchFile
+      end
+    end
+  end
+end

data/test/micro_gmagick_test.rb

@@ -1,11 +1,8 @@
-require "./test/micro_magick_test_base"
-
-class MicroGmagickTest < MicroMagickTestBase
-
-  def setup
-    MicroMagick.use(:graphicsmagick)
-    super
-  end
+require 'test_helper'
+require 'image_tests'
 
+describe 'Image tests under GraphicsMagick' do
+  before { MicroMagick.use_graphicsmagick }
+  include ImageTests
 end
 

data/test/micro_imagick_test.rb

@@ -1,11 +1,8 @@
-require "./test/micro_magick_test_base"
-
-class MicroImagickTest < MicroMagickTestBase
-
-  def setup
-    MicroMagick.use(:imagemagick)
-    super
-  end
+require 'test_helper'
+require 'image_tests'
 
+describe 'Image tests under ImageMagick' do
+  before { MicroMagick.use_imagemagick }
+  include ImageTests
 end
 

data/test/micro_magick_test.rb

@@ -1,34 +1,21 @@
-require "test/unit"
-require "micro_magick"
+require 'test_helper'
 
-class MicroMagickTest < Test::Unit::TestCase
+describe MicroMagick do
 
-  def test_use_nil
-    # This shouldn't throw:
-    MicroMagick.use(nil)
-
-    # eh, ok, now we should stub out system
-    # and verify that the next call to cmd_prefix
-    # calls `hash gm`?
-
-    # Meh, let's just assume that the test running machine has gm in their PATH.
-    assert_equal MicroMagick.cmd_prefix, "gm"
-  end
-
-  def test_use_invalid
-    assert_raise MicroMagick::InvalidArgument do
-      MicroMagick.use(:boink)
-    end
+  it 'uses GraphicsMagick by default' do
+    # Assume that the machine that's running the test has gm in it's PATH
+    MicroMagick.reset!
+    MicroMagick.cmd_prefix.must_equal 'gm '
   end
 
-  def test_use_gm
-    MicroMagick.use(:graphicsmagick)
-    assert_equal "gm", MicroMagick.cmd_prefix
+  it 'uses GraphicsMagick when set explicitly' do
+    MicroMagick.use_graphicsmagick
+    MicroMagick.cmd_prefix.must_equal 'gm '
   end
 
-  def test_use_im
-    MicroMagick.use(:imagemagick)
-    assert_equal nil, MicroMagick.cmd_prefix
+  it 'uses ImageMagick when set explicitly' do
+    MicroMagick.use_imagemagick
+    MicroMagick.cmd_prefix.must_equal ''
   end
 
 end

data/test/test_helper.rb

@@ -0,0 +1,3 @@
+require 'minitest/autorun'
+require 'minitest/great_expectations'
+require 'micro_magick'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: micro_magick
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,62 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  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: minitest
+  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: minitest-great_expectations
+  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: minitest-reporters
+  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'
 description: ''
 email:
 - matthew-github@mceachen.org
@@ -32,15 +88,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/micro_magick.rb
-- lib/micro_magick/convert.rb
-- lib/micro_magick/geometry.rb
+- lib/micro_magick/identify_parser.rb
+- lib/micro_magick/image.rb
 - lib/micro_magick/version.rb
 - test/480x270.jpg
-- test/geometry_test.rb
+- test/corrupt.jpg
+- test/identify_parser_test.rb
+- test/image_tests.rb
 - test/micro_gmagick_test.rb
 - test/micro_imagick_test.rb
 - test/micro_magick_test.rb
-- test/micro_magick_test_base.rb
+- test/test_helper.rb
 homepage: https://github.com/mceachen/micro_magick
 licenses: []
 metadata: {}
@@ -60,14 +118,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
-summary: The simplest and most correct ImageMagick/GraphicsMagick ruby wrapper
+summary: Simple and efficient ImageMagick/GraphicsMagick ruby wrapper
 test_files:
 - test/480x270.jpg
-- test/geometry_test.rb
+- test/corrupt.jpg
+- test/identify_parser_test.rb
+- test/image_tests.rb
 - test/micro_gmagick_test.rb
 - test/micro_imagick_test.rb
 - test/micro_magick_test.rb
-- test/micro_magick_test_base.rb
+- test/test_helper.rb
+has_rdoc: 

data/lib/micro_magick/convert.rb

@@ -1,84 +0,0 @@
-require 'shellwords'
-
-module MicroMagick
-  class Convert
-    def initialize(input_file)
-      @input_file = input_file
-      @input_options = []
-      @output_options = []
-    end
-
-    def width
-      geometry.width
-    end
-
-    def height
-      geometry.height
-    end
-
-    def geometry
-      @geometry ||= MicroMagick::Geometry.new(@input_file)
-    end
-
-    # strip the image of any profiles or comments
-    # (ImageMagick has the -strip command, but GraphicsMagick doesn't.
-    # It turns out that ```+profile *``` does the same thing.)
-    def strip
-      add_output_option("+profile", "*")
-    end
-
-    # Crop to a square, using the specified gravity.
-    def square_crop(gravity = "Center")
-      gravity(gravity) unless gravity.nil?
-      d = [width, height].min
-      crop("#{d}x#{d}+0+0!")
-    end
-
-    # For normal options, like -resize or -flip, you can call .resize("32x32") or .flip().
-    # If you need to add an output option that starts with a '+', you can use this method.
-    def add_output_option(option_name, *args)
-      (@output_options ||= []) << option_name
-      @output_options += args.collect { |ea| Shellwords.escape(ea.to_s) }
-
-      # if we're a resize call, let's give the -size render hint to gm, but only when it's safe:
-      # * we don't have input options yet,
-      # * we're not cropping (because the -size will prevent the crop from working),
-      # * and we have dimensions in the form of NNNxNNN
-      if %w{-geometry -resize -sample -scale}.include?(option_name) &&
-        @input_options.empty? &&
-        !@output_options.include?("-crop")
-        if (dimensions = args.first)
-          if dimensions =~ /^(\d+x\d+)$/
-            @input_options << "-size #{dimensions}"
-          end
-        end
-      end
-    end
-
-
-    # Executes `convert`, writing to output_file, and clearing all previously set input and output options.
-    # @return the command given to system()
-    def write(output_file)
-      @output_file = output_file
-      cmd = command()
-      MicroMagick.exec(cmd)
-      @input_options.clear
-      @output_options.clear
-      cmd
-    end
-
-    protected
-
-    def method_missing(method, *args, &block)
-      add_output_option("-#{method.to_s}", *args)
-    end
-
-    def command
-      ([MicroMagick.cmd_prefix, "convert"] +
-        @input_options +
-        [Shellwords.escape(@input_file)] +
-        @output_options +
-        [Shellwords.escape(@output_file)]).compact.join(" ")
-    end
-  end
-end

data/lib/micro_magick/geometry.rb

@@ -1,22 +0,0 @@
-require 'shellwords'
-
-module MicroMagick
-  class Geometry
-    attr_reader :width, :height
-
-    def initialize(input_file)
-      cmd = [MicroMagick.cmd_prefix,
-        "identify",
-        "-format",
-        "%w:%h",
-        Shellwords.escape(input_file)
-      ]
-      geometry = MicroMagick.exec(cmd.join(" "))
-      @width, @height = geometry.split(':').collect { |ea| ea.to_i }
-    end
-
-    def to_s
-      "#{width} x #{height}"
-    end
-  end
-end

data/test/geometry_test.rb

@@ -1,10 +0,0 @@
-require "test/unit"
-require "micro_magick"
-
-class GeometryTest < Test::Unit::TestCase
-  def test_geometry
-    img = MicroMagick::Convert.new("test/480x270.jpg")
-    assert_equal 270, img.width
-    assert_equal 480, img.height
-  end
-end

data/test/micro_magick_test_base.rb

@@ -1,66 +0,0 @@
-require "test/unit"
-require "shellwords"
-require "micro_magick"
-
-class MicroMagickTestBase < Test::Unit::TestCase
-
-  def setup
-    @img = MicroMagick::Convert.new("test/480x270.jpg")
-    tmp = Tempfile.new('out.jpg')
-    @outfile = tmp.path
-    tmp.close
-    tmp.delete
-    assert !File.exist?(@outfile)
-  end
-
-  def cmd_prefix
-    s = MicroMagick.cmd_prefix
-    s.nil? ? "" : s + " "
-  end
-
-  def test_resize
-    @img.resize("64x64")
-    command = @img.write(@outfile)
-    assert_equal "#{cmd_prefix}convert -size 64x64 test/480x270.jpg -resize 64x64 " + Shellwords.escape(@outfile), command
-    assert File.exist?(@outfile)
-    g = MicroMagick::Geometry.new(@outfile)
-    assert_equal (64 * (270.0/480.0)).to_i, g.width
-    assert_equal 64, g.height
-  end
-
-  def test_strip
-    @img.strip
-    command = @img.write(@outfile)
-    assert_equal "#{cmd_prefix}convert test/480x270.jpg +profile \\* " + Shellwords.escape(@outfile), command
-  end
-
-  def test_convert_with_crop
-    @img.quality(85)
-    @img.square_crop("North")
-    @img.resize("128x128")
-    command = @img.write(@outfile)
-    assert_equal "#{cmd_prefix}convert test/480x270.jpg " +
-      "-quality 85 -gravity North -crop 270x270\\+0\\+0\\! -resize 128x128 " +
-      Shellwords.escape(@outfile),
-      command
-    assert File.exist?(@outfile)
-    g = MicroMagick::Geometry.new(@outfile)
-    assert_equal 128, g.width
-    assert_equal 128, g.height
-
-    # make sure calling previous arguments don't leak into new calls:
-    @img.resize("64x64")
-    command = @img.write(@outfile)
-    assert_equal "#{cmd_prefix}convert -size 64x64 test/480x270.jpg -resize 64x64 " +
-      Shellwords.escape(@outfile),
-      command
-  end
-
-  def test_bad_args
-    @img.boing
-    assert_raise MicroMagick::InvalidArgument do
-      @img.write(@outfile)
-    end
-  end
-end
-