micro_magick 0.0.7 → 1.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YmJkMmI2NzI4MTk4ZDBiZTZjNmFkZDc4ZTljNWZjYzkwZTMyYzdmOQ==
-  data.tar.gz: !binary |-
-    Yzk2YzEyNTk2OTEzYzkyOWI1MGE4NTc3MGNiNmY0ZWI3OThiZDI0NA==
+SHA1:
+  metadata.gz: d5fe2a80cd4fd39386b5427a88450816586f236b
+  data.tar.gz: 8c1904a65e0e4cd5569e42d94ad725d6a234b2ed
 SHA512:
-  metadata.gz: !binary |-
-    OTc4OGExNDUyOGRmMWFlZjIxODk3MGQ4Njg0ODRjMGUyODBlYzNjODQ5MjIy
-    YmJmZGI0ZTY1NTI3Y2U4NDdkN2M1YmY3YzdmMjUyNDgzN2YwYjcxMTE0OThj
-    MWJlNjFlZmUxYTIxMTgyZDQ4ZWVmOWQ3MGQ4YzI5YTg0ZWFkMmY=
-  data.tar.gz: !binary |-
-    NmI1ZmE4OTBlOTBlMGU4MjAxYzFmYjUzNTE2NGQ1OWE1NjEwMTRhYzAyNzUx
-    NmI3M2EwZDJmMzZmMjM1ZGMyODFkNjhlM2I0OTg1YjZmZjBmNTgxZTdjZDlm
-    NTI4ZWQzYWVhMGUwMjY0MzcyMTg2ZWJiOWViOTM0MjZmMTM2ZWI=
+  metadata.gz: f3ff709ef212a13c5286f47be04588b8746304b946d1594321aed5c23e7a46b9ceb460b475291fe50bc649e5a9f4c3aa19ab3d05d973a2f3707b133118ee8800
+  data.tar.gz: 4697bd37f648c0674a377e0df032763b742f226afe98aceb38a9da6a529222edacaff7ba9de0eed56673fe878b8feccccc16917d1148985dd8991d5de3b2396a

data/lib/micro_magick.rb

@@ -11,16 +11,40 @@ module MicroMagick
   ArgumentError = Class.new(Error)
   CorruptImageError = Class.new(Error)
 
-  def self.use_imagemagick
+  def self.use_imagemagick!
+    reset!
     @cmd_prefix = ''
   end
 
-  def self.use_graphicsmagick
+  def self.use_graphicsmagick!
+    reset!
     @cmd_prefix = 'gm '
   end
 
+  def self.graphicsmagick?
+    cmd_prefix == 'gm '
+  end
+
+  def self.imagemagick?
+    !graphicsmagick?
+  end
+
   def self.reset!
-    @cmd_prefix = nil
+    @cmd_prefix = @verbose_version = @version = nil
+  end
+
+  def self.verbose_version
+    @verbose_version ||= begin
+      cmd = graphicsmagick? ? %w(version) : %w(identify --version)
+      exec(cmd, true)
+    end
+  end
+
+  def self.version
+    @version ||= begin
+      m = verbose_version.split($/, 1).first.match(/([\d\.]{5,})/)
+      Gem::Version.new(m[1]) if m
+    end
   end
 
   def self.cmd_prefix
@@ -37,23 +61,21 @@ module MicroMagick
 
   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
+    stdout, stderr, status = Open3.capture3(final_cmd)
+    err = stderr.strip
+    if err.size > 0 || status != 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 (#{status}): #{err}"
     end
-    return_stdout ? stdout : final_cmd
+    return_stdout ? stdout.strip : final_cmd
   rescue Errno::ENOENT => e
     raise NoSuchFile, e.message
   end

data/lib/micro_magick/identify_parser.rb

@@ -1,54 +1,13 @@
 module MicroMagick
   class IdentifyParser
 
-    attr_reader :results
+    DIMENSIONS_RE = /(\d+)x(\d+)/
 
+    attr_reader :width, :height
     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
+      if (m = stdout.match(DIMENSIONS_RE))
+        @width, @height = m[1].to_i, m[2].to_i
       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

@@ -11,16 +11,12 @@ module MicroMagick
       @output_options = []
     end
 
-    def [](key)
-      identify[key]
-    end
-
     def width
-      self[:width]
+      identify.width unless corrupt?
     end
 
     def height
-      self[:height]
+      identify.height unless corrupt?
     end
 
     def corrupt?
@@ -100,8 +96,8 @@ module MicroMagick
 
     def identify
       @identify || begin
-        cmd = ['identify', '-verbose', Shellwords.escape(input_file)]
-        @identify = IdentifyParser.new(MicroMagick.exec(cmd, true)).results
+        cmd = ['identify', '-verbose', '-format', '%wx%h', Shellwords.escape(input_file)]
+        @identify = IdentifyParser.new(MicroMagick.exec(cmd, true))
         @corrupt = false
       rescue CorruptImageError => e
         @identify = {}

data/lib/micro_magick/version.rb

@@ -1,3 +1,3 @@
 module MicroMagick
-  VERSION = '0.0.7'
+  VERSION = Gem::Version.new('1.0.0')
 end

data/test/image_tests.rb

@@ -5,9 +5,10 @@ module ImageTests
   def self.included spec_class
     spec_class.class_eval do
 
-      let(:img) { MicroMagick::Convert.new('test/480x270.jpg') }
+      let(:imgfile) { 'test/480x270.jpg' }
+      let(:img) { MicroMagick::Convert.new(imgfile) }
 
-      let(:corrupt) { MicroMagick::Convert.new('test/corrupt.jpg') }
+      let(:corrupt) { MicroMagick::Convert.new('test/borked.jpg') }
 
       # By using the block format, the tempfile will be closed and deleted:
       let(:outfile) { Tempfile.open(%w(out .jpg)) { |ea| ea.path } }
@@ -18,10 +19,24 @@ module ImageTests
         img.corrupt?.must_be_false
       end
 
+      def corrupt_checks_broken
+        MicroMagick.imagemagick? && MicroMagick.version < Gem::Version.new('6.7.0')
+      end
+
       it 'detects corrupt images properly' do
-        corrupt.width.must_be_nil
-        corrupt.height.must_be_nil
-        corrupt.corrupt?.must_be_true
+        if corrupt_checks_broken
+          puts "skipping .corrupt? tests"
+        else
+          corrupt.width.must_be_nil
+          corrupt.height.must_be_nil
+          corrupt.corrupt?.must_be_true
+        end
+      end
+
+      it 'extracts image geometry for problematic JPGs' do
+        jpg = MicroMagick::Image.new('test/bad_exif.jpg')
+        jpg.width.must_equal(1944)
+        jpg.height.must_equal(2592)
       end
 
       it 'resizes to cropped square' do
@@ -38,8 +53,13 @@ module ImageTests
         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
+
+        stripped = MicroMagick::Image.new(outfile)
+        stripped.corrupt?.must_be_false
+        stripped.width.must_equal img.width
+        stripped.height.must_equal img.height
+
+        File.stat(outfile).size.must_be :<, File.stat(imgfile).size
       end
 
       it 'crops properly' do
@@ -53,7 +73,7 @@ module ImageTests
         g.height.must_equal 128
 
         # make sure calling previous arguments don't leak into new calls:
-        img.resize("64x64")
+        img.resize('64x64')
         command = img.write(outfile)
         command.must_equal "#{MicroMagick.cmd_prefix}convert -size 64x64 test/480x270.jpg -resize 64x64 " +
           Shellwords.escape(outfile)

data/test/micro_gmagick_test.rb

@@ -2,7 +2,19 @@ require 'test_helper'
 require 'image_tests'
 
 describe 'Image tests under GraphicsMagick' do
-  before { MicroMagick.use_graphicsmagick }
+  before { MicroMagick.use_graphicsmagick! }
+
+  it 'properly reports using graphicsmagick' do
+    MicroMagick.imagemagick?.must_equal false
+    MicroMagick.graphicsmagick?.must_equal true
+  end
+
+  it 'returns the correct GraphicsMagick version' do
+    # GraphicsMagick should be around 1.3.x-ish. See http://www.graphicsmagick.org/Changelog.html
+    MicroMagick.version.must_be :<, Gem::Version.new('1.4')
+    MicroMagick.version.must_be :>, Gem::Version.new('1.0')
+  end
+
   include ImageTests
 end
 

data/test/micro_imagick_test.rb

@@ -2,7 +2,20 @@ require 'test_helper'
 require 'image_tests'
 
 describe 'Image tests under ImageMagick' do
-  before { MicroMagick.use_imagemagick }
+  before { MicroMagick.use_imagemagick! }
+
+  it 'properly reports using imagemagick' do
+    MicroMagick.imagemagick?.must_equal true
+    MicroMagick.graphicsmagick?.must_equal false
+  end
+
+  it 'returns the correct ImageMagick version' do
+    # ImageMagick should be around 6.9.x-ish. See http://www.imagemagick.org/script/changelog.php
+    puts MicroMagick.version
+    MicroMagick.version.must_be :<, Gem::Version.new('7.0.0')
+    MicroMagick.version.must_be :>, Gem::Version.new('6.3.0')
+  end
+
   include ImageTests
 end
 

data/test/micro_magick_test.rb

@@ -9,12 +9,12 @@ describe MicroMagick do
   end
 
   it 'uses GraphicsMagick when set explicitly' do
-    MicroMagick.use_graphicsmagick
+    MicroMagick.use_graphicsmagick!
     MicroMagick.cmd_prefix.must_equal 'gm '
   end
 
   it 'uses ImageMagick when set explicitly' do
-    MicroMagick.use_imagemagick
+    MicroMagick.use_imagemagick!
     MicroMagick.cmd_prefix.must_equal ''
   end
 

data/test/test_helper.rb

@@ -1,3 +1,8 @@
 require 'minitest/autorun'
 require 'minitest/great_expectations'
 require 'micro_magick'
+
+unless ENV['CI']
+  require 'minitest/reporters'
+  Minitest::Reporters.use! [Minitest::Reporters::SpecReporter.new]
+end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: micro_magick
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 1.0.0
 platform: ruby
 authors:
 - Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   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: 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: ''
@@ -91,9 +91,10 @@ files:
 - lib/micro_magick/identify_parser.rb
 - lib/micro_magick/image.rb
 - lib/micro_magick/version.rb
+- test/393.JPG
 - test/480x270.jpg
-- test/corrupt.jpg
-- test/identify_parser_test.rb
+- test/bad_exif.jpg
+- test/borked.jpg
 - test/image_tests.rb
 - test/micro_gmagick_test.rb
 - test/micro_imagick_test.rb
@@ -108,24 +109,25 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Simple and efficient ImageMagick/GraphicsMagick ruby wrapper
 test_files:
+- test/393.JPG
 - test/480x270.jpg
-- test/corrupt.jpg
-- test/identify_parser_test.rb
+- test/bad_exif.jpg
+- test/borked.jpg
 - test/image_tests.rb
 - test/micro_gmagick_test.rb
 - test/micro_imagick_test.rb

data/test/identify_parser_test.rb

@@ -1,185 +0,0 @@
-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