cld3 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 802d8ce56f02f41e503bf2ae7415ed923c3ad9ae
-  data.tar.gz: 74f8eaac5fabba6d1a12c7fd36fec81cd20ec7d0
+  metadata.gz: ea4240a74f4ef81e65a71255eb4be281aeafeacf
+  data.tar.gz: b51bafafd92fcf3b2a44f552757a24babf6adc1e
 SHA512:
-  metadata.gz: 7284abdad8aaf5f270c09cff5473c7632199370d2f7ce243e2c4184d83190e5290946665b0b4c3875d7456ecec09acf69d3e9c124b52dd21f2d6f75bd75d7e18
-  data.tar.gz: 7af4fe7bd2a8bd82d942b6401d4731fecb08b1752a9e36fb9b2cdb9b78a2312f62cd5575336700b8ad204fa870b3373abaa149a1063193d80361c854c96d946d
+  metadata.gz: 650499b98a32f6b5c4d4e44d6016b48f59b9809a02b70b1a72e904243027bed862ced5377388152891db86bf940c4b0d6b3263d1a6ad3d87c0f3968693c92bb4
+  data.tar.gz: 02ba6ba68d6e50e7e35004ab2bec4ddee02390d841151f20ea3b26a56070016f171410a6f7d818e3a8be73e55a45db663e7944463a161e422b5adad592c20741

data/README.md

@@ -3,6 +3,7 @@ cld3-ruby is an interface of Compact Language Detector v3 (CLD3) for Ruby.
 
 ## Installation
 ### Prerequisites
+* [Bundler](http://bundler.io/)
 * C++ compiler
 * [Protocol buffers](https://developers.google.com/protocol-buffers/)
 * [Rake](https://ruby.github.io/rake/)

data/cld3.gemspec

@@ -16,7 +16,7 @@
 
 Gem::Specification.new do |gem|
   gem.name = "cld3"
-  gem.version = "3.1.0"
+  gem.version = "3.1.1"
   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"

data/ext/cld3/nnet_language_identifier_c.cc

@@ -24,20 +24,15 @@ limitations under the License.
   #define EXPORT __attribute__ ((visibility ("default")))
 #endif
 
-class NNetLanguageIdentifier : public chrome_lang_id::NNetLanguageIdentifier {
- public:
-  inline NNetLanguageIdentifier(int min_num_bytes, int max_num_bytes)
-      : chrome_lang_id::NNetLanguageIdentifier(min_num_bytes, max_num_bytes)
-  {
-  }
-
+struct NNetLanguageIdentifier {
+  chrome_lang_id::NNetLanguageIdentifier context;
   std::string language;
 };
 
 extern "C" {
   #include <stddef.h>
 
-  struct result {
+  typedef struct {
     struct {
       const char *data;
       size_t size;
@@ -45,16 +40,16 @@ extern "C" {
     float probability;
     float proportion;
     bool is_reliable;
-  };
+  } Result;
 
-  EXPORT struct result NNetLanguageIdentifier_find_language(void *pointer,
-                                                            const char *data,
-                                                            size_t size) {
+  EXPORT Result NNetLanguageIdentifier_find_language(void *pointer,
+                                                     const char *data,
+                                                     size_t size) {
     auto instance = reinterpret_cast<NNetLanguageIdentifier *>(pointer);
-    auto result = instance->FindLanguage(std::string(data, size));
+    auto result = instance->context.FindLanguage(std::string(data, size));
     instance->language = std::move(result.language);
 
-    return (struct result) {
+    return Result {
         { instance->language.data(), instance->language.size() },
         std::move(result.probability),
         std::move(result.proportion),
@@ -67,6 +62,6 @@ extern "C" {
   }
 
   EXPORT void *new_NNetLanguageIdentifier(int min_num_bytes, int max_num_bytes) {
-    return new NNetLanguageIdentifier(min_num_bytes, max_num_bytes);
+    return new NNetLanguageIdentifier{{min_num_bytes, max_num_bytes}, {}};
   }
 }

data/lib/cld3.rb

@@ -18,6 +18,7 @@
 # ==============================================================================
 
 require "ffi"
+require "rbconfig"
 
 # Module providing an interface for Compact Language Detector v3 (CLD3)
 module CLD3
@@ -83,7 +84,7 @@ module CLD3
   module Unstable
     extend FFI::Library
 
-    ffi_lib File.join(File.expand_path(File.dirname(__FILE__)), "..", "ext", "cld3", FFI.map_library_name("cld3"))
+    ffi_lib File.join(File.expand_path(File.dirname(__FILE__)), "..", "ext", "cld3", "libcld3." + RbConfig::CONFIG["DLEXT"])
 
     class NNetLanguageIdentifierResult < FFI::Struct
       layout :language_data, :pointer, :language_size, :size_t, :probability, :float, :proportion, :float, :reliable?, :bool

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cld3
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Akihiko Odaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-06 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi