jieba_rb 0.0.2 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf9ad1c59145d326f4edd1c639066e107b52c13a
-  data.tar.gz: 4732514648268711284a8198a4a324889636112d
+  metadata.gz: 2aab0ba015d462b0ab6fc1ee344961660e20adeb
+  data.tar.gz: d15db1389073584381a83aad79967152949cda7c
 SHA512:
-  metadata.gz: 8fdc938f12a9506eb46baef952fd6bd5a261803934673273ba33f8e57cccd614ea31725dc58262b1e6c24828db9f8787027f8e95f4e614504eb943cf75dadf04
-  data.tar.gz: cd5d7df0f5f46cf4a7f8553d9f09cf05d0aeceb2f7b211a9238b9596aa43c3bd395425d2d278fc971bc3f224ac764b55cdfe88506c1b77a0ab8bcb927b206b48
+  metadata.gz: b63793a07432aaf9811cb0dc16c4a3e61b3c5930019cd417a0f8e86b310909a48974199bc8c731c0656c75c744bb37ebe734a1515967f6fb29d299a9fa977bdd
+  data.tar.gz: 1ec9fde21352676ba4be0e6a2cf99310dfec07c3933e23554e7b473d527dcea19ccc8d435d22328bcf1ced19860b1d9d141671221f1bbb9391961065f74d5761

data/.travis.yml

@@ -2,10 +2,15 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.5
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
   - ruby-head
   - rbx-2
 
+before_install:
+  - gem install bundler
+
 before_script: rake compile
 
 matrix:

data/README.md

@@ -41,6 +41,22 @@ HMM or Max probability (mp) Segment mode:
     seg = JiebaRb::Segment.new mode: :hmm # or  mode: :mp
     words = seg.cut "令狐冲是云计算行业的专家"
 
+## Word tagging Usage
+
+Default tagging:
+
+	require 'jieba_rb'
+    tagging = JiebaRb::Tagging.new
+    pairs = tagging.tag "我是蓝翔技工拖拉机学院手扶拖拉机专业的。"
+    # [{"我"=>"r"}, {"是"=>"v"}, {"蓝翔"=>"x"}, {"技工"=>"n"}, {"拖拉机"=>"n"}, {"学院"=>"n"}, {"手扶拖拉机"=>"n"}, {"专业"=>"n"}, {"的"=>"uj"}, {"。"=>"x"}]
+
+Tagging with user-defined dictionary:
+
+	require 'jieba_rb'
+    tagging = JiebaRb::Tagging.new user_dict: :default
+    pairs = tagging.tag "我是蓝翔技工拖拉机学院手扶拖拉机专业的。"
+    # [{"我"=>"r"}, {"是"=>"v"}, {"蓝翔"=>"nz"}, {"技工"=>"n"}, {"拖拉机"=>"n"}, {"学院"=>"n"}, {"手扶拖拉机"=>"n"}, {"专业"=>"n"}, {"的"=>"uj"}, {"。"=>"x"}]
+
 ## Keyword Extractor Usage
 
 * only support TF-IDF currently

data/ext/jieba/jieba.c

@@ -7,4 +7,5 @@ void Init_jieba()
 
     Init_segment();
     Init_keyword();
+    Init_tagging();
 }

data/ext/jieba/jieba.h

@@ -4,6 +4,7 @@
 #include <ruby.h>
 #include <segment.h>
 #include <keyword.h>
+#include <tagging.h>
 
 extern VALUE mJieba;
 

data/ext/jieba/tagging.cc

@@ -0,0 +1,75 @@
+#include "tagging.h"
+#include <ruby/encoding.h>
+#include <PosTagger.hpp>
+
+static rb_encoding* u8_enc;
+
+struct Tagging{
+    CppJieba::PosTagger * p;
+};
+
+static void tagger_free(void *p){
+    delete ((Tagging*) p) -> p;
+    delete (Tagging*)p;
+}
+
+static VALUE alloc(VALUE klass)
+{
+    Tagging * tagging = new Tagging();
+    return Data_Wrap_Struct(klass, NULL, tagger_free, tagging);
+}
+
+static void init(VALUE self,
+                 VALUE jieba_dict_rbs,
+                 VALUE hmm_dict_rbs,
+                 VALUE user_dict_rbs)
+{
+    Tagging *tagging;
+    Data_Get_Struct(self, Tagging, tagging);
+
+    Check_Type(jieba_dict_rbs, T_STRING);
+    Check_Type(hmm_dict_rbs, T_STRING);
+    Check_Type(user_dict_rbs, T_STRING);
+
+    std::string jieba_dict = StringValueCStr(jieba_dict_rbs);
+    std::string hmm_dict = StringValueCStr(hmm_dict_rbs);
+    std::string user_dict = StringValueCStr(user_dict_rbs);
+
+    tagging->p = new CppJieba::PosTagger(jieba_dict, hmm_dict, user_dict);
+}
+
+static VALUE tag(VALUE self, VALUE text_rbs)
+{
+    Check_Type(text_rbs, T_STRING);
+    std::string text = StringValueCStr(text_rbs);
+
+    Tagging *tagging;
+    Data_Get_Struct(self, Tagging, tagging);
+
+    std::vector<std::pair<std::string, std::string>> pairs;
+    tagging->p->tag(text, pairs);
+
+    volatile VALUE arr = rb_ary_new();
+    for (std::vector<std::pair<std::string, std::string>>::const_iterator j = pairs.begin(); j != pairs.end(); j++)
+    {
+        VALUE pair = rb_hash_new();
+        rb_hash_aset(pair, rb_enc_str_new(std::get<0>(*j).c_str(), std::get<0>(*j).length(), u8_enc), rb_enc_str_new(std::get<1>(*j).c_str(), std::get<1>(*j).length(), u8_enc));
+        rb_ary_push(arr, pair);
+
+    }
+    return arr;
+}
+
+#define DEF(k,n,f,c) rb_define_method(k,n,RUBY_METHOD_FUNC(f),c)
+
+extern "C" {
+    void Init_tagging()
+    {
+        VALUE cTagging = rb_define_class_under(mJieba, "Tagging", rb_cObject);
+        u8_enc = rb_utf8_encoding();
+        rb_define_alloc_func(cTagging, alloc);
+        DEF(cTagging, "_init",init,3);
+        DEF(cTagging, "tag",tag,1);
+    }
+
+}

data/ext/jieba/tagging.h

@@ -0,0 +1,17 @@
+#ifndef RUBY_JIEBA_TAGGING
+#define RUBY_JIEBA_TAGGING
+
+#include <jieba.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    void Init_tagging();
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif

data/lib/jieba_rb.rb

@@ -46,10 +46,21 @@ module JiebaRb
       stop_words_path = opts[:stop_words] || DEFAULT_STOP_WORDS
 
       user_dict = opts[:user_dict] || ""
-      user_dict = USER_DICT_FILE if user_dict == :default
+      user_dict = DEFAULT_USER_DICT if user_dict == :default
 
       _init mode, jieba_dict, hmm_dict, idf_path, stop_words_path, user_dict
     end
   end
 
+  class Tagging
+    private :_init
+    def initialize opts = {}
+      jieba_dict = opts[:jieba_dict] || DEFAULT_JIEBA_DICT
+      hmm_dict = opts[:hmm_dict] || DEFAULT_HMM_DICT
+      user_dict = opts[:user_dict] || ""
+      user_dict = DEFAULT_USER_DICT if user_dict == :default
+
+      _init jieba_dict, hmm_dict, user_dict
+    end
+  end
 end

data/lib/jieba_rb/version.rb

@@ -1,3 +1,3 @@
 module JiebaRb
-  VERSION = "0.0.2"
+  VERSION = "0.0.5"
 end

data/test/test_tagging.rb

@@ -0,0 +1,17 @@
+# coding: utf-8
+require 'minitest/autorun'
+require 'jieba_rb'
+class JiebaTest < Minitest::Test
+  def test_tagging
+    tagging = JiebaRb::Tagging.new
+    pairs = tagging.tag "我是蓝翔技工拖拉机学院手扶拖拉机专业的。"
+    assert_equal [{"我"=>"r"}, {"是"=>"v"}, {"蓝翔"=>"x"}, {"技工"=>"n"}, {"拖拉机"=>"n"}, {"学院"=>"n"}, {"手扶拖拉机"=>"n"}, {"专业"=>"n"}, {"的"=>"uj"}, {"。"=>"x"}], pairs
+  end
+
+  def test_tagging_with_user_dict
+    tagging = JiebaRb::Tagging.new user_dict: :default
+    pairs = tagging.tag "我是蓝翔技工拖拉机学院手扶拖拉机专业的。"
+    assert_equal [{"我"=>"r"}, {"是"=>"v"}, {"蓝翔"=>"nz"}, {"技工"=>"n"}, {"拖拉机"=>"n"}, {"学院"=>"n"}, {"手扶拖拉机"=>"n"}, {"专业"=>"n"}, {"的"=>"uj"}, {"。"=>"x"}], pairs
+  end
+
+end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: jieba_rb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.5
 platform: ruby
 authors:
 - Chris Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-24 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: cppjieba binding for ruby
@@ -74,9 +74,9 @@ extensions:
 - ext/jieba/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
-- .travis.yml
+- ".gitignore"
+- ".gitmodules"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -215,11 +215,14 @@ files:
 - ext/jieba/keyword.h
 - ext/jieba/segment.cc
 - ext/jieba/segment.h
+- ext/jieba/tagging.cc
+- ext/jieba/tagging.h
 - jieba_rb.gemspec
 - lib/jieba_rb.rb
 - lib/jieba_rb/version.rb
 - test/test_keyword.rb
 - test/test_segment.rb
+- test/test_tagging.rb
 homepage: https://github.com/altkatz/jieba_rb
 licenses:
 - MIT
@@ -230,21 +233,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: cppjieba binding for ruby
 test_files:
 - test/test_keyword.rb
 - test/test_segment.rb
-has_rdoc: 
+- test/test_tagging.rb