Changeset 12178

Timestamp:

05/22/08 08:31:22 (6 months ago)

Author:

tokuhirom

Message:

more moose

Location:

lang/perl/mobirc/trunk

Files:

• Makefile.PL (modified) (1 diff)
• lib/App/Mobirc.pm (modified) (5 diffs)
• lib/App/Mobirc/Model/Channel.pm (modified) (1 diff)
• lib/App/Mobirc/Model/Server.pm (added)

lang/perl/mobirc/trunk/Makefile.PL

@@ -6 +6 @@
 
 requires 'Moose' => 0.44;
+requires 'MooseX::Singleton' => 0.07;
 requires 'CGI';
 requires 'CGI::Cookie';

lang/perl/mobirc/trunk/lib/App/Mobirc.pm

@@ -1 +1 @@
 package App::Mobirc;
-use strict;
-use warnings;
+use Moose;
 use 5.00800;
 use Scalar::Util qw/blessed/;
@@ -10 +9 @@
 use UNIVERSAL::require;
 use Carp;
-use App::Mobirc::Model::Channel;
+use App::Mobirc::Model::Server;
 use Encode;
 
@@ -21 +20 @@
 };
 
+has server => (
+    is      => 'ro',
+    isa     => 'App::Mobirc::Model::Server',
+    default => sub { App::Mobirc::Model::Server->instance() },
+    handles => [qw/add_channel delete_channel channels get_channel delete_channel/], # for backward compatibility
+);
+
+has config => (
+    is       => 'ro',
+    isa      => 'HashRef',
+    required => 1,
+);
+
 my $context;
 sub context { $context }
 
-sub new {
-    my ($class, $config_stuff) = @_;
+around 'new' => sub {
+    my ($next, $class, $config_stuff) = @_;
     my $config = App::Mobirc::ConfigLoader->load($config_stuff);
-    my $self = bless {config => $config, channels => {}}, $class;
 
+    my $self = $next->( $class, config => $config );
     $self->load_plugins;
 
@@ -34 +46 @@
 
     return $self;
-}
+};
 
 sub load_plugins {
@@ -81 +93 @@
     croak "hook point missing" unless $hook_point;
     return $self->{hooks}->{$hook_point} || [];
-}
-
-# -------------------------------------------------------------------------
-
-sub add_channel {
-    my ($self, $channel) = @_;
-    croak "missing channel" unless $channel;
-
-    $self->{channels}->{$channel->name} = $channel;
-}
-
-sub channels {
-    my $self = shift;
-    my @channels = values %{ $self->{channels} };
-    return wantarray ? @channels : \@channels;
-}
-
-sub get_channel {
-    my ($self, $name) = @_;
-    croak "channel name is flagged utf8" unless Encode::is_utf8($name);
-    croak "invalid channel name : $name" if $name =~ / /;
-    return $self->{channels}->{$name} ||= App::Mobirc::Model::Channel->new($self, $name);
-}
-
-sub delete_channel {
-    my ($self, $name) = @_;
-    croak "channel name is flagged utf8" unless Encode::is_utf8($name);
-    delete $self->{channels}->{$name};
 }
 

lang/perl/mobirc/trunk/lib/App/Mobirc/Model/Channel.pm

@@ -12 +12 @@
 sub new {
     my ($class, $global_context, $name) = @_;
-    croak "global context missing" unless blessed $global_context && $global_context->isa("App::Mobirc");
+    $global_context = App::Mobirc->context; # XXX this is temporary thing
+    croak "global context missing" unless blessed $global_context;
     croak "missing channel name" unless defined $name;
     croak "Invalid channel name $name" if $name =~ / /;