cld3 3.5.2 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f7c737ba1af7401c90400054cd2908557e8957f7444777bd18f7781e8467da6
-  data.tar.gz: 7f7db14d8cbb0ecb70ee12a77e5e0f57f0b247118567f902bd8fc3e583ace749
+  metadata.gz: a1a78e26ab2a3e05e4b030e92aac7285fef10cea9d5fe82c0cb60718cc4212e7
+  data.tar.gz: fa95eaf115c80978b13718b2c5e9cd34d379cb32947a20860a24f7a78a9be5aa
 SHA512:
-  metadata.gz: c04a26422eed82c14f7e3a60b6a738736f4dc46edc2d79e77a016ca08cbb4c60a2f78f176597bfc6d3dc470e6a2a09697657277ff7703516d9bd85a2c7ae4321
-  data.tar.gz: d9752e2366d44b29dd9493ae8aa5e92af27af7e790424897fc7ec072e9e9fa4aa08ca49b237f2e7efb39b21e6d2250c61355aba48b69afe9ebb34bb1ca6c7e93
+  metadata.gz: e4e3870a821d1099b50db929e1ba330f451ca2af011f3aa601a6749f2276af3fb7db46fcd797e807c779d6aa7ce0a9a042a6c9233ed43a88ae7d47b5a8922484
+  data.tar.gz: 84894909ef06022f4ba4e0b3fd7c3e816accb058bd434c28dabd4db1cb2a851cd8c66c672e1ab56d0aa41ab8e4572c4beb85964e84c2fca7d52f58940f2e6cac

data/README.md

@@ -19,14 +19,14 @@ cld3.find_language("здравствуйте") # => #<struct Struct::Result lang
 ### Prerequisites
 * [Bundler](http://bundler.io/)
 * C++ compiler
-* [Rake](https://ruby.github.io/rake/)
 * [RubyGems](https://rubygems.org/)
 
 ### Instructions
 I (Akihiko Odaki) recommend to setup this library installing via `gem`.
 
 You can also build this library by yourself. `Rakefile` includes a Rake task to
-put this code into files buildable as a gem. Build a gem with `rake` command.
+put this code into files buildable as a gem. Build a gem with `bundle exec rake`
+command.
 
 ### Platform-specific information
 
@@ -42,7 +42,8 @@ I recommend [GCC](https://gcc.gnu.org/) as a C++ compiler.
 
 If you cannot identify the cause of your problem, run spec of this library and
 see whether the problem is reproducible with it or not. Spec is not included in
-the gem, so clone the source code repository and then run `rake spec`.
+the gem, so clone the source code repository and then run
+`bundle exec rake spec`.
 The source code repository is at
 https://github.com/akihikodaki/cld3-ruby.
 

data/{Gemfile → Steepfile}

@@ -1,4 +1,4 @@
-# Copyright 2017 Akihiko Odaki <akihiko.odaki@gmail.com>
+# Copyright 2021 Akihiko Odaki <akihiko.odaki@gmail.com>
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,5 +14,7 @@
 # limitations under the License.
 #==============================================================================
 
-source 'https://rubygems.org'
-gemspec
+target :lib do
+  signature "sig"
+  check "lib/cld3.rb"
+end

data/cld3.gemspec

@@ -16,21 +16,21 @@
 
 Gem::Specification.new do |gem|
   gem.name = "cld3"
-  gem.version = "3.5.2"
+  gem.version = "3.6.0"
   gem.summary = "Compact Language Detector v3 (CLD3)"
   gem.description = "Compact Language Detector v3 (CLD3) is a neural network model for language identification."
   gem.license = "Apache-2.0"
   gem.homepage = "https://github.com/akihikodaki/cld3-ruby"
   gem.author = "Akihiko Odaki"
   gem.email = "akihiko.odaki@gmail.com"
-  gem.required_ruby_version = [ ">= 2.7.0", "< 3.3.0" ]
-  gem.add_development_dependency "rbs", [ ">= 2.8.0", "< 2.9.0" ]
-  gem.add_development_dependency "rspec", [ ">= 3.12.0", "< 3.13.0" ]
-  gem.add_development_dependency "steep", [ ">= 1.3.0", "< 1.4.0" ]
+  gem.required_ruby_version = [ ">= 3.0.0", "< 3.4.0" ]
+  gem.add_development_dependency "rbs", "~> 3.1.0"
+  gem.add_development_dependency "rspec", "~> 3.12.0"
+  gem.add_development_dependency "steep", "~> 1.5.0"
   gem.files = Dir[
-    "Gemfile", "LICENSE", "LICENSE_CLD3", "README.md",
+    "LICENSE", "LICENSE_CLD3", "README.md", "Steepfile",
     "cld3.gemspec", "ext/**/*.c", "ext/**/*.cc", "ext/**/*.h",
-    "lib/**/*.rb", "sig/**/*"
+    "lib/**/*.rb", "sig/**/*.rbs", "spec/**/*.rb"
   ]
   gem.require_paths = [ "lib" ]
   gem.extensions = [ "ext/cld3/extconf.rb" ]

data/ext/cld3/nnet_language_identifier_c.cc

@@ -24,7 +24,7 @@ limitations under the License.
 #if defined _WIN32 || defined __CYGWIN__
   #define EXPORT __declspec(dllexport)
 #else
-  #define EXPORT __attribute__ ((visibility ("default")))
+  #define EXPORT __attribute__((visibility("default")))
 #endif
 
 struct Result {
@@ -84,10 +84,9 @@ struct ResultVector {
 };
 
 template<typename T>
-VALUE convert_protected(VALUE arg)
-{
-    auto result = reinterpret_cast<const T *>(arg);
-    return result->convert();
+VALUE convert_protected(VALUE arg) {
+  auto result = reinterpret_cast<const T *>(arg);
+  return result->convert();
 }
 
 static void dfree(void *arg) {
@@ -101,12 +100,8 @@ static size_t dsize(const void *data) {
 }
 
 static const rb_data_type_t data_type = {
-  .wrap_struct_name = "CLD3::NNetLanguageIdentifier",
-  .function = {
-    .dfree = dfree,
-    .dsize = dsize,
-  },
-  .flags = RUBY_TYPED_FREE_IMMEDIATELY
+  "CLD3::NNetLanguageIdentifier", { nullptr, dfree, dsize }, nullptr, nullptr,
+  RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE find_language(VALUE obj,

data/sig/cld3.rbs

@@ -36,6 +36,7 @@ module CLD3
       attr_accessor byte_ranges(): Array[SpanInfo]
     end
 
+    Unstable: untyped
     @cc: untyped
 
     def initialize: (?Integer, ?Integer) -> void
@@ -62,6 +63,4 @@ module CLD3
 
     LANGUAGE_NAMES: Array[language_names]
   end
-
-  Unstable: untyped
 end

data/spec/cld3_spec.rb

@@ -0,0 +1,99 @@
+# Copyright 2017 Akihiko Odaki <akihiko.odaki@gmail.com>
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#==============================================================================
+
+require "bundler/setup"
+Bundler.setup
+
+require "rbs/test/setup"
+require "cld3"
+
+describe CLD3::NNetLanguageIdentifier do
+  describe "#initialize" do
+    it "is expected to raise ArgumentError with negative min_num_bytes" do
+      expect { described_class.new(-1, 1000) }.to raise_error(ArgumentError)
+    end
+
+    it "is expected to raise ArgumentError with min_num_bytes <= max_num_bytes" do
+      expect { described_class.new(0, 0) }.to raise_error(ArgumentError)
+    end
+  end
+
+  context "initialized without parameters" do
+    let(:lang_id) { described_class.new }
+
+    describe "#find_language" do
+      subject { lang_id.find_language("This text is written in English.") }
+      it { is_expected.to be_nil }
+    end
+  end
+
+  # See ext/cld3/ext/src/language_identifier_main.cc
+  context "initialized with custom parameters" do
+    let(:lang_id) { described_class.new(0, 1000) }
+
+    describe "#find_language" do
+      subject { lang_id.find_language text }
+
+      context "with an English text" do
+        let(:text) { "This text is written in English." }
+        it {
+          is_expected.to satisfy { |result|
+            result.language == :en &&
+            result.probability > 0 &&
+            result.probability < 1 &&
+            result.reliable? &&
+            result.proportion == 1 &&
+            result.byte_ranges == []
+          }
+        }
+      end
+    end
+
+    describe "#find_top_n_most_freq_langs" do
+      subject { lang_id.find_top_n_most_freq_langs text, 3 }
+
+      context "with an English text followed by a Russian text" do
+        let(:text) { "This piece of text is in English. Този текст е на Български." }
+        it {
+          is_expected.to satisfy { |results|
+            results.size == 2 &&
+            results[0].language == :bg &&
+            results[0].probability > 0 &&
+            results[0].probability < 1 &&
+            results[0].reliable? &&
+            results[0].proportion > 0 &&
+            results[0].proportion < 1 &&
+            results[0].byte_ranges.size == 1 &&
+            results[0].byte_ranges[0].start_index == 34 &&
+            results[0].byte_ranges[0].end_index == 81 &&
+            results[0].byte_ranges[0].probability == results[0].probability &&
+            results.size == 2 &&
+            results[1].language == :en &&
+            results[1].probability > 0 &&
+            results[1].probability < 1 &&
+            results[1].reliable? &&
+            results[1].proportion > 0 &&
+            results[1].proportion < 1 &&
+            results[1].byte_ranges.size == 1 &&
+            results[1].byte_ranges[0].start_index == 0 &&
+            results[1].byte_ranges[0].end_index == 34 &&
+            results[1].byte_ranges[0].probability == results[1].probability
+          }
+        }
+      end
+    end
+  end
+end

metadata

@@ -1,75 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: cld3
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.6.0
 platform: ruby
 authors:
 - Akihiko Odaki
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2023-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.8.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.12.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.12.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.13.0
 - !ruby/object:Gem::Dependency
   name: steep
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 description: Compact Language Detector v3 (CLD3) is a neural network model for language
   identification.
 email: akihiko.odaki@gmail.com
@@ -78,10 +60,10 @@ extensions:
 - ext/cld3/extconf.rb
 extra_rdoc_files: []
 files:
-- Gemfile
 - LICENSE
 - LICENSE_CLD3
 - README.md
+- Steepfile
 - cld3.gemspec
 - ext/cld3/base.cc
 - ext/cld3/base.h
@@ -149,6 +131,7 @@ files:
 - ext/cld3/workspace.h
 - lib/cld3.rb
 - sig/cld3.rbs
+- spec/cld3_spec.rb
 homepage: https://github.com/akihikodaki/cld3-ruby
 licenses:
 - Apache-2.0
@@ -161,10 +144,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
   - - "<"
     - !ruby/object:Gem::Version
-      version: 3.3.0
+      version: 3.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="