Changeset 13510

Timestamp:

06/08/08 21:50:30 (5 years ago)

Author:

tokuhirom

Message:

added new component loader.

Location:

lang/perl/Ulgori/trunk

Files:

• config.yaml (modified) (1 diff)
• lib/Ulgori/ComponentManager (added)
• lib/Ulgori/ComponentManager/Singleton.pm (added)
• lib/Ulgori/Model/Log.pm (modified) (5 diffs)
• lib/Ulgori/Web/C/Root.pm (modified) (2 diffs)
• t/ComponentManager (added)
• t/ComponentManager/Singleton.t (added)
• t/ComponentManager/config.yaml (added)
• ulgori.pl (modified) (1 diff)

lang/perl/Ulgori/trunk/config.yaml

@@ -1 +1 @@
 ---
 'Model::Log':
-  log_path: /Users/tokuhirom/share/irclog/others/[% date.year | format('%04d') %].[% date.month | format('%02d') %].[% date.day | format('%02d') %].txt
-  log_encoding: euc-jp
+  path: /Users/tokuhirom/share/irclog/others/[% date.year | format('%04d') %].[% date.month | format('%02d') %].[% date.day | format('%02d') %].txt
+  encoding: euc-jp
   entries_per_page: 20
 'Engine':

lang/perl/Ulgori/trunk/lib/Ulgori/Model/Log.pm

@@ -1 +1 @@
 package Ulgori::Model::Log;
-use strict;
-use MooseX::Singleton;
+use Moose;
 use Ulgori::Config;
 use MooseX::Params::Validate;
@@ -9 +8 @@
 use Ulgori::Util;
 
+has path => (
+    is       => 'ro',
+    isa      => 'Str',
+    required => 1,
+);
+
+has encoding => (
+    is       => 'ro',
+    isa      => 'Str',
+    required => 1,
+);
+
+has entries_per_page => (
+    is       => 'ro',
+    isa      => 'Int',
+    required => 1,
+);
+
 sub retrieve_all {
-    my ($class, %args) = @_;
+    my ($self, %args) = @_;
     my $keyword = delete $args{keyword};
-    my $log_fname = _log_fname(date => $args{date});
+    my $log_fname = $self->_log_fname(date => $args{date});
     if (-f $log_fname) {
-        return _read_logs(
+        return $self->_read_logs(
             fname   => $log_fname,
             keyword => $args{keyword},
@@ -30 +47 @@
 
 sub _read_logs {
+    my $self = shift;
     my %args = validate(\@_ => (
         fname   => {is => 'Str', required => 1},
@@ -38 +56 @@
     my @res      = ();
 
-    my $entries_per_page = config->{entries_per_page} or die "entries_per_page missing";
-    my $encoding         = config->{log_encoding}     or die "log_encoding missing";
+    my $entries_per_page = $self->entries_per_page;
+    my $encoding         = $self->encoding;
 
     open my $fh, '<', $args{fname} or die "$! $args{fname}";
@@ -60 +78 @@
 
 sub _log_fname {
+    my $self = shift;
     my %params = validate(\@_,
         date => { isa => 'DateTime', required => 1 },
     );
-    my $log_path = config->{log_path};
     my $tt = Template->new;
-    $tt->process(\$log_path, \%params, \my $fname) or die $tt->error;
+    $tt->process(\( $self->path ), \%params, \my $fname) or die $tt->error;
     $fname;
 }
 
+no Moose;
+__PACKAGE__->meta->make_immutable;
 1;

lang/perl/Ulgori/trunk/lib/Ulgori/Web/C/Root.pm

@@ -4 +4 @@
 use DateTime;
 use Ulgori::Web::View;
+use Ulgori::ComponentManager::Singleton;
 
 sub dispatch_index {
@@ -10 +11 @@
     my $date = $self->_date($c);
 
-    my $rs = Ulgori::Model::Log->instance->retrieve_all(
+    my $log = Ulgori::ComponentManager::Singleton->get('Model::Log');
+
+    my $rs = $log->retrieve_all(
         date    => $date,
         keyword => $c->req->params->{keyword} || undef,

lang/perl/Ulgori/trunk/ulgori.pl

@@ -15 +15 @@
 use Ulgori::Web::Handler;
 use Ulgori::Config;
+use Ulgori::ComponentManager::Singleton;
+
+Ulgori::ComponentManager::Singleton->get( 'Model::Log' ); # preload.
 
 my $cfg = Ulgori::Config->instance;