mecab-light 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a5511af0c985b3d07f4d529ca04c7138657867c
-  data.tar.gz: 89da28098265ec53e39c01bd3b6fedc75ff614f5
+  metadata.gz: 77a05bf9485489ccba812f53eb6976d9688fa170
+  data.tar.gz: 5352eec6b99dd1f96754a70a54e06d0c8e773c68
 SHA512:
-  metadata.gz: f1a8cbd1738fcab2d3b3d508cd45440c3755791fe8a061704ba91dad37aef5254719c42f60820ad3fdbf533de9101170e159b57c4cf7bed7529e19a4cec5d52e
-  data.tar.gz: 29244fa47f165c0e26ddffc1e8a733fa97945250988a82ff088eea7da13dde505c4877c7acf51fe9d89b54119d3a8b839e09f2244515f7b46330e7a7b1572040
+  metadata.gz: 11117258db644f31ae7fd45f2c7df69aa474aaebf34b3945d1defa1deced0514f155206904f7065c5beeaaaaaf9fe27baa71852c6905f31ba57e4a080381655a
+  data.tar.gz: 162454bcaede7008c631d391204e86b48a36064e3eac4ebb5d31c3a4cb93497c9951b46929ad56cb33ce8a15352895409651b798be6dc175c2450cc9043faf5a

data/README.md

@@ -4,11 +4,6 @@ Use a sequence of results as an Enumerable object.
 
 ## Installation
 
-This gem works without official binding.
-MeCab::Light is a 'light' tool.
-This supports only the 'parse' method for now,
-and the method's feature is totally different from its original.
-
 Add this line to your application's Gemfile:
 
     gem 'mecab-light'
@@ -23,6 +18,11 @@ Or install it yourself as:
 
 ## Usage
 
+This gem works without official binding.
+MeCab::Light is a 'light' tool.
+This supports only the 'parse' method for now,
+and the method's feature is totally different from its original.
+
 ```ruby
 require 'mecab/light'
 

data/ext/extconf.rb

@@ -0,0 +1,7 @@
+require 'mkmf'
+
+if have_header('mecab.h') && have_library('mecab')
+  create_makefile('mecab_light_binding')
+else
+  puts 'Install MeCab and give it another try.'
+end

data/ext/mecab_light_binding.c

@@ -0,0 +1,53 @@
+#include <ruby.h>
+#include <ruby/encoding.h>
+#include <mecab.h>
+
+struct binding {
+  mecab_t* mecab;
+};
+
+static VALUE
+binding_alloc(VALUE klass)
+{
+  struct binding* ptr = ALLOC(struct binding);
+  return Data_Wrap_Struct(klass, 0, -1, ptr);
+}
+
+static VALUE
+rb_mecab_light_binding_initialize(VALUE self, VALUE arg)
+{
+  struct binding* ptr;
+
+  Data_Get_Struct(self, struct binding, ptr);
+  ptr->mecab = mecab_new2(RSTRING_PTR(arg));
+  return Qnil;
+}
+
+static VALUE
+rb_mecab_light_binding_parse_to_s(VALUE self, VALUE str)
+{
+  struct binding* ptr;
+  const char* result;
+  rb_encoding* enc;
+
+  Data_Get_Struct(self, struct binding, ptr);
+  enc = rb_enc_get(str);
+  result = mecab_sparse_tostr(ptr->mecab, RSTRING_PTR(str));
+  return rb_enc_associate(rb_str_new2(result), enc);
+}
+
+void
+Init_mecab_light_binding()
+{
+  VALUE rb_mMeCab, rb_mMeCab_Light, rb_cMeCab_Light_Binding;
+
+  rb_mMeCab = rb_define_module("MeCab");
+  rb_mMeCab_Light = rb_define_module_under(rb_mMeCab, "Light");
+  rb_cMeCab_Light_Binding = rb_define_class_under(rb_mMeCab_Light,
+      "Binding", rb_cObject);
+  rb_define_alloc_func(rb_cMeCab_Light_Binding, binding_alloc);
+  rb_define_private_method(rb_cMeCab_Light_Binding, "initialize",
+      rb_mecab_light_binding_initialize, 1);
+  rb_define_method(rb_cMeCab_Light_Binding, "parse_to_s",
+      rb_mecab_light_binding_parse_to_s, 1);
+}

data/lib/mecab/light/tagger.rb

@@ -2,7 +2,7 @@ module MeCab
   module Light
     class Tagger
       def initialize
-        @mecab = Binding.mecab_new2('')
+        @mecab = Binding.new('')
       end
 
       def parse(string)
@@ -11,12 +11,7 @@ module MeCab
 
       private
       def parse_to_enum(string)
-        parse_to_str(string).sub(/EOS\n$/, '').each_line
-      end
-
-      def parse_to_str(string)
-        encoding = Encoding.default_external
-        Binding.mecab_sparse_tostr(@mecab, string).force_encoding(encoding)
+        @mecab.parse_to_s(string).sub(/EOS\n$/, '').each_line
       end
     end
   end

data/lib/mecab/light/version.rb

@@ -1,5 +1,5 @@
 module MeCab
   module Light
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/mecab/light.rb

@@ -1,6 +1,5 @@
-require 'ffi'
 require 'mecab/light/version'
 require 'mecab/light/morpheme'
 require 'mecab/light/result'
 require 'mecab/light/tagger'
-require 'mecab/light/binding'
+require 'mecab_light_binding'

data/mecab-light.gemspec

@@ -17,8 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.required_ruby_version = '>= 1.9'
-
-  gem.add_runtime_dependency 'ffi'
+  gem.extensions << 'ext/extconf.rb'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'

data/spec/mecab_spec.rb

@@ -10,14 +10,12 @@ end
 
 module MeCab
   module Light
-    module Binding
-      def self.mecab_new2(arg)
-        :dummy_mecab
+    class Binding
+      def initialize(option)
       end
 
-      def self.mecab_sparse_tostr(mecab, string)
-        result = "見る\t動詞,自立,*,*,一段,基本形,見る,ミル,ミル\nEOS\n"
-        result.force_encoding('ASCII-8BIT')
+      def parse_to_s(string)
+        "見る\t動詞,自立,*,*,一段,基本形,見る,ミル,ミル\nEOS\n"
       end
     end
   end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mecab-light
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Hajime WAKAHARA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ffi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -56,7 +42,8 @@ description: Use a sequence of results as an Enumerable object.
 email:
 - hajime.wakahara@gmail.com
 executables: []
-extensions: []
+extensions:
+- ext/extconf.rb
 extra_rdoc_files: []
 files:
 - .gitignore
@@ -64,6 +51,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- ext/extconf.rb
+- ext/mecab_light_binding.c
 - lib/mecab/light.rb
 - lib/mecab/light/binding.rb
 - lib/mecab/light/morpheme.rb
@@ -91,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: A Thin Wrapper for mecab-ruby