image_vise 0.6.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1be0d4d8682d0436356b4ea5e0023869b50709dd
-  data.tar.gz: de463d93ee8e7e55c0cfa59db9a5c0dee9b91a25
+SHA256:
+  metadata.gz: 448a0d9a3decdcb6af4a3c0dc52fbed811bca85a8ba1df2775916ee164dffdcf
+  data.tar.gz: 3bb7300d2622d442ebe559195276e1ab753a9f1268b955fe2427362041f35036
 SHA512:
-  metadata.gz: e93df7c9c8723663ab09a7ba09916f5327ec7b2a71e63818b7e4bf72d851dcb119fd21c9133bd6e97158fc672e9ac64043db9f6f897a5dd9b051dd7e706c5315
-  data.tar.gz: 15e293b3e33026a78f486ba2921a8df5a1af1b51fb08c3984864b81316697c14979715148e39eaa00f0b85a7228cc0a79f19a7b8f41002558f6e86ceaec507cd
+  metadata.gz: c71485f40a843adfc42887ef0d3766df61c83457bb3cbc92763e1c172c82a74ba7b1aba8472f9f16e79a2a35469648d361e7f6a0c85f5bfddba2f8f662283b5d
+  data.tar.gz: 6863b83f51d044589e20c6cf40ff6e6843f148374cea3a8c036a9af8fef99f626f6ef941a83bd80a44159eaed2a1a85122c7a2444510a006fddf8825f3195954

data/.gitignore

@@ -6,3 +6,4 @@ Gemfile.lock
 *.log
 pkg
 coverage
+.ruby-version

data/.travis.yml

@@ -1,13 +1,10 @@
 rvm:
-- 2.2.10
-- 2.3.7
 - 2.4.4
 - 2.5.1
+- 2.6.2
 sudo: false
 cache: bundler
-
 env:
   global:
     - SKIP_INTERACTIVE=yes
-before_install: gem install bundler
 script: bundle exec rspec

data/CHANGELOG.md

@@ -0,0 +1,2 @@
+## 0.8.2
+* Change format_parser required version to allow > 0.24

data/examples/error_handling_appsignal.rb

@@ -1,7 +1,7 @@
 # Anywhere in your app code
 module ImageViseAppsignal
   ImageVise::RenderEngine.prepend self
-  ImageVise::Measurometer.drivers << Appsignal # to obtain ImageVise instrumentation
+  Measurometer.drivers << Appsignal # to obtain ImageVise instrumentation
   def setup_error_handling(rack_env)
     txn = Appsignal::Transaction.current
     txn.set_action('%s#%s' % [self.class, 'call'])

data/image_vise.gemspec

@@ -21,20 +21,21 @@ Gem::Specification.new do |spec|
   else
     raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end
-  
+
   spec.files         = `git ls-files -z`.split("\x0")
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'patron', '~> 0.9'
-  spec.add_dependency 'rmagick', '~> 2.15'
+  spec.add_dependency 'rmagick', '~> 3'
   spec.add_dependency 'ks'
   spec.add_dependency 'rack', '>= 1', '< 3'
-  spec.add_dependency 'format_parser', '>= 0.12.1', '< 1.0'
+  spec.add_dependency 'format_parser', '~> 0.25'
+  spec.add_dependency 'measurometer', '~> 1'
 
   spec.add_development_dependency 'magic_bytes', '~> 1'
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 12.2"
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "rspec", "~> 3"

data/lib/image_vise.rb

@@ -2,10 +2,10 @@ require 'ks'
 require 'json'
 require 'patron'
 require 'rmagick'
-require 'magic_bytes'
 require 'thread'
 require 'base64'
 require 'rack'
+require 'measurometer'
 require 'format_parser'
 
 class ImageVise
@@ -27,7 +27,9 @@ class ImageVise
   @allowed_glob_patterns = Set.new
   @fetchers = {}
   @cache_lifetime = DEFAULT_CACHE_LIFETIME
-
+  
+  const_set(:Measurometer, ::Measurometer)
+  
   class << self
     # Resets all allowed hosts
     def reset_allowed_hosts!
@@ -165,7 +167,7 @@ class ImageVise
     return unless maybe_image
     return unless maybe_image.respond_to?(:destroy!)
     return if maybe_image.destroyed?
-    ImageVise::Measurometer.instrument('image_vise.image_destroy_dealloc') do
+    Measurometer.instrument('image_vise.image_destroy_dealloc') do
       maybe_image.destroy!
     end
   end
@@ -175,7 +177,7 @@ class ImageVise
   # 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
-    ImageVise::Measurometer.instrument('image_vise.tempfile_unlink') do
+    Measurometer.instrument('image_vise.tempfile_unlink') do
       maybe_tempfile.close unless maybe_tempfile.closed?
       maybe_tempfile.unlink if maybe_tempfile.respond_to?(:unlink)
     end

data/lib/image_vise/image_request.rb

@@ -14,11 +14,11 @@ class ImageVise::ImageRequest < Ks.strict(:src_url, :pipeline)
 
     # Check the signature before decoding JSON (since we will be creating symbols)
     unless valid_signature?(base64_encoded_params, given_signature, secrets)
-      ImageVise::Measurometer.increment_counter('image_vise.params.invalid_signatures', 1)
+      Measurometer.increment_counter('image_vise.params.invalid_signatures', 1)
       raise SignatureError, "Invalid or missing signature"
     end
 
-    ImageVise::Measurometer.increment_counter('image_vise.params.valid_signatures', 1)
+    Measurometer.increment_counter('image_vise.params.valid_signatures', 1)
 
     # Decode the JSON - only AFTER the signature has been validated,
     # so we can use symbol keys

data/lib/image_vise/pipeline.rb

@@ -47,7 +47,7 @@ class ImageVise::Pipeline
   def apply!(magick_image, image_metadata)
     @ops.each do |operator|
       operator_short_classname = operator.class.to_s.split('::').pop
-      ImageVise::Measurometer.instrument('image_vise.op.%s' % operator_short_classname) do
+      Measurometer.instrument('image_vise.op.%s' % operator_short_classname) do
         apply_operator_passing_metadata(magick_image, operator, image_metadata)
       end
     end

data/lib/image_vise/render_engine.rb

@@ -13,7 +13,8 @@
   end
 
   DEFAULT_HEADERS = {
-    'Allow' => "GET"
+    'Allow' => 'GET',
+    'X-Content-Type-Options' => 'nosniff',
   }.freeze
 
   # Headers for error responses that denote an invalid or
@@ -152,7 +153,7 @@
 
     # Download/copy the original into a Tempfile
     fetcher = ImageVise.fetcher_for(source_image_uri.scheme)
-    source_file = ImageVise::Measurometer.instrument('image_vise.fetch') do
+    source_file = Measurometer.instrument('image_vise.fetch') do
       fetcher.fetch_uri_to_tempfile(source_image_uri)
     end
     file_format = FormatParser.parse(source_file, natures: [:image]).tap { source_file.rewind }
@@ -162,7 +163,7 @@
     render_destination_file = Tempfile.new('imagevise-render').tap{|f| f.binmode }
 
     # Do the actual imaging stuff
-    expire_after = ImageVise::Measurometer.instrument('image_vise.render_engine.apply_pipeline') do
+    expire_after = Measurometer.instrument('image_vise.render_engine.apply_pipeline') do
       apply_pipeline(source_file.path, pipeline, file_format, render_destination_file.path)
     end
 
@@ -295,7 +296,7 @@
   def apply_pipeline(source_file_path, pipeline, source_format_parser_result, render_to_path)
 
     # Load the first frame of the animated GIF _or_ the blended compatibility layer from Photoshop
-    image_list = ImageVise::Measurometer.instrument('image_vise.load_pixbuf') do
+    image_list = Measurometer.instrument('image_vise.load_pixbuf') do
       Magick::Image.read(source_file_path)
     end
       
@@ -312,7 +313,7 @@
     # it so that we get a KeyError if some operator has deleted it without providing a replacement.
     # If no operators touched the writer we are going to use the automatic format selection
     writer = metadata.fetch(:writer, ImageVise::AutoWriter.new)
-    ImageVise::Measurometer.instrument('image_vise.write_image') do
+    Measurometer.instrument('image_vise.write_image') do
       writer.write_image!(magick_image, metadata, render_to_path)
     end
 

data/lib/image_vise/version.rb

@@ -1,3 +1,3 @@
 class ImageVise
-  VERSION = '0.6.0'
+  VERSION = '0.8.2'
 end

data/spec/image_vise/render_engine_spec.rb

@@ -110,6 +110,8 @@ describe ImageVise::RenderEngine do
         expect(last_response.headers['Cache-Control']).to match(/public/)
 
         expect(last_response.headers['Content-Type']).to eq('application/json')
+        expect(last_response['X-Content-Type-Options']).to eq('nosniff')
+
         parsed = JSON.load(last_response.body)
         expect(parsed['errors'].to_s).to include("Unfortunate upstream response")
       end
@@ -182,6 +184,8 @@ describe ImageVise::RenderEngine do
       expect(last_response.status).to eq(200)
 
       expect(last_response.headers['Content-Type']).to eq('image/jpeg')
+      expect(last_response['X-Content-Type-Options']).to eq('nosniff')
+
       expect(last_response.headers).to have_key('Content-Length')
       parsed_image = Magick::Image.from_blob(last_response.body)[0]
       expect(parsed_image.columns).to eq(10)

data/spec/spec_helper.rb

@@ -11,6 +11,7 @@ require 'securerandom'
 require 'addressable/uri'
 require 'strenv'
 require 'pry'
+require 'magic_bytes'
 require_relative 'test_server'
 
 TEST_RENDERS_DIR = Dir.mktmpdir

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_vise
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: patron
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: ks
   requirement: !ruby/object:Gem::Requirement
@@ -76,22 +76,30 @@ dependencies:
   name: format_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.1
-    - - "<"
+        version: '0.25'
+- !ruby/object:Gem::Dependency
+  name: measurometer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: magic_bytes
   requirement: !ruby/object:Gem::Requirement
@@ -110,16 +118,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -227,6 +235,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - DEVELOPMENT.md
 - Gemfile
 - LICENSE.txt
@@ -260,7 +269,6 @@ files:
 - lib/image_vise/version.rb
 - lib/image_vise/writers/auto_writer.rb
 - lib/image_vise/writers/jpeg_writer.rb
-- lib/measurometer.rb
 - spec/image_vise/auto_orient_spec.rb
 - spec/image_vise/background_fill_spec.rb
 - spec/image_vise/crop_spec.rb
@@ -282,7 +290,6 @@ files:
 - spec/image_vise/writers/jpeg_writer_spec.rb
 - spec/image_vise_spec.rb
 - spec/layers-with-blending.psd
-- spec/measurometer_spec.rb
 - spec/spec_helper.rb
 - spec/test_server.rb
 - spec/waterside_magic_hour.jpg
@@ -311,8 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Runtime thumbnailing proxy

data/lib/measurometer.rb

@@ -1,92 +0,0 @@
-# Measurometer is 1-1 API compatible with Appsignal,
-# which we use a lot
-class ImageVise::Measurometer
-  class << self
-    # Permits adding instrumentation drivers. To magically
-    # obtain all Appsignal instrumentation, add the Appsignal module
-    # as a driver.
-    #
-    #   Measurometer.drivers << Appsignal
-    #
-    # A driver must be reentrant and thread-safe - it should be possible
-    # to have multiple `instrument` calls open from different threads at the
-    # same time.
-    #
-    # The driver must support the same interface as the Measurometer class
-    # itself, minus the `drivers` and `instrument_instance_method` methods.
-    #
-    # @return Array
-    def drivers
-      @drivers ||= []
-      @drivers
-    end
-
-    # Runs a given block within a cascade of `instrument` blocks of all the
-    # added drivers.
-    #
-    #   Measurometer.instrument('do_foo') { compute! }
-    #
-    # unfolds to
-    #
-    #   Appsignal.instrument('do_foo') do
-    #     Statsd.timing('do_foo') do
-    #       compute!
-    #     end
-    #   end
-    #
-    # Note that it is _imperative_ that the block return value is preserved
-    # by the drivers and passed as the result of the block.
-    #
-    # @param block_name[String] under which path to push the metric
-    # @param blk[#call] the block to instrument
-    # @return [Object] the return value of &blk
-    def instrument(block_name, &blk)
-      return yield unless @drivers && @drivers.any? # The block wrapping business is not free
-      @drivers.inject(blk) { |outer_block, driver|
-        -> {
-          driver.instrument(block_name, &outer_block)
-        }
-      }.call
-    end
-
-    # Adds a distribution value (sample) under a given path
-    #
-    # @param value_path[String] under which path to push the metric
-    # @param value[Numeric] distribution value
-    # @return nil
-    def add_distribution_value(value_path, value)
-      (@drivers || []).each { |d| d.add_distribution_value(value_path, value) }
-      nil
-    end
-
-    # Increment a named counter under a given path
-    #
-    # @param counter_path[String] under which path to push the metric
-    # @param by[Integer] the counter increment to apply
-    # @return nil
-    def increment_counter(counter_path, by)
-      (@drivers || []).each { |d| d.increment_counter(counter_path, by) }
-      nil
-    end
-
-    # Wrap an anonymous module around an instance method in the given class to have
-    # it instrumented automatically. The name of the measurement will be interpolated as:
-    #
-    #   "#{prefix}.#{rightmost_class_constant_name}.#{instance_method_name}"
-    #
-    # @param target_class[Class] the class to instrument
-    # @param instance_method_name_to_instrument[Symbol] the method name to instrument
-    # @param path_prefix[String] under which path to push the instrumented metric
-    # @return void
-    def instrument_instance_method(target_class, instance_method_name_to_instrument, path_prefix)
-      short_class_name = target_class.to_s.split('::').last
-      instrumentation_name = [path_prefix, short_class_name, instance_method_name_to_instrument].join('.')
-      instrumenter_module = Module.new do
-        define_method(instance_method_name_to_instrument) do |*any|
-          ::ImageVise::Measurometer.instrument(instrumentation_name) { super(*any) }
-        end
-      end
-      target_class.prepend(instrumenter_module)
-    end
-  end
-end

data/spec/measurometer_spec.rb

@@ -1,58 +0,0 @@
-require 'spec_helper'
-
-describe ImageVise::Measurometer do
-  RSpec::Matchers.define :include_counter_or_measurement_named do |named|
-    match do |actual|
-      actual.any? do |e|
-        e[0] == named && e[1] > 0
-      end
-    end
-  end
-
-  it 'instruments a full cycle FormatParser.parse' do
-    driver_class = Class.new do
-      attr_accessor :timings, :counters, :distributions
-      def initialize
-        @timings = []
-        @distributions = []
-        @counters = []
-      end
-
-      def instrument(block_name)
-        s = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-        yield.tap do
-          delta = Process.clock_gettime(Process::CLOCK_MONOTONIC) - s
-          @timings << [block_name, delta * 1000]
-        end
-      end
-
-      def add_distribution_value(value_path, value)
-        @distributions << [value_path, value]
-      end
-
-      def increment_counter(value_path, value)
-        @counters << [value_path, value]
-      end
-    end
-
-    instrumenter = driver_class.new
-    described_class.drivers << instrumenter
-
-    builder = ImageVise::Pipeline.new
-    pipeline = builder.
-      auto_orient.
-      fit_crop(width: 48, height: 48, gravity: 'c').
-      sharpen(radius: 2, sigma: 0.5).
-      ellipse_stencil.
-      strip_metadata
-
-    image = Magick::Image.read(test_image_path)[0]
-    pipeline.apply! image, {}
-
-    described_class.drivers.delete(instrumenter)
-    expect(described_class.drivers).not_to include(instrumenter)
-
-    expect(instrumenter.timings).to include_counter_or_measurement_named('image_vise.op.AutoOrient')
-    expect(instrumenter.timings).to include_counter_or_measurement_named('image_vise.op.StripMetadata')
-  end
-end