natto 0.0.4 → 0.0.6

data/README

@@ -49,7 +49,17 @@ Install natto with the following gem command:
 
 == Changelog
 
-- **2010/12/22**: 0.0.3 release.
+- **2010/12/28**: 0.0.6 release.
+    - Correction to natto.gemspec to include lib/natto/binding.rb.
+
+- **2010/12/28**: 0.0.5 release. (yanked)
+    - On-going refactoring
+    - Project structure refactored for greater maintainability
+
+- **2010/12/26**: 0.0.4 release.
+    - On-going refactoring
+
+- **2010/12/23**: 0.0.3 release.
     - On-going refactoring
     - Adding documentation via yard
 

data/lib/natto.rb

@@ -1,5 +1,6 @@
-# -*- coding: UTF-8 -*-
+# -*- encoding: utf-8 -*-
 require 'rubygems' if RUBY_VERSION.to_f < 1.9
+require 'natto/binding'
 
 # natto combines the Ruby programming language with MeCab, 
 # the part-of-speech and morphological analyzer for the
@@ -113,11 +114,13 @@ module Natto
       SUPPORTED_OPTS.each do |k|
         if options.has_key? k
           key = k.to_s.gsub('_', '-')  
-          if key.end_with? '_format_' or key.end_with? '_feature'
-            opt << "--#{key}="+options[k]
-          else
-            opt << "--#{key}=#{options[k]}"
-          end
+          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(" ")
@@ -158,56 +161,4 @@ module Natto
             :version,  :ushort,
             :next,     :pointer 
   end
-
-  # Module <tt>Binding</tt> encapsulates operations which are
-  # made available via <tt>FFI</tt> bindings to <tt>mecab</tt>
-  module Binding
-    require 'rbconfig'
-    extend FFI::Library
-
-    # String name for the environment variable used by 
-    # <tt>Natto</tt> to indicate the exact name / full path
-    # to the <tt>mecab</tt> library.
-    MECAB_PATH = 'MECAB_PATH'
-    
-    # @private
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    # Returns the name of the <tt>mecab</tt> library based on 
-    # the runtime environment. The value of the environment
-    # parameter <tt>MECAB_PATH</tt> is checked before this
-    # function is invoked, and in the case of Windows, a
-    # <tt>LoadError</tt> will be raised if <tt>MECAB_PATH</tt>
-    # is <b>not</b> set to the full path of the <tt>mecab</tt>
-    # library.
-    def self.find_library
-      host_os = RbConfig::CONFIG['host_os']
-
-      if host_os =~ /mswin|mingw/i
-        raise LoadError, "Please set #{MECAB_PATH} to full path to libmecab.dll"
-      elsif host_os =~ /cygwin/i
-        'cygmecab-1'
-      else
-        'mecab'
-      end
-    end
-
-    ffi_lib(ENV[MECAB_PATH] || find_library)
-
-    attach_function :mecab_version, [], :string
-    attach_function :mecab_new2, [:string], :pointer
-    attach_function :mecab_destroy, [:pointer], :void
-    attach_function :mecab_sparse_tostr, [:pointer, :string], :string
-    attach_function :mecab_strerror, [:pointer],:string
-    attach_function :mecab_dictionary_info, [:pointer], :pointer
-
-    # @private
-    module ClassMethods
-      def mecab_version
-        Natto::Binding.mecab_version
-      end
-    end
-  end
 end

data/lib/natto/binding.rb

@@ -0,0 +1,55 @@
+module Natto
+
+  # Module <tt>Binding</tt> encapsulates operations which are
+  # made available via <tt>FFI</tt> bindings to <tt>mecab</tt>
+  module Binding
+    require 'ffi'
+    require 'rbconfig'
+    extend FFI::Library
+
+    # String name for the environment variable used by 
+    # <tt>Natto</tt> to indicate the exact name / full path
+    # to the <tt>mecab</tt> library.
+    MECAB_PATH = 'MECAB_PATH'
+    
+    # @private
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    # Returns the name of the <tt>mecab</tt> library based on 
+    # the runtime environment. The value of the environment
+    # parameter <tt>MECAB_PATH</tt> is checked before this
+    # function is invoked, and in the case of Windows, a
+    # <tt>LoadError</tt> will be raised if <tt>MECAB_PATH</tt>
+    # is <b>not</b> set to the full path of the <tt>mecab</tt>
+    # library.
+    def self.find_library
+      host_os = RbConfig::CONFIG['host_os']
+
+      if host_os =~ /mswin|mingw/i
+        raise LoadError, "Please set #{MECAB_PATH} to full path to libmecab.dll"
+      elsif host_os =~ /cygwin/i
+        'cygmecab-1'
+      else
+        'mecab'
+      end
+    end
+
+    ffi_lib(ENV[MECAB_PATH] || find_library)
+
+    attach_function :mecab_version, [], :string
+    attach_function :mecab_new2, [:string], :pointer
+    attach_function :mecab_destroy, [:pointer], :void
+    attach_function :mecab_sparse_tostr, [:pointer, :string], :string
+    attach_function :mecab_strerror, [:pointer],:string
+    attach_function :mecab_dictionary_info, [:pointer], :pointer
+
+    # @private
+    module ClassMethods
+      def mecab_version
+        Natto::Binding.mecab_version
+      end
+    end
+  end
+end

data/lib/natto/version.rb

@@ -0,0 +1,5 @@
+# -*- encoding: utf-8 -*-
+module Natto
+  # Version string for this Rubygem.
+  VERSION = "0.0.6"
+end

data/test/test_natto.rb

@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+# -*- encoding: utf-8 -*-
 $:.unshift('lib')
 require 'rubygems' if RUBY_VERSION.to_f < 1.9
 require 'test/unit'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: natto
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Brooke M. Fujita
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-27 00:00:00 +09:00
+date: 2010-12-28 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 0
         - 6
@@ -43,6 +45,8 @@ extra_rdoc_files:
 - README
 files: 
 - lib/natto.rb
+- lib/natto/binding.rb
+- lib/natto/version.rb
 - test/test_natto.rb
 - LICENSE
 - README
@@ -60,6 +64,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
@@ -70,6 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"