ruby-vips 2.0.15 → 2.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f840e3348f61c24e35a7edaf8110e04c80d554ca0941e1a2657e42a5e7d9c585
-  data.tar.gz: 914ae65523b71d0703e0dadcb0a864d89dbf15c4177fd98b3d440e84023b31ec
+  metadata.gz: d671129c93cfb4105aec4736c4caf7898c93f1ab088ee4a97b4a5189a924501e
+  data.tar.gz: 8c34c01cbb010805fced2d1677c814055c2856708d9e2175bbe4a016d2c32993
 SHA512:
-  metadata.gz: 173ff890370fb1a4fdc70f5ab6ecb4622995a855494c5b46ff3aa2b1ef74415e1c39d9b20773e42b2e01dd520cdb6d59a00abc2a54d34a670b503d811cee8aa8
-  data.tar.gz: fdc9235e39d693067d4e2ac3f327bce3b71d98ed170a8946ec12626599f274485d4ebd71fdacf837122d34b6da08cabe1b0f31e530a36e3cf548e7b498179880
+  metadata.gz: 70ccc45f4aa940db1e5959a50ae1e998415e9ad0ed7e8cd92726fc905a5a1ad22d530739fdd2192957464e3e96242400db29c644dbe815a741d1047211348cad
+  data.tar.gz: 0ce3050e2fc3ef1d4729881087b29eaa88c53960195a4b45e50fab4f618d50a2b9d50ac22ce72e433d0cad33f913f378f664a392faa7913a68db844549ed7412

data/.rubocop_todo.yml

@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-06-12 17:59:17 +0100 using RuboCop version 0.71.0.
+# on 2019-10-02 15:42:13 +0100 using RuboCop version 0.75.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 43
+# Offense count: 42
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: with_first_argument, with_fixed_indentation
@@ -39,7 +39,7 @@ Lint/UselessComparison:
 
 # Offense count: 7
 Metrics/AbcSize:
-  Max: 114
+  Max: 113
 
 # Offense count: 6
 # Configuration parameters: CountComments, ExcludedMethods.
@@ -50,25 +50,25 @@ Metrics/BlockLength:
 # Offense count: 3
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 518
+  Max: 515
 
 # Offense count: 6
 Metrics/CyclomaticComplexity:
-  Max: 28
+  Max: 27
 
-# Offense count: 12
+# Offense count: 11
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
-  Max: 150
+  Max: 128
 
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 150
+  Max: 131
 
 # Offense count: 4
 Metrics/PerceivedComplexity:
-  Max: 32
+  Max: 31
 
 # Offense count: 9
 Naming/AccessorMethodName:
@@ -133,48 +133,17 @@ Style/BlockDelimiters:
     - 'lib/vips.rb'
     - 'lib/vips/operation.rb'
 
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: braces, no_braces, context_dependent
-Style/BracesAroundHashParameters:
-  Exclude:
-    - 'spec/vips_spec.rb'
-
 # Offense count: 5
 Style/ClassVars:
   Exclude:
     - 'lib/vips/image.rb'
 
-# Offense count: 168
+# Offense count: 173
 # Cop supports --auto-correct.
 Style/ColonMethodCall:
-  Exclude:
-    - 'example/example1.rb'
-    - 'example/example2.rb'
-    - 'example/example3.rb'
-    - 'example/example4.rb'
-    - 'example/inheritance_with_refcount.rb'
-    - 'lib/vips.rb'
-    - 'lib/vips/gobject.rb'
-    - 'lib/vips/gvalue.rb'
-    - 'lib/vips/image.rb'
-    - 'lib/vips/interpolate.rb'
-    - 'lib/vips/object.rb'
-    - 'lib/vips/operation.rb'
-    - 'spec/image_spec.rb'
-    - 'spec/spec_helper.rb'
-    - 'spec/vips_spec.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
-# SupportedStyles: assign_to_condition, assign_inside_condition
-Style/ConditionalAssignment:
-  Exclude:
-    - 'lib/vips.rb'
+  Enabled: false
 
-# Offense count: 44
+# Offense count: 47
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
@@ -188,6 +157,7 @@ Style/Documentation:
     - 'lib/vips/interpolate.rb'
     - 'lib/vips/object.rb'
     - 'lib/vips/operation.rb'
+    - 'lib/vips/region.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -209,7 +179,7 @@ Style/ExpandPathArguments:
     - 'ruby-vips.gemspec'
     - 'spec/spec_helper.rb'
 
-# Offense count: 50
+# Offense count: 51
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, never
@@ -229,7 +199,7 @@ Style/GuardClause:
     - 'example/inheritance_with_refcount.rb'
     - 'lib/vips.rb'
 
-# Offense count: 53
+# Offense count: 21
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
 # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
@@ -240,12 +210,8 @@ Style/HashSyntax:
     - 'example/daltonize8.rb'
     - 'example/example3.rb'
     - 'example/example5.rb'
-    - 'lib/vips/image.rb'
-    - 'lib/vips/object.rb'
-    - 'lib/vips/operation.rb'
     - 'spec/image_spec.rb'
     - 'spec/spec_helper.rb'
-    - 'spec/vips_spec.rb'
 
 # Offense count: 30
 # Cop supports --auto-correct.
@@ -269,7 +235,7 @@ Style/LambdaCall:
   Exclude:
     - 'lib/vips/image.rb'
 
-# Offense count: 11
+# Offense count: 9
 # Cop supports --auto-correct.
 Style/LineEndConcatenation:
   Exclude:
@@ -340,7 +306,7 @@ Style/NestedParenthesizedCalls:
   Exclude:
     - 'lib/vips/image.rb'
 
-# Offense count: 3
+# Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, MinBodyLength.
 # SupportedStyles: skip_modifier_ifs, always
@@ -421,14 +387,6 @@ Style/RedundantSelf:
     - 'example/inheritance_with_refcount.rb'
     - 'lib/vips/gobject.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: implicit, explicit
-Style/RescueStandardError:
-  Exclude:
-    - 'lib/vips/image.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/SelfAssignment:
@@ -487,7 +445,7 @@ Style/TrailingCommaInHashLiteral:
   Exclude:
     - 'lib/vips/image.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 Style/UnneededInterpolation:
   Exclude:
@@ -507,7 +465,7 @@ Style/ZeroLengthPredicate:
     - 'lib/vips/image.rb'
     - 'lib/vips/operation.rb'
 
-# Offense count: 105
+# Offense count: 107
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## Version 2.0.16 (2019-9-21)
+
+* better library name generation [renchap]
+* allow `_` as a separator in enum names [D-W-L]
+* add `Vips::Region` and `Region#fetch` [jcupitt]
+
 ## Version 2.0.15 (2019-6-12)
 
 * better error messages from `write_to_memory` [linkyndy]

data/TODO

@@ -1,44 +1,48 @@
 # Notes
 
-- support complex constants, eg. 
+- We should support complex constants, eg: 
 
 	Complex(1, 2)
 	=> (1+2i)
 
 # Common operations
 
-- lint 
+- Lint.
 
 	bundle exec rake rubocop
 
-- reinstall local copy of gem after a change
+- Reinstall local copy of gem after a change.
 
 	bundle exec rake install
 
-- run test suite
+- Run test suite.
 
 	bundle exec rake 
 
-- version bump
+- Version bump.
 
 	edit lib/vips/version.rb 
 	edit VERSION
 
-- regenerate autodocs
+- Regenerate autodocs.
 
 	cd lib/vips
 	ruby > methods.rb
 	require 'vips'; Vips::generate_yard
 	^D
 
-- regenerate .rubocop_todo.yml
+- Regenerate `.rubocop_todo.yml`.
 
 	bundle exec rubocop --auto-gen-config
 
-- regenerate docs
+- Regenerate docs.
 
 	bundle exec rake yard
 
-- push new gem to rubygems, tag repository with version
+- Push new gem to rubygems, tag repository with version.
 
 	bundle exec rake release
+
+  There's an invisible prompt for the authenticator code. Enter eg. 123456, 
+  press return and the upload should work.
+

data/VERSION

@@ -1 +1 @@
-2.0.15
+2.0.16

data/lib/vips.rb

@@ -10,6 +10,29 @@ require 'logger'
 # This module uses FFI to make a simple layer over the glib and gobject
 # libraries.
 
+# Generate a library name for ffi.
+#
+# Platform notes:
+# linux:
+#   Some distros allow "libvips.so", but only if the -dev headers have been
+#   installed. To work everywhere, you must include the ABI number.
+#   Confusingly, the file extension is not at the end. ffi adds the "lib"
+#   prefix.
+# mac:
+#   As linux, but the extension is at the end and is added by ffi.
+# windows:
+#   The ABI number must be included, but with a hyphen. ffi does not add a
+#   "lib" prefix or a ".dll" suffix.
+def library_name(name, abi_number)
+  if FFI::Platform.windows?
+    "lib#{name}-#{abi_number}.dll"
+  elsif FFI::Platform.mac?
+    "#{name}.#{abi_number}"
+  else
+    "#{name}.so.#{abi_number}"
+  end
+end
+
 module GLib
   class << self
     attr_accessor :logger
@@ -19,13 +42,7 @@ module GLib
 
   extend FFI::Library
 
-  if FFI::Platform.windows?
-    glib_libname = 'libglib-2.0-0.dll'
-  else
-    glib_libname = 'glib-2.0'
-  end
-
-  ffi_lib glib_libname
+  ffi_lib library_name('glib-2.0', 0)
 
   attach_function :g_malloc, [:size_t], :pointer
 
@@ -117,13 +134,7 @@ end
 module GObject
   extend FFI::Library
 
-  if FFI::Platform.windows?
-    gobject_libname = 'libgobject-2.0-0.dll'
-  else
-    gobject_libname = 'gobject-2.0'
-  end
-
-  ffi_lib gobject_libname
+  ffi_lib library_name('gobject-2.0', 0)
 
   # we can't just use ulong, windows has different int sizing rules
   if FFI::Platform::ADDRESS_SIZE == 64
@@ -459,13 +470,7 @@ require 'vips/gvalue'
 module Vips
   extend FFI::Library
 
-  if FFI::Platform.windows?
-    vips_libname = 'libvips-42.dll'
-  else
-    vips_libname = 'vips'
-  end
-
-  ffi_lib vips_libname
+  ffi_lib library_name('vips', 42)
 
   LOG_DOMAIN = "VIPS"
   GLib::set_log_domain LOG_DOMAIN
@@ -617,4 +622,5 @@ require 'vips/object'
 require 'vips/operation'
 require 'vips/image'
 require 'vips/interpolate'
+require 'vips/region'
 require 'vips/version'

data/lib/vips/gvalue.rb

@@ -25,6 +25,9 @@ module GObject
     # convert an enum value (str/symb/int) into an int ready for libvips
     def self.from_nick(gtype, value)
       value = value.to_s if value.is_a? Symbol
+      # libvips expects "-" as a separator in enum names, but "_" is more
+      # convenient for ruby, eg. :b_w
+      value = value.tr("_", "-")
 
       if value.is_a? String
         value = Vips::vips_enum_from_nick "ruby-vips", gtype, value

data/lib/vips/image.rb

@@ -29,20 +29,14 @@ module Vips
   attach_function :vips_image_get,
       [:pointer, :string, GObject::GValue.ptr], :int
 
-  # vips_image_get_fields was added in libvips 8.5
-  begin
+  if Vips::at_least_libvips?(8, 5)
     attach_function :vips_image_get_fields, [:pointer], :pointer
-  rescue FFI::NotFoundError
-    nil
+    attach_function :vips_image_hasalpha, [:pointer], :int
   end
 
-  # vips_addalpha was added in libvips 8.6
   if Vips::at_least_libvips?(8, 6)
     attach_function :vips_addalpha, [:pointer, :pointer, :varargs], :int
   end
-  if Vips::at_least_libvips?(8, 5)
-    attach_function :vips_image_hasalpha, [:pointer], :int
-  end
 
   attach_function :vips_image_set,
       [:pointer, :string, GObject::GValue.ptr], :void
@@ -219,13 +213,13 @@ module Vips
     # load options, for example:
     #
     # ```
-    # image = Vips::new_from_file "fred.jpg[shrink=2]"
+    # image = Vips::Image.new_from_file "fred.jpg[shrink=2]"
     # ```
     #
     # You can also supply options as a hash, for example:
     #
     # ```
-    # image = Vips::new_from_file "fred.jpg", shrink: 2
+    # image = Vips::Image.new_from_file "fred.jpg", shrink: 2
     # ```
     #
     # The full set of options available depend upon the load operation that
@@ -317,13 +311,13 @@ module Vips
     # For example:
     #
     # ```
-    # image = Vips::new_from_array [1, 2, 3]
+    # image = Vips::Image.new_from_array [1, 2, 3]
     # ```
     #
     # or
     #
     # ```
-    # image = Vips::new_from_array [
+    # image = Vips::Image.new_from_array [
     #     [-1, -1, -1],
     #     [-1, 16, -1],
     #     [-1, -1, -1]], 8

data/lib/vips/region.rb

@@ -0,0 +1,73 @@
+# This module provides an interface to the top level bits of libvips
+# via ruby-ffi.
+#
+# Author::    John Cupitt  (mailto:jcupitt@gmail.com)
+# License::   MIT
+
+require 'ffi'
+
+module Vips
+  attach_function :vips_region_new, [:pointer], :pointer
+
+  if Vips::at_least_libvips?(8, 8)
+    attach_function :vips_region_fetch, [:pointer, :int, :int, :int, :int, SizeStruct.ptr], :pointer
+    attach_function :vips_region_width, [:pointer], :int
+    attach_function :vips_region_height, [:pointer], :int
+  end
+
+  # A region on an image. Create one, then use `fetch` to quickly get a region
+  # of pixels.
+  #
+  # For example:
+  #
+  #  ```ruby
+  #  region = Vips::Region.new(image)
+  #  pixels = region.fetch(10, 10, 100, 100)
+  #  ```
+  class Region < Vips::Object
+    # The layout of the VipsRegion struct.
+    module RegionLayout
+      def self.included(base)
+        base.class_eval do
+          layout :parent, Vips::Object::Struct
+          # rest opaque
+        end
+      end
+    end
+
+    class Struct < Vips::Object::Struct
+      include RegionLayout
+    end
+
+    class ManagedStruct < Vips::Object::ManagedStruct
+      include RegionLayout
+    end
+
+    def initialize(name)
+      ptr = Vips::vips_region_new name
+      raise Vips::Error if ptr.nil?
+
+      super ptr
+    end
+
+    def width
+      Vips::vips_region_width self
+    end
+
+    def height
+      Vips::vips_region_height self
+    end
+
+    # Fetch a region filled with pixel data.
+    def fetch(left, top, width, height)
+      len = Vips::SizeStruct.new
+      ptr = Vips::vips_region_fetch self, left, top, width, height, len
+      raise Vips::Error if ptr.nil?
+
+      # wrap up as an autopointer
+      ptr = FFI::AutoPointer.new(ptr, GLib::G_FREE)
+
+      ptr.get_bytes 0, len[:value]
+    end
+  end
+end

data/lib/vips/version.rb

@@ -1,3 +1,3 @@
 module Vips
-  VERSION = "2.0.15"
+  VERSION = "2.0.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-vips
 version: !ruby/object:Gem::Version
-  version: 2.0.15
+  version: 2.0.16
 platform: ruby
 authors:
 - John Cupitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-08 00:00:00.000000000 Z
+date: 2019-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -193,6 +193,7 @@ files:
 - lib/vips/operationmath2.rb
 - lib/vips/operationrelational.rb
 - lib/vips/operationround.rb
+- lib/vips/region.rb
 - lib/vips/size.rb
 - lib/vips/version.rb
 - ruby-vips.gemspec