halton 0.2.1.2 → 0.2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a65d2ef8aa05f9ff2b905cd199b67c457c22f6916be59df4fff97a92af0a48e
-  data.tar.gz: 15b62c7f8c05f1bcc9d206d3f228012fc1839a11095d6cc67cf046996696477c
+  metadata.gz: 8115499e016e8c1c3ef1608ac90caed45b48ba7d34a722788b3ae4f550d35db5
+  data.tar.gz: c2e2f8af26707e3b486036c24b82b15df6421caaa03eb35f0cfdaa383dc5c649
 SHA512:
-  metadata.gz: ca1ad0a5551d63dc6009b11afe17f8d792af1181564794c4a707bd9fdb08311459d73c3ff13dc76a7e067ac72fa510089a4bf8d09a093bf5f761af0d45284f8a
-  data.tar.gz: 11ebf433af39d7047da8c1cf99404bc09eb422ebc0f4e0c532ef0fdda96a7dbf37f89b09e01ca76c258dd03566f74653af7a096ece95d39117820b247bf36e21
+  metadata.gz: 021dbd5d00a5045f9a02c6b3f09560305468c0f360b16dbd3acb0829db8d848457c685864edbb8427fad1a7e7d3852b242d26dfcf33ddb95bc51dc8c1d90f076
+  data.tar.gz: a6ece029b0b98a9f4ac3f8e8c5dc4cf604d9a13d6d2e5d4de3cdf9376925c6a480ec437635f7b52340df09c57f1f767f65f7171c2a5052a137abd7499c42d843

data/ext/halton/Cargo.lock

@@ -4,54 +4,30 @@ version = 3
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.18"
+version = "0.7.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
 dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "bindgen"
-version = "0.59.2"
+version = "0.60.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
+checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6"
 dependencies = [
  "bitflags",
  "cexpr",
  "clang-sys",
- "clap",
- "env_logger",
  "lazy_static",
  "lazycell",
- "log",
  "peeking_take_while",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash",
  "shlex",
- "which",
 ]
 
 [[package]]
@@ -77,90 +53,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clang-sys"
-version = "1.3.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cc00842eed744b858222c4c9faf7243aafc6d33f92f96935263ef4d8a41ce21"
+checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
 dependencies = [
  "glob",
  "libc",
  "libloading",
 ]
 
-[[package]]
-name = "clap"
-version = "2.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags",
- "strsim 0.8.0",
- "textwrap",
- "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "darling"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a340f241d2ceed1deb47ae36c4144b2707ec7dd0b649f894cb39bb595986324"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim 0.10.0",
- "syn",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b"
-dependencies = [
- "darling_core",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "either"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
-
-[[package]]
-name = "env_logger"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "regex",
- "termcolor",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
 [[package]]
 name = "glob"
 version = "0.3.0"
@@ -172,7 +73,6 @@ name = "halton"
 version = "0.1.0"
 dependencies = [
  "halton 0.2.1",
- "lazy_static",
  "magnus",
 ]
 
@@ -182,27 +82,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be629448e3d85a1be12868f190df524655fea8ec3f143e14d803e298f618acae"
 
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -217,46 +96,37 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.119"
+version = "0.2.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4"
+checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
 
 [[package]]
 name = "libloading"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
 dependencies = [
  "cfg-if",
  "winapi",
 ]
 
-[[package]]
-name = "log"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "magnus"
-version = "0.1.0"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1825dcc83398c263845f82fdf847f2599a6d51a4da6e668e5ca8e84309eea8df"
+checksum = "c7d904f55da4e2b0ac7f133257af80580ff4ca17bcca67f51ea06be46aa634ac"
 dependencies = [
- "bindgen",
  "magnus-macros",
+ "rb-sys",
+ "rb-sys-env",
 ]
 
 [[package]]
 name = "magnus-macros"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27968fcabe2ef7e35b8331d71a62882282996f6222c133c0255cf7f33b8d9b48"
+checksum = "acc8ba6908cb0f67a4e75cb48fc81a1f0e6a6dd1501936e0c9e2c7c8f9f18e05"
 dependencies = [
- "darling",
  "proc-macro2",
  "quote",
  "syn",
@@ -264,9 +134,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "minimal-lexical"
@@ -276,13 +146,12 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "nom"
-version = "7.1.0"
+version = "7.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109"
+checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
 dependencies = [
  "memchr",
  "minimal-lexical",
- "version_check",
 ]
 
 [[package]]
@@ -293,27 +162,53 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.36"
+version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
 dependencies = [
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.15"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
 dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "rb-sys"
+version = "0.9.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9f1cfd225389bd9333d93d393d0feeeacd191d97f9b1c881528ac1233c67f0f"
+dependencies = [
+ "rb-sys-build",
+]
+
+[[package]]
+name = "rb-sys-build"
+version = "0.9.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fad39a523a00dc5d4f6dcec077568d985807aa5bd03204a0ddf7c1f36544289c"
+dependencies = [
+ "bindgen",
+ "regex",
+ "shell-words",
+]
+
+[[package]]
+name = "rb-sys-env"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74c38752410925faeb82c400c06ba2fd9ee6aa8f719dd33994c9e53f5242d25f"
+
 [[package]]
 name = "regex"
-version = "1.5.4"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
+checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -322,9 +217,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.25"
+version = "0.6.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
 
 [[package]]
 name = "rustc-hash"
@@ -333,86 +228,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
-name = "shlex"
+name = "shell-words"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
-
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
 
 [[package]]
-name = "strsim"
-version = "0.10.0"
+name = "shlex"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
 
 [[package]]
 name = "syn"
-version = "1.0.86"
+version = "1.0.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
+checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
 dependencies = [
  "proc-macro2",
  "quote",
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
-name = "termcolor"
-version = "1.1.2"
+name = "unicode-ident"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "unicode-width"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
-
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "which"
-version = "4.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a5a7e487e921cf220206864a94a89b6c6905bfc19f1057fa26a4cb360e5c1d2"
-dependencies = [
- "either",
- "lazy_static",
- "libc",
-]
+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
 
 [[package]]
 name = "winapi"
@@ -430,15 +272,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"

data/ext/halton/Cargo.toml

@@ -9,5 +9,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 halton = "0.2.1"
-lazy_static = "1"
-magnus = "0.1.0"
+magnus = "0.4.3"

data/ext/halton/extconf.rb

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

data/ext/halton/src/lib.rs

@@ -1,6 +1,12 @@
 use std::cell::RefCell;
 
-use magnus::{define_module, function, method, prelude::*, Error};
+use magnus::{
+    block::{block_given, Yield, YieldSplat, YieldValues},
+    define_module, exception, function, method,
+    scan_args::check_arity,
+    prelude::*,
+    Error, RArray, Value,
+};
 
 #[magnus::wrap(class = "Halton::Sequence", free_immediatly, size)]
 struct Sequence(RefCell<halton::Sequence>);
@@ -13,7 +19,10 @@ impl Sequence {
     fn next(&self) -> Result<f64, Error> {
         match self.0.try_borrow_mut().unwrap().next() {
             Some(f) => Ok(f),
-            None => Err(Error::stop_iteration("iteration reached an end")),
+            None => Err(Error::new(
+                exception::stop_iteration(),
+                "iteration reached an end",
+            )),
         }
     }
 
@@ -26,14 +35,88 @@ impl Sequence {
     }
 }
 
+fn each_one(rb_self: Value, base: u8) -> Yield<impl Iterator<Item = f64>> {
+    if !block_given() {
+        return Yield::Enumerator(rb_self.enumeratorize("each_one", (base,)));
+    }
+    Yield::Iter(halton::Sequence::new(base))
+}
+
+fn each_pair(
+    rb_self: Value,
+    x_base: u8,
+    y_base: u8,
+) -> YieldValues<impl Iterator<Item = (f64, f64)>> {
+    if !block_given() {
+        return YieldValues::Enumerator(rb_self.enumeratorize("each_pair", (x_base, y_base)));
+    }
+    let seq_x = halton::Sequence::new(x_base);
+    let seq_y = halton::Sequence::new(y_base);
+    YieldValues::Iter(seq_x.zip(seq_y))
+}
+
+fn each_triple(
+    rb_self: Value,
+    x_base: u8,
+    y_base: u8,
+    z_base: u8,
+) -> YieldValues<impl Iterator<Item = (f64, f64, f64)>> {
+    if !block_given() {
+        return YieldValues::Enumerator(
+            rb_self.enumeratorize("each_triple", (x_base, y_base, z_base)),
+        );
+    }
+    let seq_x = halton::Sequence::new(x_base);
+    let seq_y = halton::Sequence::new(y_base);
+    let seq_z = halton::Sequence::new(z_base);
+    YieldValues::Iter(seq_x.zip(seq_y).zip(seq_z).map(|((x, y), z)| (x, y, z)))
+}
+
+fn each_many(
+    rb_self: Value,
+    args: &[Value],
+) -> Result<YieldSplat<impl Iterator<Item = RArray>>, Error> {
+    check_arity(args.len(), 1..)?;
+    let bases = args
+        .iter()
+        .map(|v| v.try_convert())
+        .collect::<Result<Vec<u8>, _>>()?;
+
+    if !block_given() {
+        return Ok(YieldSplat::Enumerator(
+            rb_self.enumeratorize("each_many", args),
+        ));
+    }
+    let mut seqs = bases
+        .into_iter()
+        .map(halton::Sequence::new)
+        .collect::<Vec<_>>();
+    let mut buffer = Vec::<Value>::with_capacity(seqs.len());
+    Ok(YieldSplat::Iter(std::iter::from_fn(move || {
+        buffer.clear();
+        for seq in &mut seqs {
+            if let Some(v) = seq.next() {
+                buffer.push(v.into());
+            } else {
+                return None;
+            }
+        }
+        Some(RArray::from_slice(&buffer))
+    })))
+}
+
 #[magnus::init]
 fn init() -> Result<(), Error> {
     let module = define_module("Halton")?;
-    module.define_singleton_method("number", function!(halton::number, 2));
+    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())?;
-    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_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))?;
     Ok(())
 }

data/lib/halton.rb

@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "halton/halton"
+begin
+  /(?<ruby_version>\d+\.\d+)/ =~ RUBY_VERSION
+  require_relative "halton/#{ruby_version}/halton"
+rescue LoadError
+  require_relative "halton/halton"
+end
 
 # The Halton module provides methods for generating Halton sequences, a
 # deterministic low discrepancy sequence that appears to be random. The uniform
@@ -68,33 +73,17 @@ module Halton
   #
   # The numbers yielded will be in the range > 0 and < 1.
   #
-  def self.each(base, *bases)
-    return to_enum(__method__, base, *bases) unless block_given?
-
-    if bases.empty?
-      seq = Sequence.new(base)
-      loop {yield seq.next}
-      return nil
-    end
-
-    if bases.length == 1
-      x = Sequence.new(base)
-      y = Sequence.new(bases.first)
-      loop {yield x.next, y.next}
-      return nil
+  def self.each(base, *bases, &block)
+    case bases.length
+    when 0
+      each_one(base, &block)
+    when 1
+      each_pair(base, bases.first, &block)
+    when 2
+      each_triple(base, bases.first, bases.last, &block)
+    else
+      each_many(*bases.unshift(base), &block)
     end
-
-    if bases.length == 2
-      x = Sequence.new(base)
-      y = Sequence.new(bases.first)
-      z = Sequence.new(bases.last)
-      loop {yield x.next, y.next, z.next}
-      return nil
-    end
-
-    seqs = bases.unshift(base).map {|b| Sequence.new(b)}
-    loop {yield(*seqs.map(&:next))}
-    nil
   end
 
   # Halton::Sequence implements the fast generation of Halton sequences.

metadata

@@ -1,29 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: halton
 version: !ruby/object:Gem::Version
-  version: 0.2.1.2
+  version: 0.2.1.4
 platform: ruby
 authors:
 - Mat Sadler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-26 00:00:00.000000000 Z
+date: 2022-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rb_sys
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 0.9.46
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.46
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 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.
@@ -31,14 +59,14 @@ email:
 - mat@sourcetagsandcodes.com
 executables: []
 extensions:
-- ext/halton/Rakefile
+- ext/halton/extconf.rb
 extra_rdoc_files:
 - README.rdoc
 files:
 - README.rdoc
 - ext/halton/Cargo.lock
 - ext/halton/Cargo.toml
-- ext/halton/Rakefile
+- ext/halton/extconf.rb
 - ext/halton/src/lib.rs
 - lib/halton.rb
 homepage: https://github.com/matsadler/halton-rb
@@ -67,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Rust >= 1.51.0
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: A module for generating Halton sequences

data/ext/halton/Rakefile

@@ -1,133 +0,0 @@
-# frozen_string_literal: true
-
-require "shellwords"
-
-class RakeCargoHelper
-  attr_reader :gemname
-
-  def initialize(gemname=File.basename(__dir__))
-    @gemname = gemname
-  end
-
-  def self.command?(name)
-    exts = ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [""]
-    ENV["PATH"].split(File::PATH_SEPARATOR).any? do |path|
-      exts.any? do |ext|
-        exe = File.join(path, "#{name}#{ext}")
-        File.executable?(exe) && !File.directory?(exe)
-      end
-    end
-  end
-
-  def self.rust_toolchain
-    str = `rustc --version --verbose`
-    info = str.lines.map {|l| l.chomp.split(/:\s+/, 2)}.drop(1).to_h
-    info["host"]
-  end
-
-  def self.cargo_target_dir
-    return @cargo_target_dir if defined? @cargo_target_dir
-
-    str = `cargo metadata --format-version 1 --offline --no-deps --quiet`
-    begin
-      require "json"
-      dir = JSON.parse(str)["target_directory"]
-    rescue LoadError # json is usually part of the stdlib, but just in case
-      /"target_directory"\s*:\s*"(?<dir>[^"]*)"/ =~ str
-    end
-    @cargo_target_dir = dir || "target"
-  end
-
-  def self.dld_flags
-    map = {"-L" => "-L native=", "-l" => "-l", "-F" => "-l framework="}
-    map.default_proc = proc {|_, key| "-C link_arg=#{key}"}
-    Shellwords.split(RbConfig::CONFIG["DLDFLAGS"]).flat_map do |arg|
-      k, v = arg.split(/(?<=..)/, 2)
-      case k
-      when "-L"
-        [k, "native=#{v}"]
-      when "-l"
-        [k, v]
-      when "-F"
-        ["-l", "framework=#{v}"]
-      else
-        ["-C", "link_arg=#{k}#{v}"]
-      end
-    end
-  end
-
-  def install_dir
-    File.expand_path(File.join("..", "..", "lib", gemname), __dir__)
-  end
-
-  def rust_name
-    prefix = "lib" unless Gem.win_platform?
-    suffix = if RbConfig::CONFIG["target_os"] =~ /darwin/i
-      ".dylib"
-    elsif Gem.win_platform?
-      ".dll"
-    else
-      ".so"
-    end
-    "#{prefix}#{gemname}#{suffix}"
-  end
-
-  def ruby_name
-    "#{gemname}.#{RbConfig::CONFIG["DLEXT"]}"
-  end
-
-end
-
-task default: [:install, :clean]
-
-desc "set dev mode for subsequent task, run like `rake dev install`"
-task :dev do
-  @dev = true
-end
-
-desc "build gem native extension and copy to lib"
-task install: [:cd, :build] do
-  helper = RakeCargoHelper.new
-  profile_dir = @dev ? "debug" : "release"
-  source = File.join(RakeCargoHelper.cargo_target_dir, profile_dir, helper.rust_name)
-  dest = File.join(helper.install_dir, helper.ruby_name)
-  mkdir_p(helper.install_dir)
-  rm(dest) if File.exist?(dest)
-  cp(source, dest)
-end
-
-desc "build gem native extension"
-task build: [:cargo, :cd] do
-  sh "cargo", "rustc", *(["--locked", "--release"] unless @dev), "--", *RakeCargoHelper.dld_flags
-end
-
-desc "clean up release build artifacts"
-task clean: [:cargo, :cd] do
-  sh "cargo clean --release"
-end
-
-desc "clean up build artifacts"
-task clobber: [:cargo, :cd] do
-  sh "cargo clean"
-end
-
-desc "check for cargo"
-task :cargo do
-  raise <<-MSG unless RakeCargoHelper.command?("cargo")
-
-    This gem requires a Rust compiler and the `cargo' build tool to build the
-    gem's native extension. See https://www.rust-lang.org/tools/install for
-    how to install Rust. `cargo' is usually part of the Rust installation.
-  MSG
-
-  raise <<-MSG if Gem.win_platform? && RakeCargoHelper.rust_toolchain !~ /gnu/
-
-    Found Rust toolchain `#{RakeCargoHelper.rust_toolchain}' but the gem native
-    extension requires the gnu toolchain on Windows.
-  MSG
-end
-
-# ensure task is running in the right dir
-task :cd do
-  cd(__dir__) unless __dir__ == pwd
-end