majorsilence_reporting 26.0.2 → 27.0.0.alpha.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0c20949e3b2c421c89e771936dc50e98082291cf6e11d145de122460ccf8853
-  data.tar.gz: b9ea34259b4746f52d222fdda1582a12e49b35c7b21017c4d0294c8eab720995
+  metadata.gz: dd28f7a474ab3c01d9302c2dee0f28cd4b46bbaa77d43e8852135ee7efa5a8dc
+  data.tar.gz: a110ea2c0bb28cc524f43885389f68bb1215771ed16027333bd4eb5fec504872
 SHA512:
-  metadata.gz: 9af31caf85cf5eaf612009990b8a66fcd17c8e6be8195cab1662cee9813f11ad1a882d37815a7e81f91f5010df24f7840622d1d3f511849b396336d9f608898d
-  data.tar.gz: 7714eb5ca849b9044754c0c1d9b27fdc6d4cfca7fda63c4e3d263bf674ac9c28798c7e1ea861dcff3a3cc72c5d740a90a48abb334d77e2d3a2c22457d94ef090
+  metadata.gz: 5c267753000cbf4daea2d8cb319b9cfd8f0cdeaf55e6573e58820e76e666fe5f436cefe4ef75dcd8cbf721e3ab5e36e1ceeac5f24035a01ca0e3ba447b2030e4
+  data.tar.gz: 7323d67dc032eed2ee270f13ca07c57be6f9c3d97db8c0f1a5afa241c3295705a9fc3bee8c9944d26a4ab78a7712ca5812d77764ef8c47cbafcae6a8064e76a4

data/lib/majorsilence_reporting/report_native.rb

@@ -102,11 +102,23 @@ module RdlLibrary
     fns
   end
 
+  # Fiddle returns a TYPE_VOIDP result as a Fiddle::Pointer on current Rubies and as an Integer
+  # address on older ones, so never call Integer methods (zero?) on it directly.
+  def self.address_of(value)
+    return 0 if value.nil?
+
+    value.respond_to?(:to_i) ? value.to_i : value
+  end
+
+  def self.null_pointer?(value)
+    address_of(value).zero?
+  end
+
   def self.rdl_last_error_str(fns)
     ptr = fns[:rdl_last_error].call
-    return 'unknown error' if ptr.nil? || ptr.zero?
+    return 'unknown error' if null_pointer?(ptr)
 
-    Fiddle::Pointer.new(ptr).to_s
+    Fiddle::Pointer.new(address_of(ptr)).to_s
   end
 end
 
@@ -183,7 +195,7 @@ class ReportNative
   def with_handle
     cs_ptr = @connection_string ? c_str(@connection_string) : Fiddle::NULL
     h = @fns[:rdl_report_open].call(c_str(@report_path), cs_ptr)
-    raise_last_error('rdl_report_open') if h.nil? || h.zero?
+    raise_last_error('rdl_report_open') if RdlLibrary.null_pointer?(h)
     begin
       @parameters.each do |name, value|
         ret = @fns[:rdl_report_set_param].call(h, c_str(name), c_str(value))
@@ -212,7 +224,7 @@ class ReportNative
 
   def raise_last_error(fn)
     ptr = @fns[:rdl_last_error].call
-    msg = (ptr && !ptr.zero?) ? Fiddle::Pointer.new(ptr).to_s : 'unknown error'
+    msg = RdlLibrary.null_pointer?(ptr) ? 'unknown error' : Fiddle::Pointer.new(RdlLibrary.address_of(ptr)).to_s
     raise "#{fn} failed: #{msg}"
   end
 end

data/lib/majorsilence_reporting/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MajorsilenceReporting
-  VERSION = '26.0.2'
+  VERSION = '27.0.0.alpha.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: majorsilence_reporting
 version: !ruby/object:Gem::Version
-  version: 26.0.2
+  version: 27.0.0.alpha.11
 platform: ruby
 authors:
 - Peter Gill
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Ruby bindings for Majorsilence Reporting
 test_files: []