whatlang 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6969f45a6e8d99fde1ee19edbcaf5ac672ba81af754907a4b1c0dd77a456d74e
-  data.tar.gz: 586b03e1cd85a5ee0f01a17a89419528c340d17049b5610d34fde796917d7cae
+  metadata.gz: 36245d42bea26a35cafc65448b915efab2f3a372c58d4230b5de21d9fc7219fa
+  data.tar.gz: 42a935dca11dfd87741c16bbcefd5ef0d1c475cf20c7e109accb7e4d21c2da43
 SHA512:
-  metadata.gz: 31cb5f4d79e7fefd759eea437372ed91942dc52e574bea3b6b749f1a14a51f0633098659b7f0a34d8d9f2a4cb3d4519d5b8c6be240ff900eb76081c288bd414b
-  data.tar.gz: 28d08924fa51c32aef5f7ce5cca35c4ee8fdb6c8d057284a6b5b22ef057aa05fd546c11ed893eae4df5a7aaabef61fe5f708ece6d7f93308506969d0aeffe9b6
+  metadata.gz: ac72ff2a73db480bc82406ba057f696850505532f714e813e7b4d70b5ae1432cab89a1527e6a6e7a518843199e0cda96265c71342a9b48972412a0d058751f5d
+  data.tar.gz: a7a320d6b29572cdadabc27400f6cfd376158cc6322a17952535fbfc0a99cd0bbb9ff7251f7966caef9ab3b11c589b37d20f5d0b5c77fe2e30c163c718d5c7c4

data/.gitignore

@@ -11,4 +11,4 @@ Gemfile.lock
 # Added by cargo
 
 /target
-Cargo.lock
+

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.1.1
+=====
+
+* Update Whatlang version to 0.12.0
+
 0.1.0
 =====
 

data/Cargo.lock

@@ -0,0 +1,64 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "ahash"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217"
+
+[[package]]
+name = "autocfg"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
+[[package]]
+name = "hashbrown"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96282e96bfcd3da0d3aa9938bedf1e50df3269b6db08b4876d2da0bb1a0841cf"
+dependencies = [
+ "ahash",
+ "autocfg",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765"
+
+[[package]]
+name = "rutie"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "678217ed742ca819057a79c0146703d1278afbb38896eb0283c410a6cab7c28c"
+dependencies = [
+ "lazy_static",
+ "libc",
+]
+
+[[package]]
+name = "whatlang"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a346d2eb29c03618693ed24a29d1acd0c3f2cb08ae58b9669d7461e033cf703"
+dependencies = [
+ "hashbrown",
+]
+
+[[package]]
+name = "whatlang-rb"
+version = "0.1.0"
+dependencies = [
+ "rutie",
+ "whatlang",
+]

data/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 name = "whatlang-rb"
-version = "0.1.0"
+version = "0.1.1"
 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.1", features = ["no-link"] }
-whatlang = "0.11.1"
+rutie = { version = "0.8.2", features = ["no-link"] }
+whatlang = "0.12.0"
 
 [lib]
 crate-type = ["cdylib"]

data/README.md

@@ -61,10 +61,10 @@ Usage
     
     text = "Jen la trinkejo fermitis, ni iras tra mallumo kaj pluvo."
     list = ["eng", "ita"]
-    Whatlang.detect(text, whitelist: list).lang.code # => "ita"
-    Whatlang.detect(text, blacklist: list).lang.code # => "epo"
+    Whatlang.detect(text, allowlist: list).lang.code # => "ita"
+    Whatlang.detect(text, denylist: list).lang.code # => "epo"
 
-If you're interedted in only language information, use `detect_lang` function:
+If you're interested in only language information, use `detect_lang` function:
 
     lang = Whatlang.detect_lang(text)
     lang.code # => "bul"

data/Rakefile

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "rake/clean"
 require "rubygems/tasks"
 require "rake/testtask"
 require "yard"
@@ -25,4 +26,5 @@ end
 file RUST_TARGET => RUST_SRC do
   sh "cargo build --release"
 end
+CLEAN.include RUST_TARGET
 task test: RUST_TARGET

data/lib/whatlang.rb

@@ -4,16 +4,16 @@ Rutie.new(:whatlang_rb).init "Init_whatlang", __dir__
 
 module Whatlang
   class << self
-    def detect(text, whitelist: nil, blacklist: nil)
-      if blacklist && whitelist
-        raise ArgumentError, "Couldn't specify `whitelist' and `blacklist' at a time. Choose one."
+    def detect(text, allowlist: nil, denylist: nil)
+      if denylist && allowlist
+        raise ArgumentError, "Couldn't specify `allowlist' and `denylist' at a time. Choose one."
       end
 
       case
-      when whitelist
-        detect_with_whitelist(text, whitelist)
-      when blacklist
-        detect_with_blacklist(text, blacklist)
+      when allowlist
+        detect_with_allowlist(text, allowlist)
+      when denylist
+        detect_with_denylist(text, denylist)
       else
         detect_without_options(text)
       end

data/src/lib.rs

@@ -2,7 +2,7 @@ use rutie::{
     methods, module, AnyException, AnyObject, Array, Boolean, Float, Module, NilClass, Object,
     RString, VM,
 };
-use whatlang::{detect, detect_lang, detect_script, detect_with_options, Info, Lang, Options};
+use whatlang::{detect, detect_lang, detect_script, Detector, Info, Lang};
 
 module!(Whatlang);
 
@@ -14,14 +14,14 @@ methods!(
         detect(rstring(text).to_str()).map_or(NilClass::new().into(), rinfo)
     }
 
-    fn wl_detect_with_whitelist(text: RString, list: Array) -> AnyObject {
-        let options = Options::new().set_whitelist(rarray_to_lang_list(list));
-        detect_with_options(rstring(text).to_str(), &options).map_or(NilClass::new().into(), 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)
     }
 
-    fn wl_detect_with_blacklist(text: RString, list: Array) -> AnyObject {
-        let options = Options::new().set_blacklist(rarray_to_lang_list(list));
-        detect_with_options(rstring(text).to_str(), &options).map_or(NilClass::new().into(), 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)
     }
 
     fn wl_detect_lang(text: RString) -> AnyObject {
@@ -40,19 +40,18 @@ fn rstring(rstring: Result<RString, AnyException>) -> RString {
 }
 
 fn rarray_to_lang_list(rarray: Result<Array, AnyException>) -> Vec<Lang> {
-    let rlist = rarray.map_err(VM::raise_ex).unwrap();
-    rlist
+    rarray
+        .map_err(VM::raise_ex)
+        .unwrap()
         .into_iter()
-        .map(|rcode| {
+        .filter_map(|rcode| {
             let code = rcode
                 .try_convert_to::<RString>()
                 .map_err(VM::raise_ex)
                 .unwrap();
             Lang::from_code(code.to_str())
         })
-        .filter(|lang_res| lang_res.is_some())
-        .map(|lang_res| lang_res.unwrap())
-        .collect::<Vec<Lang>>()
+        .collect()
 }
 
 fn rinfo(info: Info) -> AnyObject {
@@ -81,8 +80,8 @@ fn rlang(lang: Lang) -> AnyObject {
 pub extern "C" fn Init_whatlang() {
     Module::new("Whatlang").define(|itself| {
         itself.def_self("detect_without_options", wl_detect_without_options);
-        itself.def_self("detect_with_whitelist", wl_detect_with_whitelist);
-        itself.def_self("detect_with_blacklist", wl_detect_with_blacklist);
+        itself.def_self("detect_with_allowlist", wl_detect_with_allowlist);
+        itself.def_self("detect_with_denylist", wl_detect_with_denylist);
         itself.def_self("detect_lang", wl_detect_lang);
         itself.def_self("detect_script", wl_detect_script);
     });

data/test/whatlang_test.rb

@@ -8,10 +8,10 @@ class WhatlangTest < Test::Unit::TestCase
     list = ["eng", "ita"]
 
     assert_equal "epo", Whatlang.detect(text).lang.code
-    assert_equal "ita", Whatlang.detect(text, whitelist: list).lang.code
-    assert_equal "epo", Whatlang.detect(text, blacklist: list).lang.code
+    assert_equal "ita", Whatlang.detect(text, allowlist: list).lang.code
+    assert_equal "epo", Whatlang.detect(text, denylist: list).lang.code
     assert_raise ArgumentError do
-      Whatlang.detect(text, whitelist: list, blacklist: list)
+      Whatlang.detect(text, allowlist: list, denylist: list)
     end
   end
 
@@ -22,16 +22,16 @@ class WhatlangTest < Test::Unit::TestCase
     assert_equal "Latin", info.script
   end
 
-  def test_detect_with_whitelist
+  def test_detect_with_allowlist
     text = "Jen la trinkejo fermitis, ni iras tra mallumo kaj pluvo."
     list = ["eng", "ita"]
-    assert_equal "ita", Whatlang.detect_with_whitelist(text, list).lang.code
+    assert_equal "ita", Whatlang.detect_with_allowlist(text, list).lang.code
   end
 
-  def test_detect_with_blacklist
+  def test_detect_with_denylist
     text = "Jen la trinkejo fermitis, ni iras tra mallumo kaj pluvo."
     list = ["eng", "ita"]
-    assert_equal "epo", Whatlang.detect_with_blacklist(text, list).lang.code
+    assert_equal "epo", Whatlang.detect_with_denylist(text, list).lang.code
   end
 
   def test_detect_lang

data/whatlang.gemspec

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "tomlrb"
 
 Gem::Specification.new do |spec|
@@ -9,10 +7,9 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Kitaiti Makoto"]
   spec.email         = ["KitaitiMakoto@gmail.com"]
 
-  spec.summary       = "Natural language detection."
+  spec.summary       = "Natural language detection library."
   spec.description   = "Ruby bindings for Whatlang, a natural language detection for Rust."
   spec.homepage      = "https://gitlab.com/KitaitiMakoto/whatlang-rb"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://gitlab.com/KitaitiMakoto/whatlang-rb"
@@ -21,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0")
   end
-  spec.require_paths = ["lib"]
   spec.extensions = ["ext/Rakefile"]
 
   spec.add_runtime_dependency "rutie"
@@ -31,7 +27,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "yard"
   spec.add_development_dependency "rubygems-tasks"
-
-  # For more information and examples about making a new gem, checkout our
-  # guide at: https://bundler.io/guides/creating_gem.html
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whatlang
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kitaiti Makoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-01 00:00:00.000000000 Z
+date: 2021-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rutie
@@ -105,6 +105,7 @@ files:
 - ".gitignore"
 - ".yardopts"
 - CHANGELOG.md
+- Cargo.lock
 - Cargo.toml
 - Gemfile
 - README.md
@@ -131,15 +132,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
-summary: Natural language detection.
+summary: Natural language detection library.
 test_files: []