halton 0.2.1.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8115499e016e8c1c3ef1608ac90caed45b48ba7d34a722788b3ae4f550d35db5
-  data.tar.gz: c2e2f8af26707e3b486036c24b82b15df6421caaa03eb35f0cfdaa383dc5c649
+  metadata.gz: a8818a9a7f4cf3ae86377e55d0ac217df57e1ee2adc7ae560673b3f388047a34
+  data.tar.gz: 5887f4a293d8e182c62f263ff605672d4ea4d1a05fdf1c84abc296914f272853
 SHA512:
-  metadata.gz: 021dbd5d00a5045f9a02c6b3f09560305468c0f360b16dbd3acb0829db8d848457c685864edbb8427fad1a7e7d3852b242d26dfcf33ddb95bc51dc8c1d90f076
-  data.tar.gz: a6ece029b0b98a9f4ac3f8e8c5dc4cf604d9a13d6d2e5d4de3cdf9376925c6a480ec437635f7b52340df09c57f1f767f65f7171c2a5052a137abd7499c42d843
+  metadata.gz: c2b05a5c6b4d9a1aeb80d757ca41e51681f91f4248395e9b4dac30b65ee857f234dc096935f626f5392028cb790e993c54808497381448b301f5073c7d3e238f
+  data.tar.gz: 4d03c2fe07a9d8b7a923b2a59f1893c00a4e541a63672741cca486ff7f0cff1763e09f2861631a70e395271d1df6f06233cab6b570b468243e73f74264d6b05a

data/{ext/halton/Cargo.lock → Cargo.lock}

@@ -4,18 +4,18 @@ version = 3
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.20"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "bindgen"
-version = "0.60.1"
+version = "0.66.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6"
+checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7"
 dependencies = [
  "bitflags",
  "cexpr",
@@ -28,13 +28,14 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
+ "syn",
 ]
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
 
 [[package]]
 name = "cexpr"
@@ -53,9 +54,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clang-sys"
-version = "1.4.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
+checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
 dependencies = [
  "glob",
  "libc",
@@ -64,9 +65,9 @@ dependencies = [
 
 [[package]]
 name = "glob"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "halton"
@@ -96,9 +97,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.138"
+version = "0.2.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
 
 [[package]]
 name = "libloading"
@@ -112,20 +113,21 @@ dependencies = [
 
 [[package]]
 name = "magnus"
-version = "0.4.3"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d904f55da4e2b0ac7f133257af80580ff4ca17bcca67f51ea06be46aa634ac"
+checksum = "68e9585bfe236e88e6b10b6d8eb5349bd0e0009f3f9dff8d2e99a82601b33743"
 dependencies = [
  "magnus-macros",
  "rb-sys",
  "rb-sys-env",
+ "seq-macro",
 ]
 
 [[package]]
 name = "magnus-macros"
-version = "0.2.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acc8ba6908cb0f67a4e75cb48fc81a1f0e6a6dd1501936e0c9e2c7c8f9f18e05"
+checksum = "5968c820e2960565f647819f5928a42d6e874551cab9d88d75e3e0660d7f71e3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -146,9 +148,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "nom"
-version = "7.1.1"
+version = "7.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
 dependencies = [
  "memchr",
  "minimal-lexical",
@@ -162,53 +164,69 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.47"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.21"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "rb-sys"
-version = "0.9.46"
+version = "0.9.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f1cfd225389bd9333d93d393d0feeeacd191d97f9b1c881528ac1233c67f0f"
+checksum = "a57240b308b155b09dce81e32829966a99f52d1088b45957e4283e526c5317a1"
 dependencies = [
  "rb-sys-build",
 ]
 
 [[package]]
 name = "rb-sys-build"
-version = "0.9.46"
+version = "0.9.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad39a523a00dc5d4f6dcec077568d985807aa5bd03204a0ddf7c1f36544289c"
+checksum = "f24ce877a4c5d07f06f6aa6fec3ac95e4b357b9f73b0f5445d8cbb7266d410e8"
 dependencies = [
  "bindgen",
+ "lazy_static",
+ "proc-macro2",
+ "quote",
  "regex",
  "shell-words",
+ "syn",
 ]
 
 [[package]]
 name = "rb-sys-env"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74c38752410925faeb82c400c06ba2fd9ee6aa8f719dd33994c9e53f5242d25f"
+checksum = "a35802679f07360454b418a5d1735c89716bde01d35b1560fc953c1415a0b3bb"
 
 [[package]]
 name = "regex"
-version = "1.7.0"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
+checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -217,9 +235,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.28"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
 
 [[package]]
 name = "rustc-hash"
@@ -227,6 +245,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
+[[package]]
+name = "seq-macro"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
+
 [[package]]
 name = "shell-words"
 version = "1.1.0"
@@ -241,9 +265,9 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
 
 [[package]]
 name = "syn"
-version = "1.0.105"
+version = "2.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
+checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -252,9 +276,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.5"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
 
 [[package]]
 name = "winapi"

data/Cargo.toml

@@ -0,0 +1,5 @@
+[workspace]
+members = ["ext/halton"]
+
+[profile.release]
+debug = true

data/ext/halton/Cargo.toml

@@ -1,12 +1,11 @@
 [package]
 name = "halton"
 version = "0.1.0"
-authors = ["Mat Sadler <mat@sourcetagsandcodes.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
 halton = "0.2.1"
-magnus = "0.4.3"
+magnus = { version = "0.6", default_features = false }

data/ext/halton/src/lib.rs

@@ -1,14 +1,13 @@
 use std::cell::RefCell;
 
 use magnus::{
-    block::{block_given, Yield, YieldSplat, YieldValues},
-    define_module, exception, function, method,
-    scan_args::check_arity,
+    block::{Yield, YieldSplat, YieldValues},
+    function, method,
     prelude::*,
-    Error, RArray, Value,
+    Error, RArray, Value, Ruby
 };
 
-#[magnus::wrap(class = "Halton::Sequence", free_immediatly, size)]
+#[magnus::wrap(class = "Halton::Sequence", free_immediately, size)]
 struct Sequence(RefCell<halton::Sequence>);
 
 impl Sequence {
@@ -16,11 +15,11 @@ impl Sequence {
         Self(RefCell::new(halton::Sequence::new(base)))
     }
 
-    fn next(&self) -> Result<f64, Error> {
-        match self.0.try_borrow_mut().unwrap().next() {
+    fn next(ruby: &Ruby, rb_self: &Sequence) -> Result<f64, Error> {
+        match rb_self.0.try_borrow_mut().unwrap().next() {
             Some(f) => Ok(f),
             None => Err(Error::new(
-                exception::stop_iteration(),
+                ruby.exception_stop_iteration(),
                 "iteration reached an end",
             )),
         }
@@ -33,21 +32,26 @@ impl Sequence {
     fn remaining(&self) -> Option<usize> {
         self.0.try_borrow().unwrap().size_hint().1
     }
+
+    fn take(ruby: &Ruby, rb_self: &Sequence, n: usize) -> RArray {
+        ruby.ary_from_iter(rb_self.0.try_borrow_mut().unwrap().clone().take(n))
+    }
 }
 
-fn each_one(rb_self: Value, base: u8) -> Yield<impl Iterator<Item = f64>> {
-    if !block_given() {
+fn each_one(ruby: &Ruby, rb_self: Value, base: u8) -> Yield<impl Iterator<Item = f64>> {
+    if !ruby.block_given() {
         return Yield::Enumerator(rb_self.enumeratorize("each_one", (base,)));
     }
     Yield::Iter(halton::Sequence::new(base))
 }
 
 fn each_pair(
+    ruby: &Ruby,
     rb_self: Value,
     x_base: u8,
     y_base: u8,
 ) -> YieldValues<impl Iterator<Item = (f64, f64)>> {
-    if !block_given() {
+    if !ruby.block_given() {
         return YieldValues::Enumerator(rb_self.enumeratorize("each_pair", (x_base, y_base)));
     }
     let seq_x = halton::Sequence::new(x_base);
@@ -56,12 +60,13 @@ fn each_pair(
 }
 
 fn each_triple(
+    ruby: &Ruby,
     rb_self: Value,
     x_base: u8,
     y_base: u8,
     z_base: u8,
 ) -> YieldValues<impl Iterator<Item = (f64, f64, f64)>> {
-    if !block_given() {
+    if !ruby.block_given() {
         return YieldValues::Enumerator(
             rb_self.enumeratorize("each_triple", (x_base, y_base, z_base)),
         );
@@ -76,13 +81,14 @@ fn each_many(
     rb_self: Value,
     args: &[Value],
 ) -> Result<YieldSplat<impl Iterator<Item = RArray>>, Error> {
-    check_arity(args.len(), 1..)?;
+    let ruby = unsafe { Ruby::get_unchecked() };
+    ruby.check_arity(args.len(), 1..)?;
     let bases = args
         .iter()
-        .map(|v| v.try_convert())
+        .map(|v| u8::try_convert(*v))
         .collect::<Result<Vec<u8>, _>>()?;
 
-    if !block_given() {
+    if !ruby.block_given() {
         return Ok(YieldSplat::Enumerator(
             rb_self.enumeratorize("each_many", args),
         ));
@@ -96,27 +102,28 @@ fn each_many(
         buffer.clear();
         for seq in &mut seqs {
             if let Some(v) = seq.next() {
-                buffer.push(v.into());
+                buffer.push(ruby.into_value(v));
             } else {
                 return None;
             }
         }
-        Some(RArray::from_slice(&buffer))
+        Some(ruby.ary_new_from_values(&buffer))
     })))
 }
 
 #[magnus::init]
-fn init() -> Result<(), Error> {
-    let module = define_module("Halton")?;
+fn init(ruby: &Ruby) -> Result<(), Error> {
+    let module = ruby.define_module("Halton")?;
     module.define_singleton_method("number", function!(halton::number, 2))?;
     module.define_singleton_method("each_one", method!(each_one, 1))?;
     module.define_singleton_method("each_pair", method!(each_pair, 2))?;
     module.define_singleton_method("each_triple", method!(each_triple, 3))?;
     module.define_singleton_method("each_many", method!(each_many, -1))?;
-    let class = module.define_class("Sequence", Default::default())?;
+    let class = module.define_class("Sequence", ruby.class_object())?;
     class.define_singleton_method("new", function!(Sequence::new, 1))?;
     class.define_method("next", method!(Sequence::next, 0))?;
     class.define_method("skip", method!(Sequence::skip, 1))?;
     class.define_method("remaining", method!(Sequence::remaining, 0))?;
+    class.define_method("take", method!(Sequence::take, 1))?;
     Ok(())
 }

data/lib/halton.rb

@@ -4,7 +4,11 @@ begin
   /(?<ruby_version>\d+\.\d+)/ =~ RUBY_VERSION
   require_relative "halton/#{ruby_version}/halton"
 rescue LoadError
-  require_relative "halton/halton"
+  begin
+    require_relative "halton/halton"
+  rescue LoadError # Cargo Builder in RubyGems < 3.4.6 doesn't install to dir
+    require_relative "halton.so"
+  end
 end
 
 # The Halton module provides methods for generating Halton sequences, a

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: halton
 version: !ruby/object:Gem::Version
-  version: 0.2.1.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Mat Sadler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-13 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rb_sys
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.46
-  type: :runtime
+        version: '1.2'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.46
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: rb_sys
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
 description: A module implementing the fast generation of Halton sequences. The method
   of generation is adapted from "Fast, portable, and reliable algorithm for the calculation
   of Halton number" by Miroslav Kolář and Seamus F. O'Shea.
@@ -59,14 +73,14 @@ email:
 - mat@sourcetagsandcodes.com
 executables: []
 extensions:
-- ext/halton/extconf.rb
+- ext/halton/Cargo.toml
 extra_rdoc_files:
 - README.rdoc
 files:
+- Cargo.lock
+- Cargo.toml
 - README.rdoc
-- ext/halton/Cargo.lock
 - ext/halton/Cargo.toml
-- ext/halton/extconf.rb
 - ext/halton/src/lib.rs
 - lib/halton.rb
 homepage: https://github.com/matsadler/halton-rb
@@ -87,15 +101,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.3.26
 requirements:
-- Rust >= 1.51.0
-rubygems_version: 3.3.26
+- Rust >= 1.61
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: A module for generating Halton sequences

data/ext/halton/extconf.rb

@@ -1,4 +0,0 @@
-require "mkmf"
-require "rb_sys/mkmf"
-
-create_rust_makefile("halton/halton")