micro_magick 0.0.3 → 0.0.5

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+script: bundle exec rake
+before_install:
+ - sudo apt-get update
+ - sudo apt-get install graphicsmagick imagemagick
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode

data/README.md

@@ -1,26 +1,11 @@
-# Simplest possible ruby wrapper for [ImageMagick](http://www.imagemagick.org/) and [GraphicsMagick](http://www.graphicsmagick.org/)
+# [ImageMagick](http://www.imagemagick.org/)/[GraphicsMagick](http://www.graphicsmagick.org/) Ruby wrapper
 
-### OMG, SRSLY?
-
-Yes. Seriously.
-
-### The other five libraries didn't make you happy?
-
-No.
-
-### OK, Sunshine, cry me a river.
-
-All I wanted was something that
-
-* didn't create temporary files unnecessarily (like mini_magick)
-* didn't fail with valid geometry specifications, like ```640x480>``` (like mini_magick and quick_magick)
-* didn't assume you only needed to resize your images (like imagery)
-* didn't think you're going to run a public image caching service (like magickly)
+[![Build Status](https://secure.travis-ci.org/mceachen/micro_magick.png)](http://travis-ci.org/mceachen/micro_magick)
 
 ## Usage
 
-```micro_magick``` is an exec wrapper for the ```convert``` command, which reads from an image
-source, performs operations on it, and saves the result to a different file.
+```micro_magick``` is an exec wrapper for the ```convert``` command in either GraphicsMagick or ImageMagic.
+```convert``` reads an image from a given input file, performs operations on it, then saves the result to a different file.
 
 ```ruby
 img = MicroMagick::Convert.new("/path/to/image.jpg")
@@ -38,6 +23,23 @@ This results in the following system call:
 
 ```gm convert -size 640x480 /path/to/image.jpg +profile \* -quality 85 -resize "640x480>" /new/path/image-640x480.jpg```
 
+
+### Installation
+
+You'll want to [install GraphicsMagick](http://www.graphicsmagick.org/README.html), then
+
+```
+gem install micro_magick
+```
+
+or add to your Gemfile:
+
+```
+gem 'micro_magick'
+```
+
+and run ```bundle```.
+
 ### "Plus" options
 
 To add an output option that has a "plus" prefix, like, ```+matte```, use ```.add_output_option("+matte")```.
@@ -49,8 +51,6 @@ There are a couple additional methods that have been added to address common ima
 * ```img.strip``` removes all comments and EXIF headers
 * ```img.square_crop``` crops the image to a square (so a 640x480 image would crop down to a 480x480 image, cropped in the middle).
 
-
-
 Note that all of ```convert```'s options are supported, but ```micro_magick``` does no validations.
 A ```MicroMagick::ArgumentError``` will be raised on ```.write``` if
 convert writes anything to stderr or the return value is not 0.
@@ -60,7 +60,7 @@ but you can force the library MicroMagick uses by calling ```MicroMagick.use(:gr
 
 In-place image edits through ```mogrify``` are not supported (yet).
 
-### GraphicsMagick versus ImageMagick
+## GraphicsMagick versus ImageMagick
 
 *At least in my testing, GraphicsMagick blows ImageMagick out of the water.*
 
@@ -71,21 +71,14 @@ In resizing a 2248x4000 image to 640x480:
 
 Not only is GraphicsMagick 4 times faster, it produces 2.5x smaller output with the same quality--WIN WIN.
 
-## Installation
-
-You'll want to [install GraphicsMagick](http://www.graphicsmagick.org/README.html), then
-
-```
-gem install micro_magick
-```
+## MicroMagick versus the competition
 
-or add to your Gemfile:
+Why does the world need another *Magick wrapper? Because I needed a library that:
 
-```
-gem 'micro_magick'
-```
-
-and run ```bundle```.
+* didn't create temporary files unnecessarily (like mini_magick)
+* didn't fail with valid geometry specifications, like ```640x480>``` (like mini_magick and quick_magick)
+* didn't assume you only needed to resize your images (like imagery)
+* didn't think you're going to run a public image caching service (like magickly)
 
 ## Change history
 
@@ -96,3 +89,7 @@ Let's get this party started.
 ### 0.0.3
 
 Added square_crop, image dimensions, and support for ```+option```s.
+
+### 0.0.4
+
+Input file -size render hint is now only used with simple dimension specifications

data/lib/micro_magick/convert.rb

@@ -46,10 +46,12 @@ module MicroMagick
       # * 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) &&
-        (simple_dim = dimensions.scan(/(\d+x\d+)/).first)
-        @input_options << "-size #{simple_dim}"
+        !@output_options.include?("-crop")
+        if (dimensions = args.first)
+          if dimensions =~ /^(\d+x\d+)$/
+            @input_options << "-size #{dimensions}"
+          end
+        end
       end
     end
 

data/lib/micro_magick/version.rb

@@ -1,3 +1,3 @@
 module MicroMagick
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/micro_magick.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = MicroMagick::VERSION
   s.authors     = ["Matthew McEachen"]
   s.email       = ["matthew-github@mceachen.org"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/mceachen/micro_magick"
   s.summary     = %q{Simplest ImageMagick/GraphicsMagick ruby wrapper EVAR}
   s.description = %q{Simplest ImageMagick/GraphicsMagick ruby wrapper EVAR}
 

data/test/geometry_test.rb

@@ -1,4 +1,5 @@
 require "test/unit"
+require "micro_magick"
 
 class GeometryTest < Test::Unit::TestCase
   def test_geometry

data/test/micro_gmagick_test.rb

@@ -1,4 +1,4 @@
-require "test/micro_magick_test_base"
+require "./test/micro_magick_test_base"
 
 class MicroGmagickTest < MicroMagickTestBase
 

data/test/micro_imagick_test.rb

@@ -1,4 +1,4 @@
-require "test/micro_magick_test_base"
+require "./test/micro_magick_test_base"
 
 class MicroImagickTest < MicroMagickTestBase
 

data/test/micro_magick_test.rb

@@ -1,4 +1,5 @@
 require "test/unit"
+require "micro_magick"
 
 class MicroMagickTest < Test::Unit::TestCase
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: micro_magick
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Matthew McEachen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-04 00:00:00 Z
+date: 2012-03-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -42,6 +42,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -56,7 +57,7 @@ files:
 - test/micro_imagick_test.rb
 - test/micro_magick_test.rb
 - test/micro_magick_test_base.rb
-homepage: ""
+homepage: https://github.com/mceachen/micro_magick
 licenses: []
 
 post_install_message: