image_vise 0.8.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 448a0d9a3decdcb6af4a3c0dc52fbed811bca85a8ba1df2775916ee164dffdcf
-  data.tar.gz: 3bb7300d2622d442ebe559195276e1ab753a9f1268b955fe2427362041f35036
+  metadata.gz: db4e835de55f61d43df27411213d6b121bd586c3cd3e25c09010d02afc58ba27
+  data.tar.gz: 5d5235feae9b5310f7c35f8ebbbc582efc7f191dfe686cc8dda2de8c3fe948f8
 SHA512:
-  metadata.gz: c71485f40a843adfc42887ef0d3766df61c83457bb3cbc92763e1c172c82a74ba7b1aba8472f9f16e79a2a35469648d361e7f6a0c85f5bfddba2f8f662283b5d
-  data.tar.gz: 6863b83f51d044589e20c6cf40ff6e6843f148374cea3a8c036a9af8fef99f626f6ef941a83bd80a44159eaed2a1a85122c7a2444510a006fddf8825f3195954
+  metadata.gz: 5d1b4d6d6b62344c2cdc2073dca78ba16a485e9d7dca852f249313194d33c29df857460291db1531ff526adbcfb4353243aa2b777f482673916a607dc23c7608
+  data.tar.gz: 9909a197b5488f6e1c348e6fb57b5d12c43b22dc98e9841c9b0ee98c801f8073813ad979bf1af3860e2872f07a6ef23b30095014bb491eec5c0559b3dc790302

data/.travis.yml

@@ -1,8 +1,7 @@
+language: ruby
 rvm:
-- 2.4.4
-- 2.5.1
-- 2.6.2
-sudo: false
+- 2.5
+- 3.0.2
 cache: bundler
 env:
   global:

data/CHANGELOG.md

@@ -1,2 +1,7 @@
+## 1.0.0
+* Add support for Ruby 2.6 and newer (including Ruby 3.0)
+* Minimum supported Ruby is now 2.5
+* Remove `ks` dependency
+
 ## 0.8.2
 * Change format_parser required version to allow > 0.24

data/DEVELOPMENT.md

@@ -62,9 +62,9 @@ path access using the glob whitelist)
     class PicFetcher < ImageVise::FetcherFile
       def self.fetch_uri_to_tempfile(uri_object)
         # Convert an internal "pic://sites/uploads/abcdef.jpg" to a full path URL
-        partial_path = URI.decode(uri_object.path)
-        full_path = File.join(Mappe::ROOT, 'sites', partial_path)
-        full_path_uri = URI('file://' + URI.encode(full_path))
+        partial_path = decode_file_uri_path(uri_object.path)
+        full_filesystem_path = File.join(Mappe::ROOT, 'sites', partial_path)
+        full_path_uri = URI(file_url_for(full_filesystem_path))
         super(full_path_uri)
       end
       ImageVise.register_fetcher 'pic', self

data/README.md

@@ -95,7 +95,7 @@ end
 
 If you want to grab a local file, compose a `file://` URL (mind the endcoding!)
 
-    src_url = 'file://' + URI.encode(File.expand_path(my_pic))
+    src_url = 'file://' + ImageVise::FetcherFile.encode_file_uri_path(File.expand_path(my_pic))
 
 Note that you need to permit certain glob patterns as sources before this will work, see below.
 

data/image_vise.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
     raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end
 
+  spec.required_ruby_version = ">= 2.5"
+
   spec.files         = `git ls-files -z`.split("\x0")
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -29,18 +31,16 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'patron', '~> 0.9'
   spec.add_dependency 'rmagick', '~> 3'
-  spec.add_dependency 'ks'
   spec.add_dependency 'rack', '>= 1', '< 3'
   spec.add_dependency 'format_parser', '~> 0.25'
   spec.add_dependency 'measurometer', '~> 1'
 
   spec.add_development_dependency 'magic_bytes', '~> 1'
-  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 12.2"
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "rspec", "~> 3"
-  spec.add_development_dependency "addressable"
   spec.add_development_dependency "strenv"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "webrick"
 end

data/lib/image_vise.rb

@@ -1,4 +1,3 @@
-require 'ks'
 require 'json'
 require 'patron'
 require 'rmagick'

data/lib/image_vise/fetchers/fetcher_file.rb

@@ -21,8 +21,20 @@ class ImageVise::FetcherFile
     raise e
   end
 
+  def self.decode_file_uri_path(path_with_percent_encoded_components)
+    path_with_percent_encoded_components.split('/').map { |component| URI.decode_www_form_component(component) }.join('/')
+  end
+
+  def self.file_url_for(path)
+    "file://#{encode_file_uri_path(path)}"
+  end
+
+  def self.encode_file_uri_path(path)
+    path.split('/').map { |component| URI.encode_www_form_component(component) }.join('/')
+  end
+
   def self.uri_to_path(uri)
-    File.expand_path(URI.decode(uri.path))
+    File.expand_path(decode_file_uri_path(uri.path))
   end
 
   def self.verify_filesystem_access!(path_on_filesystem)

data/lib/image_vise/image_request.rb

@@ -1,6 +1,6 @@
 require 'openssl'
 
-class ImageVise::ImageRequest < Ks.strict(:src_url, :pipeline)
+class ImageVise::ImageRequest < Struct.new(:src_url, :pipeline, keyword_init: true)
   class InvalidRequest < ArgumentError; end
   class SignatureError < InvalidRequest; end
   class URLError < InvalidRequest; end

data/lib/image_vise/operators/background_fill.rb

@@ -2,7 +2,7 @@
 # Can handle most 'word' colors and hex color codes but not RGB values.
 #
 # The corresponding Pipeline method is `background_fill`.
-class ImageVise::BackgroundFill < Ks.strict(:color)
+class ImageVise::BackgroundFill < Struct.new(:color, keyword_init: true)
   def initialize(*)
     super
     self.color = color.to_s

data/lib/image_vise/operators/crop.rb

@@ -2,7 +2,7 @@
 # of ImageMagick gravity parameters (see GRAVITY_PARAMS)
 #
 # The corresponding Pipeline method is `crop`.
-class ImageVise::Crop < Ks.strict(:width, :height, :gravity)
+class ImageVise::Crop < Struct.new(:width, :height, :gravity, keyword_init: true)
   GRAVITY_PARAMS = {
     'nw' => Magick::NorthWestGravity,
     'n' => Magick::NorthGravity,

data/lib/image_vise/operators/expire_after.rb

@@ -1,7 +1,7 @@
 # Overrides the cache lifetime set in the output headers of the RenderEngine.
 # Can be used to permit the requester to set the caching lifetime, instead
 # of it being a configuration variable in the service performing the rendering
-class ImageVise::ExpireAfter < Ks.strict(:seconds)
+class ImageVise::ExpireAfter < Struct.new(:seconds, keyword_init: true)
   def initialize(seconds:)
     unless seconds.is_a?(Integer) && seconds > 0
       raise ArgumentError, "the :seconds parameter must be an Integer and must be above 0, but was %s" % seconds.inspect

data/lib/image_vise/operators/fit_crop.rb

@@ -3,7 +3,7 @@
 # gravity parameter defines the crop gravity (on corners, sides, or in the middle).
 #
 # The corresponding Pipeline method is `fit_crop`.
-class ImageVise::FitCrop < Ks.strict(:width, :height, :gravity)
+class ImageVise::FitCrop < Struct.new(:width, :height, :gravity, keyword_init: true)
   GRAVITY_PARAMS = {
     'nw' => Magick::NorthWestGravity,
     'n' => Magick::NorthGravity,

data/lib/image_vise/operators/force_jpg_out.rb

@@ -1,7 +1,7 @@
 # Forces the output format to be JPEG and specifies the quality factor to use when saving
 #
 # The corresponding Pipeline method is `force_jpg_out`.
-class ImageVise::ForceJPGOut < Ks.strict(:quality)
+class ImageVise::ForceJPGOut < Struct.new(:quality, keyword_init: true)
   def initialize(quality:)
     unless (0..100).cover?(quality)
       raise ArgumentError, "the :quality setting must be within 0..100, but was %d" % quality

data/lib/image_vise/operators/geom.rb

@@ -1,7 +1,7 @@
 # Applies a transformation using an ImageMagick geometry string
 #
 # The corresponding Pipeline method is `geom`.
-class ImageVise::Geom < Ks.strict(:geometry_string)
+class ImageVise::Geom < Struct.new(:geometry_string, keyword_init: true)
   def initialize(*)
     super
     self.geometry_string = geometry_string.to_s

data/lib/image_vise/operators/sharpen.rb

@@ -1,7 +1,7 @@
 # Applies a sharpening filter to the image.
 #
 # The corresponding Pipeline method is `sharpen`.
-class ImageVise::Sharpen < Ks.strict(:radius, :sigma)
+class ImageVise::Sharpen < Struct.new(:radius, :sigma, keyword_init: true)
   def initialize(*)
     super
     self.radius = radius.to_f

data/lib/image_vise/pipeline.rb

@@ -27,11 +27,16 @@ class ImageVise::Pipeline
     @ops.empty?
   end
 
-  def method_missing(method_name, *a, &blk)
+  def method_missing(method_name, args = {}, &blk)
     operator_builder = ImageVise.operator_from(method_name)
-    self << operator_builder.new(*a)
+
+    if args.empty? # TODO: remove conditional after dropping Ruby 2.6 support
+      self << operator_builder.new
+    else
+      self << operator_builder.new(**args)
+    end
   end
-  
+
   def respond_to_missing?(method_name, *a)
     ImageVise.defined_operators.include?(method_name.to_s)
   end

data/lib/image_vise/version.rb

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

data/lib/image_vise/writers/jpeg_writer.rb

@@ -1,4 +1,4 @@
-class ImageVise::JPGWriter < Ks.strict(:quality)
+class ImageVise::JPGWriter < Struct.new(:quality, keyword_init: true)
   JPG_EXT = 'jpg'
 
   def write_image!(magick_image, _, render_to_path)

data/spec/image_vise/fetcher_file_spec.rb

@@ -8,13 +8,13 @@ describe ImageVise::FetcherFile do
   it 'is registered as a fetcher for file://' do
     expect(ImageVise.fetcher_for('file')).to eq(ImageVise::FetcherFile)
   end
-  
+
   it 'returns a Tempfile containing this test suite' do
     path = File.expand_path(__FILE__)
     ruby_files_in_this_directory = __dir__ + '/*.rb'
     ImageVise.allow_filesystem_source! ruby_files_in_this_directory
-    
-    uri = URI('file://' + URI.encode(path))
+
+    uri = URI('file://' + ImageVise::FetcherFile.encode_file_uri_path(path))
     fetched = ImageVise::FetcherFile.fetch_uri_to_tempfile(uri)
 
     expect(fetched).to be_kind_of(Tempfile)
@@ -27,7 +27,7 @@ describe ImageVise::FetcherFile do
 
     ImageVise.deny_filesystem_sources!
 
-    uri = URI('file://' + URI.encode(path))
+    uri = URI('file://' + ImageVise::FetcherFile.encode_file_uri_path(path))
     expect {
       ImageVise::FetcherFile.fetch_uri_to_tempfile(uri)
     }.to raise_error(ImageVise::FetcherFile::AccessError)
@@ -40,7 +40,7 @@ describe ImageVise::FetcherFile do
     ImageVise.deny_filesystem_sources!
     ImageVise.allow_filesystem_source! text_files_in_this_directory
 
-    uri = URI('file://' + URI.encode(path))
+    uri = URI('file://' + ImageVise::FetcherFile.encode_file_uri_path(path))
     expect {
       ImageVise::FetcherFile.fetch_uri_to_tempfile(uri)
     }.to raise_error(ImageVise::FetcherFile::AccessError)
@@ -51,7 +51,7 @@ describe ImageVise::FetcherFile do
     ruby_files_in_this_directory = __dir__ + '/*.rb'
     ImageVise.allow_filesystem_source! ruby_files_in_this_directory
 
-    uri = URI('file://' + URI.encode(path))
+    uri = URI('file://' + ImageVise::FetcherFile.encode_file_uri_path(path))
     expect(ImageVise::FetcherFile).to receive(:maximum_source_file_size_bytes).and_return(1)
 
     expect {

data/spec/image_vise/render_engine_spec.rb

@@ -33,7 +33,7 @@ describe ImageVise::RenderEngine do
 
   context 'when requesting an image' do
     before :each do
-      parsed_url = Addressable::URI.parse(public_url)
+      parsed_url = URI.parse(public_url)
       ImageVise.add_allowed_host!(parsed_url.host)
     end
 
@@ -43,7 +43,7 @@ describe ImageVise::RenderEngine do
     end
 
     it 'halts with 400 when the requested image cannot be opened by ImageMagick' do
-      uri = Addressable::URI.parse(public_url)
+      uri = URI.parse(public_url)
       ImageVise.add_allowed_host!(uri.host)
       ImageVise.add_secret_key!('l33tness')
       uri.path = '/___nonexistent_image.jpg'
@@ -76,7 +76,7 @@ describe ImageVise::RenderEngine do
     end
 
     it 'responds with 403 when upstream returns it, and includes the URL in the error message' do
-      uri = Addressable::URI.parse(public_url)
+      uri = URI.parse(public_url)
       ImageVise.add_allowed_host!(uri.host)
       ImageVise.add_secret_key!('l33tness')
       uri.path = '/forbidden'
@@ -93,7 +93,7 @@ describe ImageVise::RenderEngine do
     end
 
     it 'replays upstream error response codes that are selected to be replayed to the requester' do
-      uri = Addressable::URI.parse(public_url)
+      uri = URI.parse(public_url)
       ImageVise.add_allowed_host!(uri.host)
       ImageVise.add_secret_key!('l33tness')
 
@@ -118,7 +118,7 @@ describe ImageVise::RenderEngine do
     end
 
     it 'sets very far caching headers and an ETag, and returns a 304 if any ETag is set' do
-      uri = Addressable::URI.parse(public_url)
+      uri = URI.parse(public_url)
       ImageVise.add_allowed_host!(uri.host)
       ImageVise.add_secret_key!('l33tness')
 
@@ -142,7 +142,7 @@ describe ImageVise::RenderEngine do
     end
 
     it 'allows for setting a custom cache lifetime' do
-      uri = Addressable::URI.parse(public_url)
+      uri = URI.parse(public_url)
       ImageVise.add_allowed_host!(uri.host)
       ImageVise.add_secret_key!('l33tness')
 
@@ -158,7 +158,7 @@ describe ImageVise::RenderEngine do
     end
 
     it 'uses the correct default cache lifetime if one is not specified' do
-      uri = Addressable::URI.parse(public_url)
+      uri = URI.parse(public_url)
       ImageVise.add_allowed_host!(uri.host)
       ImageVise.add_secret_key!('l33tness')
 
@@ -173,7 +173,7 @@ describe ImageVise::RenderEngine do
     end
 
     it 'responds with an image that passes through all the processing steps' do
-      uri = Addressable::URI.parse(public_url)
+      uri = URI.parse(public_url)
       ImageVise.add_allowed_host!(uri.host)
       ImageVise.add_secret_key!('l33tness')
 
@@ -216,7 +216,7 @@ describe ImageVise::RenderEngine do
     end
 
     it 'calls all of the internal methods during execution' do
-      uri = Addressable::URI.parse(public_url)
+      uri = URI.parse(public_url)
       ImageVise.add_allowed_host!(uri.host)
       ImageVise.add_secret_key!('l33tness')
 
@@ -249,7 +249,7 @@ describe ImageVise::RenderEngine do
     it 'URI-decodes the path in a file:// URL for a file with a Unicode path' do
       utf8_file_path = File.dirname(test_image_path) + '/картинка.jpg'
       FileUtils.cp_r(test_image_path, utf8_file_path)
-      uri = 'file://' + URI.encode(utf8_file_path)
+      uri = 'file://' + ImageVise::FetcherFile.encode_file_uri_path(utf8_file_path)
 
       ImageVise.allow_filesystem_source!(File.dirname(test_image_path) + '/*.*')
       ImageVise.add_secret_key!('l33tness')
@@ -264,7 +264,7 @@ describe ImageVise::RenderEngine do
     end
 
     it 'forbids a request with an extra GET param' do
-      uri = 'file://' + URI.encode(test_image_path)
+      uri = 'file://' + ImageVise::FetcherFile.encode_file_uri_path(test_image_path)
 
       p = ImageVise::Pipeline.new.fit_crop(width: 10, height: 10, gravity: 'c')
       image_request = ImageVise::ImageRequest.new(src_url: uri.to_s, pipeline: p)
@@ -275,7 +275,7 @@ describe ImageVise::RenderEngine do
     end
 
     it 'returns the processed JPEG image as a PNG if it had to get an alpha channel during processing' do
-      uri = Addressable::URI.parse(public_url)
+      uri = URI.parse(public_url)
       ImageVise.add_allowed_host!(uri.host)
       ImageVise.add_secret_key!('l33tness')
 
@@ -292,7 +292,7 @@ describe ImageVise::RenderEngine do
     end
 
     it 'permits a PSD file by default' do
-      uri = Addressable::URI.parse(public_url_psd)
+      uri = URI.parse(public_url_psd)
       ImageVise.add_allowed_host!(uri.host)
       ImageVise.add_secret_key!('l33tness')
 
@@ -304,7 +304,7 @@ describe ImageVise::RenderEngine do
     end
 
     it 'destroys all the loaded PSD layers' do
-      uri = Addressable::URI.parse(public_url_psd_multilayer)
+      uri = URI.parse(public_url_psd_multilayer)
       ImageVise.add_allowed_host!(uri.host)
       ImageVise.add_secret_key!('l33tness')
 
@@ -324,7 +324,7 @@ describe ImageVise::RenderEngine do
     end
 
     it 'outputs a converted TIFF file as a PNG' do
-      uri = Addressable::URI.parse(public_url_tif)
+      uri = URI.parse(public_url_tif)
       ImageVise.add_allowed_host!(uri.host)
       ImageVise.add_secret_key!('l33tness')
 
@@ -341,7 +341,7 @@ describe ImageVise::RenderEngine do
     end
 
     it 'processes a 1.5mb PSD with a forced conversion to JPEG' do
-      uri = Addressable::URI.parse(public_url_psd)
+      uri = URI.parse(public_url_psd)
       ImageVise.add_allowed_host!(uri.host)
       ImageVise.add_secret_key!('1337ness')
 
@@ -357,7 +357,7 @@ describe ImageVise::RenderEngine do
     end
 
     it 'sets a customized Expires: cache lifetime set via the pipeline' do
-      uri = Addressable::URI.parse(public_url_psd)
+      uri = URI.parse(public_url_psd)
       ImageVise.add_allowed_host!(uri.host)
       ImageVise.add_secret_key!('1337ness')
 
@@ -370,7 +370,7 @@ describe ImageVise::RenderEngine do
     end
 
     it 'converts a PNG into a JPG applying a background fill' do
-      uri = Addressable::URI.parse(public_url_png_transparency)
+      uri = URI.parse(public_url_png_transparency)
       ImageVise.add_allowed_host!(uri.host)
       ImageVise.add_secret_key!('h00ray')
 

data/spec/spec_helper.rb

@@ -8,7 +8,6 @@ Bundler.require
 
 require 'tmpdir'
 require 'securerandom'
-require 'addressable/uri'
 require 'strenv'
 require 'pry'
 require 'magic_bytes'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_vise
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Julik Tarkhanov
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: patron
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: ks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -114,20 +100,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -171,7 +143,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: strenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -185,7 +157,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: strenv
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -199,7 +171,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -213,7 +185,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -303,7 +275,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -311,15 +283,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Runtime thumbnailing proxy
 test_files: []