r38582 - in /branches/upstream/libmoosex-declare-perl/current: ./ inc/Module/ inc/Module/Install/ lib/MooseX/ lib/MooseX/Declare/ lib/MooseX/Declare/Syntax/ lib/MooseX/Declare/Syntax/Keyword/ t/ t/recipes/basics/

ryan52-guest at users.alioth.debian.org ryan52-guest at users.alioth.debian.org
Thu Jun 25 03:48:37 UTC 2009


Author: ryan52-guest
Date: Thu Jun 25 03:48:18 2009
New Revision: 38582

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=38582
Log:
[svn-upgrade] Integrating new upstream version, libmoosex-declare-perl (0.23)

Added:
    branches/upstream/libmoosex-declare-perl/current/t/meta_should_be_signature.t
Modified:
    branches/upstream/libmoosex-declare-perl/current/Changes
    branches/upstream/libmoosex-declare-perl/current/MANIFEST
    branches/upstream/libmoosex-declare-perl/current/META.yml
    branches/upstream/libmoosex-declare-perl/current/Makefile.PL
    branches/upstream/libmoosex-declare-perl/current/inc/Module/Install.pm
    branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Base.pm
    branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Can.pm
    branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Fetch.pm
    branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Makefile.pm
    branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Metadata.pm
    branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Win32.pm
    branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/WriteAll.pm
    branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare.pm
    branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare/Context.pm
    branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare/Syntax/Keyword/Method.pm
    branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare/Syntax/MooseSetup.pm
    branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare/Syntax/NamespaceHandling.pm
    branches/upstream/libmoosex-declare-perl/current/t/attribute_issues.t
    branches/upstream/libmoosex-declare-perl/current/t/modifiers.t
    branches/upstream/libmoosex-declare-perl/current/t/recipes/basics/001_point.t

Modified: branches/upstream/libmoosex-declare-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-declare-perl/current/Changes?rev=38582&op=diff
==============================================================================
--- branches/upstream/libmoosex-declare-perl/current/Changes (original)
+++ branches/upstream/libmoosex-declare-perl/current/Changes Thu Jun 25 03:48:18 2009
@@ -1,3 +1,13 @@
+0.23  Thu, 25 Jun 2009 05:09:10 +0200
+  * Add test to make sure methods returned from meta are
+    MooseX::Method::Signatures::Meta::Method (nperez).
+  * Add the actual ::Signature methods to the meta class instead of letting it
+    wrap the coderef itself.
+  * Make inner scopes inherit the declaration provider instead of hardcoding
+    'MooseX::Declare' (Robert 'phaylon' Sedlacek).
+  * Fix test failure on new Moose versions, which inline a DESTROY method on
+    immutalisation.
+
 0.22  Wed, 06 May 2009 02:37:37 +0200
   * Add TODO tests for creating nested anonymous classes and roles
     (nperez).

Modified: branches/upstream/libmoosex-declare-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-declare-perl/current/MANIFEST?rev=38582&op=diff
==============================================================================
--- branches/upstream/libmoosex-declare-perl/current/MANIFEST (original)
+++ branches/upstream/libmoosex-declare-perl/current/MANIFEST Thu Jun 25 03:48:18 2009
@@ -44,6 +44,7 @@
 t/lib/Tiger.pm
 t/lib/WithMethod.pm
 t/lib/WithNewline.pm
+t/meta_should_be_signature.t
 t/modifiers.t
 t/nested_anonymous_classes.t
 t/nesting.t

Modified: branches/upstream/libmoosex-declare-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-declare-perl/current/META.yml?rev=38582&op=diff
==============================================================================
--- branches/upstream/libmoosex-declare-perl/current/META.yml (original)
+++ branches/upstream/libmoosex-declare-perl/current/META.yml Thu Jun 25 03:48:18 2009
@@ -9,7 +9,7 @@
 configure_requires:
   ExtUtils::MakeMaker: 6.42
 distribution_type: module
-generated_by: 'Module::Install version 0.85'
+generated_by: 'Module::Install version 0.91'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -19,13 +19,14 @@
   directory:
     - inc
     - t
+    - xt
 requires:
   B::Hooks::EndOfScope: 0
   Devel::Declare: 0.005001
-  Moose: 0
+  Moose: 0.82
   MooseX::Method::Signatures: 0.16
   namespace::autoclean: 0.05
   namespace::clean: 0
 resources:
   license: http://dev.perl.org/licenses/
-version: 0.22
+version: 0.23

Modified: branches/upstream/libmoosex-declare-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-declare-perl/current/Makefile.PL?rev=38582&op=diff
==============================================================================
--- branches/upstream/libmoosex-declare-perl/current/Makefile.PL (original)
+++ branches/upstream/libmoosex-declare-perl/current/Makefile.PL Thu Jun 25 03:48:18 2009
@@ -9,7 +9,7 @@
 requires 'B::Hooks::EndOfScope';
 requires 'namespace::clean';
 requires 'namespace::autoclean' => '0.05';
-requires 'Moose';
+requires 'Moose' => '0.82';
 requires 'MooseX::Method::Signatures' => '0.16';
 
 test_requires 'Test::Exception';

Modified: branches/upstream/libmoosex-declare-perl/current/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-declare-perl/current/inc/Module/Install.pm?rev=38582&op=diff
==============================================================================
--- branches/upstream/libmoosex-declare-perl/current/inc/Module/Install.pm (original)
+++ branches/upstream/libmoosex-declare-perl/current/inc/Module/Install.pm Thu Jun 25 03:48:18 2009
@@ -28,7 +28,7 @@
 	# This is not enforced yet, but will be some time in the next few
 	# releases once we can make sure it won't clash with custom
 	# Module::Install extensions.
-	$VERSION = '0.85';
+	$VERSION = '0.91';
 
 	# Storage for the pseudo-singleton
 	$MAIN    = undef;
@@ -353,7 +353,7 @@
 	if ( $] >= 5.006 ) {
 		open( FH, '<', $_[0] ) or die "open($_[0]): $!";
 	} else {
-		open( FH, "< $_[0]"  ) or die "open($_[0]): $!";	
+		open( FH, "< $_[0]"  ) or die "open($_[0]): $!";
 	}
 	my $string = do { local $/; <FH> };
 	close FH or die "close($_[0]): $!";
@@ -384,7 +384,7 @@
 	if ( $] >= 5.006 ) {
 		open( FH, '>', $_[0] ) or die "open($_[0]): $!";
 	} else {
-		open( FH, "> $_[0]"  ) or die "open($_[0]): $!";	
+		open( FH, "> $_[0]"  ) or die "open($_[0]): $!";
 	}
 	foreach ( 1 .. $#_ ) {
 		print FH $_[$_] or die "print($_[0]): $!";

Modified: branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Base.pm?rev=38582&op=diff
==============================================================================
--- branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Base.pm (original)
+++ branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Base.pm Thu Jun 25 03:48:18 2009
@@ -4,7 +4,7 @@
 use strict 'vars';
 use vars qw{$VERSION};
 BEGIN {
-	$VERSION = '0.85';
+	$VERSION = '0.91';
 }
 
 # Suspend handler for "redefined" warnings
@@ -13,42 +13,34 @@
 	$SIG{__WARN__} = sub { $w };
 }
 
-### This is the ONLY module that shouldn't have strict on
-# use strict;
-
-#line 45
+#line 42
 
 sub new {
-	my ($class, %args) = @_;
-
-	foreach my $method ( qw(call load) ) {
-		next if defined &{"$class\::$method"};
-		*{"$class\::$method"} = sub {
-			shift()->_top->$method(@_);
-		};
+	my $class = shift;
+	unless ( defined &{"${class}::call"} ) {
+		*{"${class}::call"} = sub { shift->_top->call(@_) };
 	}
-
-	bless( \%args, $class );
+	unless ( defined &{"${class}::load"} ) {
+		*{"${class}::load"} = sub { shift->_top->load(@_) };
+	}
+	bless { @_ }, $class;
 }
 
-#line 66
+#line 61
 
 sub AUTOLOAD {
-	my $self = shift;
 	local $@;
-	my $autoload = eval {
-		$self->_top->autoload
-	} or return;
-	goto &$autoload;
+	my $func = eval { shift->_top->autoload } or return;
+	goto &$func;
 }
 
-#line 83
+#line 75
 
 sub _top {
 	$_[0]->{_top};
 }
 
-#line 98
+#line 90
 
 sub admin {
 	$_[0]->_top->{admin}
@@ -56,7 +48,7 @@
 	Module::Install::Base::FakeAdmin->new;
 }
 
-#line 114
+#line 106
 
 sub is_admin {
 	$_[0]->admin->VERSION;
@@ -83,4 +75,4 @@
 
 1;
 
-#line 162
+#line 154

Modified: branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Can.pm?rev=38582&op=diff
==============================================================================
--- branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Can.pm (original)
+++ branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Can.pm Thu Jun 25 03:48:18 2009
@@ -2,16 +2,16 @@
 package Module::Install::Can;
 
 use strict;
-use Module::Install::Base;
-use Config              ();
-use File::Spec          ();
-use ExtUtils::MakeMaker ();
+use Config                ();
+use File::Spec            ();
+use ExtUtils::MakeMaker   ();
+use Module::Install::Base ();
 
-use vars qw{$VERSION $ISCORE @ISA};
+use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.85';
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
-	@ISA     = qw{Module::Install::Base};
 }
 
 # check if we can load some module

Modified: branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Fetch.pm?rev=38582&op=diff
==============================================================================
--- branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Fetch.pm (original)
+++ branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Fetch.pm Thu Jun 25 03:48:18 2009
@@ -2,13 +2,13 @@
 package Module::Install::Fetch;
 
 use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
 
-use vars qw{$VERSION $ISCORE @ISA};
+use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.85';
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
-	@ISA     = qw{Module::Install::Base};
 }
 
 sub get_file {

Modified: branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Makefile.pm?rev=38582&op=diff
==============================================================================
--- branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Makefile.pm (original)
+++ branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Makefile.pm Thu Jun 25 03:48:18 2009
@@ -2,14 +2,14 @@
 package Module::Install::Makefile;
 
 use strict 'vars';
-use Module::Install::Base;
-use ExtUtils::MakeMaker ();
-
-use vars qw{$VERSION $ISCORE @ISA};
+use ExtUtils::MakeMaker   ();
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.85';
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
-	@ISA     = qw{Module::Install::Base};
 }
 
 sub Makefile { $_[0] }

Modified: branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Metadata.pm?rev=38582&op=diff
==============================================================================
--- branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Metadata.pm (original)
+++ branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Metadata.pm Thu Jun 25 03:48:18 2009
@@ -2,18 +2,17 @@
 package Module::Install::Metadata;
 
 use strict 'vars';
-use Module::Install::Base;
+use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.85';
-	@ISA     = qw{Module::Install::Base};
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
 
 my @boolean_keys = qw{
 	sign
-	mymeta
 };
 
 my @scalar_keys = qw{
@@ -440,21 +439,21 @@
 	/ixms ) {
 		my $license_text = $1;
 		my @phrases      = (
-			'under the same (?:terms|license) as perl itself' => 'perl',        1,
-			'GNU general public license'                      => 'gpl',         1,
-			'GNU public license'                              => 'gpl',         1,
-			'GNU lesser general public license'               => 'lgpl',        1,
-			'GNU lesser public license'                       => 'lgpl',        1,
-			'GNU library general public license'              => 'lgpl',        1,
-			'GNU library public license'                      => 'lgpl',        1,
-			'BSD license'                                     => 'bsd',         1,
-			'Artistic license'                                => 'artistic',    1,
-			'GPL'                                             => 'gpl',         1,
-			'LGPL'                                            => 'lgpl',        1,
-			'BSD'                                             => 'bsd',         1,
-			'Artistic'                                        => 'artistic',    1,
-			'MIT'                                             => 'mit',         1,
-			'proprietary'                                     => 'proprietary', 0,
+			'under the same (?:terms|license) as (?:perl|the perl programming language) itself' => 'perl', 1,
+			'GNU general public license'         => 'gpl',         1,
+			'GNU public license'                 => 'gpl',         1,
+			'GNU lesser general public license'  => 'lgpl',        1,
+			'GNU lesser public license'          => 'lgpl',        1,
+			'GNU library general public license' => 'lgpl',        1,
+			'GNU library public license'         => 'lgpl',        1,
+			'BSD license'                        => 'bsd',         1,
+			'Artistic license'                   => 'artistic',    1,
+			'GPL'                                => 'gpl',         1,
+			'LGPL'                               => 'lgpl',        1,
+			'BSD'                                => 'bsd',         1,
+			'Artistic'                           => 'artistic',    1,
+			'MIT'                                => 'mit',         1,
+			'proprietary'                        => 'proprietary', 0,
 		);
 		while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
 			$pattern =~ s{\s+}{\\s+}g;
@@ -506,17 +505,29 @@
 	}
 }
 
+sub test_requires_from {
+	my $self     = shift;
+	my $content  = Module::Install::_readperl($_[0]);
+	my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
+	while ( @requires ) {
+		my $module  = shift @requires;
+		my $version = shift @requires;
+		$self->test_requires( $module => $version );
+	}
+}
+
 # Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
 # numbers (eg, 5.006001 or 5.008009).
 # Also, convert double-part versions (eg, 5.8)
 sub _perl_version {
 	my $v = $_[-1];
-	$v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;	
+	$v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;
 	$v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e;
 	$v =~ s/(\.\d\d\d)000$/$1/;
 	$v =~ s/_.+$//;
 	if ( ref($v) ) {
-		$v = $v + 0; # Numify
+		# Numify
+		$v = $v + 0;
 	}
 	return $v;
 }
@@ -526,21 +537,56 @@
 
 
 ######################################################################
-# MYMETA.yml Support
+# MYMETA Support
 
 sub WriteMyMeta {
 	die "WriteMyMeta has been deprecated";
 }
 
-sub write_mymeta {
-	my $self = shift;
-	
-	# If there's no existing META.yml there is nothing we can do
-	return unless -f 'META.yml';
+sub write_mymeta_yaml {
+	my $self = shift;
 
 	# We need YAML::Tiny to write the MYMETA.yml file
 	unless ( eval { require YAML::Tiny; 1; } ) {
 		return 1;
+	}
+
+	# Generate the data
+	my $meta = $self->_write_mymeta_data or return 1;
+
+	# Save as the MYMETA.yml file
+	print "Writing MYMETA.yml\n";
+	YAML::Tiny::DumpFile('MYMETA.yml', $meta);
+}
+
+sub write_mymeta_json {
+	my $self = shift;
+
+	# We need JSON to write the MYMETA.json file
+	unless ( eval { require JSON; 1; } ) {
+		return 1;
+	}
+
+	# Generate the data
+	my $meta = $self->_write_mymeta_data or return 1;
+
+	# Save as the MYMETA.yml file
+	print "Writing MYMETA.json\n";
+	Module::Install::_write(
+		'MYMETA.json',
+		JSON->new->pretty(1)->canonical->encode($meta),
+	);
+}
+
+sub _write_mymeta_data {
+	my $self = shift;
+
+	# If there's no existing META.yml there is nothing we can do
+	return undef unless -f 'META.yml';
+
+	# We need Parse::CPAN::Meta to load the file
+	unless ( eval { require Parse::CPAN::Meta; 1; } ) {
+		return undef;
 	}
 
 	# Merge the perl version into the dependencies
@@ -558,7 +604,7 @@
 	}
 
 	# Load the advisory META.yml file
-	my @yaml = YAML::Tiny::LoadFile('META.yml');
+	my @yaml = Parse::CPAN::Meta::LoadFile('META.yml');
 	my $meta = $yaml[0];
 
 	# Overwrite the non-configure dependency hashs
@@ -572,9 +618,7 @@
 		$meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } };
 	}
 
-	# Save as the MYMETA.yml file
-	print "Writing MYMETA.yml\n";
-	YAML::Tiny::DumpFile('MYMETA.yml', $meta);	
+	return $meta;
 }
 
 1;

Modified: branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Win32.pm?rev=38582&op=diff
==============================================================================
--- branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Win32.pm (original)
+++ branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/Win32.pm Thu Jun 25 03:48:18 2009
@@ -2,12 +2,12 @@
 package Module::Install::Win32;
 
 use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.85';
-	@ISA     = qw{Module::Install::Base};
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
 

Modified: branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/WriteAll.pm?rev=38582&op=diff
==============================================================================
--- branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/WriteAll.pm (original)
+++ branches/upstream/libmoosex-declare-perl/current/inc/Module/Install/WriteAll.pm Thu Jun 25 03:48:18 2009
@@ -2,11 +2,11 @@
 package Module::Install::WriteAll;
 
 use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.85';
+	$VERSION = '0.91';;
 	@ISA     = qw{Module::Install::Base};
 	$ISCORE  = 1;
 }
@@ -41,8 +41,18 @@
 
 	# The Makefile write process adds a couple of dependencies,
 	# so write the META.yml files after the Makefile.
-	$self->Meta->write        if $args{meta};
-	$self->Meta->write_mymeta if $self->mymeta;
+	if ( $args{meta} ) {
+		$self->Meta->write;
+	}
+
+	# Experimental support for MYMETA
+	if ( $ENV{X_MYMETA} ) {
+		if ( $ENV{X_MYMETA} eq 'JSON' ) {
+			$self->Meta->write_mymeta_json;
+		} else {
+			$self->Meta->write_mymeta_yaml;
+		}
+	}
 
 	return 1;
 }

Modified: branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare.pm?rev=38582&op=diff
==============================================================================
--- branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare.pm (original)
+++ branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare.pm Thu Jun 25 03:48:18 2009
@@ -8,7 +8,7 @@
 
 use namespace::clean;
 
-our $VERSION = '0.22';
+our $VERSION = '0.23';
 
 sub import {
     my ($class, %args) = @_;
@@ -19,7 +19,7 @@
     warnings->import;
 
     for my $keyword ($class->keywords) {
-        $keyword->setup_for($caller, %args);
+        $keyword->setup_for($caller, %args, provided_by => $class);
     }
 }
 

Modified: branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare/Context.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare/Context.pm?rev=38582&op=diff
==============================================================================
--- branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare/Context.pm (original)
+++ branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare/Context.pm Thu Jun 25 03:48:18 2009
@@ -28,6 +28,12 @@
     is          => 'rw',
     isa         => 'HashRef',
     default     => sub { {} },
+    required    => 1,
+);
+
+has provided_by => (
+    is          => 'ro',
+    isa         => 'ClassName',
     required    => 1,
 );
 

Modified: branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare/Syntax/Keyword/Method.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare/Syntax/Keyword/Method.pm?rev=38582&op=diff
==============================================================================
--- branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare/Syntax/Keyword/Method.pm (original)
+++ branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare/Syntax/Keyword/Method.pm Thu Jun 25 03:48:18 2009
@@ -8,7 +8,7 @@
 
 sub register_method_declaration {
     my ($self, $class, $method) = @_;
-    return $class->meta->add_method($method->name, $method->body);
+    return $class->meta->add_method($method->name, $method);
 }
 
 1;

Modified: branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare/Syntax/MooseSetup.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare/Syntax/MooseSetup.pm?rev=38582&op=diff
==============================================================================
--- branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare/Syntax/MooseSetup.pm (original)
+++ branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare/Syntax/MooseSetup.pm Thu Jun 25 03:48:18 2009
@@ -1,5 +1,5 @@
 package MooseX::Declare::Syntax::MooseSetup;
- 
+
 use Moose::Role;
 
 use Moose::Util  qw( find_meta );

Modified: branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare/Syntax/NamespaceHandling.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare/Syntax/NamespaceHandling.pm?rev=38582&op=diff
==============================================================================
--- branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare/Syntax/NamespaceHandling.pm (original)
+++ branches/upstream/libmoosex-declare-perl/current/lib/MooseX/Declare/Syntax/NamespaceHandling.pm Thu Jun 25 03:48:18 2009
@@ -106,7 +106,8 @@
     $ctx->add_preamble_code_parts(
         "package ${package}",
         sprintf(
-            "use MooseX::Declare %s => '%s', file => __FILE__, stack => [ %s ]",
+            "use %s %s => '%s', file => __FILE__, stack => [ %s ]",
+            $ctx->provided_by,
             outer_package => $package,
             $self->generate_inline_stack($ctx),
         ),

Modified: branches/upstream/libmoosex-declare-perl/current/t/attribute_issues.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-declare-perl/current/t/attribute_issues.t?rev=38582&op=diff
==============================================================================
--- branches/upstream/libmoosex-declare-perl/current/t/attribute_issues.t (original)
+++ branches/upstream/libmoosex-declare-perl/current/t/attribute_issues.t Thu Jun 25 03:48:18 2009
@@ -1,3 +1,5 @@
+use strict;
+use warnings;
 use Test::More tests => 6;
 use Test::NoWarnings;
 use Test::Exception;

Added: branches/upstream/libmoosex-declare-perl/current/t/meta_should_be_signature.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-declare-perl/current/t/meta_should_be_signature.t?rev=38582&op=file
==============================================================================
--- branches/upstream/libmoosex-declare-perl/current/t/meta_should_be_signature.t (added)
+++ branches/upstream/libmoosex-declare-perl/current/t/meta_should_be_signature.t Thu Jun 25 03:48:18 2009
@@ -1,0 +1,12 @@
+use Test::More tests => 1;
+use MooseX::Declare;
+
+class Foo {
+    method blat (Str $str) { }
+}
+
+my $foo = Foo->new();
+
+my $blat = $foo->meta->get_method('blat');
+
+isa_ok($blat, 'MooseX::Method::Signatures::Meta::Method');

Modified: branches/upstream/libmoosex-declare-perl/current/t/modifiers.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-declare-perl/current/t/modifiers.t?rev=38582&op=diff
==============================================================================
--- branches/upstream/libmoosex-declare-perl/current/t/modifiers.t (original)
+++ branches/upstream/libmoosex-declare-perl/current/t/modifiers.t Thu Jun 25 03:48:18 2009
@@ -19,7 +19,7 @@
 }
 
 class Foo with Bar {
-  method do_foo { 
+  method do_foo {
     push @log, { class => 'string' };
   }
 }

Modified: branches/upstream/libmoosex-declare-perl/current/t/recipes/basics/001_point.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-declare-perl/current/t/recipes/basics/001_point.t?rev=38582&op=diff
==============================================================================
--- branches/upstream/libmoosex-declare-perl/current/t/recipes/basics/001_point.t (original)
+++ branches/upstream/libmoosex-declare-perl/current/t/recipes/basics/001_point.t Thu Jun 25 03:48:18 2009
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 57;
+use Test::More tests => 59;
 use Test::Exception;
 
 use MooseX::Declare;
@@ -113,7 +113,7 @@
 	[ 'Moose::Object' ],
 	'... Point got the automagic base class');
 
-my @Point_methods = qw(meta new x y clear);
+my @Point_methods = qw(meta new x y clear DESTROY);
 my @Point_attrs   = ('x', 'y');
 
 is_deeply(
@@ -145,7 +145,7 @@
 	[ 'Point' ],
 	'... Point3D gets the parent given to it');
 
-my @Point3D_methods = qw(new meta z clear);
+my @Point3D_methods = qw(new meta z clear DESTROY);
 my @Point3D_attrs   = ('z');
 
 is_deeply(




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