whatlang 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f348df5e7f1c431fce809e42a475bde67a8af6a25e4a79cd1e1e1e4537c98c2
-  data.tar.gz: 50f7297d38590e621eae72144cf2776f414a18fceb1496ca0c71b059eecdf49a
+  metadata.gz: 3fe408a4eb64c2503c40b8ab8aecdada6911921fe21f70b280666ac1a8e6caef
+  data.tar.gz: 97543a0ee08c9c4dbaedf432f13fae42e717277e175330b5a750dedac0a3eddb
 SHA512:
-  metadata.gz: 8c3bd3c90a4736c8c2f2291decdaded53e759ef9990031c21d64cf2ddc18cb925567aa9646122e88d798f71fac34f0af5a4d66d4c3fe86cbafc16f2c61471ab6
-  data.tar.gz: ebef27d4bbf696ccd8499efcc3125ca8077c1e6fba22b1506bb19b44528ba2a569967a122efb7c6363e533df6e26120c7b3a8fd85a80bae737a4105f14ddc8a1
+  metadata.gz: ed1d876556395802faad05ef54858d0ebfb2c8d4050a68fa2da806c9cfc870bde75d3716bab9e3ef30734913308c719b4dd5f87410cc84fbb2e6aca3a9f4f6d2
+  data.tar.gz: 3944216a4447a75408e0bc1ebb2e9d865be9ddc8739091cdf14cd4ac9a8e44942f89bedc6d8a54b254c5432813ab0dc937d2c78dc755a7a3fb889cdd5af39a24

data/.gitlab-ci.yml

@@ -0,0 +1,16 @@
+default:
+  image: ruby:3.2.2
+
+  before_script:
+    - apt-get update && apt-get install -y clang
+    - gem update --system '3.4.22'
+    - gem install bundler -v 2.4.22
+    - gem install tomlrb
+    - bundle install
+    - curl https://sh.rustup.rs -sSf | sh -s -- -y
+
+test:
+  variables:
+    RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN: 'true'
+  script:
+    - source "$HOME/.cargo/env" && bundle exec rake test

data/CHANGELOG.md

@@ -1,5 +1,16 @@
+0.1.7
+=====
+
+* Stick Rust version to 1.77.2. See https://github.com/danielpclark/rutie/issues/185 for details
+
+0.1.6
+=====
+
+* Check argument and return value. Thanks [@bendangelo][] for filing a issue!
+* Update Whatlang version to 0.16.4, which includes bug fix on Czech
+
 0.1.5
-====
+=====
 
 * Update Whatlang version to 0.16.0, which includes addition of Armenian
 
@@ -28,3 +39,5 @@
 =====
 
 * Initial release
+
+[@bendangelo]: https://gitlab.com/bendangelo

data/Cargo.lock

@@ -4,86 +4,112 @@ version = 3
 
 [[package]]
 name = "ahash"
-version = "0.7.6"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
- "getrandom",
+ "cfg-if",
  "once_cell",
  "version_check",
+ "zerocopy",
 ]
 
 [[package]]
-name = "cfg-if"
-version = "1.0.0"
+name = "allocator-api2"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
 [[package]]
-name = "getrandom"
-version = "0.2.6"
+name = "cfg-if"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "hashbrown"
-version = "0.12.1"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
  "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.125"
+version = "0.2.158"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
 
 [[package]]
 name = "once_cell"
-version = "1.10.0"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
 
 [[package]]
 name = "rutie"
-version = "0.8.4"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d97db4cbb9739b48364c38cc9a6ebabdc07b42bd87b60ab448e1f29eaebb2ac"
+checksum = "e5e8e4f6480c30609e3480adfab87b8d4792525225a1caf98b371fbc9a7b698a"
 dependencies = [
  "lazy_static",
  "libc",
 ]
 
 [[package]]
-name = "version_check"
-version = "0.9.4"
+name = "syn"
+version = "2.0.76"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
-name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
+name = "version_check"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "whatlang"
-version = "0.16.0"
+version = "0.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2989d7e9d3cb96a76438e879144030b1be0931b944fbfed65e89e2ae536cd3b9"
+checksum = "471d1c1645d361eb782a1650b1786a8fb58dd625e681a04c09f5ff7c8764a7b0"
 dependencies = [
  "hashbrown",
  "once_cell",
@@ -91,8 +117,28 @@ dependencies = [
 
 [[package]]
 name = "whatlang-rb"
-version = "0.1.5"
+version = "0.1.6"
 dependencies = [
  "rutie",
  "whatlang",
 ]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]

data/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 name = "whatlang-rb"
-version = "0.1.5"
+version = "0.1.7"
 authors = ["Kitaiti Makoto <KitaitiMakoto@gmail.com>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rutie = { version = "0.8.4", features = ["no-link"] }
-whatlang = "0.16.0"
+rutie = { version = "0.9.0", features = ["no-link"] }
+whatlang = "0.16.4"
 
 [lib]
 crate-type = ["cdylib"]

data/README.md

@@ -8,7 +8,7 @@ Features
 
 Features are derived from original [Whatlang][] library, which includes:
 
-* Supports [87 languages](https://github.com/greyblake/whatlang-rs/blob/master/SUPPORTED_LANGUAGES.md)
+* Supports [69 languages](https://github.com/greyblake/whatlang-rs/blob/master/SUPPORTED_LANGUAGES.md)
 * Lightweight, fast and simple
 * Recognizes not only a language, but also a script (Latin, Cyrillic, etc)
 * Provides reliability information

data/Rakefile

@@ -5,12 +5,6 @@ require "rubygems/tasks"
 require "rake/testtask"
 require "yard"
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
-end
-
 task default: :test
 
 Gem::Tasks.new
@@ -23,8 +17,9 @@ RUST_SRC.each do |path|
   file path
 end
 
-file RUST_TARGET => RUST_SRC do
+file RUST_TARGET => RUST_SRC + ["Cargo.toml", "Cargo.lock"] do
   sh "cargo build --release"
 end
 CLEAN.include RUST_TARGET
-task test: RUST_TARGET
+
+Rake::TestTask.new test: RUST_TARGET

data/lib/whatlang.rb

@@ -9,6 +9,8 @@ module Whatlang
         raise ArgumentError, "Couldn't specify `allowlist' and `denylist' at a time. Choose one."
       end
 
+      text = text.to_s
+
       case
       when allowlist
         detect_with_allowlist(text, allowlist)
@@ -44,4 +46,12 @@ module Whatlang
       @eng_name = eng_name
     end
   end
+
+  private
+
+  # Class returnned by detect when no lang detected.
+  # 
+  # Needed because Rutie cause segmentation fault when it returns NilClass.
+  # Should be removed after https://github.com/danielpclark/rutie/pull/180 is solved.
+  NO_INFO = nil
 end

data/rust-toolchain.toml

@@ -0,0 +1,3 @@
+[toolchain]
+channel = "1.77.2"
+profile = "minimal"

data/src/lib.rs

@@ -1,5 +1,5 @@
 use rutie::{
-    methods, module, AnyException, AnyObject, Array, Boolean, Float, Module, NilClass, Object,
+    methods, module, AnyException, AnyObject, Array, Boolean, Float, Module, Object,
     RString, VM,
 };
 use whatlang::{detect, detect_lang, detect_script, Detector, Info, Lang};
@@ -11,25 +11,25 @@ methods!(
     _rtself,
 
     fn wl_detect_without_options(text: RString) -> AnyObject {
-        detect(rstring(text).to_str()).map_or(NilClass::new().into(), rinfo)
+        detect(rstring(text).to_str()).map_or(no_info(), rinfo)
     }
 
     fn wl_detect_with_allowlist(text: RString, list: Array) -> AnyObject {
         let detector = Detector::with_allowlist(rarray_to_lang_list(list));
-        detector.detect(rstring(text).to_str()).map_or(NilClass::new().into(), rinfo)
+        detector.detect(rstring(text).to_str()).map_or(no_info(), rinfo)
     }
 
     fn wl_detect_with_denylist(text: RString, list: Array) -> AnyObject {
         let detector = Detector::with_denylist(rarray_to_lang_list(list));
-        detector.detect(rstring(text).to_str()).map_or(NilClass::new().into(), rinfo)
+        detector.detect(rstring(text).to_str()).map_or(no_info(), rinfo)
     }
 
     fn wl_detect_lang(text: RString) -> AnyObject {
-        detect_lang(rstring(text).to_str()).map_or(NilClass::new().into(), rlang)
+        detect_lang(rstring(text).to_str()).map_or(no_info(), rlang)
     }
 
     fn wl_detect_script(text: RString) -> AnyObject {
-        detect_script(rstring(text).to_str()).map_or(NilClass::new().into(), |script| {
+        detect_script(rstring(text).to_str()).map_or(no_info(), |script| {
             RString::new_utf8(script.name()).into()
         })
     }
@@ -75,6 +75,13 @@ fn rlang(lang: Lang) -> AnyObject {
         ])
 }
 
+// Needed because Rutie cause segmentation fault when it returns NilClass.
+// Should be removed after https://github.com/danielpclark/rutie/pull/180 is solved.
+fn no_info() -> AnyObject {
+    Module::from_existing("Whatlang")
+        .const_get("NO_INFO")
+}
+
 #[allow(non_snake_case)]
 #[no_mangle]
 pub extern "C" fn Init_whatlang() {

data/test/{whatlang_test.rb → test_whatlang.rb}

@@ -2,7 +2,7 @@
 
 require_relative "helper"
 
-class WhatlangTest < Test::Unit::TestCase
+class TestWhatlang < Test::Unit::TestCase
   def test_detect
     text = "Ĉu vi ne volas eklerni Esperanton? Bonvolu!"
     list = ["eng", "ita"]
@@ -43,4 +43,22 @@ class WhatlangTest < Test::Unit::TestCase
     text = "Благодаря Эсперанто вы обрётете друзей по всему миру!"
     assert_equal "Cyrillic", Whatlang.detect_script(text)
   end
+
+  def test_detect_empty_string
+    assert_nil Whatlang.detect("")
+  end
+
+  def test_detect_nil
+    assert_nil Whatlang.detect(nil)
+  end
+
+  def test_inspect
+    assert_nothing_raised do
+      Whatlang.detect("こんにちは").inspect
+    end
+  end
+
+  def test_numeric
+    assert_nil Whatlang.detect(1234)
+  end
 end

data/whatlang.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "yard"
   spec.add_development_dependency "rubygems-tasks"
+  spec.add_runtime_dependency "racc"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whatlang
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Kitaiti Makoto
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-10 00:00:00.000000000 Z
+date: 2024-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rutie
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: racc
+  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'
 description: Ruby bindings for Whatlang, a natural language detection for Rust.
 email:
 - KitaitiMakoto@gmail.com
@@ -103,6 +117,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".yardopts"
 - BSDL
 - CHANGELOG.md
@@ -114,9 +129,10 @@ files:
 - Rakefile
 - ext/Rakefile
 - lib/whatlang.rb
+- rust-toolchain.toml
 - src/lib.rs
 - test/helper.rb
-- test/whatlang_test.rb
+- test/test_whatlang.rb
 - whatlang.gemspec
 homepage: https://gitlab.com/KitaitiMakoto/whatlang-rb
 licenses:
@@ -125,7 +141,7 @@ metadata:
   homepage_uri: https://gitlab.com/KitaitiMakoto/whatlang-rb
   source_code_uri: https://gitlab.com/KitaitiMakoto/whatlang-rb
   changelog_uri: https://gitlab.com/KitaitiMakoto/whatlang-rb/-/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -140,8 +156,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.5.18
+signing_key:
 specification_version: 4
 summary: Fast natural language detection library.
 test_files: []