tzf 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48df16af5b451c34d6846702e7d9b1be6c611265373c6a8d029acc91a3c408df
-  data.tar.gz: 5fc86e8dc9ca12cd85b9012435be01d4c2b4219570d5bf81951bc0136d204749
+  metadata.gz: c80b6ca046967ff228dd5cb4b7cc1e5496a8dc5aa5f846c1b379aa1e7242ffb7
+  data.tar.gz: 6fa7cb0747cad4a8e9c1ad63f72118ff800aab3273bf7de16b63f55195df8fee
 SHA512:
-  metadata.gz: e11348024a150255d2f28e7d364bd1bbadc32c44b8207350f614a58217ea6f046ecb242266d5931563bc554011117ff4f5b9174f43ac527689abe0daef9694de
-  data.tar.gz: f1b14261e4fe77be1d3a2100d9f7ebfd996394577534f88b2a2759736abf4b417fd4b7567426edda46675a161ce9df43e1b6744c41a3d755ae31784940953e8c
+  metadata.gz: 6f2a1c7e289115079db4eb51d8b642f1310687508b21f55b673cfe539fb399845283fec1b7bd0cac9711ac3f1c48739ccecd9ee58597617c9bd7810298f213ce
+  data.tar.gz: 5a29a4726445df194ddd768152a0ae8b5e8e633ee23bb692907a76c16703bec6073823e250dd2c78c403a8d3af04ee2154bd406bec3a3b1303780dcd21d1002e

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.2.0] - 2023-02-22
+
+- Migrate to [magnus](https://github.com/matsadler/magnus)
+
 ## [0.1.0] - 2023-02-21
 
 - Initial release

data/Cargo.lock

@@ -29,6 +29,15 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "aho-corasick"
+version = "0.7.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "anyhow"
 version = "1.0.69"
@@ -62,6 +71,25 @@ dependencies = [
  "rustc-demangle",
 ]
 
+[[package]]
+name = "bindgen"
+version = "0.60.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6"
+dependencies = [
+ "bitflags",
+ "cexpr",
+ "clang-sys",
+ "lazy_static",
+ "lazycell",
+ "peeking_take_while",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -86,6 +114,15 @@ version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
 
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -104,6 +141,17 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "clang-sys"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
 [[package]]
 name = "clap"
 version = "4.1.6"
@@ -248,6 +296,12 @@ version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
 
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -346,12 +400,28 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
 [[package]]
 name = "libc"
 version = "0.2.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
 
+[[package]]
+name = "libloading"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+dependencies = [
+ "cfg-if",
+ "winapi",
+]
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.1.4"
@@ -377,6 +447,28 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "magnus"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc87660cd7daa49fddbfd524c836de54d5c927d520cd163f43700c5087c57d6c"
+dependencies = [
+ "magnus-macros",
+ "rb-sys",
+ "rb-sys-env",
+]
+
+[[package]]
+name = "magnus-macros"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "206cb23bfeea05180c97522ef6a3e52a4eb17b0ed2f30ee3ca9c4f994d2378ae"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "memchr"
 version = "2.5.0"
@@ -392,6 +484,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
 [[package]]
 name = "miniz_oxide"
 version = "0.6.2"
@@ -418,6 +516,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
 [[package]]
 name = "num-format"
 version = "0.4.4"
@@ -481,6 +589,12 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "peeking_take_while"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+
 [[package]]
 name = "petgraph"
 version = "0.6.3"
@@ -664,6 +778,35 @@ dependencies = [
  "getrandom",
 ]
 
+[[package]]
+name = "rb-sys"
+version = "0.9.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8fe617bad8e88fd7e5d6f432e35f09e5f94144dfb8e8ee4adde82fb920dc59b"
+dependencies = [
+ "rb-sys-build",
+]
+
+[[package]]
+name = "rb-sys-build"
+version = "0.9.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "007e63597f91c711cbb299e60fecbdb6f5ad4a066d6a20c81943893f1584c895"
+dependencies = [
+ "bindgen",
+ "lazy_static",
+ "quote",
+ "regex",
+ "shell-words",
+ "syn",
+]
+
+[[package]]
+name = "rb-sys-env"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a35802679f07360454b418a5d1735c89716bde01d35b1560fc953c1415a0b3bb"
+
 [[package]]
 name = "redox_syscall"
 version = "0.2.16"
@@ -679,6 +822,8 @@ version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
 dependencies = [
+ "aho-corasick",
+ "memchr",
  "regex-syntax",
 ]
 
@@ -712,6 +857,12 @@ version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
 
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
 [[package]]
 name = "rustix"
 version = "0.36.8"
@@ -769,6 +920,18 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "shell-words"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
+
+[[package]]
+name = "shlex"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
+
 [[package]]
 name = "smallvec"
 version = "1.10.0"
@@ -875,6 +1038,7 @@ name = "tzf"
 version = "0.1.0"
 dependencies = [
  "lazy_static",
+ "magnus",
  "tzf-rs",
 ]
 

data/Cargo.toml

@@ -1,13 +1,7 @@
-[package]
-name = "tzf"
-version = "0.1.0"
-edition = "2021"
+# This Cargo.toml is here to let externals tools (IDEs, etc.) know that this is
+# a Rust project. Your extensions dependencies should be added to the Cargo.toml
+# in the ext/ directory.
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies]
-lazy_static = "1.4.0"
-tzf-rs = "0.3.0"
+[workspace]
+members = ["./ext/tzf"]
+resolver = "2"

data/Gemfile

@@ -6,6 +6,8 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 13.0"
+gem "rake-compiler"
+gem "rb_sys"
 
 gem "rspec", "~> 3.0"
 

data/Gemfile.lock

@@ -1,21 +1,22 @@
 PATH
   remote: .
   specs:
-    tzf (0.1.0)
-      ffi (~> 1.0)
+    tzf (0.2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
     diff-lcs (1.5.0)
-    ffi (1.15.5)
     json (2.6.3)
     parallel (1.22.1)
     parser (3.2.0.0)
       ast (~> 2.4.1)
     rainbow (3.1.1)
     rake (13.0.6)
+    rake-compiler (1.2.1)
+      rake
+    rb_sys (0.9.65)
     regexp_parser (2.6.1)
     rexml (3.2.5)
     rspec (3.12.0)
@@ -58,6 +59,8 @@ PLATFORMS
 
 DEPENDENCIES
   rake (~> 13.0)
+  rake-compiler
+  rb_sys
   rspec (~> 3.0)
   rubocop (~> 1.21)
   rubocop-rake (~> 0.6)

data/README.md

@@ -1,6 +1,10 @@
 # tzf-rb
 
-Time zone lookup using [tzf-rs](https://github.com/ringsaturn/tzf-rs).
+[![Gem Version](https://badge.fury.io/rb/tzf.svg)](https://badge.fury.io/rb/tzf)
+
+Ruby time zone lookup for coordinates using the [tzf-rs](https://github.com/ringsaturn/tzf-rs) Rust library.
+
+Data is sourced from [Timezone Boundary Builder](https://github.com/evansiroky/timezone-boundary-builder).
 
 ## Installation
 

data/Rakefile

@@ -9,16 +9,13 @@ require "rubocop/rake_task"
 
 RuboCop::RakeTask.new
 
-desc "Build rust dependencies"
-task :rust_build do
-  `cargo rustc --release`
-  `cp ./target/release/libtzf.so ./lib/tzf/`
-end
+require "rake/extensiontask"
+
+desc "Build extension"
+task build: :compile
 
-desc "Clean rust dependencies"
-task :rust_clean do
-  `cargo clean`
-  `rm -f ./lib/tzf/libtzf.so`
+Rake::ExtensionTask.new("tzf") do |ext|
+  ext.lib_dir = "lib/tzf"
 end
 
-task default: %i[rust_build spec rubocop]
+task default: %i[compile spec rubocop]