mecab-light 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 974e912e189f8360bb6262bd58cd1d429bf3c0e8
-  data.tar.gz: 30c75d49c243b6607af51332cff756d882760cf3
+  metadata.gz: c610ca8725dff12d78f4c8e57aed3a669cb4dfd9
+  data.tar.gz: 2c7400b6c7355e26bf1cf0c11f9dbd9a98401330
 SHA512:
-  metadata.gz: 00e60f2b160e885a58cbab9ce939b62846968e89b2b34d8fb18ba6cb658041297b9272949b0939b535f1e934ad89c96d0ba31e11d1deeb04165aa07d878dc4c0
-  data.tar.gz: 98223a90310d0be19a82f7084faaf4536431b2ec4e4ed25547c9b3c87f3969f4e3731726ee005c41438b7eb0d1b6f1c6625d800834496a60b778bdf28a27aaa4
+  metadata.gz: 68e644215d1733e15152650d68923532d20e6cfeae91f0150f1e8b9c9b56503ce42cfc090c9d5cc4f6db26ce971784117d081937d2c61507b8d80c93e9ccaa6d
+  data.tar.gz: df72e4d97b55674761e303e218d8087bf470e9d730be9017eaef8a059bff3a53fbb5c85938f00bc00e79099b6a03e8fb4bac028fafaddc9a408cc5dd4de27cf2

data/.travis.yml

@@ -0,0 +1,2 @@
+rvm:
+- 2.0.0

data/README.md

@@ -18,10 +18,10 @@ 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.
+MeCab::Light is a lightweight tool.
+This gem works without the official binding.
+This supports only Tagger#parse method for now.
+Note that the method's feature is totally different from its original.
 
 ```ruby
 require 'mecab/light'
@@ -31,7 +31,7 @@ string = 'この文を形態素解析してください。'
 result = tagger.parse(string)
 result[0].surface #=> "この"
 result.kind_of?(Enumerable) #=> true
-result.map{|morpheme| morpheme.surface }
+result.map { |morpheme| morpheme.surface }
 #=> ["この", "文", "を", "形態素", "解析", "し", "て", "ください", "。"]
 ```
 

data/ext/mecab/light/binding.c

@@ -2,52 +2,49 @@
 #include <ruby/encoding.h>
 #include <mecab.h>
 
-struct binding {
-  mecab_t* mecab;
-};
+typedef struct {
+  mecab_t* ptr;
+} MeCab;
 
 static VALUE
-binding_alloc(VALUE klass)
+mecab_alloc(VALUE klass)
 {
-  struct binding* ptr = ALLOC(struct binding);
-  return Data_Wrap_Struct(klass, 0, -1, ptr);
+  MeCab* mecab = ALLOC(MeCab);
+  return Data_Wrap_Struct(klass, 0, 0, mecab);
 }
 
 static VALUE
-rb_mecab_light_binding_initialize(VALUE self, VALUE arg)
+rb_mecab_initialize(VALUE self, VALUE arg)
 {
-  struct binding* ptr;
+  MeCab* mecab;
 
-  Data_Get_Struct(self, struct binding, ptr);
-  ptr->mecab = mecab_new2(RSTRING_PTR(arg));
+  Data_Get_Struct(self, MeCab, mecab);
+  mecab->ptr = mecab_new2(RSTRING_PTR(arg));
   return Qnil;
 }
 
 static VALUE
-rb_mecab_light_binding_parse_to_s(VALUE self, VALUE str)
+rb_mecab_parse_to_s(VALUE self, VALUE str)
 {
-  struct binding* ptr;
+  MeCab* mecab;
   const char* result;
   rb_encoding* enc;
 
-  Data_Get_Struct(self, struct binding, ptr);
+  Data_Get_Struct(self, MeCab, mecab);
   enc = rb_enc_get(str);
-  result = mecab_sparse_tostr(ptr->mecab, RSTRING_PTR(str));
+  result = mecab_sparse_tostr(mecab->ptr, RSTRING_PTR(str));
   return rb_enc_associate(rb_str_new2(result), enc);
 }
 
 void
 Init_binding()
 {
-  VALUE rb_mMeCab, rb_mMeCab_Light, rb_cMeCab_Light_Binding;
+  VALUE rb_mMeCab, rb_mLight, rb_cBinding;
 
   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);
+  rb_mLight = rb_define_module_under(rb_mMeCab, "Light");
+  rb_cBinding = rb_define_class_under(rb_mLight, "Binding", rb_cObject);
+  rb_define_alloc_func(rb_cBinding, mecab_alloc);
+  rb_define_private_method(rb_cBinding, "initialize", rb_mecab_initialize, 1);
+  rb_define_method(rb_cBinding, "parse_to_s", rb_mecab_parse_to_s, 1);
 }

data/ext/mecab/light/extconf.rb

@@ -1,5 +1,12 @@
 require 'mkmf'
 
+begin
+  require 'Win32API'
+
+  dir_config('opt', 'c:\MeCab\sdk', 'c:\MeCab\bin')
+rescue LoadError
+end
+
 if have_header('mecab.h') && have_library('mecab')
   create_makefile('mecab/light/binding')
 else

data/lib/mecab/light/result.rb

@@ -2,8 +2,9 @@ module MeCab
   module Light
     class Result
       include Enumerable
-      def initialize(line_enum)
-        @morphemes = line_enum.map{|line| Morpheme.new(line) }
+
+      def initialize(parsed)
+        @morphemes = parsed.each_line.map { |line| Morpheme.new(line) }
       end
 
       def each(&block)

data/lib/mecab/light/tagger.rb

@@ -6,12 +6,12 @@ module MeCab
       end
 
       def parse(string)
-        Result.new(parse_to_enum(string))
+        Result.new(parse_to_s(string))
       end
 
       private
-      def parse_to_enum(string)
-        @mecab.parse_to_s(string).sub(/EOS\n$/, '').each_line
+      def parse_to_s(string)
+        @mecab.parse_to_s(string).sub(/EOS\n$/, '')
       end
     end
   end

data/lib/mecab/light/version.rb

@@ -1,5 +1,5 @@
 module MeCab
   module Light
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

data/spec/mecab-light-morpheme_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe MeCab::Light::Morpheme do
+  let(:morpheme) { MeCab::Light::Morpheme.new("surface\tfeature\n") }
+
+  context 'the class' do
+    it { expect(MeCab::Light::Morpheme).to respond_to(:new).with(1).argument }
+  end
+
+  context 'an instance initialized with "surface\tfeature\n"' do
+    it { expect(morpheme).to respond_to(:surface).with(0).arguments }
+    it { expect(morpheme).to respond_to(:feature).with(0).arguments }
+
+    context 'surface' do
+      it { expect(morpheme.surface).to eq('surface') }
+
+      context 'encoding' do
+        it { expect(morpheme.surface.encoding).to eq(Encoding::UTF_8) }
+      end
+    end
+
+    context 'feature' do
+      it { expect(morpheme.feature).to eq('feature') }
+
+      context 'encoding' do
+        it { expect(morpheme.feature.encoding).to eq(Encoding::UTF_8) }
+      end
+    end
+  end
+end

data/spec/mecab-light-result_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+describe MeCab::Light::Result do
+  let(:morpheme) { double('MeCab::Light::Morpheme') }
+  let(:result) { MeCab::Light::Result.new("surface\tfeature\n") }
+  before do
+    MeCab::Light::Morpheme.stub(:new).and_return(morpheme)
+  end
+
+  context 'class' do
+    it { expect(MeCab::Light::Result).to respond_to(:new).with(1).argument }
+
+    context 'new with "surface\tfeature\n"' do
+      context 'MeCab::Light::Morpheme class' do
+        after do
+          MeCab::Light::Result.new("surface\tfeature\n")
+        end
+
+        it 'should receive #new with "surface\tfeature\n"' do
+          expect(MeCab::Light::Morpheme).to receive(:new).with("surface\tfeature\n")
+        end
+      end
+    end
+  end
+
+  context 'an instance initialized with ""' do
+    it { expect(result).to respond_to(:each).with(0).arguments }
+    it { expect(result).to be_an(Enumerable) }
+
+    context 'count' do
+      it { expect(result.count).to eq(1) }
+    end
+
+    context 'each' do
+      context 'with block' do
+        it 'should return self' do
+          expect(result.each{}).to eq(result)
+        end
+        it { expect { |b| result.each(&b) }.to yield_control }
+        it 'should yield with args(MeCab::Light::Morpheme)' do
+          expect { |b| result.each(&b) }.to yield_with_args(morpheme)
+        end
+      end
+
+      context 'without block' do
+        it { expect(result.each).to be_an_instance_of(Enumerator) }
+      end
+    end
+
+    context '[] with 0' do
+      it 'should be an instance of Morpheme' do
+        expect(result[0]).to eq(morpheme)
+      end
+    end
+
+    context 'at with 0' do
+      it 'should be an instance of Morpheme' do
+        expect(result.at(0)).to eq(morpheme)
+      end
+    end
+  end
+end

data/spec/mecab-light-tagger_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe MeCab::Light::Tagger do
+  let(:binding) { double( parse_to_s: "surface\tfeature\nEOS\n" ) }
+  let(:result) { double('MeCab::Light::Result') }
+  let(:tagger) { MeCab::Light::Tagger.new }
+  before do
+    MeCab::Light::Binding.stub(:new).and_return(binding)
+    MeCab::Light::Result.stub(:new).and_return(result)
+  end
+
+  context 'the class' do
+    it { expect(MeCab::Light::Tagger).to respond_to(:new).with(0).arguments }
+
+    context 'new' do
+      context 'MeCab::Light::Binding class' do
+        after do
+          MeCab::Light::Tagger.new
+        end
+
+        it 'should receive #new with ""' do
+          expect(MeCab::Light::Binding).to receive(:new).with('')
+        end
+      end
+    end
+  end
+
+  context 'an instance' do
+    it { expect(tagger).to respond_to(:parse).with(1).argument }
+
+    context 'parse with "surface"' do
+      it 'should be an instance of MeCab::Light::Result' do
+        expect(tagger.parse('surface')).to eq(result)
+      end
+
+      context 'MeCab::Light::Result class' do
+        after do
+          tagger.parse('surface')
+        end
+
+        it 'should receive #new with "surface\tfeature\n"' do
+          expect(MeCab::Light::Result).to receive(:new).with("surface\tfeature\n")
+        end
+      end
+
+      context 'a MeCab::Light::Binding object' do
+        after do
+          tagger.parse('surface')
+        end
+
+        it 'should receive #parse_to_s with "surface"' do
+          expect(binding).to receive(:parse_to_s).with('surface')
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,8 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'mecab/light/morpheme'
+require 'mecab/light/result'
+require 'mecab/light/tagger'
+
+class MeCab::Light::Binding
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mecab-light
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Hajime WAKAHARA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -47,6 +47,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -59,7 +60,10 @@ files:
 - lib/mecab/light/tagger.rb
 - lib/mecab/light/version.rb
 - mecab-light.gemspec
-- spec/mecab_spec.rb
+- spec/mecab-light-morpheme_spec.rb
+- spec/mecab-light-result_spec.rb
+- spec/mecab-light-tagger_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/hadzimme/mecab-light
 licenses: []
 metadata: {}
@@ -79,9 +83,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: An simple interface for MeCab (UNOFFICIAL)
 test_files:
-- spec/mecab_spec.rb
+- spec/mecab-light-morpheme_spec.rb
+- spec/mecab-light-result_spec.rb
+- spec/mecab-light-tagger_spec.rb
+- spec/spec_helper.rb

data/spec/mecab_spec.rb

@@ -1,110 +0,0 @@
-# coding: utf-8
-
-require 'rspec'
-begin
-  require 'mecab/light'
-rescue LoadError
-  puts 'loaded mecab-light but MeCab does not exist.'
-  puts 'dummy binding will be loaded.'
-end
-
-module MeCab
-  module Light
-    class Binding
-      def initialize(option)
-      end
-
-      def parse_to_s(string)
-        "見る\t動詞,自立,*,*,一段,基本形,見る,ミル,ミル\nEOS\n"
-      end
-    end
-  end
-end
-
-describe MeCab::Light::Morpheme do
-  context 'when initialized with the result line of the word "見る"' do
-    before do
-      @morpheme = MeCab::Light::Morpheme.new(
-        "見る\t動詞,自立,*,*,一段,基本形,見る,ミル,ミル\n")
-    end
-    subject { @morpheme }
-    its(:surface){ should eq '見る' }
-    its(:feature){ should eq '動詞,自立,*,*,一段,基本形,見る,ミル,ミル' }
-    describe 'surface' do
-      subject { @morpheme.surface }
-      its(:encoding){ should be Encoding::UTF_8 }
-    end
-    describe 'feature' do
-      subject { @morpheme.feature }
-      its(:encoding){ should be Encoding::UTF_8 }
-    end
-  end
-end
-describe MeCab::Light::Result do
-  context 'when initialized with the result Enumerator of the word "見る"' do
-    before do
-      @result = MeCab::Light::Result.new(
-        ["見る\t動詞,自立,*,*,一段,基本形,見る,ミル,ミル\n"].to_enum)
-    end
-    subject { @result }
-    it { should respond_to :each }
-    it { should be_an Enumerable }
-    its(:count){ should be 1 }
-    describe 'each' do
-      context 'with block' do
-        subject { @result.each{} }
-        it 'should return self' do
-          should be @result
-        end
-      end
-      context 'without block' do
-        subject { @result.each }
-        it 'should return Enumerator' do
-          should be_an_instance_of Enumerator
-        end
-      end
-    end
-    describe '[]' do
-      context 'when argument 0' do
-        subject { @result[0] }
-        it { should be_an_instance_of MeCab::Light::Morpheme }
-      end
-    end
-    describe 'at' do
-      context 'when argument 0' do
-        subject { @result.at(0) }
-        it { should be_an_instance_of MeCab::Light::Morpheme }
-      end
-    end
-  end
-end
-describe MeCab::Light::Tagger do
-  before { @tagger = MeCab::Light::Tagger.new }
-  subject { @tagger }
-  it { should respond_to :parse }
-  describe 'parse' do
-    context 'when argument "見る"' do
-      before { @result = @tagger.parse('見る') }
-      subject { @result }
-      it 'should return MeCab::Light::Result object' do
-        should be_an_instance_of MeCab::Light::Result
-      end
-      its(:count){ should be 1 }
-      describe 'MeCab::Light::Result (returned)' do
-        context '[0]' do
-          before { @morpheme = @result[0] }
-          subject { @morpheme }
-          it 'should return MeCab::Light::Morpheme object' do
-            should be_an_instance_of MeCab::Light::Morpheme
-          end
-          describe 'MeCab::Light::Morpheme (returned)' do
-            context 'surface' do
-              subject { @morpheme.surface }
-              it { should eq '見る' }
-            end
-          end
-        end
-      end
-    end
-  end
-end