tzf 0.1.0 → 0.2.1

data/ext/tzf/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "tzf"
+version = "0.1.0"
+edition = "2021"
+authors = ["Kevin McCormack <kevin@mccormack.tech>"]
+license = "MIT"
+publish = false
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+lazy_static = "1.4.0"
+magnus = { version = "0.4" }
+tzf-rs = "0.3.0"

data/ext/tzf/extconf.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+require "mkmf"
+require "rb_sys/mkmf"
+
+create_rust_makefile("tzf/tzf")

data/ext/tzf/src/lib.rs

@@ -0,0 +1,25 @@
+use lazy_static::lazy_static;
+use magnus::{define_module, function, prelude::*, Error};
+use magnus::{RString};
+
+use tzf_rs::DefaultFinder;
+
+lazy_static! {
+  static ref FINDER: DefaultFinder = DefaultFinder::new();
+}
+
+#[no_mangle]
+fn get_tz_name(lat: f64, lng: f64) -> RString {
+  let tz_name = RString::new(FINDER.get_tz_name(lng, lat));
+
+  return tz_name;
+}
+
+#[magnus::init]
+fn init() -> Result<(), Error> {
+    let module = define_module("TZF")?;
+
+    module.define_singleton_method("tz_name", function!(get_tz_name, 2))?;
+
+    Ok(())
+}

data/lib/tzf/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TZF
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

data/lib/tzf.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
 require_relative "tzf/version"
-require_relative "tzf/ffi_ext"
+require_relative "tzf/tzf"
 
 ##
-# Top level.
+# Top level module.
+#
+# Methods defined in ext/tzf/src/lib.rs
+#
+# Ex TZF.tz_name(latitude, longitude) => String
 #
 module TZF
   class Error < StandardError; end
-
-  def self.tz_name(lat, lng)
-    RS.get_tz_name(lat, lng)
-  end
 end

data/sig/{tzf_rs_rb.rbs → tzf.rbs}

@@ -1,4 +1,6 @@
-module tzf
+module TZF
   VERSION: String
   # See the writing guide of rbs: https://github.com/ruby/rbs#guides
+
+  def self.tz_name: (Float, Float) -> String
 end

data/tzf.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage = "https://github.com/HarlemSquirrel/tzf-rb"
   spec.license = "MIT"
   spec.required_ruby_version = ">= 3.0.0"
+  spec.required_rubygems_version = ">= 3.3.11"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/HarlemSquirrel/tzf-rb"
@@ -28,11 +29,7 @@ Gem::Specification.new do |spec|
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.extensions = ["ext/tzf/extconf.rb"]
 
-  # Uncomment to register a new dependency of your gem
-  spec.add_dependency "ffi", "~> 1.0"
-
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
   spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,34 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: tzf
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Kevin McCormack
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-21 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: ffi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+date: 2023-02-22 00:00:00.000000000 Z
+dependencies: []
 description: Ruby time zone lookup interface using tzf-rs.
 email:
 - kevin@mccormack.tech
 executables: []
-extensions: []
+extensions:
+- ext/tzf/extconf.rb
 extra_rdoc_files: []
 files:
 - ".rspec"
@@ -42,11 +29,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- ext/tzf/Cargo.lock
+- ext/tzf/Cargo.toml
+- ext/tzf/extconf.rb
+- ext/tzf/src/lib.rs
 - lib/tzf.rb
-- lib/tzf/ffi_ext.rb
-- lib/tzf/libtzf.so
 - lib/tzf/version.rb
-- sig/tzf_rs_rb.rbs
+- sig/tzf.rbs
 - src/lib.rs
 - tzf.gemspec
 homepage: https://github.com/HarlemSquirrel/tzf-rb
@@ -70,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.3.11
 requirements: []
 rubygems_version: 3.3.26
 signing_key: 

data/lib/tzf/ffi_ext.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require "ffi"
-
-module TZF
-  ##
-  # Interface to tsf-rs Rust library.
-  #
-  module RS
-    extend FFI::Library
-
-    ffi_lib File.expand_path("libtzf.so", __dir__)
-    attach_function :get_tz_name, %i[double double], :string
-  end
-end