whatlang 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5b245173c946709df258efa77b2e253d062ecd79087cde657919f488d3f08b8
-  data.tar.gz: ec4cd29f02a29bfd44c66b31ee8cd5e2aec9b5be6db126897dbf7214ccb7ad73
+  metadata.gz: b63c656fd014ba105b808ee8b7a80b31f6223fb59d988123f60b74e35b30ffa2
+  data.tar.gz: 2317a34d7f831f2c27ddaadb7b9694b546c0ae9013e133e09776c55956819d38
 SHA512:
-  metadata.gz: e13e54ad577c1949673739ab8a02dab3405dd19f7ac3602d47232cf5f746576be8c0d23de36efc02ac1837e8bbaeb41a21fff9a7eecf6170bf0a6b782fbb246f
-  data.tar.gz: 89832e91d3b3be94a019416f95627c5fe8e46981a0066a85a0b3a758bae333a72572dba8a31197ef3665c0ec8fe61a5b601792beb18367c306ad17f07c6ac37c
+  metadata.gz: c2656f9ff575b44e1e763537c290e725d217d9ed0b74cfd713b5c84a4c2b797ae9bec0b614202f8b5e544a012feeeba80e42e669ad4df2b94698e568a0b485a5
+  data.tar.gz: 57c662f065d1fc43f4f3ef6ee9655af9bdc91b245901dfba8b5dd5c8a61a42251d8605d3cd0862029ab3e228544beba334c68e2d747e9da39b893791b1b2ac2a

data/.gitignore

@@ -8,5 +8,8 @@
 /tmp/
 Gemfile.lock
 /lib/whatlang.bundle
-/whatlang.bundle
+/ext/whatlang.bundle
 /ext/target/
+/ext/release/
+/ext/.rustc_info.json
+target/

data/.gitlab-ci.yml

@@ -1,6 +1,5 @@
-default:
-  image: ruby:3.4.7
-
+test:
+  image: ruby:$RUBY_VERSION
   before_script:
     - apt-get update && apt-get install -y clang
     - curl https://sh.rustup.rs -sSf | sh -s -- -y
@@ -8,9 +7,10 @@ default:
     - gem update --system
     - gem install bundler
     - bundle install
-
-test:
   variables:
     RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN: 'true'
   script:
     - source "$HOME/.cargo/env" && rake test
+  parallel:
+    matrix:
+      - RUBY_VERSION: ["3.2", "3.3", "3.4", "4.0"]

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.2.1
+=====
+
+* Switch Rust glue library from [Magnus][] to [Rutie][]
+
 0.2.0
 =====
 

data/Cargo.lock

@@ -0,0 +1,72 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
+[[package]]
+name = "hashbrown"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20870f649af7073d53e38067b2a84312175d56ea15217e1b15bc83506ec50afb"
+
+[[package]]
+name = "libc"
+version = "0.2.190"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce5d3ddc6d3fa000eb1536d85e147bfe31aacaba692ed6a876f95cb7c855be78"
+
+[[package]]
+name = "rutie"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f2bb20b12c4e3f307de8021dbf6f2b7396dbc203c1c9a2beeabd32aa9522e5e"
+dependencies = [
+ "lazy_static",
+ "libc",
+]
+
+[[package]]
+name = "whatlang"
+version = "0.2.1"
+dependencies = [
+ "lazy_static",
+ "rutie",
+ "whatlang 0.18.0",
+]
+
+[[package]]
+name = "whatlang"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5e8f38b596e2a359b755342473520a99421e43658548c79489ee221b728c107"
+dependencies = [
+ "hashbrown",
+]

data/{ext/Cargo.toml → Cargo.toml}

@@ -1,14 +1,14 @@
 [package]
 name = "whatlang"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["Kitaiti Makoto <KitaitiMakoto@gmail.com>"]
 edition = "2024"
 publish = false
 
 [dependencies]
-magnus = "0.8"
+lazy_static = "1.5.1"
+rutie = "0.14"
 whatlang-rs = { package = "whatlang", version = "0.18.0", registry = "crates-io" }
-rb-sys = { version = "*", features = ["stable-api-compiled-fallback"] }
 
 [lib]
 crate-type = ["cdylib"]

data/Rakefile

@@ -1,37 +1,26 @@
 require "rake/clean"
-require "rubygems/ext"
 require "rubygems/tasks"
 require "rake/testtask"
 require "yard"
-require "shellwords"
+require "rutie/rake_task"
+require "kar/dsl"
 
-task default: :test
+TARGET = "target/release/libwhatlang.#{RbConfig::CONFIG['SOEXT']}"
 
-GEMSPEC = Gem::Specification.load("whatlang.gemspec")
-MANIFEST = GEMSPEC.extensions.first
+task default: :test
 
-CARGO_LOCK = "ext/Cargo.lock"
-file CARGO_LOCK => MANIFEST do |t|
-  pkgid = `cargo pkgid --manifest-path=#{t.source.shellescape}`.chomp
-  system "cargo", "update", "--manifest-path", t.source, pkgid, exception: true
-end
+gem_tasks = Gem::Tasks.new
 
-SO_NAME = "#{GEMSPEC.name}.#{RbConfig::CONFIG["DLEXT"]}"
-SO_PATH = File.join("lib", SO_NAME)
-SRC = FileList["ext/src/**/*.rs"]
-file SO_PATH => [CARGO_LOCK] + SRC do
-  results = Rake.verbose == true ? $stdout : []
-  Gem::Ext::CargoBuilder.new.build MANIFEST, ".", results, [], "lib", File.expand_path("ext")
+file TARGET do |t|
+  chdir "ext" do
+    sh "rake"
+  end
 end
-CLEAN.include SO_NAME
-CLOBBER.include SO_PATH
 
-Gem::Tasks.new
-task build: CARGO_LOCK
-CLOBBER.include("pkg/#{GEMSPEC.file_name}")
+Rake::TestTask.new test: TARGET
+Rutie::RakeTask.new
 
-Rake::TestTask.new
-task test: SO_PATH
+task clean: "rutie:clean"
 
 YARD::Rake::YardocTask.new
 desc "Generate Ruby and Rust documentation"

data/ext/Rakefile

@@ -0,0 +1,19 @@
+require "rutie/rake_task"
+
+RUBY_TO_RUTIE = {
+  "3.2" => "0.13",
+  "3.3" => "0.13",
+  "3.4" => "0.13",
+  "4.0" => "0.14"
+}
+
+task default: "rutie:build"
+
+ruby_version = [RbConfig::CONFIG["MAJOR"], RbConfig::CONFIG["MINOR"]].join(".")
+rutie_version = RUBY_TO_RUTIE[ruby_version]
+unless rutie_version
+  abort "Unsupported Ruby version. Available versions are: #{RUBY_TO_RUTIE.keys.join(', ')}"
+end
+sh "cargo", "add", "rutie@#{rutie_version}"
+
+Rutie::RakeTask.new

data/lib/whatlang.rb

@@ -0,0 +1,3 @@
+require "rutie"
+
+Rutie.new(:whatlang).init "Init_whatlang", __dir__

data/src/lib.rs

@@ -0,0 +1,192 @@
+use rutie::{AnyException, AnyObject, Array, Boolean, Class, Exception, Float, Module, NilClass, Object, RString, VM, class, methods, module, rutie_callback, types::Argc, util::parse_arguments, wrappable_struct};
+use whatlang_rs as wl;
+
+module!(Whatlang);
+
+wrappable_struct!(wl::Lang, LangWrapper, LANG_WRAPPER);
+
+class!(Lang);
+
+fn get_lang(rtself: &Lang) -> wl::Lang {
+    *rtself.get_data(&*LANG_WRAPPER)
+}
+
+impl Lang {
+    fn new(lang: wl::Lang) -> AnyObject {
+        Module::from_existing("Whatlang").get_nested_class("Lang").wrap_data(lang, &*LANG_WRAPPER)
+    }
+}
+
+methods!(
+    Lang,
+    rtself,
+
+    fn wl_lang_all() -> Array {
+        let langs = wl::Lang::all();
+        let mut ary = Array::with_capacity(langs.len());
+        for lang in langs {   
+            ary.push(Lang::new(*lang));
+        }
+        ary
+    }
+
+    fn wl_lang_code() -> RString {
+        get_lang(&rtself).code().into()
+    }
+
+    fn wl_lang_name() -> RString {
+        get_lang(&rtself).name().into()
+    }
+
+    fn wl_lang_eng_name() -> RString {
+        get_lang(&rtself).eng_name().into()
+    }
+);
+
+wrappable_struct!(wl::Info, InfoWrapper, INFO_WRAPPER);
+
+class!(Info);
+
+impl Info {
+    fn new(info: wl::Info) -> AnyObject {
+        Module::from_existing("Whatlang").get_nested_class("Info").wrap_data(info, &*INFO_WRAPPER)
+    }
+}
+
+methods!(
+    Info,
+    rtself,
+
+    fn wl_info_lang() -> AnyObject {
+        Lang::new(rtself.get_data(&*INFO_WRAPPER).lang())
+    }
+
+    fn wl_info_script() -> RString {
+        rtself.get_data(&*INFO_WRAPPER).script().name().to_owned().into()
+    }
+
+    fn wl_info_confidence() -> Float {
+        Float::new(rtself.get_data(&*INFO_WRAPPER).confidence())
+    }
+
+    fn wl_info_is_reliable() -> Boolean {
+        Boolean::new(rtself.get_data(&*INFO_WRAPPER).is_reliable())
+    }
+);
+
+rutie_callback! {
+    fn wl_detect(argc: Argc, argv: *const AnyObject, _rtself: AnyObject) -> AnyObject {
+        let arguments = parse_arguments(argc, argv);
+        let args = match VM::scan_args(&arguments, "10:") {
+            Ok(args) => args,
+            Err(error) => VM::raise_message(error.class(), &error.message())
+        };
+
+        let Ok(text) = args.required[0].try_convert_to::<RString>() else {
+            return NilClass::new().into()
+        };
+
+        let keywords = VM::get_kwargs((&args.keywords).into(), &[], &["allowlist", "denylist"], false).map_err(VM::raise_ex).unwrap();
+
+        let info = match (keywords.optional[0].clone(), keywords.optional[1].clone()) {
+            (Some(..), Some(..)) => {
+                VM::raise_message(Class::argument_error(), "Couldn't specify `allowlist' and `denylist' at a time. Choose one.");
+            },
+            (Some(allowlist), None) => detect_with_allowlist(text.to_str(), lang_list(allowlist.try_convert_to::<Array>().map_err(VM::raise_ex).unwrap())),
+            (None, Some(denylist)) => detect_with_denylist(text.to_str(), lang_list(denylist.try_convert_to::<Array>().map_err(VM::raise_ex).unwrap())),
+            (None, None) => detect_without_options(text.to_str())
+        };
+        option_to_nillable(info)
+    }
+}
+
+methods!(
+    Whatlang,
+    _rtself,
+
+    fn wl_detect_without_options(text: RString) -> AnyObject {
+        let text = text.map_err(VM::raise_ex).unwrap();
+        let info = detect_without_options(text.to_str());
+        option_to_nillable(info)
+    }
+
+    fn wl_detect_with_allowlist(text: RString, allowlist: Array) -> AnyObject {
+        let text = text.map_err(VM::raise_ex).unwrap();
+        let allowlist = allowlist.map_err(VM::raise_ex).unwrap();
+        let info = detect_with_allowlist(text.to_str(), lang_list(allowlist));
+        option_to_nillable(info)
+    }
+
+    fn wl_detect_with_denylist(text: RString, denylist: Array) -> AnyObject {
+        let text = text.map_err(VM::raise_ex).unwrap();
+        let denylist = denylist.map_err(VM::raise_ex).unwrap();
+        let info = detect_with_denylist(text.to_str(), lang_list(denylist));
+        option_to_nillable(info)
+    }
+
+    fn wl_detect_lang(text: RString) -> AnyObject {
+        let lang = wl::detect_lang(rstring(text).to_str()).map(Lang::new);
+        option_to_nillable(lang)
+    }
+
+    fn wl_detect_script(text: RString) -> AnyObject {
+        let script = wl::detect_script(rstring(text).to_str())
+            .map(|script| RString::new_utf8(script.name()).into());
+        option_to_nillable(script)
+    }
+);
+
+fn detect_without_options(text: &str) -> Option<AnyObject> {
+    wl::detect(text).map(Info::new)
+}
+
+fn detect_with_allowlist(text: &str, allowlist: Vec<wl::Lang>) -> Option<AnyObject> {
+    wl::Detector::with_allowlist(allowlist)
+        .detect(text)
+        .map(Info::new)
+}
+
+fn detect_with_denylist(text: &str, denylist: Vec<wl::Lang>) -> Option<AnyObject> {
+    wl::Detector::with_denylist(denylist)
+        .detect(text)
+        .map(Info::new)
+}
+
+fn rstring(s: Result<RString, AnyException>) -> RString {
+    s.map_err(VM::raise_ex).unwrap()
+}
+
+fn lang_list(list: Array) -> Vec<wl::Lang> {
+    list.into_iter().filter_map(|s| wl::Lang::from_code(s.as_string().to_str())).collect()
+}
+
+fn option_to_nillable(nillable: Option<AnyObject>) -> AnyObject {
+    nillable.unwrap_or_else(|| NilClass::new().into())
+}
+
+#[allow(non_snake_case)]
+#[unsafe(no_mangle)]
+pub extern "C" fn Init_whatlang() {
+    Module::new("Whatlang").define(|whatlang| {
+        whatlang.def_self("detect", wl_detect);
+        whatlang.def_self("detect_with_allowlist", wl_detect_with_allowlist);
+        whatlang.def_self("detect_without_options", wl_detect_without_options);
+        whatlang.def_self("detect_with_denylist", wl_detect_with_denylist);
+        whatlang.def_self("detect_lang", wl_detect_lang);
+        whatlang.def_self("detect_script", wl_detect_script);
+
+        whatlang.define_nested_class("Lang", None).define(|lang| {
+            lang.def_self("all", wl_lang_all);
+            lang.def("code", wl_lang_code);
+            lang.def("name", wl_lang_name);
+            lang.def("eng_name", wl_lang_eng_name);
+        });
+
+        whatlang.define_nested_class("Info", None).define(|info| {
+            info.def("lang", wl_info_lang);
+            info.def("script", wl_info_script);
+            info.def("confidence", wl_info_confidence);
+            info.def("is_reliable", wl_info_is_reliable);
+        });
+    });
+}

data/test/test_package.rb

@@ -14,18 +14,18 @@ class TestPackage < Test::Unit::TestCase
   end
 
   class TestInstall < self
-    def setup
-      system "rake", "build", exception: true
-    end
-
     def test_install
       gemspec = Gem::Specification.load("whatlang.gemspec")
       Dir.mktmpdir do |dir|
         dir = File.realpath(dir)
-        system "gem", "install", "--install-dir", dir.shellescape, "--no-document", "pkg/#{gemspec.file_name.shellescape}", exception: true
-        assert_installed dir, gemspec.version
+        gemfile = File.join(dir, gemspec.full_name + ".gem")
+        system "gem", "build", "whatlang.gemspec", "--output", gemfile, exception: true
+        install_dir = File.join(dir, "install")
+        FileUtils.mkdir install_dir
+        system "gem", "install", "--install-dir", install_dir, "--no-document", gemfile, exception: true
+        assert_installed install_dir, gemspec.version
 
-        libdir = File.join(dir, "gems", "#{gemspec.name}-#{gemspec.version}", "lib")
+        libdir = File.join(install_dir, "gems", "#{gemspec.name}-#{gemspec.version}", "lib")
         assert_match(/ita/, `ruby -I #{libdir.shellescape} -r whatlang -e 'print Whatlang.detect("Jen la trinkejo fermitis, ni iras tra mallumo kaj pluvo.", allowlist: ["eng", "ita"]).lang.code'`)
       end
     end
@@ -33,7 +33,7 @@ class TestPackage < Test::Unit::TestCase
     private
 
     def assert_installed(dir, version)
-      assert_path_exist File.join(dir, "gems/whatlang-#{version}/lib", "whatlang.#{RbConfig::CONFIG["DLEXT"]}")
+      assert_path_exist File.join(dir, "gems", "whatlang-#{version}", "target", "release", "libwhatlang.#{RbConfig::CONFIG["SOEXT"]}")
     end
   end
 end

data/test/test_whatlang.rb

@@ -43,6 +43,8 @@ class TestWhatlang < Test::Unit::TestCase
   def test_detect_script
     text = "Благодаря Эсперанто вы обрётете друзей по всему миру!"
     assert_equal "Cyrillic", Whatlang.detect_script(text)
+
+    assert_nil Whatlang.detect_script("")
   end
 
   def test_detect_empty_string

data/whatlang.gemspec

@@ -2,7 +2,7 @@ require "json"
 
 Gem::Specification.new do |spec|
   spec.name          = "whatlang"
-  spec.version       = JSON.parse(`cargo metadata --no-deps --format-version=1 --manifest-path=ext/Cargo.toml`)["packages"][0]["version"]
+  spec.version       = JSON.parse(`cargo metadata --no-deps --format-version=1`)["packages"][0]["version"]
   spec.license       = "Ruby"
   spec.authors       = ["Kitaiti Makoto"]
   spec.email         = ["KitaitiMakoto@gmail.com"]
@@ -15,15 +15,19 @@ Gem::Specification.new do |spec|
   spec.metadata["source_code_uri"] = "https://gitlab.com/KitaitiMakoto/whatlang-rb"
   spec.metadata["changelog_uri"] = "https://gitlab.com/KitaitiMakoto/whatlang-rb/-/blob/master/CHANGELOG.md"
 
+  spec.required_ruby_version = ">= 3.2.0"
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0")
   end
-  spec.extensions = ["ext/Cargo.toml"]
+  spec.extensions = ["ext/Rakefile"]
+
+  spec.add_runtime_dependency "rutie"
 
   spec.add_development_dependency "test-unit"
   spec.add_development_dependency "test-unit-notify"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "yard"
   spec.add_development_dependency "rubygems-tasks"
+  spec.add_development_dependency "kar"
   spec.add_development_dependency "terminal-notifier"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whatlang
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Kitaiti Makoto
@@ -9,6 +9,20 @@ bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rutie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +93,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: kar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +126,7 @@ email:
 - KitaitiMakoto@gmail.com
 executables: []
 extensions:
-- ext/Cargo.toml
+- ext/Rakefile
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -107,12 +135,14 @@ files:
 - BSDL
 - CHANGELOG.md
 - COPYING
+- Cargo.lock
+- Cargo.toml
 - Gemfile
 - README.md
 - Rakefile
-- ext/Cargo.lock
-- ext/Cargo.toml
-- ext/src/lib.rs
+- ext/Rakefile
+- lib/whatlang.rb
+- src/lib.rs
 - test/test_package.rb
 - test/test_whatlang.rb
 - whatlang.gemspec
@@ -130,14 +160,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Fast natural language detection library.
 test_files: []

data/ext/Cargo.lock

@@ -1,329 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 4
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "allocator-api2"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
-
-[[package]]
-name = "bindgen"
-version = "0.69.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
-dependencies = [
- "bitflags",
- "cexpr",
- "clang-sys",
- "itertools",
- "lazy_static",
- "lazycell",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash",
- "shlex",
- "syn",
-]
-
-[[package]]
-name = "bitflags"
-version = "2.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
-
-[[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.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
-
-[[package]]
-name = "clang-sys"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
-dependencies = [
- "glob",
- "libc",
- "libloading",
-]
-
-[[package]]
-name = "either"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
-
-[[package]]
-name = "equivalent"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
-
-[[package]]
-name = "foldhash"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
-
-[[package]]
-name = "glob"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
-
-[[package]]
-name = "hashbrown"
-version = "0.15.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
-dependencies = [
- "allocator-api2",
- "equivalent",
- "foldhash",
-]
-
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
-[[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.177"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
-
-[[package]]
-name = "libloading"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
-dependencies = [
- "cfg-if",
- "windows-link",
-]
-
-[[package]]
-name = "magnus"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b36a5b126bbe97eb0d02d07acfeb327036c6319fd816139a49824a83b7f9012"
-dependencies = [
- "magnus-macros",
- "rb-sys",
- "rb-sys-env",
- "seq-macro",
-]
-
-[[package]]
-name = "magnus-macros"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47607461fd8e1513cb4f2076c197d8092d921a1ea75bd08af97398f593751892"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "memchr"
-version = "2.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[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 = "proc-macro2"
-version = "1.0.101"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rb-sys"
-version = "0.9.117"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f900d1ce4629a2ebffaf5de74bd8f9c1188d4c5ed406df02f97e22f77a006f44"
-dependencies = [
- "rb-sys-build",
-]
-
-[[package]]
-name = "rb-sys-build"
-version = "0.9.117"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef1e9c857028f631056bcd6d88cec390c751e343ce2223ddb26d23eb4a151d59"
-dependencies = [
- "bindgen",
- "lazy_static",
- "proc-macro2",
- "quote",
- "regex",
- "shell-words",
- "syn",
-]
-
-[[package]]
-name = "rb-sys-env"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f8d2924cf136a1315e2b4c7460a39f62ef11ee5d522df9b2750fab55b868b6"
-
-[[package]]
-name = "regex"
-version = "1.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "seq-macro"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc"
-
-[[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.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
-[[package]]
-name = "syn"
-version = "2.0.107"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a26dbd934e5451d21ef060c018dae56fc073894c5a7896f882928a76e6d081b"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06"
-
-[[package]]
-name = "whatlang"
-version = "0.2.0"
-dependencies = [
- "magnus",
- "rb-sys",
- "whatlang 0.18.0",
-]
-
-[[package]]
-name = "whatlang"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5e8f38b596e2a359b755342473520a99421e43658548c79489ee221b728c107"
-dependencies = [
- "hashbrown",
-]
-
-[[package]]
-name = "windows-link"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"

data/ext/src/lib.rs

@@ -1,132 +0,0 @@
-use magnus::{
-    Error, RArray, Ruby, Value, function, method,
-    prelude::*,
-    scan_args::{get_kwargs, scan_args},
-};
-use whatlang_rs as wl;
-
-#[magnus::wrap(class = "Whatlang::Lang")]
-struct Lang(wl::Lang);
-
-impl Lang {
-    fn all(ruby: &Ruby) -> RArray {
-        let langs = wl::Lang::all();
-        ruby.ary_from_iter(langs.iter().map(|&lang| Lang(lang)))
-    }
-
-    fn code(&self) -> &str {
-        self.0.code()
-    }
-
-    fn name(&self) -> &str {
-        self.0.name()
-    }
-
-    fn eng_name(&self) -> &str {
-        self.0.eng_name()
-    }
-}
-
-#[magnus::wrap(class = "Whatlang::Info")]
-struct Info(wl::Info);
-
-impl Info {
-    fn lang(&self) -> Lang {
-        Lang(self.0.lang())
-    }
-
-    fn script(&self) -> String {
-        self.0.script().to_string()
-    }
-
-    fn confidence(&self) -> f64 {
-        self.0.confidence()
-    }
-
-    fn is_reliable(&self) -> bool {
-        self.0.is_reliable()
-    }
-}
-
-fn detect(ruby: &Ruby, args: &[Value]) -> Result<Option<Info>, Error> {
-    type LangList = Option<Vec<String>>;
-
-    let args = scan_args::<(Value,), (), (), (), _, ()>(args)?;
-    let kw_args = get_kwargs::<_, (), (LangList, LangList), ()>(
-        args.keywords,
-        &[],
-        &["allowlist", "denylist"],
-    )?;
-    let (allowlist, denylist) = kw_args.optional;
-    if allowlist.is_some() && denylist.is_some() {
-        return Err(Error::new(
-            ruby.exception_arg_error(),
-            "Couldn't specify `allowlist' and `denylist' at a time. Choose one.",
-        ));
-    }
-
-    let text = args.required.0.to_r_string()?.to_string()?;
-    Ok(if let Some(allowlist) = allowlist {
-        detect_with_allowlist(text, allowlist)
-    } else if let Some(denylist) = denylist {
-        detect_with_denylist(text, denylist)
-    } else {
-        detect_without_options(text)
-    })
-}
-
-fn detect_without_options(text: String) -> Option<Info> {
-    wl::detect(&text).map(Info)
-}
-
-fn detect_with_allowlist(text: String, allowlist: Vec<String>) -> Option<Info> {
-    wl::Detector::with_allowlist(lang_list(allowlist))
-        .detect(&text)
-        .map(Info)
-}
-
-fn detect_with_denylist(text: String, denylist: Vec<String>) -> Option<Info> {
-    wl::Detector::with_denylist(lang_list(denylist))
-        .detect(&text)
-        .map(Info)
-}
-
-fn lang_list(list: Vec<String>) -> Vec<wl::Lang> {
-    list.iter().filter_map(wl::Lang::from_code).collect()
-}
-
-fn detect_lang(text: String) -> Option<Lang> {
-    wl::detect_lang(&text).map(Lang)
-}
-
-fn detect_script(text: String) -> Option<String> {
-    wl::detect_script(&text).map(|script| script.to_string())
-}
-
-#[magnus::init]
-fn init(ruby: &Ruby) -> Result<(), Error> {
-    let module = ruby.define_module("Whatlang")?;
-    module.define_singleton_method(
-        "detect_without_options",
-        function!(detect_without_options, 1),
-    )?;
-    module.define_singleton_method("detect", function!(detect, -1))?;
-    module.define_singleton_method("detect_with_allowlist", function!(detect_with_allowlist, 2))?;
-    module.define_singleton_method("detect_with_denylist", function!(detect_with_denylist, 2))?;
-    module.define_singleton_method("detect_lang", function!(detect_lang, 1))?;
-    module.define_singleton_method("detect_script", function!(detect_script, 1))?;
-
-    let lang = module.define_class("Lang", ruby.class_object())?;
-    lang.define_singleton_method("all", function!(Lang::all, 0))?;
-    lang.define_method("code", method!(Lang::code, 0))?;
-    lang.define_method("name", method!(Lang::name, 0))?;
-    lang.define_method("eng_name", method!(Lang::eng_name, 0))?;
-
-    let info = module.define_class("Info", ruby.class_object())?;
-    info.define_method("lang", method!(Info::lang, 0))?;
-    info.define_method("script", method!(Info::script, 0))?;
-    info.define_method("confidence", method!(Info::confidence, 0))?;
-    info.define_method("reliable?", method!(Info::is_reliable, 0))?;
-
-    Ok(())
-}