morandi 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68cd42331964c9dd3672616161db84d71093f565f0186c4cc1b090bfec537cab
-  data.tar.gz: 3715b3e1b8288453ea1421260ca8a6305867305b1047e8ffa855c82b4b5fc501
+  metadata.gz: 9cc53b714e3e5e997376714b0f5033b14c753110b82a2d2de2b0d2d90b173b14
+  data.tar.gz: 4d59da477a6760c96c227d4b1d416b5114086ff63986c4631e9e406e73b4ec3e
 SHA512:
-  metadata.gz: b1af52f959e8b6dc5c25dadb1368797943d5d68256386b3f41be57ed4d1c92c1091977f00982ca1f3169b82df71f75dcd64d8a7346f4eb03f1fdc939df98856c
-  data.tar.gz: c8831c9ad0fc69f433abddbacc15352dfca2ad156841167f942038536cfcabf243d659967b1b64f865d6280797a0dcf2866e1f46695ef4c8e99db333cc700909
+  metadata.gz: b12fa0320ca0dd1d036fe2d84fbf7948b6020c0a90d2db75a13b3b8b33c38b6aa9b6ceb9fe5caa0e6b1deace48012c9748e44cd3b455a5af9afc9662e16446ad
+  data.tar.gz: 5695162218181fe2adc94e4d851411079e1703b2238a424330f5b80725e18e4fbe58bb669d92b377aa32e930754a7bd157b8f28a8d0cd595eb0b0515d3f3487b

data/.gitignore

@@ -1,6 +1,7 @@
 *.gem
 *.rbc
 .bundle
+.DS_Store
 .config
 .yardoc
 Gemfile.lock

data/CHANGELOG.md

@@ -9,3 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [0.11.0] 07.12.2018
 ### Added
 - Added option to set the JPEG image compression size [104324]
+
+## [0.11.1] 21.02.2019
+### Added
+- Have option to set the JPEG image compression size be a string like all the other options. [TECH-7701]
+- While throwing Gdk::PixbufError::CorruptImage in Morandi::ProfiledPixbuf#initialize try to recover the image by saving it to a tempfile and re-read. This operation should remove all wrong markers. [TECH-7663]

data/lib/morandi/image_processor.rb

@@ -72,7 +72,7 @@ class Morandi::ImageProcessor
   end
 
   def write_to_jpeg(fn, quality = nil)
-    quality ||= options.fetch(:quality, 97)
+    quality ||= options.fetch('quality', 97)
     @pb.save(fn, 'jpeg', quality: quality)
   end
 

data/lib/morandi/profiled_pixbuf.rb

@@ -12,6 +12,15 @@ class Morandi::ProfiledPixbuf < Gdk::Pixbuf
     false
   end
 
+  def self.from_string(string, loader: nil, chunk_size: 4096)
+    loader ||= Gdk::PixbufLoader.new
+    ((string.bytesize + chunk_size - 1) / chunk_size).times do |i|
+      loader.write(string.byteslice(i * chunk_size, chunk_size))
+    end
+    loader.close
+    loader.pixbuf
+  end
+
   def self.default_icc_path(path)
     "#{path}.icc.jpg"
   end
@@ -30,6 +39,18 @@ class Morandi::ProfiledPixbuf < Gdk::Pixbuf
     end
 
     super(*args)
+  rescue Gdk::PixbufError::CorruptImage => e
+    if args[0].is_a?(String) && defined? Tempfile
+      temp =  Tempfile.new
+      pixbuf = self.class.from_string(File.read(args[0]))
+      pixbuf.save(temp.path, 'jpeg')
+      args[0] = temp.path
+      super(*args)
+      temp.close
+      temp.unlink
+    else
+      throw e
+    end
   end
 
 

data/lib/morandi/version.rb

@@ -1,3 +1,3 @@
 module Morandi
-  VERSION = '0.11.0'.freeze
+  VERSION = '0.11.1'.freeze
 end

data/spec/morandi_spec.rb

@@ -122,7 +122,7 @@ RSpec.describe Morandi, "#process" do
 
   context 'with increasing quality settings' do
     let(:max_quality_file_size) do
-      Morandi.process("sample/sample.jpg", { quality: 100 }, "sample/out-100.jpg")
+      Morandi.process("sample/sample.jpg", { 'quality' => 100 }, "sample/out-100.jpg")
       File.size("sample/out-100.jpg")
     end
 
@@ -132,7 +132,7 @@ RSpec.describe Morandi, "#process" do
     end
 
     let(:quality_of_40_by_options_args) do
-      Morandi.process("sample/sample.jpg", { quality: 40 }, "sample/out-40.jpg")
+      Morandi.process("sample/sample.jpg", { 'quality' => 40 }, "sample/out-40.jpg")
       File.size("sample/out-40.jpg")
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morandi
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - |+
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2019-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2