Changeset 24453

Timestamp:

11/20/08 17:08:33 (7 weeks ago)

Author:

kazuho

Message:

brush up the design (query is always CODE or CGI::Simple)

Files:

• lang/perl/NanoA/trunk/lib/NanoA.pm (modified) (2 diffs)

lang/perl/NanoA/trunk/lib/NanoA.pm

@@ -24 +24 @@
     my $self = bless {
         config        => $config,
-        query         => undef,
+        query         => sub {
+            require_once('CGI/Simple.pm');
+            no warnings "all"; # suppress 'used only once'
+            $CGI::Simple::PARAM_UTF8 = 1;
+            CGI::Simple->new();
+        },
         headers       => {
             -type    => 'text/html',
@@ -58 +63 @@
     return $self->{query} = shift
         if @_;
-    if ($self->{query} && ref $self->{query} eq 'CODE') {
-        $self->{query} = $self->{query}->($self);
-    }
-    unless ($self->{query}) {
-        require_once('CGI/Simple.pm');
-        no warnings "all"; # suppress 'used only once'
-        $CGI::Simple::PARAM_UTF8 = 1;
-        $self->{query} = CGI::Simple->new;
-    }
+    $self->{query} = $self->{query}->($self)
+        if ref $self->{query} eq 'CODE';
     $self->{query};
 }