natto 0.0.3 → 0.0.4

data/lib/natto.rb

@@ -9,6 +9,7 @@ require 'rubygems' if RUBY_VERSION.to_f < 1.9
 # natto requires the following:
 # * {http://sourceforge.net/projects/mecab/files/mecab/ MeCab 0.98}
 # * {http://rubygems.org/gems/ffi ffi 0.63 or greater}
+# * Ruby 1.8.7 or greater
 #
 # === Installation
 # Install natto with the following gem command:
@@ -58,7 +59,7 @@ module Natto
     # * :dicdir -- system dicdir
     # * :userdic -- user dictionary
     # * :lattice_level -- lattice information level (integer, default 0)
-    # * :output_format_type -- output format type (wakati, chasen, yomi, dump)
+    # * :output_format_type -- output format type (wakati, chasen, yomi, etc.)
     # * :node_format -- user-defined node format
     # * :unk_format -- user-defined unknown node format
     # * :bos_format -- user-defined beginning-of-sentence format
@@ -68,13 +69,18 @@ module Natto
     # * :nbest --  output N best results (integer, default 1)
     # * :theta -- temperature parameter theta (float, default 0.75)
     # * :cost_factor -- cost factor (integer, default 700)
+    # <br/>
+    # Use single-quotes to preserve format options that contain escape chars.
+    # <br/>
+    # e.g.
+    #   m = Natto::MeCab.new(:node_format=>'%m\t%f[7]\n')
     #
     # @param [Hash]
     # @see {SUPPORTED_OPTS}
     def initialize(options={})
       opt_str = self.class.build_options_str(options)
       @ptr = Natto::Binding.mecab_new2(opt_str)
-      raise MeCabError.new("MeCab initialization error with '#{opt_str}'") if @ptr.address == 0
+      raise MeCabError.new("Could not initialize MeCab with options: '#{opt_str}'") if @ptr.address == 0
       #@dict = Natto::DictionaryInfo.new(Natto::Binding.mecab_dictionary_info(@ptr))
       ObjectSpace.define_finalizer(self, self.class.create_free_proc(@ptr))
     end
@@ -87,6 +93,7 @@ module Natto
         raise(MeCabError.new(Natto::Binding.mecab_strerror(@ptr)))
     end
 
+
     # Returns a <tt>Proc</tt> that is registered to be invoked
     # after the object owning <tt>ptr</tt> has been destroyed.
     #
@@ -106,7 +113,11 @@ module Natto
       SUPPORTED_OPTS.each do |k|
         if options.has_key? k
           key = k.to_s.gsub('_', '-')  
-          opt << "--#{key}=#{options[k]}"
+          if key.end_with? '_format_' or key.end_with? '_feature'
+            opt << "--#{key}="+options[k]
+          else
+            opt << "--#{key}=#{options[k]}"
+          end
         end
       end
       opt.join(" ")
@@ -131,7 +142,7 @@ module Natto
   # * :version
   # * :next
   # <br>
-  #
+  # Usage:
   #  dict = Natto::DictionaryInfo.new(mecab_ptr)
   #  puts dict[:filename]
   #  =>  /usr/local/lib/mecab/dic/ipadic/sys.dic

data/test/test_natto.rb

@@ -25,17 +25,52 @@ class TestNatto < Test::Unit::TestCase
     res = Natto::MeCab.build_options_str(:unknown=>"ignore")
     assert_equal('', res)
 
-    res = Natto::MeCab.build_options_str(:dicdir=>"a")
-    assert_equal('--dicdir=a', res)
+    res = Natto::MeCab.build_options_str(:rcfile=>"/some/file")
+    assert_equal('--rcfile=/some/file', res)
 
-    res = Natto::MeCab.build_options_str(:userdic=>"b")
-    assert_equal('--userdic=b', res)
+    res = Natto::MeCab.build_options_str(:dicdir=>"/some/other/file")
+    assert_equal('--dicdir=/some/other/file', res)
+
+    res = Natto::MeCab.build_options_str(:userdic=>"/yet/another/file")
+    assert_equal('--userdic=/yet/another/file', res)
 
     res = Natto::MeCab.build_options_str(:output_format_type=>"c")
     assert_equal('--output-format-type=c', res)
 
-    res = Natto::MeCab.build_options_str(:output_format_type=>"c", :userdic=>"b", :dicdir=>"a")
-    assert_equal('--dicdir=a --userdic=b --output-format-type=c', res)
+    res = Natto::MeCab.build_options_str(:output_format_type=>"c", 
+                                         :userdic=>"/some/file", 
+                                         :dicdir=>"/some/other/file")
+    assert_equal('--dicdir=/some/other/file --userdic=/some/file --output-format-type=c', res)
+
+    res = Natto::MeCab.build_options_str(:node_format=>'%m\t%f[7]\n')
+    assert_equal('--node-format=%m\t%f[7]\n', res)
+    
+    res = Natto::MeCab.build_options_str(:unk_format=>'%m\t%f[7]\n')
+    assert_equal('--unk-format=%m\t%f[7]\n', res)
+
+    res = Natto::MeCab.build_options_str(:bos_format=>'%m\t%f[7]\n')
+    assert_equal('--bos-format=%m\t%f[7]\n', res)
+
+    res = Natto::MeCab.build_options_str(:eos_format=>'%m\t%f[7]\n')
+    assert_equal('--eos-format=%m\t%f[7]\n', res)
+
+    res = Natto::MeCab.build_options_str(:eon_format=>'%m\t%f[7]\n')
+    assert_equal('--eon-format=%m\t%f[7]\n', res)
+
+    res = Natto::MeCab.build_options_str(:unk_feature=>'%m\t%f[7]\n')
+    assert_equal('--unk-feature=%m\t%f[7]\n', res)
+
+    res = Natto::MeCab.build_options_str(:lattice_level=>42)
+    assert_equal('--lattice-level=42', res)
+
+    res = Natto::MeCab.build_options_str(:nbest=>42)
+    assert_equal('--nbest=42', res)
+
+    res = Natto::MeCab.build_options_str(:theta=>0.42)
+    assert_equal('--theta=0.42', res)
+
+    res = Natto::MeCab.build_options_str(:cost_factor=>42)
+    assert_equal('--cost-factor=42', res)
   end
 
   def test_initialize
@@ -43,4 +78,5 @@ class TestNatto < Test::Unit::TestCase
       Natto::MeCab.new(:output_format_type=>'UNDEFINED')
     end
   end
+
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Brooke M. Fujita
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 +09:00
+date: 2010-12-27 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,14 +38,15 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- LICENSE
+- README
 files: 
 - lib/natto.rb
 - test/test_natto.rb
 - LICENSE
 - README
-has_rdoc: true
+has_rdoc: yard
 homepage: http://code.google.com/p/natto/
 licenses: 
 - BSD
@@ -74,6 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: 
 - MeCab, 0.98 or greater
+- FFI, 0.6.3 or greater
 rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: