Fix HDF5 version handling and update memory pointer types to uint

Author: kojix2

lib/hdf5.rb

@@ -11,20 +11,23 @@ class << self
 
     def search_hdf5lib
       name = "libhdf5.#{FFI::Platform::LIBSUFFIX}"
-      return File.expand_path(name, ENV['HDF5_LIB_PATH']) if ENV['HDF5_LIB_PATH']
+      env_path = ENV['HDF5_LIB_PATH']
+      return env_path if env_path && File.file?(env_path)
+      return File.expand_path(name, env_path) if env_path && File.directory?(env_path)
 
       begin
         require 'pkg-config'
         libs = PKGConfig.libs('hdf5')
         pattern = %r{(?<=-L)/[^ ]+}
-        lib_dir = libs.scan(pattern).first
-        lib_path = File.expand_path(name, lib_dir)
+        libs.scan(pattern).each do |lib_dir|
+          lib_path = File.expand_path(name, lib_dir)
+          return lib_path if File.exist?(lib_path)
+        end
       rescue PackageConfig::NotFoundError
         warn 'hdf5.pc not found.'
       end
-      return lib_path if File.exist?(lib_path)
 
-      warn "hdf5 shared library '#{name}' not found."
+      name
     end
   end
 

lib/hdf5/ffi.rb

@@ -30,18 +30,22 @@ def self.attach_variable(*)
       pointer
     ], :int
 
-    major_ptr = ::FFI::MemoryPointer.new(:int)
-    minor_ptr = ::FFI::MemoryPointer.new(:int)
-    release_ptr = ::FFI::MemoryPointer.new(:int)
+    major_ptr = ::FFI::MemoryPointer.new(:uint)
+    minor_ptr = ::FFI::MemoryPointer.new(:uint)
+    release_ptr = ::FFI::MemoryPointer.new(:uint)
     HDF5::FFI.H5get_libversion(major_ptr, minor_ptr, release_ptr)
 
-    raise 'HDF5 major version mismatch' if major_ptr.read_int != 1
+    major = major_ptr.read_uint
+    minor = minor_ptr.read_uint
+    release = release_ptr.read_uint
 
-    case minor_ptr.read_int
-    when 10
+    case [major, minor]
+    in [1, 10]
       require_relative 'ffi_10'
-    when 14..Float::INFINITY
+    in [1, 14..] | [2.., _]
       require_relative 'ffi_14'
+    else
+      raise "Unsupported HDF5 version #{major}.#{minor}.#{release}"
     end
   end
 end

test/hdf5_test.rb

@@ -10,13 +10,13 @@ class HDF5Test < Test::Unit::TestCase
   end
 
   test 'libversion' do
-    major = FFI::MemoryPointer.new(:int)
-    minor = FFI::MemoryPointer.new(:int)
-    release = FFI::MemoryPointer.new(:int)
+    major = FFI::MemoryPointer.new(:uint)
+    minor = FFI::MemoryPointer.new(:uint)
+    release = FFI::MemoryPointer.new(:uint)
     HDF5::FFI.H5get_libversion(major, minor, release)
-    assert_equal(1, major.read_int)
-    assert_kind_of(Integer, minor.read_int)
-    assert_kind_of(Integer, release.read_int)
+    assert_include([1, 2], major.read_uint)
+    assert_kind_of(Integer, minor.read_uint)
+    assert_kind_of(Integer, release.read_uint)
   end
 
   test 'example' do