micro_magick 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10a457128480449b93b16c01a2be37a44de681a5
-  data.tar.gz: 9e6fac256930e94e810c9ac5d80d6e1946943bd1
+  metadata.gz: 7db109b6f15512b98ddf6a0636105ffc2230909d
+  data.tar.gz: e462ef989de13f415ff76e33ec21949920272b2d
 SHA512:
-  metadata.gz: 43856ed019ecae1569a17fbdffec70d61e85060e858f0c5b43da9854e149df9716561435bb115b1d5d54b0c024d5edc7adae75706752f64b74d21b34d40d460a
-  data.tar.gz: a463a2c9c7b1c1774479a4aef04df80c791c90dfe12a793984a4d2a36370ac9c1c720bf8594b58a583055cc2e61baa041cae03c909ad2d232d8524d3d53e9b98
+  metadata.gz: c069a6361739fd6989779e5c286750e33392ef5d039e5f214da27428d94d861187dd58010fa1c5d92b2c8a3c7a08102363c75b2c05072bc688c74ce1914a7b2e
+  data.tar.gz: 2ea92b82fba3b5752bfbf4de96a8527e4b40fc7005010d4969d69ed586555f6ebae4942fa196c26dabef6675b611e59703cc951a6008364e0457c728a4214e80

data/lib/micro_magick.rb

@@ -66,7 +66,7 @@ module MicroMagick
     if err.size > 0 || status != 0
       error = if err =~ /unrecognized option/i
                 ArgumentError
-              elsif err =~ /corrupt/i
+              elsif err =~ /corrupt|CRC error/i
                 CorruptImageError
               elsif err =~ /no such file or directory|unable to open/i
                 NoSuchFile

data/lib/micro_magick/image.rb

@@ -9,6 +9,25 @@ module MicroMagick
       @input_file = input_file
       @input_options = []
       @output_options = []
+      @identify = nil
+    end
+
+    # If you need to add an option that affects processing of input files,
+    # you can use this method.
+    def add_input_option(option_name, *args)
+      (@input_options ||= []).push(option_name)
+      args.each { |ea| @input_options.push(Shellwords.escape(ea.to_s)) }
+
+      # Support call chaining:
+      self
+    end
+
+    # Ignore the checksum embedded in the image.
+    # Useful if the image is known to not be corrupted but has an invalid checksum;
+    # some devices export such broken images.
+    def ignore_checksum
+      # Only PNG for now
+      add_input_option("-define", "png:ignore-crc")
     end
 
     def width
@@ -87,9 +106,9 @@ module MicroMagick
 
     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(*@input_options)
+      cmd.push(Shellwords.escape(@input_file))
+      cmd.push(*@output_options)
       cmd.push(Shellwords.escape(output_file)) if output_file
       cmd
     end
@@ -99,7 +118,7 @@ module MicroMagick
         cmd = ['identify', '-verbose', '-format', '%wx%h', Shellwords.escape(input_file)]
         @identify = IdentifyParser.new(MicroMagick.exec(cmd, true))
         @corrupt = false
-      rescue CorruptImageError => e
+      rescue CorruptImageError
         @identify = {}
         @corrupt = true
       end

data/lib/micro_magick/version.rb

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

data/test/image_tests.rb

@@ -19,18 +19,15 @@ module ImageTests
         img.corrupt?.must_be_false
       end
 
-      def corrupt_checks_broken
-        MicroMagick.imagemagick? && MicroMagick.version < Gem::Version.new('6.7.0')
+      def old_imagemagick
+        MicroMagick.imagemagick? && MicroMagick.version < Gem::Version.new('6.8.0')
       end
 
       it 'detects corrupt images properly' do
-        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
+        skip "Old ImageMagick versions don't detect corruption properly" if old_imagemagick
+        corrupt.width.must_be_nil
+        corrupt.height.must_be_nil
+        corrupt.corrupt?.must_be_true
       end
 
       it 'extracts image geometry for problematic JPGs' do
@@ -84,6 +81,18 @@ module ImageTests
         proc { img.write(outfile) }.must_raise MicroMagick::ArgumentError
       end
 
+      it 'allows to ignore checksum errors' do
+        unless MicroMagick.imagemagick? && MicroMagick.version >= Gem::Version.new('7.0.6')
+          skip "The png:ignore-crc format option only exists in ImageMagick 7.0.6+"
+        end
+
+        img = MicroMagick::Image.new('test/broken_crc.png')
+        proc { img.write(outfile) }.must_raise MicroMagick::CorruptImageError
+
+        img = MicroMagick::Image.new('test/broken_crc.png')
+        img.ignore_checksum.write(outfile)
+      end
+
       let(:enoent) { MicroMagick::Image.new('nonexistant-file.jpg') }
 
       it 'raises NoSuchFile when fetching attributes' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: micro_magick
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -95,6 +95,7 @@ files:
 - test/480x270.jpg
 - test/bad_exif.jpg
 - test/borked.jpg
+- test/broken_crc.png
 - test/image_tests.rb
 - test/micro_gmagick_test.rb
 - test/micro_imagick_test.rb
@@ -120,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Simple and efficient ImageMagick/GraphicsMagick ruby wrapper
@@ -129,9 +130,9 @@ test_files:
 - test/480x270.jpg
 - test/bad_exif.jpg
 - test/borked.jpg
+- test/broken_crc.png
 - test/image_tests.rb
 - test/micro_gmagick_test.rb
 - test/micro_imagick_test.rb
 - test/micro_magick_test.rb
 - test/test_helper.rb
-has_rdoc: