micro_magick 0.0.1 → 0.0.2

data/README.md

@@ -45,13 +45,14 @@ In-place image edits through ```mogrify``` are not supported (yet).
 
 ### GraphicsMagick versus ImageMagick
 
+*At least in my testing, GraphicsMagick blows ImageMagick out of the water.*
+
 In resizing a 2248x4000 image to 640x480:
-* GraphicsMagick takes 141 milliseconds. ImageMagick takes over 550 millis.
-* GraphicsMagick outputs a 37K JPG, ImageMagick outputs a 94K JPG, with no detectable visual differences.
 
-At least in my testing, GraphicsMagick blows ImageMagick out of the water.
+* GraphicsMagick takes ~140 milliseconds. ImageMagick takes ~550 millis.
+* GraphicsMagick outputs a 37K JPG, ImageMagick outputs a 94K JPG, with no detectable visual differences.
 
-Not only is it 4 times faster, it produces 2.5x smaller output with the same quality--WIN WIN.
+Not only is GraphicsMagick 4 times faster, it produces 2.5x smaller output with the same quality--WIN WIN.
 
 ## Installation
 

data/lib/micro_magick/convert.rb

@@ -6,15 +6,17 @@ module MicroMagick
       @args = [Shellwords.escape(input_file)]
     end
 
-    def command
-      ([MicroMagick.cmd_prefix, "convert", @pre_input] + @args).compact.join(" ")
-    end
-
     def write(output_file)
       @args << Shellwords.escape(output_file)
-      MicroMagick.exec command
+      cmd = build_command()
+      MicroMagick.exec(cmd)
+      @args = @args.first(1)
+      @pre_input = nil
+      cmd
     end
 
+    protected
+
     def method_missing(method, *args, &block)
       if @pre_input.nil? && [:geometry, :resize, :sample, :scale].include?(method)
         dimensions = args.first
@@ -33,5 +35,9 @@ module MicroMagick
       end
       @args += args.compact.collect { |ea| Shellwords.escape(ea.to_s) }
     end
+
+    def build_command
+      ([MicroMagick.cmd_prefix, "convert", @pre_input] + @args).compact.join(" ")
+    end
   end
 end

data/lib/micro_magick/version.rb

@@ -1,3 +1,3 @@
 module MicroMagick
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/test_micro_magick.rb

@@ -31,16 +31,35 @@ class TestMicroMagick < Test::Unit::TestCase
     i.gravity("Center")
     i.crop("250x250")
     i.resize("128x128")
+    tmp = mktmpfile
+    assert !File.exist?(tmp)
+    command = i.write(tmp)
+    assert_equal command, "gm convert -size 128x128 test/640.jpg +profile \\* " +
+      "-quality 85 -gravity Center -crop 250x250 -resize 128x128 " +
+      Shellwords.escape(tmp)
+    assert File.exist?(tmp)
+
+    # make sure calling previous arguments don't leak into new calls:
+    i.resize("64x64")
+    command = i.write(tmp)
+    assert_equal command, "gm convert -size 64x64 test/640.jpg -resize 64x64 " +
+      Shellwords.escape(tmp)
+  end
+
+  def mktmpfile
     tmp = Tempfile.new('out.jpg')
     outfile = tmp.path
     tmp.close
     tmp.delete
-    assert !File.exist?(outfile)
-    i.write(outfile)
-    assert_equal i.command, "gm convert -size 128x128 test/640.jpg +profile \\* " +
-      "-quality 85 -gravity Center -crop 250x250 -resize 128x128 " +
-      Shellwords.escape(outfile)
-    assert File.exist?(outfile)
+    outfile
+  end
+
+  def test_bad_args
+    i = MicroMagick::Convert.new("test/640.jpg")
+    i.boing
+    assert_raise MicroMagick::InvalidArgument do
+      i.write(mktmpfile)
+    end
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: micro_magick
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Matthew McEachen