fasttext 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e2e013c33aa194ca0b996c1dfab98452d15f6ce909e14d69b6a60c3911ab077
-  data.tar.gz: ff859b72fa2150f3158bf1317780ffaeb3e7dbbe3da55313b634ae3d4a5dbd5d
+  metadata.gz: 9978bfe50053f76326bfd7f97b7acb6ff7af67ca4acba77f21de5000175428b1
+  data.tar.gz: 7488a7dc79f8d2e62636468f18e916b8bfbccec59897909a1f666a3ff02a1d86
 SHA512:
-  metadata.gz: b1eb41b2bad524ca07e564c62c9d104ffec5730cd7b19a200df793ec3a359538cf2f83eefecfec89b019c0101cc48e4dbc50ea4fc9921af1841e8c4fd2b0cec5
-  data.tar.gz: e45d97a8d015eca12e23c83fcd1aa5890c55ea09b6f741285a15bb54e0053a6d2f1aa28d859e977ea81ab081b1918885e310370a227d519338225dd657897674
+  metadata.gz: ffd2b8f15be1fdbbd0a0b10dfe94c482645c2961ca119af160c8a9952bb95380c5512fb2de85b9885c773f3393fbcc776efa2dcaf94dd390c459470974a07ef7
+  data.tar.gz: 831fa02b20d7b594dc3ceefe9b33499df37d75436ea724369b3dc976d950b72c533ae400a1d4c26838381746c94c227bccb50f9ca341d5575e87dd88e2908e41

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.5.0 (2026-04-09)
+
+- Dropped support for Ruby < 3.3
+
 ## 0.4.1 (2025-10-26)
 
 - Fixed error with Rice 4.7

data/LICENSE.txt

@@ -1,7 +1,7 @@
 MIT License
 
 Copyright (c) 2016-present, Facebook, Inc.
-Copyright (c) 2019-2024 Andrew Kane
+Copyright (c) 2019-2025 Andrew Kane
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/ext/fasttext/ext.cpp

@@ -1,18 +1,21 @@
 // stdlib
 #include <cmath>
 #include <cstdint>
-#include <iterator>
+#include <fstream>
 #include <memory>
 #include <sstream>
 #include <stdexcept>
 #include <string>
+#include <utility>
 #include <vector>
 
 // fasttext
 #include <args.h>
 #include <autotune.h>
 #include <densematrix.h>
+#include <dictionary.h>
 #include <fasttext.h>
+#include <meter.h>
 #include <real.h>
 #include <vector.h>
 
@@ -23,21 +26,19 @@
 using fasttext::Args;
 using fasttext::FastText;
 
-using Rice::Array;
-
 namespace Rice::detail {
   template<>
   class To_Ruby<std::vector<std::pair<fasttext::real, std::string>>> {
   public:
     explicit To_Ruby(Arg* arg) : arg_(arg) { }
 
-    VALUE convert(std::vector<std::pair<fasttext::real, std::string>> const & x) {
-      Array ret;
+    VALUE convert(const std::vector<std::pair<fasttext::real, std::string>>& x) {
+      VALUE ret = detail::protect(rb_ary_new2, x.size());
       for (const auto& v : x) {
-        Array a;
-        a.push(v.first, false);
-        a.push(v.second, false);
-        ret.push(a, false);
+        VALUE p1 = To_Ruby<fasttext::real>().convert(v.first);
+        VALUE p2 = To_Ruby<std::string>().convert(v.second);
+        VALUE a = detail::protect(rb_ary_new3, 2, p1, p2);
+        detail::protect(rb_ary_push, ret, a);
       }
       return ret;
     }
@@ -117,14 +118,14 @@ void Init_ext() {
         std::shared_ptr<const fasttext::Dictionary> d = m.getDictionary();
         std::vector<int64_t> freq = d->getCounts(fasttext::entry_type::word);
 
-        Array vocab_list;
-        Array vocab_freq;
+        Rice::Array vocab_list;
+        Rice::Array vocab_freq;
         for (int32_t i = 0; i < d->nwords(); i++) {
           vocab_list.push(d->getWord(i), false);
-          vocab_freq.push(freq[i], false);
+          vocab_freq.push(freq.at(i), false);
         }
 
-        Array ret;
+        Rice::Array ret;
         ret.push(vocab_list, false);
         ret.push(vocab_freq, false);
         return ret;
@@ -135,14 +136,14 @@ void Init_ext() {
         std::shared_ptr<const fasttext::Dictionary> d = m.getDictionary();
         std::vector<int64_t> freq = d->getCounts(fasttext::entry_type::label);
 
-        Array vocab_list;
-        Array vocab_freq;
+        Rice::Array vocab_list;
+        Rice::Array vocab_freq;
         for (int32_t i = 0; i < d->nlabels(); i++) {
           vocab_list.push(d->getLabel(i), false);
-          vocab_freq.push(freq[i], false);
+          vocab_freq.push(freq.at(i), false);
         }
 
-        Array ret;
+        Rice::Array ret;
         ret.push(vocab_list, false);
         ret.push(vocab_freq, false);
         return ret;
@@ -150,7 +151,7 @@ void Init_ext() {
     .define_method(
       "test",
       [](FastText& m, const std::string& filename, int32_t k) {
-        std::ifstream ifs(filename);
+        std::ifstream ifs{filename};
         if (!ifs.is_open()) {
           throw std::invalid_argument("Test file cannot be opened!");
         }
@@ -158,7 +159,7 @@ void Init_ext() {
         m.test(ifs, k, 0.0, meter);
         ifs.close();
 
-        Array ret;
+        Rice::Array ret;
         ret.push(meter.nexamples(), false);
         ret.push(meter.precision(), false);
         ret.push(meter.recall(), false);
@@ -166,13 +167,13 @@ void Init_ext() {
       })
     .define_method(
       "load_model",
-      [](FastText& m, const std::string& s) {
-        m.loadModel(s);
+      [](FastText& m, const std::string& filename) {
+        m.loadModel(filename);
       })
     .define_method(
       "save_model",
-      [](FastText& m, const std::string& s) {
-        m.saveModel(s);
+      [](FastText& m, const std::string& filename) {
+        m.saveModel(filename);
       })
     .define_method("dimension", &FastText::getDimension)
     .define_method("quantized?", &FastText::isQuant)
@@ -181,7 +182,7 @@ void Init_ext() {
     .define_method(
       "predict",
       [](FastText& m, const std::string& text, int32_t k, float threshold) {
-        std::stringstream ioss(text);
+        std::stringstream ioss{text};
         std::vector<std::pair<fasttext::real, std::string>> predictions;
         m.predictLine(ioss, predictions, k, threshold);
         return predictions;
@@ -196,11 +197,12 @@ void Init_ext() {
     .define_method(
       "word_vector",
       [](FastText& m, const std::string& word) {
-        auto dimension = m.getDimension();
-        fasttext::Vector vec = fasttext::Vector(dimension);
+        int dimension = m.getDimension();
+        fasttext::Vector vec{dimension};
         m.getWordVector(vec, word);
-        Array ret;
-        for (size_t i = 0; i < vec.size(); i++) {
+        Rice::Array ret;
+        // fasttext::Vector uses int64_t for size and indexing
+        for (int64_t i = 0; i < vec.size(); i++) {
           ret.push(vec[i], false);
         }
         return ret;
@@ -213,7 +215,7 @@ void Init_ext() {
         std::shared_ptr<const fasttext::Dictionary> d = m.getDictionary();
         d->getSubwords(word, ngrams, subwords);
 
-        Array ret;
+        Rice::Array ret;
         for (const auto& subword : subwords) {
           ret.push(subword, false);
         }
@@ -222,12 +224,13 @@ void Init_ext() {
     .define_method(
       "sentence_vector",
       [](FastText& m, const std::string& text) {
-        std::istringstream in(text);
-        auto dimension = m.getDimension();
-        fasttext::Vector vec = fasttext::Vector(dimension);
+        std::istringstream in{text};
+        int dimension = m.getDimension();
+        fasttext::Vector vec{dimension};
         m.getSentenceVector(in, vec);
-        Array ret;
-        for (size_t i = 0; i < vec.size(); i++) {
+        Rice::Array ret;
+        // fasttext::Vector uses int64_t for size and indexing
+        for (int64_t i = 0; i < vec.size(); i++) {
           ret.push(vec[i], false);
         }
         return ret;
@@ -236,7 +239,7 @@ void Init_ext() {
       "train",
       [](FastText& m, Args& a) {
         if (a.hasAutotune()) {
-          fasttext::Autotune autotune(std::shared_ptr<fasttext::FastText>(&m, [](fasttext::FastText*) {}));
+          fasttext::Autotune autotune{std::shared_ptr<fasttext::FastText>(&m, [](fasttext::FastText*) {})};
           autotune.train(a);
         } else {
           m.train(a);

data/lib/fasttext/version.rb

@@ -1,3 +1,3 @@
 module FastText
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/lib/fasttext.rb

@@ -23,7 +23,7 @@ module FastText
         else
           FastText::Vectorizer.new
         end
-      model.instance_variable_set("@m", m)
+      model.instance_variable_set(:@m, m)
       model
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fasttext
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Andrew Kane
@@ -80,14 +80,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Efficient text classification and representation learning for Ruby
 test_files: []