neta*

bayashi · Jun 2, 2009 · df24272 · df24272
1 parent 843a640
commit df24272
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 18 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,8 @@
 Revision history for Acme-Yomeru
 
+0.0.4  Tue Jun 03 00:19:19 2009
+       neta*
+
 0.0.3  Sun May 24 13:13:13 2009
        tests are likely to fail. but you can force install and run it. ;-P
 

diff --git a/lib/Acme/Yomeru.pm b/lib/Acme/Yomeru.pm
@@ -1,17 +1,22 @@
 package Acme::Yomeru;
-use Moose;
 use utf8;
 
 use Carp qw(croak);
 
-our $VERSION = '0.0.3';
+our $VERSION = '0.0.4';
 
+use Moose;
 has 'text' => (
     is       => 'rw',
     isa      => 'Str',
     required => 1,
 );
 
+has '_convert_text' => (
+    is  => 'rw',
+    isa => 'Str',
+);
+
 has 'parser' => (
     is      => 'rw',
     does    => 'Acme::Yomeru::Parser',
@@ -20,6 +25,14 @@ has 'parser' => (
     handles  => [ 'parse' ]
 );
 
+before 'cambridgize' => sub {
+    my $self = shift;
+    my $text = $self->text;
+    $text =~ tr/[０-９]/[0-9]/;
+    $self->_convert_text($text);
+    return $self;
+};
+
 __PACKAGE__->meta->make_immutable;
 
 no Moose;
@@ -29,19 +42,16 @@ sub cambridgize {
 
     croak 'text is blank!' if $self->text eq '';
 
-    $self->_randomize( $self->parse($self->_smoothing) );
-}
+    $self->parse($self)->_randomize;
 
-sub _smoothing {
-    my $self = shift;
-    my $text = $self->text;
-    $text =~ tr/[０-９]/[0-9]/;
-    return $text;
 }
 
+
+
 sub _randomize {
     my $self        = shift;
-    my $parsed_text = shift;
+
+    my $parsed_text = $self->_convert_text;
 
     srand(length $parsed_text);
 

diff --git a/lib/Acme/Yomeru/Parser/TextMeCab.pm b/lib/Acme/Yomeru/Parser/TextMeCab.pm
@@ -1,10 +1,11 @@
 package Acme::Yomeru::Parser::TextMeCab;
-use Moose;
 use utf8;
 
 use Text::MeCab;
 use Encode qw(decode_utf8);
 
+use Moose;
+
 with 'Acme::Yomeru::Parser';
 
 __PACKAGE__->meta->make_immutable;
@@ -13,10 +14,10 @@ no Moose;
 
 sub parse {
     my $self = shift;
-    my $text = shift;
+    my $obj  = shift;
 
     my $parsed_text;
-
+    my $text  = $obj->text;
     my $mecab = Text::MeCab->new;
 
     for (my $node = $mecab->parse($text); $node; $node = $node->next) {
@@ -30,7 +31,10 @@ sub parse {
 
     $parsed_text =~ tr/ァ-ン/ぁ-ん/;
 
-    return $parsed_text;
+    $obj->_convert_text($parsed_text);
+
+    return $obj;
+
 }
 
 1;

diff --git a/lib/Acme/Yomeru/Parser/YahooAPI.pm b/lib/Acme/Yomeru/Parser/YahooAPI.pm
@@ -1,5 +1,4 @@
 package Acme::Yomeru::Parser::YahooAPI;
-use Moose;
 use utf8;
 
 use Carp qw(croak);
@@ -9,6 +8,8 @@ use LWP::Simple;
 use XML::Simple;
 use Encode qw(encode_utf8 decode_utf8);
 
+use Moose;
+
 with 'Acme::Yomeru::Parser';
 
 has 'api_key' => (
@@ -23,15 +24,15 @@ no Moose;
 
 sub parse {
     my $self = shift;
-    my $text = shift;
+    my $obj  = shift;
 
     croak 'api_key is blank!' if $self->api_key eq '';
 
     my $uri = URI->new('http://jlp.yahooapis.jp/MAService/V1/parse');
 
     $uri->query_form(
         appid    => $self->api_key,
-        sentence => encode_utf8($text),
+        sentence => encode_utf8($obj->text),
     );
 
     my $node_list = XMLin( get($uri) )->{ma_result}{word_list}{word};
@@ -49,7 +50,9 @@ sub parse {
 
     $parsed_text =~ tr/ァ-ン/ぁ-ん/;
 
-    return $parsed_text;
+    $obj->_convert_text($parsed_text);
+
+    return $obj;
 }
 
 1;