image_vise 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3507edd4073f96af8d398cf699681e34d75408c
-  data.tar.gz: b77cdb7bde85fd9518c772d44e750cec01075586
+  metadata.gz: 4505547a1ef87774694ee0a4e0adda3354e9f676
+  data.tar.gz: c403f4147f907b10b2f13ca6ea2564f73bc21303
 SHA512:
-  metadata.gz: c1c78c6d74c265588f75820738d69abb4eee377e4b4a2adc97c42e39788daca884e100fdd3af1384f5c3d17727f9a13b17f4afd857445ab14e92efeaedb719c5
-  data.tar.gz: 4ad00dd86ccac4d4165151814f3c5622e7db92346177c75d8d33311fcc7773f08cd6f1f9fe70522c0a19b5678b0174fa05489103a2110369b611964b51f96675
+  metadata.gz: 736ed9bedaf46db49558b3fcec83d992368ccd670df57083be3e8ec66dbfc7bc31420a0debbd085b9237fdb29891b8c495bfbc27d0b6fac7e902b2f3938ef3f5
+  data.tar.gz: fe83b1a5f073e2b01075f6ba8f7e4451985727650e69ff390a1abc3350113639c8459e3e1341fcb45738390cf1750671694593edbcfd71bfa0db9802b66c49c7

data/examples/error_handline_appsignal.rb

@@ -0,0 +1,23 @@
+# Anywhere in your app code
+module ImageViseAppsignal
+  ImageVise::RenderEngine.prepend self
+
+  def setup_error_handling(rack_env)
+    txn = Appsignal::Transaction.current
+    txn.set_action('%s#%s' % [self.class, 'call'])
+  end
+
+  def handle_request_error(err)
+    Appsignal.add_exception(err)
+  end
+
+  def handle_generic_error(err)
+    Appsignal.add_exception(err)
+  end
+end
+
+# In config.ru
+map '/thumbnails' do
+  use Appsignal::Rack::GenericInstrumentation
+  run ImageVise
+end

data/examples/error_handling_sentry.rb

@@ -0,0 +1,25 @@
+# Anywhere in your app code
+module ImageViseSentrySupport
+  ImageVise::RenderEngine.prepend self
+
+  def setup_error_handling(rack_env)
+    @env = rack_env
+  end
+
+  def handle_request_error(err)
+    @env['rack.exception'] = err
+  end
+
+  def handle_generic_error(err)
+    @env['rack.exception'] = err
+  end
+end
+
+# In config.ru
+Raven.configure do |config|
+  config.dsn = 'https://secretoken@app.getsentry.com/1234567'
+end
+use Raven::Rack
+map '/thumbnails' do
+  run ImageVise
+end

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.0.24 ruby lib
+# stub: image_vise 0.0.25 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "image_vise"
-  s.version = "0.0.24"
+  s.version = "0.0.25"
 
   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-17"
+  s.date = "2016-10-18"
   s.description = "Image processing via URLs"
   s.email = "me@julik.nl"
   s.extra_rdoc_files = [
@@ -24,21 +24,25 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "examples/config.ru",
+    "examples/error_handline_appsignal.rb",
+    "examples/error_handling_sentry.rb",
     "image_vise.gemspec",
     "lib/image_vise.rb",
-    "lib/image_vise/auto_orient.rb",
-    "lib/image_vise/crop.rb",
-    "lib/image_vise/ellipse_stencil.rb",
+    "lib/image_vise/fetchers/fetcher_file.rb",
+    "lib/image_vise/fetchers/fetcher_http.rb",
     "lib/image_vise/file_response.rb",
-    "lib/image_vise/fit_crop.rb",
-    "lib/image_vise/geom.rb",
     "lib/image_vise/image_request.rb",
+    "lib/image_vise/operators/auto_orient.rb",
+    "lib/image_vise/operators/crop.rb",
+    "lib/image_vise/operators/ellipse_stencil.rb",
+    "lib/image_vise/operators/fit_crop.rb",
+    "lib/image_vise/operators/geom.rb",
+    "lib/image_vise/operators/sRGB_v4_ICC_preference_displayclass.icc",
+    "lib/image_vise/operators/sharpen.rb",
+    "lib/image_vise/operators/srgb.rb",
+    "lib/image_vise/operators/strip_metadata.rb",
     "lib/image_vise/pipeline.rb",
     "lib/image_vise/render_engine.rb",
-    "lib/image_vise/sRGB_v4_ICC_preference_displayclass.icc",
-    "lib/image_vise/sharpen.rb",
-    "lib/image_vise/srgb.rb",
-    "lib/image_vise/strip_metadata.rb",
     "spec/image_vise/auto_orient_spec.rb",
     "spec/image_vise/crop_spec.rb",
     "spec/image_vise/ellipse_stencil_spec.rb",

data/lib/image_vise/fetchers/fetcher_file.rb

@@ -0,0 +1,27 @@
+class ImageVise::FetcherFile
+  class AccessError < StandardError
+    def http_status; 403; end
+  end
+  def self.fetch_uri_to_tempfile(uri)
+    tf = Tempfile.new 'imagevise-localfs-copy'
+    real_path_on_filesystem = File.expand_path(URI.decode(uri.path))
+    verify_filesystem_access! real_path_on_filesystem
+    # Do the checks
+    File.open(real_path_on_filesystem, 'rb') do |f|
+      IO.copy_stream(f, tf)
+    end
+    tf.rewind; tf
+  rescue Exception => e
+    ImageVise.close_and_unlink(tf)
+    raise e
+  end
+
+  def self.verify_filesystem_access!(path_on_filesystem)
+    patterns = ImageVise.allowed_filesystem_sources
+    matches = patterns.any? { |glob_pattern| File.fnmatch?(glob_pattern, path_on_filesystem) }
+    raise AccessError, "filesystem access is disabled" unless patterns.any?
+    raise AccessError, "#{src_url} is not on the path whitelist" unless matches
+  end
+
+  ImageVise.register_fetcher 'file', self
+end

data/lib/image_vise/fetchers/fetcher_http.rb

@@ -0,0 +1,43 @@
+class ImageVise::FetcherHTTP
+  EXTERNAL_IMAGE_FETCH_TIMEOUT_SECONDS = 5
+
+  class AccessError < StandardError; end
+
+  class UpstreamError < StandardError
+    attr_accessor :http_status
+    def initialize(http_status, message)
+      super(message)
+      @http_status = http_status
+    end
+  end
+  
+  def self.fetch_uri_to_tempfile(uri)
+    tf = Tempfile.new 'imagevise-http-download'
+    verify_uri_access!(uri)
+    s = Patron::Session.new
+    s.automatic_content_encoding = true
+    s.timeout = EXTERNAL_IMAGE_FETCH_TIMEOUT_SECONDS
+    s.connect_timeout = EXTERNAL_IMAGE_FETCH_TIMEOUT_SECONDS
+    
+    response = s.get_file(uri.to_s, tf.path)
+    
+    if response.status != 200
+      raise UpstreamError.new(response.status, "Unfortunate upstream response #{response.status}")
+    end
+    
+    tf
+  rescue Exception => e
+    ImageVise.close_and_unlink(tf)
+    raise e
+  end
+  
+  def self.verify_uri_access!(uri)
+    host = uri.host
+    unless ImageVise.allowed_hosts.include?(uri.host)
+      raise AccessError, "#{uri} is not permitted as source"
+    end
+  end
+
+  ImageVise.register_fetcher 'http', self
+  ImageVise.register_fetcher 'https', self
+end

data/lib/image_vise/file_response.rb

@@ -17,7 +17,6 @@ class ImageVise::FileResponse
   end
   
   def close
-    @file.close
-    @file.unlink
+    ImageVise.close_and_unlink(@file)
   end
 end

data/lib/image_vise/image_request.rb

@@ -6,7 +6,7 @@ class ImageVise::ImageRequest < Ks.strict(:src_url, :pipeline)
   
   # Initializes a new ParamsChecker from given HTTP server framework
   # params. The params can be symbol- or string-keyed, does not matter.
-  def self.to_request(qs_params:, secrets:, permitted_source_hosts:, allowed_filesystem_patterns:)
+  def self.to_request(qs_params:, secrets:)
     base64_encoded_params = qs_params.fetch(:q) rescue qs_params.fetch('q')
     given_signature = qs_params.fetch(:sig) rescue qs_params.fetch('sig')
     
@@ -20,22 +20,10 @@ class ImageVise::ImageRequest < Ks.strict(:src_url, :pipeline)
     params = JSON.parse(decoded_json, symbolize_names: true)
 
     # Pick up the URL and validate it
-    src_url = params.fetch(:src_url).to_s
-    raise URLError, "the :src_url parameter must be non-empty" if src_url.empty?
-
-    src_url = URI.parse(src_url)
-    if src_url.scheme == 'file'
-      file_path = URI.decode(src_url.path)
-      raise URLError, "#{src_url} not permitted since filesystem access is disabled" if allowed_filesystem_patterns.empty?
-      raise URLError, "#{src_url} is not on the path whitelist" unless allowed_path?(allowed_filesystem_patterns, file_path)
-    elsif src_url.scheme != 'file'
-      raise URLError, "#{src_url} is not permitted as source" unless permitted_source_hosts.include?(src_url.host)
-    end
-    
-    # Build out the processing pipeline
+    source_url_str = params.fetch(:src_url).to_s
+    raise URLError, "the :src_url parameter must be non-empty" if source_url_str.empty?
     pipeline_definition = params.fetch(:pipeline)
-
-    new(src_url: src_url.to_s, pipeline: ImageVise::Pipeline.from_param(pipeline_definition))
+    new(src_url: URI(source_url_str), pipeline: ImageVise::Pipeline.from_param(pipeline_definition))
   rescue KeyError => e
     raise InvalidRequest.new(e.message)
   end
@@ -46,7 +34,7 @@ class ImageVise::ImageRequest < Ks.strict(:src_url, :pipeline)
   end
 
   def to_h
-    {pipeline: pipeline.to_params, src_url: src_url}
+    {pipeline: pipeline.to_params, src_url: src_url.to_s}
   end
   
   def cache_etag
@@ -55,11 +43,6 @@ class ImageVise::ImageRequest < Ks.strict(:src_url, :pipeline)
 
   private
 
-  def self.allowed_path?(filesystem_glob_patterns, path_to_check)
-    expanded_path = File.expand_path(path_to_check)
-    filesystem_glob_patterns.any? {|pattern| File.fnmatch?(pattern, expanded_path) }
-  end
-
   def self.valid_signature?(for_payload, given_signature, secrets)
     # Check the signature against every key that we have,
     # since different apps might be using different keys

data/lib/image_vise/pipeline.rb

@@ -6,7 +6,7 @@ class ImageVise::Pipeline
   def self.from_param(array_of_operator_names_to_operator_params)
     operators = array_of_operator_names_to_operator_params.map do |(operator_name, operator_params)|
       operator_class = operator_by_name(operator_name)
-      if operator_params.any? && operator_class.method(:new).arity.nonzero?
+      if operator_params && operator_params.any? && operator_class.method(:new).arity.nonzero?
         operator_class.new(**operator_params)
       else
         operator_class.new

data/lib/image_vise/render_engine.rb

@@ -2,9 +2,6 @@ class ImageVise::RenderEngine
   class UnsupportedInputFormat < StandardError; end
   class EmptyRender < StandardError; end
 
-  # Codes that have to be sent through to the requester
-  PASSTHROUGH_STATUS_CODES = [404, 403, 503, 504, 500]
-  
   DEFAULT_HEADERS = {
     'Allow' => "GET"
   }.freeze
@@ -15,6 +12,14 @@ class ImageVise::RenderEngine
     'Cache-Control' => 'private, max-age=0, no-cache'
   }).freeze
   
+  # "public" of course. Add max-age so that there is _some_
+  # revalidation after a time (otherwise some proxies treat it
+  # as "must-revalidate" always), and "no-transform" so that
+  # various deflate schemes are not applied to it (does happen
+  # with Rack::Cache and leads Chrome to throw up on content
+  # decoding for example).
+  IMAGE_CACHE_CONTROL = 'public, no-transform, max-age=2592000'
+  
   # How long is a render (the ImageMagick/write part) is allowed to
   # take before we kill it
   RENDER_TIMEOUT_SECONDS = 10
@@ -30,20 +35,7 @@ class ImageVise::RenderEngine
   EXTERNAL_IMAGE_FETCH_TIMEOUT_SECONDS = 4
   
   # The default file type for images with alpha
-  PNG_FILE_TYPE = Class.new do
-    def self.mime; 'image/png'; end
-    def self.ext; 'png'; end
-  end
-  
-  # Fetch the given URL into a Tempfile and return the File object
-  def fetch_url_into_tempfile(source_image_uri)
-    parsed = URI.parse(source_image_uri)
-    if parsed.scheme == 'file'
-      copy_path_into_tempfile(URI.decode(parsed.path))
-    else
-      fetch_url(source_image_uri)
-    end
-  end
+  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
@@ -69,8 +61,8 @@ class ImageVise::RenderEngine
     req = Rack::Request.new(env)
     bail(405, 'Only GET supported') unless req.get?
 
-    # Validate the inputs
-    image_request = ImageVise::ImageRequest.to_request(qs_params: req.params, **image_request_options)
+    # Parse and reinstate the URL and pipeline
+    image_request = ImageVise::ImageRequest.to_request(qs_params: req.params, secrets: ImageVise.secret_keys)
 
     # Recover the source image URL and the pipeline instructions (all the image ops)
     source_image_uri, pipeline = image_request.src_url, image_request.pipeline
@@ -80,8 +72,9 @@ class ImageVise::RenderEngine
     # Assume the image URL contents does _never_ change.
     etag = image_request.cache_etag
     
-    # Download the original into a Tempfile
-    source_file = fetch_url_into_tempfile(source_image_uri)
+    # Download/copy the original into a Tempfile
+    fetcher = ImageVise.fetcher_for(source_image_uri.scheme)
+    source_file = fetcher.fetch_uri_to_tempfile(source_image_uri)
     
     # Make sure we do not try to process something...questionable
     source_file_type = detect_file_type(source_file)
@@ -106,7 +99,7 @@ class ImageVise::RenderEngine
     response_headers = DEFAULT_HEADERS.merge({
       'Content-Type' => render_file_type.mime,
       'Content-Length' => '%d' % render_destination_file.size,
-      'Cache-Control' => 'public, no-transform, max-age=2592000',
+      'Cache-Control' => IMAGE_CACHE_CONTROL,
       'ETag' => etag
     })
 
@@ -115,12 +108,18 @@ class ImageVise::RenderEngine
     [200, response_headers, ImageVise::FileResponse.new(render_destination_file)]
   rescue *permanent_failures => e
     handle_request_error(e)
-    raise_exception_or_error_response(e, 422)
+    http_status_code = e.respond_to?(:http_status) ? e.http_status : 422
+    raise_exception_or_error_response(e, http_status_code)
   rescue Exception => e
-    handle_generic_error(e)
-    raise_exception_or_error_response(e, 500)
+    if http_status_code = (e.respond_to?(:http_status) && e.http_status)
+      handle_request_error(e)
+      raise_exception_or_error_response(e, http_status_code)
+    else
+      handle_generic_error(e)
+      raise_exception_or_error_response(e, 500)
+    end
   ensure
-    close_and_unlink(source_file)
+    ImageVise.close_and_unlink(source_file)
   end
   
   def raise_exception_or_error_response(exception, status_code)
@@ -131,12 +130,6 @@ class ImageVise::RenderEngine
     end
   end
   
-  def close_and_unlink(f)
-    return unless f
-    f.close unless f.closed?
-    f.unlink
-  end
-  
   def binary_tempfile
     Tempfile.new('imagevise-tmp').tap{|f| f.binmode }
   end
@@ -207,44 +200,4 @@ class ImageVise::RenderEngine
     ImageVise.destroy(magick_image)
   end
 
-  def image_request_options
-    {
-      secrets: ImageVise.secret_keys,
-      permitted_source_hosts: ImageVise.allowed_hosts,
-      allowed_filesystem_patterns: ImageVise.allowed_filesystem_sources,
-    }
-  end
-
-  def fetch_url(source_image_uri)
-    tf = binary_tempfile
-    s = Patron::Session.new
-    s.automatic_content_encoding = true
-    s.timeout = EXTERNAL_IMAGE_FETCH_TIMEOUT_SECONDS
-    s.connect_timeout = EXTERNAL_IMAGE_FETCH_TIMEOUT_SECONDS
-    response = s.get_file(source_image_uri, tf.path)
-    if PASSTHROUGH_STATUS_CODES.include?(response.status)
-      tf.close; tf.unlink;
-      bail response.status, "Unfortunate upstream response: #{response.status}" 
-    end
-    tf
-  rescue Exception => e
-    tf.close; tf.unlink;
-    raise e
-  end
-
-  def copy_path_into_tempfile(path_on_filesystem)
-    tf = binary_tempfile
-    real_path_on_filesystem = File.expand_path(path_on_filesystem)
-    File.open(real_path_on_filesystem, 'rb') do |f|
-      IO.copy_stream(f, tf)
-    end
-    tf.rewind; tf
-  rescue Errno::ENOENT
-    tf.close; tf.unlink;
-    bail 404, "Image file not found" 
-  rescue Exception => e
-    tf.close; tf.unlink;
-    raise e
-  end
-
 end

data/lib/image_vise.rb

@@ -8,7 +8,7 @@ require 'base64'
 require 'rack'
 
 class ImageVise
-  VERSION = '0.0.24'
+  VERSION = '0.0.25'
   S_MUTEX = Mutex.new
   private_constant :S_MUTEX
   
@@ -16,7 +16,8 @@ class ImageVise
   @keys = Set.new
   @operators = {}
   @allowed_glob_patterns = Set.new
-
+  @fetchers = {}
+  
   class << self
     # Resets all allowed hosts
     def reset_allowed_hosts!
@@ -80,7 +81,7 @@ class ImageVise
       p = Pipeline.new
       yield(p)
       raise ArgumentError, "Image pipeline has no steps defined" if p.empty?
-      ImageRequest.new(src_url: src_url, pipeline: p).to_query_string_params(secret)
+      ImageRequest.new(src_url: URI(src_url), pipeline: p).to_query_string_params(secret)
     end
 
     # Adds an operator
@@ -97,8 +98,18 @@ class ImageVise
       @operators.keys
     end
     
+    def register_fetcher(scheme, fetcher)
+      S_MUTEX.synchronize { @fetchers[scheme.to_s] = fetcher }
+    end
+    
+    def fetcher_for(scheme)
+      S_MUTEX.synchronize { @fetchers[scheme.to_s] or raise "No fetcher registered for #{scheme}" }
+    end
+    
     def operator_name_for(operator)
-      @operators.key(operator.class) or raise "Operator #{operator.inspect} not registered using ImageVise.add_operator"
+      S_MUTEX.synchronize do
+        @operators.key(operator.class) or raise "Operator #{operator.inspect} not registered using ImageVise.add_operator"
+      end
     end
   end
   
@@ -131,6 +142,15 @@ class ImageVise
     return if maybe_image.destroyed?
     maybe_image.destroy!
   end
+
+  # Used as a shorthand to force-dealloc Tempfiles in an ensure() blocks. Since
+  # ensure blocks sometimes deal with variables in inconsistent states (variable
+  # in scope but not yet set to an image) we take the possibility of nils into account.
+  def self.close_and_unlink(maybe_tempfile)
+    return unless maybe_tempfile
+    maybe_tempfile.close unless maybe_tempfile.closed?
+    maybe_tempfile.unlink
+  end
 end
 
 Dir.glob(__dir__ + '/**/*.rb').sort.each do |f|

data/spec/image_vise/image_request_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe ImageVise::ImageRequest do
-  it 'accepts a set of params, secrets and permitted hosts and returns a Pipeline' do
+  it 'accepts a set of params and secrets, and returns a Pipeline' do
     img_params = {src_url: 'http://bucket.s3.aws.com/image.jpg', pipeline: [[:crop, {width: 10, height: 10, gravity: 's'}]]}
     img_params_json = JSON.dump(img_params)
     signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, 'this is a secret', img_params_json)
@@ -10,31 +10,14 @@ describe ImageVise::ImageRequest do
       sig: signature
     }
 
-    image_request = described_class.to_request(qs_params: params, secrets: ['this is a secret'],
-      permitted_source_hosts: ['bucket.s3.aws.com'], allowed_filesystem_patterns: [])
+    image_request = described_class.to_request(qs_params: params, secrets: ['this is a secret'])
     request_qs_params = image_request.to_query_string_params('this is a secret')
     expect(request_qs_params).to be_kind_of(Hash)
 
-    image_request_roundtrip = described_class.to_request(qs_params: request_qs_params,
-      secrets: ['this is a secret'], permitted_source_hosts: ['bucket.s3.aws.com'], allowed_filesystem_patterns: [])
+    image_request_roundtrip = described_class.to_request(qs_params: request_qs_params, secrets: ['this is a secret'])
   end
 
-  it 'forbids a file:// URL if the flag is not enabled' do
-    img_params = {src_url: 'file:///etc/passwd', pipeline: [[:auto_orient]]}
-    img_params_json = JSON.dump(img_params)
-    signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, 'this is a secret', img_params_json)
-    params = {
-      q: Base64.encode64(img_params_json),
-      sig: signature
-    }
-    
-    expect {
-      described_class.to_request(qs_params: params, secrets: ['this is a secret'],
-        permitted_source_hosts: ['bucket.s3.aws.com'], allowed_filesystem_patterns: [])
-    }.to raise_error(/filesystem access is disabled/)
-  end
-
-  it 'allows a file:// URL if its path is within the permit list' do
+  it 'converts a file:// URL into a URI objectlist' do
     img_params = {src_url: 'file:///etc/passwd', pipeline: [[:auto_orient, {}]]}
     img_params_json = JSON.dump(img_params)
     signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, 'this is a secret', img_params_json)
@@ -42,11 +25,8 @@ describe ImageVise::ImageRequest do
       q: Base64.encode64(img_params_json),
       sig: signature
     }
-    
-    image_request = described_class.to_request(qs_params: params, secrets: ['this is a secret'],
-      permitted_source_hosts: ['bucket.s3.aws.com'], allowed_filesystem_patterns: %w( /etc/* ))
-    request_qs_params = image_request.to_query_string_params('this is a secret')
-    expect(request_qs_params).to be_kind_of(Hash)
+    image_request = described_class.to_request(qs_params: params, secrets: ['this is a secret'])
+    expect(image_request.src_url).to be_kind_of(URI)
   end
 
   describe 'fails with an invalid pipeline' do
@@ -59,8 +39,6 @@ describe ImageVise::ImageRequest do
   describe 'fails with an invalid URL' do
     it 'when the URL param is missing'
     it 'when the URL param is empty'
-    it 'when the URL is referencing a non-permitted host'
-    it 'when the URL refers to a non-HTTP(S) scheme'
   end
 
   describe 'fails with an invalid signature' do
@@ -77,8 +55,7 @@ describe ImageVise::ImageRequest do
       }
       
       expect {
-        described_class.to_request(qs_params: params,
-          secrets: ['b'], permitted_source_hosts: ['bucket.s3.aws.com'], allowed_filesystem_patterns: [])
+        described_class.to_request(qs_params: params, secrets: ['b'])
       }.to raise_error(/Invalid or missing signature/)
     end
   end

data/spec/image_vise/render_engine_spec.rb

@@ -72,7 +72,7 @@ describe ImageVise::RenderEngine do
       params = image_request.to_query_string_params('l33tness')
 
       get '/', params
-      expect(last_response.status).to eq(422)
+      expect(last_response.status).to eq(403)
       expect(last_response.body).to include('filesystem access is disabled')
     end
     
@@ -90,7 +90,7 @@ describe ImageVise::RenderEngine do
       expect(last_response.status).to eq(403)
       expect(last_response.headers['Content-Type']).to eq('application/json')
       parsed = JSON.load(last_response.body)
-      expect(parsed['errors']).to include("Unfortunate upstream response: 403")
+      expect(parsed['errors'].to_s).to include("Unfortunate upstream response")
     end
     
     it 'replays upstream error response codes that are selected to be replayed to the requester' do
@@ -112,7 +112,7 @@ describe ImageVise::RenderEngine do
         
         expect(last_response.headers['Content-Type']).to eq('application/json')
         parsed = JSON.load(last_response.body)
-        expect(parsed['errors']).to include("Unfortunate upstream response: #{error_code}")
+        expect(parsed['errors'].to_s).to include("Unfortunate upstream response")
       end
     end
     

data/spec/image_vise_spec.rb

@@ -63,7 +63,20 @@ describe ImageVise do
       expect(params[:sig]).not_to be_empty
     end
   end
-  
+
+  describe 'methods dealing with fetchers' do
+    it 'returns the fetchers for the default schemes' do
+      http = ImageVise.fetcher_for('http')
+      expect(http).to respond_to(:fetch_uri_to_tempfile)
+      file = ImageVise.fetcher_for('file')
+      expect(http).to respond_to(:fetch_uri_to_tempfile)
+      
+      expect {
+        ImageVise.fetcher_for('undernet')
+      }.to raise_error(/No fetcher registered/)
+    end
+  end
+
   describe 'methods dealing with the operator list' do
     it 'have the basic operators already set up' do
       oplist = ImageVise.defined_operator_names

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_vise
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -253,21 +253,25 @@ files:
 - README.md
 - Rakefile
 - examples/config.ru
+- examples/error_handline_appsignal.rb
+- examples/error_handling_sentry.rb
 - image_vise.gemspec
 - lib/image_vise.rb
-- lib/image_vise/auto_orient.rb
-- lib/image_vise/crop.rb
-- lib/image_vise/ellipse_stencil.rb
+- lib/image_vise/fetchers/fetcher_file.rb
+- lib/image_vise/fetchers/fetcher_http.rb
 - lib/image_vise/file_response.rb
-- lib/image_vise/fit_crop.rb
-- lib/image_vise/geom.rb
 - lib/image_vise/image_request.rb
+- lib/image_vise/operators/auto_orient.rb
+- lib/image_vise/operators/crop.rb
+- lib/image_vise/operators/ellipse_stencil.rb
+- lib/image_vise/operators/fit_crop.rb
+- lib/image_vise/operators/geom.rb
+- lib/image_vise/operators/sRGB_v4_ICC_preference_displayclass.icc
+- lib/image_vise/operators/sharpen.rb
+- lib/image_vise/operators/srgb.rb
+- lib/image_vise/operators/strip_metadata.rb
 - lib/image_vise/pipeline.rb
 - lib/image_vise/render_engine.rb
-- lib/image_vise/sRGB_v4_ICC_preference_displayclass.icc
-- lib/image_vise/sharpen.rb
-- lib/image_vise/srgb.rb
-- lib/image_vise/strip_metadata.rb
 - spec/image_vise/auto_orient_spec.rb
 - spec/image_vise/crop_spec.rb
 - spec/image_vise/ellipse_stencil_spec.rb