datasketches 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a0f499815550712d69187bde082bfbbf0a2b076f8d4ae747cf9c85b59cdbd55
-  data.tar.gz: 46cc4162f0a894a5dfc1c000ab74a4baf95404f515a69a19bede6aed28630279
+  metadata.gz: a130c4ac282887b6cd406512ab071baa7c26f6c375ed3a2c0d48dac400b7572e
+  data.tar.gz: c08742aa7121718f1459096fecc5c7a62f87ba540264082c00021dfe30eadfe6
 SHA512:
-  metadata.gz: 63ac3ca31eeb6bd10bc4ededf78f15143211e38a34fcc627d9ecdc500097b862c6e4a73e0032b5338851041facf0359c9c142e4f80e83fd76cc0ed1c264201e8
-  data.tar.gz: 9345d158a0e83d4b4a70703ddf47a686ab2a82c6dd31c5e55a1823be3a009c53ac807bc81e759812a682f23e56c2af43aab59baa1d2b2341eeac8dbdf619f26d
+  metadata.gz: e1453845a086ed9b2069e53a1a4dd47af5f3529507e41886fdd7b6728baae52164a645dc9a6f4895b74b392ef086d7873ccf36b23f49728cb73bf73428384d79
+  data.tar.gz: 423d9134d4dc134daa0c93dfe79c455e8abf5b5d95b67b8d05bf0e105a1746b60ddbfb06ff461137f6645553074db9104e940fc6f84f2bf410448a3b7671d56c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.5.1 (2025-10-26)
+
+- Fixed error with Rice 4.7
+
 ## 0.5.0 (2025-04-03)
 
 - Dropped support for Ruby < 3.2

data/ext/datasketches/cpc_wrapper.cpp

@@ -1,9 +1,10 @@
 #include <sstream>
+#include <string>
 
 #include <cpc_sketch.hpp>
 #include <cpc_union.hpp>
-
-#include "ext.h"
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 
 using datasketches::cpc_sketch;
 using datasketches::cpc_union;
@@ -11,8 +12,6 @@ using datasketches::cpc_union;
 using datasketches::cpc_constants::DEFAULT_LG_K;
 using datasketches::DEFAULT_SEED;
 
-using Rice::Arg;
-
 void init_cpc(Rice::Module& m) {
   Rice::define_class_under<cpc_sketch>(m, "CpcSketch")
     .define_constructor(Rice::Constructor<cpc_sketch, uint8_t, uint64_t>(), Rice::Arg("lg_k")=DEFAULT_LG_K, Rice::Arg("seed")=DEFAULT_SEED)

data/ext/datasketches/ext.cpp

@@ -1,4 +1,4 @@
-#include "ext.h"
+#include <rice/rice.hpp>
 
 void init_cpc(Rice::Module& m);
 void init_fi(Rice::Module& m);
@@ -8,8 +8,7 @@ void init_theta(Rice::Module& m);
 void init_vo(Rice::Module& m);
 
 extern "C"
-void Init_ext()
-{
+void Init_ext() {
   Rice::Module m = Rice::define_module("DataSketches");
   init_cpc(m);
   init_fi(m);

data/ext/datasketches/fi_wrapper.cpp

@@ -1,8 +1,10 @@
+#include <cstdint>
 #include <sstream>
+#include <string>
 
 #include <frequent_items_sketch.hpp>
-
-#include "ext.h"
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 
 template<typename T>
 void bind_fi_sketch(Rice::Module& m, const char* name) {

data/ext/datasketches/hll_wrapper.cpp

@@ -1,8 +1,9 @@
 #include <sstream>
+#include <string>
 
 #include <hll.hpp>
-
-#include "ext.h"
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 
 using datasketches::hll_sketch;
 using datasketches::hll_union;

data/ext/datasketches/kll_wrapper.cpp

@@ -1,27 +1,33 @@
 #include <sstream>
+#include <string>
+#include <vector>
 
 #include <kll_sketch.hpp>
-
-#include "ext.h"
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 
 using datasketches::kll_sketch;
 
-namespace Rice::detail
-{
+namespace Rice::detail {
   template<typename T>
-  class To_Ruby<std::vector<T>>
-  {
+  class To_Ruby<std::vector<T>> {
   public:
-    VALUE convert(std::vector<T> const & x)
-    {
+    To_Ruby() = default;
+
+    explicit To_Ruby(Arg* arg) : arg_(arg) { }
+
+    VALUE convert(std::vector<T> const & x) {
       auto a = rb_ary_new2(x.size());
       for (const auto& v : x) {
         detail::protect(rb_ary_push, a, To_Ruby<T>().convert(v));
       }
       return a;
     }
+
+  private:
+    Arg* arg_ = nullptr;
   };
-}
+} // namespace Rice::detail
 
 template<typename T>
 void bind_kll_sketch(Rice::Module& m, const char* name) {

data/ext/datasketches/theta_wrapper.cpp

@@ -1,12 +1,13 @@
 #include <sstream>
+#include <string>
 
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 #include <theta_sketch.hpp>
 #include <theta_union.hpp>
 #include <theta_intersection.hpp>
 #include <theta_a_not_b.hpp>
 
-#include "ext.h"
-
 using datasketches::theta_sketch;
 using datasketches::update_theta_sketch;
 using datasketches::compact_theta_sketch;
@@ -16,8 +17,6 @@ using datasketches::theta_a_not_b;
 
 using datasketches::DEFAULT_SEED;
 
-using Rice::Arg;
-
 void init_theta(Rice::Module& m) {
   Rice::define_class_under<theta_sketch>(m, "ThetaSketch")
     .define_method(
@@ -59,8 +58,8 @@ void init_theta(Rice::Module& m) {
         builder.set_seed(seed);
         return builder.build();
       },
-      Arg("lg_k")=datasketches::theta_constants::DEFAULT_LG_K, Arg("p")=1.0, Arg("seed")=DEFAULT_SEED)
-    .define_method("compact", &update_theta_sketch::compact, Arg("ordered")=true)
+      Rice::Arg("lg_k")=datasketches::theta_constants::DEFAULT_LG_K, Rice::Arg("p")=1.0, Rice::Arg("seed")=DEFAULT_SEED)
+    .define_method("compact", &update_theta_sketch::compact, Rice::Arg("ordered")=true)
     .define_method(
       "update",
       [](update_theta_sketch& self, Rice::Object datum) {
@@ -88,17 +87,17 @@ void init_theta(Rice::Module& m) {
         builder.set_seed(seed);
         return builder.build();
       },
-      Arg("lg_k")=datasketches::theta_constants::DEFAULT_LG_K, Arg("p")=1.0, Arg("seed")=DEFAULT_SEED)
+      Rice::Arg("lg_k")=datasketches::theta_constants::DEFAULT_LG_K, Rice::Arg("p")=1.0, Rice::Arg("seed")=DEFAULT_SEED)
     .define_method("update", &theta_union::update<const theta_sketch&>)
-    .define_method("result", &theta_union::get_result, Arg("ordered")=true);
+    .define_method("result", &theta_union::get_result, Rice::Arg("ordered")=true);
 
   Rice::define_class_under<theta_intersection>(m, "ThetaIntersection")
-    .define_constructor(Rice::Constructor<theta_intersection, uint64_t>(), Arg("seed")=DEFAULT_SEED)
+    .define_constructor(Rice::Constructor<theta_intersection, uint64_t>(), Rice::Arg("seed")=DEFAULT_SEED)
     .define_method("update", &theta_intersection::update<const theta_sketch&>)
-    .define_method("result", &theta_intersection::get_result, Arg("ordered")=true)
+    .define_method("result", &theta_intersection::get_result, Rice::Arg("ordered")=true)
     .define_method("result?", &theta_intersection::has_result);
 
   Rice::define_class_under<theta_a_not_b>(m, "ThetaANotB")
-    .define_constructor(Rice::Constructor<theta_a_not_b, uint64_t>(), Arg("seed")=DEFAULT_SEED)
-    .define_method("compute", &theta_a_not_b::compute<const theta_sketch&, const theta_sketch&>, Arg("a"), Arg("b"), Arg("ordered")=true);
+    .define_constructor(Rice::Constructor<theta_a_not_b, uint64_t>(), Rice::Arg("seed")=DEFAULT_SEED)
+    .define_method("compute", &theta_a_not_b::compute<const theta_sketch&, const theta_sketch&>, Rice::Arg("a"), Rice::Arg("b"), Rice::Arg("ordered")=true);
 }

data/ext/datasketches/vo_wrapper.cpp

@@ -1,9 +1,9 @@
 #include <sstream>
 
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 #include <var_opt_sketch.hpp>
 
-#include "ext.h"
-
 using datasketches::var_opt_sketch;
 
 template<typename T>
@@ -21,9 +21,9 @@ void bind_vo_sketch(Rice::Module &m, const char* name) {
         auto a = Rice::Array();
         for (auto item : self) {
           auto t = Rice::Array();
-          t.push(item.first);
-          t.push(item.second);
-          a.push(t);
+          t.push(item.first, false);
+          t.push(item.second, false);
+          a.push(t, false);
         }
         return a;
       })

data/lib/datasketches/version.rb

@@ -1,3 +1,3 @@
 module DataSketches
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: datasketches
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Andrew Kane
 bindir: bin
 cert_chain: []
-date: 2025-04-03 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.3
+        version: '4.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.3
+        version: '4.7'
 email: andrew@ankane.org
 executables: []
 extensions:
@@ -35,7 +35,6 @@ files:
 - README.md
 - ext/datasketches/cpc_wrapper.cpp
 - ext/datasketches/ext.cpp
-- ext/datasketches/ext.h
 - ext/datasketches/extconf.rb
 - ext/datasketches/fi_wrapper.cpp
 - ext/datasketches/hll_wrapper.cpp
@@ -343,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Sketch data structures for Ruby
 test_files: []

data/ext/datasketches/ext.h

@@ -1,4 +0,0 @@
-#pragma once
-
-#include <rice/rice.hpp>
-#include <rice/stl.hpp>