r57531 - in /branches/upstream/libstring-flogger-perl/current: Changes MANIFEST META.json META.yml Makefile.PL README lib/String/Flogger.pm t/basic.t

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Wed May 5 19:34:09 UTC 2010


Author: jawnsy-guest
Date: Wed May  5 19:34:00 2010
New Revision: 57531

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=57531
Log:
[svn-upgrade] Integrating new upstream version, libstring-flogger-perl (1.101240)

Added:
    branches/upstream/libstring-flogger-perl/current/t/basic.t
Modified:
    branches/upstream/libstring-flogger-perl/current/Changes
    branches/upstream/libstring-flogger-perl/current/MANIFEST
    branches/upstream/libstring-flogger-perl/current/META.json
    branches/upstream/libstring-flogger-perl/current/META.yml
    branches/upstream/libstring-flogger-perl/current/Makefile.PL
    branches/upstream/libstring-flogger-perl/current/README
    branches/upstream/libstring-flogger-perl/current/lib/String/Flogger.pm

Modified: branches/upstream/libstring-flogger-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libstring-flogger-perl/current/Changes?rev=57531&op=diff
==============================================================================
--- branches/upstream/libstring-flogger-perl/current/Changes (original)
+++ branches/upstream/libstring-flogger-perl/current/Changes Wed May  5 19:34:00 2010
@@ -1,4 +1,8 @@
 Revision history for String-Flogger
+
+1.101240  2010-05-04 16:25:47 America/New_York
+          better stringification of unblessed scalar refs (to ref(...))
+          better stringification of undef (to null)
 
 1.101170  2010-04-27 14:59:36 America/New_York
           fix a typo in docs (thanks MJD)

Modified: branches/upstream/libstring-flogger-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libstring-flogger-perl/current/MANIFEST?rev=57531&op=diff
==============================================================================
--- branches/upstream/libstring-flogger-perl/current/MANIFEST (original)
+++ branches/upstream/libstring-flogger-perl/current/MANIFEST Wed May  5 19:34:00 2010
@@ -7,5 +7,6 @@
 README
 dist.ini
 lib/String/Flogger.pm
+t/basic.t
 t/release-pod-syntax.t
 t/synopsis.t

Modified: branches/upstream/libstring-flogger-perl/current/META.json
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libstring-flogger-perl/current/META.json?rev=57531&op=diff
==============================================================================
--- branches/upstream/libstring-flogger-perl/current/META.json (original)
+++ branches/upstream/libstring-flogger-perl/current/META.json Wed May  5 19:34:00 2010
@@ -9,7 +9,7 @@
    "configure_requires" : {
       "ExtUtils::MakeMaker" : "6.31"
    },
-   "generated_by" : "Dist::Zilla version 2.101160",
+   "generated_by" : "Dist::Zilla version 2.101230",
    "license" : "perl",
    "meta-spec" : {
       "url" : "http://module-build.sourceforge.net/META-spec-v1.4.html",
@@ -27,113 +27,113 @@
    "resources" : {
       "repository" : "git://git.codesimply.com/String-Flogger.git"
    },
-   "version" : "1.101170",
+   "version" : "1.101240",
    "x_Dist_Zilla" : {
       "plugins" : [
          {
             "class" : "Dist::Zilla::Plugin::GatherDir",
             "name" : "@RJBS/@Basic/GatherDir",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::PruneCruft",
             "name" : "@RJBS/@Basic/PruneCruft",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::ManifestSkip",
             "name" : "@RJBS/@Basic/ManifestSkip",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaYAML",
             "name" : "@RJBS/@Basic/MetaYAML",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::License",
             "name" : "@RJBS/@Basic/License",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::Readme",
             "name" : "@RJBS/@Basic/Readme",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::ExtraTests",
             "name" : "@RJBS/@Basic/ExtraTests",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::ExecDir",
             "name" : "@RJBS/@Basic/ExecDir",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::ShareDir",
             "name" : "@RJBS/@Basic/ShareDir",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::MakeMaker",
             "name" : "@RJBS/@Basic/MakeMaker",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::Manifest",
             "name" : "@RJBS/@Basic/Manifest",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::TestRelease",
             "name" : "@RJBS/@Basic/TestRelease",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::ConfirmRelease",
             "name" : "@RJBS/@Basic/ConfirmRelease",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::UploadToCPAN",
             "name" : "@RJBS/@Basic/UploadToCPAN",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::AutoPrereq",
             "name" : "@RJBS/AutoPrereq",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::AutoVersion",
             "name" : "@RJBS/AutoVersion",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::PkgVersion",
             "name" : "@RJBS/PkgVersion",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaConfig",
             "name" : "@RJBS/MetaConfig",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaJSON",
             "name" : "@RJBS/MetaJSON",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::NextRelease",
             "name" : "@RJBS/NextRelease",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::PodSyntaxTests",
             "name" : "@RJBS/PodSyntaxTests",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::Repository",
@@ -168,22 +168,22 @@
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":InstallModules",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":TestFiles",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":ExecFiles",
-            "version" : "2.101160"
+            "version" : "2.101230"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":ShareFiles",
-            "version" : "2.101160"
+            "version" : "2.101230"
          }
       ],
       "zilla" : {
@@ -191,7 +191,7 @@
          "config" : {
             "is_trial" : 0
          },
-         "version" : "2.101160"
+         "version" : "2.101230"
       }
    }
 }

Modified: branches/upstream/libstring-flogger-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libstring-flogger-perl/current/META.yml?rev=57531&op=diff
==============================================================================
--- branches/upstream/libstring-flogger-perl/current/META.yml (original)
+++ branches/upstream/libstring-flogger-perl/current/META.yml Wed May  5 19:34:00 2010
@@ -6,7 +6,7 @@
   Test::More: 0
 configure_requires:
   ExtUtils::MakeMaker: 6.31
-generated_by: 'Dist::Zilla version 2.101160'
+generated_by: 'Dist::Zilla version 2.101230'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -21,93 +21,93 @@
   Sub::Exporter::Util: 0
 resources:
   repository: git://git.codesimply.com/String-Flogger.git
-version: 1.101170
+version: 1.101240
 x_Dist_Zilla:
   plugins:
     -
       class: Dist::Zilla::Plugin::GatherDir
       name: '@RJBS/@Basic/GatherDir'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::PruneCruft
       name: '@RJBS/@Basic/PruneCruft'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::ManifestSkip
       name: '@RJBS/@Basic/ManifestSkip'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::MetaYAML
       name: '@RJBS/@Basic/MetaYAML'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::License
       name: '@RJBS/@Basic/License'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::Readme
       name: '@RJBS/@Basic/Readme'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::ExtraTests
       name: '@RJBS/@Basic/ExtraTests'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::ExecDir
       name: '@RJBS/@Basic/ExecDir'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::ShareDir
       name: '@RJBS/@Basic/ShareDir'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::MakeMaker
       name: '@RJBS/@Basic/MakeMaker'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::Manifest
       name: '@RJBS/@Basic/Manifest'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::TestRelease
       name: '@RJBS/@Basic/TestRelease'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::ConfirmRelease
       name: '@RJBS/@Basic/ConfirmRelease'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::UploadToCPAN
       name: '@RJBS/@Basic/UploadToCPAN'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::AutoPrereq
       name: '@RJBS/AutoPrereq'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::AutoVersion
       name: '@RJBS/AutoVersion'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::PkgVersion
       name: '@RJBS/PkgVersion'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::MetaConfig
       name: '@RJBS/MetaConfig'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::MetaJSON
       name: '@RJBS/MetaJSON'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::NextRelease
       name: '@RJBS/NextRelease'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::PodSyntaxTests
       name: '@RJBS/PodSyntaxTests'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::Repository
       name: '@RJBS/Repository'
@@ -135,21 +135,21 @@
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':InstallModules'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':TestFiles'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':ExecFiles'
-      version: 2.101160
+      version: 2.101230
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':ShareFiles'
-      version: 2.101160
+      version: 2.101230
   zilla:
     class: Dist::Zilla
     config:
       is_trial: 0
-    version: 2.101160
+    version: 2.101230

Modified: branches/upstream/libstring-flogger-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libstring-flogger-perl/current/Makefile.PL?rev=57531&op=diff
==============================================================================
--- branches/upstream/libstring-flogger-perl/current/Makefile.PL (original)
+++ branches/upstream/libstring-flogger-perl/current/Makefile.PL Wed May  5 19:34:00 2010
@@ -23,7 +23,7 @@
                                            },
                        'ABSTRACT' => 'string munging for loggers',
                        'EXE_FILES' => [],
-                       'VERSION' => '1.101170',
+                       'VERSION' => '1.101240',
                        'PREREQ_PM' => {
                                         'Sub::Exporter::Util' => '0',
                                         'Scalar::Util' => '0',

Modified: branches/upstream/libstring-flogger-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libstring-flogger-perl/current/README?rev=57531&op=diff
==============================================================================
--- branches/upstream/libstring-flogger-perl/current/README (original)
+++ branches/upstream/libstring-flogger-perl/current/README Wed May  5 19:34:00 2010
@@ -1,7 +1,7 @@
 
 
 This archive contains the distribution String-Flogger,
-version 1.101170:
+version 1.101240:
 
   string munging for loggers
 

Modified: branches/upstream/libstring-flogger-perl/current/lib/String/Flogger.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libstring-flogger-perl/current/lib/String/Flogger.pm?rev=57531&op=diff
==============================================================================
--- branches/upstream/libstring-flogger-perl/current/lib/String/Flogger.pm (original)
+++ branches/upstream/libstring-flogger-perl/current/lib/String/Flogger.pm Wed May  5 19:34:00 2010
@@ -2,7 +2,7 @@
 use warnings;
 package String::Flogger;
 BEGIN {
-  $String::Flogger::VERSION = '1.101170';
+  $String::Flogger::VERSION = '1.101240';
 }
 # ABSTRACT: string munging for loggers
 
@@ -14,8 +14,10 @@
 
 sub _encrefs {
   my ($self, $messages) = @_;
-  return map { ref $_ ? ('{{' . $self->_stringify_ref($_) . '}}') : $_ }
-         map { blessed($_) ? sprintf('obj(%s)', "$_") : $_ }
+  return map { blessed($_) ? sprintf('obj(%s)', "$_")
+             : ref $_      ? $self->_stringify_ref($_)
+             : defined $_  ? $_
+             :              '{{null}}' }
          map { _CODELIKE($_) ? scalar $_->() : $_ }
          @$messages;
 }
@@ -23,6 +25,11 @@
 my $JSON;
 sub _stringify_ref {
   my ($self, $ref) = @_;
+
+  if (ref $ref eq 'SCALAR' or ref $ref eq 'REF') {
+    my ($str) = $self->_encrefs([ $$ref ]);
+    return "ref($str)";
+  }
 
   require JSON;
   $JSON ||= JSON->new
@@ -32,7 +39,7 @@
                 ->space_after(1)
                 ->convert_blessed(1);
 
-  return $JSON->encode($ref)
+  return '{{' . $JSON->encode($ref) . '}}'
 }
 
 sub flog {
@@ -65,7 +72,7 @@
 
 =head1 VERSION
 
-version 1.101170
+version 1.101240
 
 =head1 SYNOPSIS
 

Added: branches/upstream/libstring-flogger-perl/current/t/basic.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libstring-flogger-perl/current/t/basic.t?rev=57531&op=file
==============================================================================
--- branches/upstream/libstring-flogger-perl/current/t/basic.t (added)
+++ branches/upstream/libstring-flogger-perl/current/t/basic.t Wed May  5 19:34:00 2010
@@ -1,0 +1,30 @@
+#!perl
+use strict;
+use warnings;
+use Test::More tests => 4;
+use String::Flogger qw(flog);
+
+is(
+  flog([ 'foo %s bar', undef ]),
+  'foo {{null}} bar',
+  "%s <- undef",
+);
+
+is(
+  flog([ 'foo %s bar', \undef ]),
+  'foo ref({{null}}) bar',
+  "%s <- \\undef",
+);
+
+is(
+  flog([ 'foo %s bar', \1 ]),
+  'foo ref(1) bar',
+  "%s <- \\1",
+);
+
+is(
+  flog([ 'foo %s bar', \\1 ]),
+  'foo ref(ref(1)) bar',
+  "%s <- \\\\1",
+);
+




More information about the Pkg-perl-cvs-commits mailing list