Changeset 15776 for lang/perl/Mvalve

Timestamp:

07/14/08 11:13:37 (5 years ago)

Author:

daisuke

Message:

Change nested constructor semantics

Location:

lang/perl/Mvalve/trunk

Files:

• lib/Mvalve.pm (modified) (7 diffs)
• t/01_basic.t (modified) (1 diff)
• t/03_extended.t (modified) (1 diff)

lang/perl/Mvalve/trunk/lib/Mvalve.pm

@@ -17 +17 @@
     my $coerce = sub {
         my $default_class = shift;
+        my $prefix = shift;
         return sub {
             my $h = $_;
             my $module = delete $h->{module} || $default_class;
+            if ($prefix && $module !~ s/^\+//) {
+                $module = join('::', $prefix, $module);
+            }
             Class::MOP::load_class($module);
 
-            $module->new(%$h);
+            $module->new(%{$h->{args}});
         };
     };
@@ -28 +32 @@
     coerce 'Mvalve::Throttler'
         => from 'HashRef'
-        => $coerce->('Data::Valve'), # XXX - no need to use via () here
+        => $coerce->('Data::Valve', 'Mvalve::Throttler'), # XXX - no need to use via () here
     ;
 
     coerce 'Mvalve::Queue'
         => from 'HashRef'
-        => $coerce->('Mvalve::Queue::Q4M'), # XXX - no need to use via () here
+        => $coerce->('Q4M', 'Mvalve::Queue'), # XXX - no need to use via () here
     ;
 }
@@ -41 +45 @@
         => via {
             my $h = $_;
-            my $module = delete $h->{module} || 'Mvalve::State::Memory';
+            my $module = delete $h->{module} || 'Memory';
+            if ($module !~ s/^\+//) {
+                $module = "Mvalve::State::$module";
+            }
             Class::MOP::load_class($module);
 
-            $module->new(memcached => $h);
+            $module->new(%{$h->{args}});
         }
 ;
@@ -61 +68 @@
         return sub {
             Class::MOP::load_class($class);
-            Mvalve::QueueSet->new;
+            $class->new;
         };
     };
@@ -68 +75 @@
         is  => 'ro',
         isa => 'Mvalve::QueueSet',
-        default => $default->( 'Mvale::QueueSet' )
+        default => $default->( 'Mvalve::QueueSet' )
     );
 
@@ -198 +205 @@
         data => {
             destination => $destination,
-            ready       => $retry,
+            ready       => int($retry * 1000),
             message     => $message->serialize,
         }
@@ -276 +283 @@
     throttler => {
       module => 'Data::Throttler::Memcached',
-      max_items => $max,
-      interval  => $interval,
-      cache     => {
-        data => [ ... ]
+      args => {
+        max_items => $max,
+        interval  => $interval,
+        cache     => {
+          data => [ ... ]
+        }
       }
     }

lang/perl/Mvalve/trunk/t/01_basic.t

@@ -16 +16 @@
     my $mv = Mvalve->new(
         throttler => {
-            max_items => 10,
-            interval  => 20
+            args => {
+                max_items => 10,
+                interval  => 20
+            }
         },
         queue => {
-            connect_info => [ 
-                $ENV{MVALVE_Q4M_DSN},
-                $ENV{MVALVE_Q4M_USERNAME},
-                $ENV{MVALVE_Q4M_PASSWORD},
-                { RaiseError => 1, AutoCommit => 1 },
-            ]
+            args => {
+                connect_info => [ 
+                    $ENV{MVALVE_Q4M_DSN},
+                    $ENV{MVALVE_Q4M_USERNAME},
+                    $ENV{MVALVE_Q4M_PASSWORD},
+                    { RaiseError => 1, AutoCommit => 1 },
+                ]
+            }
         }
     );

lang/perl/Mvalve/trunk/t/03_extended.t

@@ -31 +31 @@
         timeout   => 1,
         queue => {
-            connect_info => [ 
-                $ENV{MVALVE_Q4M_DSN},
-                $ENV{MVALVE_Q4M_USERNAME},
-                $ENV{MVALVE_Q4M_PASSWORD},
-                { RaiseError => 1, AutoCommit => 1 },
-            ]
+            args => {
+                connect_info => [ 
+                    $ENV{MVALVE_Q4M_DSN},
+                    $ENV{MVALVE_Q4M_USERNAME},
+                    $ENV{MVALVE_Q4M_PASSWORD},
+                    { RaiseError => 1, AutoCommit => 1 },
+                ]
+            }
         },
         throttler => {
-            module    => 'Data::Throttler::Memcached',
-            max_items => 1,
-            interval  => 2,
-            cache     => {
-                data => $ENV{MEMCACHED_SERVERS},
-                namespace => $ENV{MEMCACHED_NAMESPACE},
-            },
+            module    => 'Data::Valve',
+            args => {
+                max_items => 1,
+                interval  => 1.4,
+            }
         },
         state => {
-            module => 'Mvalve::State::Memcached',
-            servers => $ENV{MEMCACHED_SERVERS},
-            namespace => $ENV{MEMCACHED_NAMESPACE},
+            module => 'Memcached',
+            args   => {
+                memcached => {
+                    servers => $ENV{MEMCACHED_SERVERS},
+                    namespace => $ENV{MEMCACHED_NAMESPACE},
+                }
+            }
         }
     );