[SCM] libmessage-passing-perl Debian packaging branch, master, updated. debian/0.111-3-14-g44f6e88

[Tomas Doran]

The following commit has been merged in the master branch:
commit 558afee8f73ee89cbb9237b1c3b6a89e32c51bd9
Author: Tomas Doran <bobtfish at bobtfish.net>
Date:   Sun Apr 15 16:25:33 2012 +0100

    Rename __name and __type to be the more obvious names, as it makes from config easy

diff --git a/lib/Log/Stash/DSL.pm b/lib/Log/Stash/DSL.pm
index 745f840..08ab677 100644
--- a/lib/Log/Stash/DSL.pm
+++ b/lib/Log/Stash/DSL.pm
@@ -39,8 +39,8 @@ sub input {
     _check_factory();
     $FACTORY->make(
         %opts,
-        __name => $name,
-        __type => 'Input',
+        name => $name,
+        type => 'Input',
     );
 }
 
@@ -49,8 +49,8 @@ sub filter {
     _check_factory();
     $FACTORY->make(
         %opts,
-        __name => $name,
-        __type => 'Filter',
+        name => $name,
+        type => 'Filter',
     );
 }
 
@@ -59,8 +59,8 @@ sub output {
     _check_factory();
     $FACTORY->make(
         %opts,
-        __name => $name,
-        __type => 'Output',
+        name => $name,
+        type => 'Output',
     );
 }
 
diff --git a/lib/Log/Stash/DSL/Factory.pm b/lib/Log/Stash/DSL/Factory.pm
index f3755b0..4d0bf53 100644
--- a/lib/Log/Stash/DSL/Factory.pm
+++ b/lib/Log/Stash/DSL/Factory.pm
@@ -29,8 +29,8 @@ sub make {
     my ($self, %opts) = @_;
     my $class = delete $opts{class}
         || confess("Class name needed");
-    my $name = delete $opts{__name};
-    my $type = delete $opts{__type};
+    my $name = delete $opts{name};
+    my $type = delete $opts{type};
     confess("We already have a thing named $name")
         if $self->registry_has($name);
     my $output_to = $opts{output_to};

-- 
libmessage-passing-perl Debian packaging