chawan 0.0.3 → 0.0.4

data/README

@@ -32,33 +32,35 @@ Class
 Example
 =======
 
-  text = '本日はバリ晴天なりっす'
+  text = '登録された利用者'
 
   # 'parse' returns a Chawan::Nodes
   Chawan.parse(text)
-  => [<名詞: '本日'>, <助詞: 'は'>, <名詞: 'バリ'>, <名詞: '晴天'>, <助動詞: 'なり'>, <助動詞: 'っす'>]
+  => [<名詞: '登録'>, <動詞: 'さ'>, <動詞: 'れ'>, <助動詞: 'た'>, <名詞: '利用'>, <名詞: '者'>]
 
   # Chawan::Nodes is enumerable
   Chawan.parse(text).select{|node| node.category == '名詞'}
-  => [<名詞: '本日'>, <名詞: 'バリ'>, <名詞: '晴天'>]
+  => [<名詞: '登録'>, <名詞: '利用'>, <名詞: '者'>]
 
   # gateway interface: noun
   Chawan.parse(text).noun
-  => [<名詞: '本日'>, <名詞: 'バリ'>, <名詞: '晴天'>]
+  => [<名詞: '登録'>, <名詞: '利用'>, <名詞: '者'>]
 
   # gateway interface: verb
   Chawan.parse(text).verb
-  => [<助動詞: 'なり'>, <助動詞: 'っす'>]
+  => [<動詞: 'さ'>, <動詞: 'れ'>, <助動詞: 'た'>]
 
   # gateway interface: grep
-  Chawan.parse(text).grep(/助/)
-  => [<助詞: 'は'>, <助動詞: 'なり'>, <助動詞: 'っす'>]
+  Chawan.parse(text).grep(/動詞/)
+  => [<動詞: 'さ'>, <動詞: 'れ'>, <助動詞: 'た'>]
+  Chawan.parse(text).grep('動詞')
+  => [<動詞: 'さ'>, <動詞: 'れ'>]
 
   # gateway interface: compact
   Chawan.parse(text).compact
-  => [<名詞: '本日'>, <助詞: 'は'>, <名詞: 'バリ晴天'>, <助動詞: 'なりっす'>]
-  Chawan.parse(text).compact(/名詞/)
-  => [<名詞: '本日'>, <助詞: 'は'>, <名詞: 'バリ晴天'>, <助動詞: 'なり'>, <助動詞: 'っす'>]
+  => [<名詞: '登録'>, <動詞: 'され'>, <助動詞: 'た'>, <名詞: '利用者'>]
+  Chawan.parse(text).compact(/動詞/)
+  => [<名詞: '登録'>, <動詞: 'された'>, <名詞: '利用'>, <名詞: '者'>]
 
   # gateway interface is chainable
   Chawan.parse(text).noun.verb
@@ -66,11 +68,11 @@ Example
 
   # chainable is fun!
   Chawan.parse(text).noun
-  => [<名詞: '本日'>, <名詞: 'バリ'>, <名詞: '晴天'>]
+  => [<名詞: '登録'>, <名詞: '利用'>, <名詞: '者'>]
   Chawan.parse(text).compact.noun
-  => [<名詞: '本日'>, <名詞: 'バリ晴天'>]
+  => [<名詞: '登録'>, <名詞: '利用者'>]
   Chawan.parse(text).noun.compact
-  => [<名詞: '本日バリ晴天'>]
+  => [<名詞: '登録利用者'>]
 
   
 Analyzer

data/Rakefile

@@ -6,7 +6,7 @@ AUTHOR = "maiha"
 EMAIL = "maiha@wota.jp"
 HOMEPAGE = "http://github.com/maiha/chawan"
 SUMMARY = "A cup for chasen that provides an easy to use for extracting Japanese"
-GEM_VERSION = "0.0.3"
+GEM_VERSION = "0.0.4"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = 'asakusarb'

data/lib/chawan/nodes.rb

@@ -34,11 +34,12 @@ module Chawan
       end
     end
 
-    def compact(pattern = //)
+    def compact(pattern = nil)
       array = []
-      prev = nil
       each do |node|
-        if array.last and (pattern === node.category) and array.last.category == node.category
+        if array.last and (pattern ?
+                           (pattern === node.category && pattern === array.last.category) :
+                           (array.last.category == node.category))
           array.last.word << node.word.to_s
         else
           array << Node.new(node.vals.map(&:dup), node.keys)

data/spec/nodes_spec.rb

@@ -25,16 +25,17 @@ end
 describe Chawan::Nodes do
   before do
     keys = ["表記","品詞"]
-    @n1 = Chawan::Node.new(["本日","名詞"], keys)
-    @p1 = Chawan::Node.new(["は"  ,"助詞"], keys)
-    @n2 = Chawan::Node.new(["マジ","名詞"], keys)
-    @n3 = Chawan::Node.new(["晴天","名詞"], keys)
-    @v1 = Chawan::Node.new(["なり","助動詞"], keys)
-    @v2 = Chawan::Node.new(["っす","助動詞"], keys)
-    @nodes = Chawan::Nodes.new([@n1, @p1, @n2, @n3, @v1, @v2])
+    @n1 = Chawan::Node.new(["登録","名詞"  ], keys)
+    @v1 = Chawan::Node.new(["さ"  ,"動詞"  ], keys)
+    @v2 = Chawan::Node.new(["れ"  ,"動詞"  ], keys)
+    @p1 = Chawan::Node.new(["た"  ,"助動詞"], keys)
+    @n2 = Chawan::Node.new(["利用","名詞"  ], keys)
+    @n3 = Chawan::Node.new(["者"  ,"名詞"  ], keys)
+    @nodes = Chawan::Nodes.new([@n1, @v1, @v2, @p1, @n2, @n3])
 
-    @n23 = Chawan::Node.new(["マジ晴天","名詞"], keys)
-    @v12 = Chawan::Node.new(["なりっす","助動詞"], keys)
+    @n23   = Chawan::Node.new(["利用者","名詞"], keys)
+    @v12   = Chawan::Node.new(["され","動詞"], keys)
+    @v12p1 = Chawan::Node.new(["された","動詞"], keys)
   end
 
   subject { @nodes }
@@ -43,21 +44,21 @@ describe Chawan::Nodes do
   ### Gateway Interface
 
   gateway_interface(:noun) { should == Chawan::Nodes.new([@n1, @n2, @n3]) }
-  gateway_interface(:verb) { should == Chawan::Nodes.new([@v1, @v2]) }
+  gateway_interface(:verb) { should == Chawan::Nodes.new([@v1, @v2, @p1]) }
 
-  gateway_interface(:compact) { should == Chawan::Nodes.new([@n1, @p1, @n23, @v12]) }
-  it "#compact(/名詞/) should compact only nodes matched /名詞/" do
-    subject.compact(/名詞/).should == Chawan::Nodes.new([@n1, @p1, @n23, @v1, @v2])
+  gateway_interface(:compact) { should == Chawan::Nodes.new([@n1, @v12, @p1, @n23]) }
+  it "#compact(/動詞/) should compact only nodes matched /動詞/" do
+    subject.compact(/動詞/).should == Chawan::Nodes.new([@n1, @v12p1, @n2, @n3])
+  end
+  it "#compact('動詞') should compact only nodes categoried '動詞'" do
+    subject.compact('動詞').should == Chawan::Nodes.new([@n1, @v12, @p1, @n2, @n3])
   end
 
   provide :grep
   describe "#grep" do
     it "should scope nodes by given category" do
-      subject.grep(/名詞/).should == Chawan::Nodes.new([@n1, @n2, @n3])
-      subject.grep('名詞').should == Chawan::Nodes.new([@n1, @n2, @n3])
-
-      subject.grep(/助/).should == Chawan::Nodes.new([@p1, @v1, @v2])
-      subject.grep('助').should == Chawan::Nodes.new([])
+      subject.grep(/動詞/).should == Chawan::Nodes.new([@v1, @v2, @p1])
+      subject.grep('動詞').should == Chawan::Nodes.new([@v1, @v2])
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chawan
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - maiha