thingfish-processor-image 0.1.0.pre20161114102625 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94cec81297dc83ba31fc6dfcf4b258688c4b232c
-  data.tar.gz: 5906271b9d85a5bc5f7da0a55f553d8e4ede3310
+  metadata.gz: 71abb68f2697e12cca499539898150e567ba6381
+  data.tar.gz: 250cff10b3af2aa083985b4636cda38c12ec179e
 SHA512:
-  metadata.gz: 74ad63442c9b7cb228c955f172ded4091cf25a1267581d323f9ad8b9a526ce37eb546a81fb0c3d50c18ae03dfe4749dcc26ecfe85897734cdd7140da3f6ac6d5
-  data.tar.gz: 89fd3b8a06e6bce83d42238472dad1b503863f8676579e3d2561aa62c59b3e4937a889c5ebe79ae95180cc89598d0f249babb1b60e13e5219b2329962b7dcafc
+  metadata.gz: 1921b02379a6c6d6ce639ff887ee938e8250ed049ba27348fcae7846cf326dfda057455480432801f0c0d5291b0f79131a23b23e1d03edd0261ad803897cd1ae
+  data.tar.gz: 0c01adf4f342fc581f07a3bceb11207ffcaba83ec6da70b5b6acefc499248295a3cf91d8727db303143afc21e94e1dd3dda66645903d04696a0df16c236bf2ee

data/ChangeLog

@@ -1,9 +1,21 @@
+2016-11-16  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/thingfish/processor/image.rb,
+	spec/thingfish/processor/image_spec.rb:
+	Add ImageMagick parsing catch. Only load the first
+	frame/page/whatever into memory to generate a thumbnail.
+	[663fd528faed] [tip]
+
 2016-11-14  Michael Granger  <ged@FaerieMUD.org>
 
+	* Rakefile, thingfish-processor-image.gemspec:
+	Fix the version calculation in the gemspec task.
+	[84149cda4ae5]
+
 	* History.md, README.md, Rakefile, lib/thingfish/processor/image.rb,
 	thingfish-processor-image.gemspec:
 	Fix up the README, Rakefile.
-	[e04ece44aa56] [tip]
+	[e04ece44aa56]
 
 2016-11-13  Michael Granger  <ged@FaerieMUD.org>
 

data/History.md

@@ -1,4 +1,9 @@
-## v0.1.0 [YYYY-MM-DD] Michael Granger <ged@FaerieMUD.org>
+## v0.1.1 [2016-11-16] Michael Granger <ged@FaerieMUD.org>
 
-Initial release.
+Build system fix only.
+
+
+## v0.1.0 [2016-11-16] Michael Granger <ged@FaerieMUD.org>
+
+(Never released)
 

data/Rakefile

@@ -14,7 +14,6 @@ Hoe.plugin :signing
 Hoe.plugin :deveiate
 
 Hoe.plugins.delete :rubyforge
-Hoe.plugins.delete :gemcutter # Remove for public gems
 
 hoespec = Hoe.spec 'thingfish-processor-image' do |spec|
 	spec.readme_file = 'README.md'

data/lib/thingfish/processor/image.rb

@@ -18,10 +18,10 @@ class Thingfish::Processor::Image < Thingfish::Processor
 
 
 	# Package version
-	VERSION = '0.1.0'
+	VERSION = '0.1.1'
 
 	# Version control revision
-	REVISION = %q$Revision: e04ece44aa56 $
+	REVISION = %q$Revision: c3964930bd4f $
 
 
 	# Loggability API -- log to the :angelfish logger
@@ -110,8 +110,10 @@ class Thingfish::Processor::Image < Thingfish::Processor
 					self.log.debug "  making a single image from a StringIO"
 					Magick::Image.from_blob( request.body.read )
 				else
-					self.log.debug "  making a flattened image out of %p" % [ request.body.path ]
-					list = Magick::ImageList.new( request.body.path )
+					path = request.body.path
+					self.log.debug "  making a flattened image out of %p" % [ path ]
+					path = path.to_s + '[0]' # ImageMagick, read a single frame
+					list = Magick::ImageList.new( path )
 					list.flatten_images
 				end
 
@@ -128,7 +130,13 @@ class Thingfish::Processor::Image < Thingfish::Processor
 		end
 
 		self.log.debug "  destroying the image to free up memory"
-		image.destroy!
+
+	rescue Magick::ImageMagickError => err
+		self.log.error "Problem while processing file %p: %s" % [ err.class, err.message ]
+		self.log.debug { err.backtrace.join( "\n  " ) }
+
+	ensure
+		image.destroy! if image
 	end
 
 

data/spec/thingfish/processor/image_spec.rb

@@ -54,6 +54,15 @@ describe Thingfish::Processor::Image, :db do
 	end
 
 
+	it "continues if ImageMagick processing is aborted" do
+		req = factory.post( '/tf', fixture_data('skunks.jpg'), 'Content-type' => 'image/jpeg' )
+
+		expect( Magick::ImageList ).to receive( :new ).and_raise( Magick::ImageMagickError.new )
+		processor.process_request( req )
+
+		expect( req.related_resources ).to be_empty
+	end
+
 	it "extracts IPTC metadata from uploaded images"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thingfish-processor-image
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre20161114102625
+  version: 0.1.1
 platform: ruby
 authors:
 - Michael Granger
@@ -35,7 +35,7 @@ cert_chain:
   w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
   p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
   -----END CERTIFICATE-----
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongrel2
@@ -236,12 +236,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: This is a basic image-processor plugin for the Thingfish digital asset manager