image_vise 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93c443e8b8b6c60e3b86d1d5bfccd4d49222c793
-  data.tar.gz: 41c91138bea11c4e76452634f6ff16a56cd6041c
+  metadata.gz: f8355426daabd653dd28ce986a379ce74d04015a
+  data.tar.gz: c986a6120fec633545eaaaddb57daf751fc3067f
 SHA512:
-  metadata.gz: 044ddadc1b490096a3be67d766bd91e7c053603a05626e5c8023ee285f665d3032074fd64f04191baac62348788521ce3a665bd7870fc4433f2d849144b44852
-  data.tar.gz: dfc2a1727d89434bc2765e76b5db1dd5978d8150efada47f24f60f3aee6491e0cac0f45f8326f988318918cad56a3eb0dfb7239eabbfc8f84aee548661c2d00b
+  metadata.gz: 3ab6e3c250db5aa9870702b99b15c5bbbf29bc5d5acdd6647c8bdbb639a2b97b212cc6d9d5d3a10c9007a767ec8a53ede4625479415032d5ffe45e66be9efd21
+  data.tar.gz: b2db49f8c1655d6ff9064749098b856eb4616430e91644309c95fbe32d402e630c6eb224f430a79f9f9b46a4998d80f6f11737524b73cc8524c4aaaa777072f6

data/image_vise.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: image_vise 0.1.4 ruby lib
+# stub: image_vise 0.1.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "image_vise"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2016-10-29"
+  s.date = "2016-11-21"
   s.description = "Image processing via URLs"
   s.email = "me@julik.nl"
   s.extra_rdoc_files = [

data/lib/image_vise/render_engine.rb

@@ -6,10 +6,18 @@ class ImageVise::RenderEngine
     'Allow' => "GET"
   }.freeze
   
-  # To prevent some string allocations
-  JSON_ERROR_HEADERS = DEFAULT_HEADERS.merge({
+  # Headers for error responses that denote an invalid or
+  # an unsatisfiable request
+  JSON_ERROR_HEADERS_REQUEST = DEFAULT_HEADERS.merge({
     'Content-Type' => 'application/json',
-    'Cache-Control' => 'private, max-age=0, no-cache'
+    'Cache-Control' => 'public, max-age=600'
+  }).freeze
+
+  # Headers for error responses that denote
+  # an intermittent error (that permit retries)
+  JSON_ERROR_HEADERS_INTERMITTENT = DEFAULT_HEADERS.merge({
+    'Content-Type' => 'application/json',
+    'Cache-Control' => 'public, max-age=5'
   }).freeze
   
   # "public" of course. Add max-age so that there is _some_
@@ -25,7 +33,7 @@ class ImageVise::RenderEngine
   RENDER_TIMEOUT_SECONDS = 10
 
   # Which input files we permit (based on extensions stored in MagicBytes)
-  PERMITTED_SOURCE_FILE_EXTENSIONS = %w( gif png jpg )
+  PERMITTED_SOURCE_FILE_EXTENSIONS = %w( gif png jpg psd tif)
 
   # Which output files are permitted (regardless of the input format
   # the processed images will be converted to one of these types)
@@ -38,8 +46,12 @@ class ImageVise::RenderEngine
   PNG_FILE_TYPE = MagicBytes::FileType.new('png','image/png').freeze
   
   def bail(status, *errors_array)
-    h = JSON_ERROR_HEADERS.dup # Needed because some upstream middleware migh be modifying headers
-    response = [status.to_i, h, [JSON.pretty_generate({errors: errors_array})]]
+    headers = if (300...500).cover?(status)
+      JSON_ERROR_HEADERS_REQUEST.dup
+    else
+      JSON_ERROR_HEADERS_INTERMITTENT.dup
+    end
+    response = [status.to_i, headers, [JSON.pretty_generate({errors: errors_array})]]
     throw :__bail, response
   end
   
@@ -74,7 +86,7 @@ class ImageVise::RenderEngine
     image_rack_response(render_destination_file, render_file_type, etag)
   rescue *permanent_failures => e
     handle_request_error(e)
-    http_status_code = e.respond_to?(:http_status) ? e.http_status : 422
+    http_status_code = e.respond_to?(:http_status) ? e.http_status : 400
     raise_exception_or_error_response(e, http_status_code)
   rescue Exception => e
     if http_status_code = (e.respond_to?(:http_status) && e.http_status)

data/lib/image_vise.rb

@@ -8,7 +8,7 @@ require 'base64'
 require 'rack'
 
 class ImageVise
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
   S_MUTEX = Mutex.new
   private_constant :S_MUTEX
   

data/spec/image_vise/render_engine_spec.rb

@@ -39,7 +39,7 @@ describe ImageVise::RenderEngine do
       ImageVise.reset_secret_keys!
     end
     
-    it 'halts with 422 when the requested image cannot be opened by ImageMagick' do
+    it 'halts with 400 when the requested image cannot be opened by ImageMagick' do
       uri = Addressable::URI.parse(public_url)
       ImageVise.add_allowed_host!(uri.host)
       ImageVise.add_secret_key!('l33tness')
@@ -55,12 +55,12 @@ describe ImageVise::RenderEngine do
       expect(app).to receive(:handle_request_error).and_call_original
       
       get image_request.to_path_params('l33tness')
-      expect(last_response.status).to eq(422)
-      expect(last_response['Cache-Control']).to eq("private, max-age=0, no-cache")
+      expect(last_response.status).to eq(400)
+      expect(last_response['Cache-Control']).to match(/public/)
       expect(last_response.body).to include('Unsupported/unknown')
     end
 
-    it 'halts with 422 when a file:// URL is given and filesystem access is not enabled' do
+    it 'halts with 400 when a file:// URL is given and filesystem access is not enabled' do
       uri = 'file://' + test_image_path
       ImageVise.deny_filesystem_sources!
       ImageVise.add_secret_key!('l33tness')
@@ -105,7 +105,7 @@ describe ImageVise::RenderEngine do
 
         expect(last_response.status).to eq(error_code)
         expect(last_response.headers).to have_key('Cache-Control')
-        expect(last_response.headers['Cache-Control']).to eq("private, max-age=0, no-cache")
+        expect(last_response.headers['Cache-Control']).to match(/public/)
         
         expect(last_response.headers['Content-Type']).to eq('application/json')
         parsed = JSON.load(last_response.body)
@@ -254,7 +254,7 @@ describe ImageVise::RenderEngine do
       examine_image_from_string(last_response.body)
     end
 
-    it 'forbids a PSD file by default' do
+    it 'permits a PSD file by default' do
       uri = Addressable::URI.parse(public_url_psd)
       ImageVise.add_allowed_host!(uri.host)
       ImageVise.add_secret_key!('l33tness')
@@ -262,26 +262,8 @@ describe ImageVise::RenderEngine do
       p = ImageVise::Pipeline.new.geom(geometry_string: '220x220').ellipse_stencil
       image_request = ImageVise::ImageRequest.new(src_url: uri.to_s, pipeline: p)
 
-      get image_request.to_path_params('l33tness')
-      expect(last_response.status).to eq(422)
-      expect(last_response.body).to include('unknown input file format .psd')
-    end
-
-    it 'permits a PSD file if it is permitted via a method override' do
-      uri = Addressable::URI.parse(public_url_psd)
-      ImageVise.add_allowed_host!(uri.host)
-      ImageVise.add_secret_key!('l33tness')
-
-      p = ImageVise::Pipeline.new.geom(geometry_string: '220x220')
-      image_request = ImageVise::ImageRequest.new(src_url: uri.to_s, pipeline: p)
-
-      class << app
-        def source_file_type_permitted?(type); true; end
-      end
-
       get image_request.to_path_params('l33tness')
       expect(last_response.status).to eq(200)
-      expect(last_response.headers['Content-Type']).to eq('image/png')
     end
     
     it 'destroys all the loaded PSD layers' do
@@ -293,7 +275,6 @@ describe ImageVise::RenderEngine do
       image_request = ImageVise::ImageRequest.new(src_url: uri.to_s, pipeline: p)
 
       class << app
-        def source_file_type_permitted?(type); true; end
         def raise_exceptions?; true; end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_vise
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-29 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: patron