dragonfly_libvips 2.3.3 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb5272becaed50d47840beced080aec9e92238493034bc7265507af0acac68cf
-  data.tar.gz: 6537b77ac0440954d20898c46a289070edf03584b5d5c52693b70ed570883f54
+  metadata.gz: c1d8704fd9ff1232cc9c6d7ee96f254823b35b08d47a2f4652ecdd2c871adf30
+  data.tar.gz: f901f9e4b8e36147a33fa59745d38d1d64904a7d7d2d3594529e85a0a398b091
 SHA512:
-  metadata.gz: c8843482d5eba83f5d86a67db886c4bed0bf978c3bed9d4dd0c36cb9101c6cb471041fe620841e98710e0e6f72815c3f9c9744906e50ff80a6fee0465c3ae25d
-  data.tar.gz: 97e7e1a1b0384a49bd37a1dc472b6a4270554d383b3eafe868a97f17b8a6801fed8b274c5068cb26c655206118d456124462b7e1d7ceebaaae32e25f83f4d4ef
+  metadata.gz: dc289e762b526da8fcf8d16acf8464ce42e55122be0b24a07858127c8ddbbe6b217ba42ecd3dadc4867b2b2c8ab25b7ba1ee34257091ced5f05c9922adc41a99
+  data.tar.gz: 52f53405a530bf31cdf196cb647b1cfeba0bff6e4bda7489d751f1e071fed36f7ae87196c19be0d68e0cf7790fd2a5c6f198764502fbb48d66fd670961b9dd80

data/.ruby-version

@@ -0,0 +1 @@
+2.6.3

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.6.3

data/.travis.yml

@@ -6,7 +6,7 @@ script: 'bundle exec rake'
 sudo: required
 dist: trusty
 rvm:
-  - 2.6.1
+  - 2.6.3
 
 before_install:
   - gem update bundler

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.4.0
+
+* symbolize `input_options` and `output_options` to avoid argument errors coming from `ruby-vips`
+
 ## 2.3.3
 
 * locks `ruby-vips` to `< 2.0.14`

data/dragonfly_libvips.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'dragonfly', '~> 1.0'
-  spec.add_dependency 'ruby-vips', '~> 2.0', '< 2.0.14'
+  spec.add_dependency 'ruby-vips', '~> 2.0', '>= 2.0.16'
 
-  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'bundler'#, '~> 2.0'
   spec.add_development_dependency 'rb-readline'
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-minitest'

data/lib/dragonfly_libvips.rb

@@ -35,4 +35,14 @@ module DragonflyLibvips
   ]
 
   FORMATS_WITHOUT_PROFILE_SUPPORT = %w[bmp dz gif hdr webp heic]
+
+  private
+
+  def self.stringify_keys(hash = {})
+    hash.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v }
+  end
+
+  def self.symbolize_keys(hash = {})
+    hash.each_with_object({}) { |(k, v), memo| memo[k.to_sym] = v }
+  end
 end

data/lib/dragonfly_libvips/analysers/image_properties.rb

@@ -14,7 +14,7 @@ module DragonflyLibvips
         input_options['autorotate'] = true if content.mime_type == 'image/jpeg'
         input_options['dpi'] = DPI if content.mime_type == 'application/pdf'
 
-        img = ::Vips::Image.new_from_file(content.path, input_options)
+        img = ::Vips::Image.new_from_file(content.path, DragonflyLibvips.symbolize_keys(input_options))
 
         width = img.width
         height = img.height

data/lib/dragonfly_libvips/processors/encode.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'vips'
 
 module DragonflyLibvips
@@ -19,12 +21,12 @@ module DragonflyLibvips
           return
         end
 
-        options = options.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v } # stringify keys
+        options = DragonflyLibvips.stringify_keys(options)
 
         input_options = options.fetch('input_options', {})
         input_options['access'] ||= 'sequential'
         if content.mime_type == 'image/jpeg'
-          input_options['autorotate'] = true unless input_options.has_key?('autorotate')
+          input_options['autorotate'] = true unless input_options.key?('autorotate')
         end
 
         output_options = options.fetch('output_options', {})
@@ -36,17 +38,17 @@ module DragonflyLibvips
         output_options.delete('Q') unless format.to_s =~ /jpg|jpeg/i
         output_options['format'] ||= format.to_s if format.to_s =~ /gif|bmp/i
 
-        img = ::Vips::Image.new_from_file(content.path, input_options)
+        img = ::Vips::Image.new_from_file(content.path, DragonflyLibvips.symbolize_keys(input_options))
 
         content.update(
-          img.write_to_buffer(".#{format}", output_options),
+          img.write_to_buffer(".#{format}", DragonflyLibvips.symbolize_keys(output_options)),
           'name' => "temp.#{format}",
           'format' => format
         )
         content.ext = format
       end
 
-      def update_url(url_attributes, format, options = {})
+      def update_url(url_attributes, format, _options = {})
         url_attributes.ext = format.to_s
       end
     end

data/lib/dragonfly_libvips/processors/extract_area.rb

@@ -7,7 +7,7 @@ module DragonflyLibvips
         raise UnsupportedFormat unless content.ext
         raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext.downcase)
 
-        options = options.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v } # stringify keys
+        options = DragonflyLibvips.stringify_keys(options)
         format = options.fetch('format', content.ext)
 
         input_options = options.fetch('input_options', {})
@@ -26,11 +26,11 @@ module DragonflyLibvips
         output_options.delete('Q') unless format.to_s =~ /jpg|jpeg/i
         output_options['format'] ||= format.to_s if format.to_s =~ /gif|bmp/i
 
-        img = ::Vips::Image.new_from_file(content.path, input_options)
+        img = ::Vips::Image.new_from_file(content.path, DragonflyLibvips.symbolize_keys(input_options))
         img = img.extract_area(x, y, width, height)
 
         content.update(
-          img.write_to_buffer(".#{format}", output_options),
+          img.write_to_buffer(".#{format}", DragonflyLibvips.symbolize_keys(output_options)),
           'name' => "temp.#{format}",
           'format' => format
         )

data/lib/dragonfly_libvips/processors/rotate.rb

@@ -7,7 +7,7 @@ module DragonflyLibvips
         raise UnsupportedFormat unless content.ext
         raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext.downcase)
 
-        options = options.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v } # stringify keys
+        options = DragonflyLibvips.stringify_keys(options)
         format = options.fetch('format', content.ext)
 
         input_options = options.fetch('input_options', {})
@@ -26,11 +26,11 @@ module DragonflyLibvips
         output_options.delete('Q') unless format.to_s =~ /jpg|jpeg/i
         output_options['format'] ||= format.to_s if format.to_s =~ /gif|bmp/i
 
-        img = ::Vips::Image.new_from_file(content.path, input_options)
+        img = ::Vips::Image.new_from_file(content.path, DragonflyLibvips.symbolize_keys(input_options))
         img = img.rot("d#{rotate}")
 
         content.update(
-          img.write_to_buffer(".#{format}", output_options),
+          img.write_to_buffer(".#{format}", DragonflyLibvips.symbolize_keys(output_options)),
           'name' => "temp.#{format}",
           'format' => format
         )

data/lib/dragonfly_libvips/processors/thumb.rb

@@ -12,7 +12,7 @@ module DragonflyLibvips
         raise UnsupportedFormat unless content.ext
         raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext.downcase)
 
-        options = options.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v } # stringify keys
+        options = DragonflyLibvips.stringify_keys(options)
 
         filename = content.path
         format = options.fetch('format', content.ext).to_s
@@ -39,7 +39,7 @@ module DragonflyLibvips
         output_options['format'] ||= format.to_s if format.to_s =~ /gif|bmp/i
 
         input_options = input_options.each_with_object({}) { |(k, v), memo| memo[k.to_sym] = v } # symbolize
-        img = ::Vips::Image.new_from_file(filename, input_options)
+        img = ::Vips::Image.new_from_file(filename, DragonflyLibvips.symbolize_keys(input_options))
 
         dimensions = case geometry
                      when RESIZE_GEOMETRY then Dimensions.call(geometry, img.width, img.height)
@@ -63,10 +63,10 @@ module DragonflyLibvips
         filename += "[page=#{input_options[:page]}]" if content.mime_type == 'application/pdf'
 
         thumbnail_options = thumbnail_options.each_with_object({}) { |(k, v), memo| memo[k.to_sym] = v } # symbolize
-        thumb = ::Vips::Image.thumbnail(filename, dimensions.width.ceil, thumbnail_options)
+        thumb = ::Vips::Image.thumbnail(filename, dimensions.width.ceil, DragonflyLibvips.symbolize_keys(thumbnail_options))
 
         content.update(
-          thumb.write_to_buffer(".#{format}", output_options),
+          thumb.write_to_buffer(".#{format}", DragonflyLibvips.symbolize_keys(output_options)),
           'name' => "temp.#{format}",
           'format' => format
         )

data/lib/dragonfly_libvips/version.rb

@@ -1,3 +1,3 @@
 module DragonflyLibvips
-  VERSION = '2.3.3'.freeze
+  VERSION = '2.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly_libvips
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.4.0
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2020-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
@@ -31,9 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.14
+        version: 2.0.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -41,23 +41,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.14
+        version: 2.0.16
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-readline
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
+- ".tool-versions"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile