From: Dave Rolsky <autarch@urth.org>
Date: Mon, 7 Jun 2010 16:29:48 +0000 (-0500)
Subject: Native string methods now check that attribute is a string and confess if it isn't
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=382338eb4bb85f0522fd213c394d63df79505360;p=gitmo%2FMoose.git

Native string methods now check that attribute is a string and confess if it isn't
---

diff --git a/lib/Moose/Meta/Attribute/Native/MethodProvider/String.pm b/lib/Moose/Meta/Attribute/Native/MethodProvider/String.pm
index b502495..e61b581 100644
--- a/lib/Moose/Meta/Attribute/Native/MethodProvider/String.pm
+++ b/lib/Moose/Meta/Attribute/Native/MethodProvider/String.pm
@@ -1,28 +1,44 @@
 package Moose::Meta::Attribute::Native::MethodProvider::String;
 use Moose::Role;
 
+use Params::Util qw( _HASH0 );
+
 our $VERSION   = '1.07';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
+sub _get_string {
+    my $val = $_[1]->( $_[0] );
+
+    unless ( defined $val && ! ref $val ) {
+        local $Carp::CarpLevel += 3;
+        confess 'The ' . $_[2] . ' attribute does not contain a string';
+    }
+
+    return $val;
+}
+
 sub append : method {
     my ( $attr, $reader, $writer ) = @_;
 
-    return sub { $writer->( $_[0], $reader->( $_[0] ) . $_[1] ) };
+    my $name = $attr->name;
+    return sub { $writer->( $_[0], _get_string( $_[0], $reader, $name ) . $_[1] ) };
 }
 
 sub prepend : method {
     my ( $attr, $reader, $writer ) = @_;
 
-    return sub { $writer->( $_[0], $_[1] . $reader->( $_[0] ) ) };
+    my $name = $attr->name;
+    return sub { $writer->( $_[0], $_[1] . _get_string( $_[0], $reader, $name ) ) };
 }
 
 sub replace : method {
     my ( $attr, $reader, $writer ) = @_;
 
+    my $name = $attr->name;
     return sub {
         my ( $self, $regex, $replacement ) = @_;
-        my $v = $reader->( $_[0] );
+        my $v = _get_string( $self, $reader, $name );
 
         if ( ( ref($replacement) || '' ) eq 'CODE' ) {
             $v =~ s/$regex/$replacement->()/e;
@@ -37,13 +53,15 @@ sub replace : method {
 
 sub match : method {
     my ( $attr, $reader, $writer ) = @_;
-    return sub { $reader->( $_[0] ) =~ $_[1] };
+    my $name = $attr->name;
+    return sub { _get_string( $_[0], $reader, $name ) =~ $_[1] };
 }
 
 sub chop : method {
     my ( $attr, $reader, $writer ) = @_;
+    my $name = $attr->name;
     return sub {
-        my $v = $reader->( $_[0] );
+        my $v = _get_string( $_[0], $reader, $name );
         CORE::chop($v);
         $writer->( $_[0], $v );
     };
@@ -51,8 +69,9 @@ sub chop : method {
 
 sub chomp : method {
     my ( $attr, $reader, $writer ) = @_;
+    my $name = $attr->name;
     return sub {
-        my $v = $reader->( $_[0] );
+        my $v = _get_string( $_[0], $reader, $name );
         chomp($v);
         $writer->( $_[0], $v );
     };
@@ -60,8 +79,9 @@ sub chomp : method {
 
 sub inc : method {
     my ( $attr, $reader, $writer ) = @_;
+    my $name = $attr->name;
     return sub {
-        my $v = $reader->( $_[0] );
+        my $v = _get_string( $_[0], $reader, $name );
         $v++;
         $writer->( $_[0], $v );
     };
@@ -74,17 +94,19 @@ sub clear : method {
 
 sub length : method {
     my ($attr, $reader, $writer) = @_;
+    my $name = $attr->name;
     return sub {
-        my $v = $reader->($_[0]);
+        my $v = _get_string( $_[0], $reader, $name );
         return CORE::length($v);
     };
 }
 
 sub substr : method {
     my ( $attr, $reader, $writer ) = @_;
+    my $name = $attr->name;
     return sub {
         my $self = shift;
-        my $v    = $reader->($self);
+        my $v    = _get_string( $self, $reader, $name );
 
         my $offset      = defined $_[0] ? shift : 0;
         my $length      = defined $_[0] ? shift : CORE::length($v);
diff --git a/t/070_native_traits/207_trait_string.t b/t/070_native_traits/207_trait_string.t
index 2f3bae9..52a3f9d 100644
--- a/t/070_native_traits/207_trait_string.t
+++ b/t/070_native_traits/207_trait_string.t
@@ -3,6 +3,7 @@
 use strict;
 use warnings;
 
+use Test::Exception;
 use Test::More;
 use Test::Moose 'does_ok';
 
@@ -30,6 +31,7 @@ my $uc;
             capitalize_last => [ replace => qr/(.)$/, ($uc = sub { uc $1 }) ],
             invalid_number => [ match => qr/\D/ ],
         },
+        clearer => '_clear_string',
     );
 }
 
@@ -114,4 +116,21 @@ is_deeply(
     '... got the right handles methods'
 );
 
+$page->_clear_string;
+
+for my $test (
+    qw( inc_string chop_string chomp_string length_string exclaim ),
+    [ 'append_string',  'x' ],
+    [ 'prepend_string', 'x' ],
+    [ 'match_string',   qr/([ao])/ ],
+    [ 'replace_string', qr/([ao])/, sub { uc($1) } ],
+    ) {
+
+    my ( $meth, @args ) = ref $test ? @{$test} : $test;
+
+    throws_ok { $page->$meth(@args) }
+    qr{^\QThe string attribute does not contain a string at \E.+\Q207_trait_string.t line \E\d+},
+        "$meth dies with useful error";
+}
+
 done_testing;