X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FAccessor%2FGrouped.pm;h=24b6971108875fddf0b7f6af9bbf21cfa5d00bb1;hb=33fe229924ce0cfe5f74252774ff923910a70fbb;hp=a1da4621f3af2e2ef9d3db97173ac61756b28534;hpb=4977f64779c207d20e8cfa9247e10a1803c390e9;p=p5sagit%2FClass-Accessor-Grouped.git

diff --git a/lib/Class/Accessor/Grouped.pm b/lib/Class/Accessor/Grouped.pm
index a1da462..24b6971 100644
--- a/lib/Class/Accessor/Grouped.pm
+++ b/lib/Class/Accessor/Grouped.pm
@@ -3,72 +3,99 @@ use strict;
 use warnings;
 use Carp ();
 use Scalar::Util ();
+use Module::Runtime ();
 
 BEGIN {
+  # use M::R to work around the 5.8 require bugs
   if ($] < 5.009_005) {
-    require MRO::Compat;
+    Module::Runtime::require_module('MRO::Compat');
   }
   else {
     require mro;
   }
 }
 
-our $VERSION = '0.10004';
+our $VERSION = '0.10006';
 $VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases
 
-# when changing minimum version don't forget to adjust L</PERFORMANCE> and
-# the Makefile.PL as well
+# when changing minimum version don't forget to adjust Makefile.PL as well
 our $__minimum_xsa_version;
-BEGIN {
-    $__minimum_xsa_version = '1.11';
-}
+BEGIN { $__minimum_xsa_version = '1.13' }
 
 our $USE_XS;
 # the unless defined is here so that we can override the value
 # before require/use, *regardless* of the state of $ENV{CAG_USE_XS}
 $USE_XS = $ENV{CAG_USE_XS}
-    unless defined $USE_XS;
+  unless defined $USE_XS;
+
+BEGIN {
+  package __CAG_ENV__;
+
+  die "Huh?! No minimum C::XSA version?!\n"
+    unless $__minimum_xsa_version;
+
+  local $@;
+  require constant;
+
+  # individual (one const at a time) imports so we are 5.6.2 compatible
+  # if we can - why not ;)
+  constant->import( NO_SUBNAME => eval {
+    Module::Runtime::require_module('Sub::Name')
+  } ? 0 : "$@" );
+
+  constant->import( NO_CXSA => ( !NO_SUBNAME() and eval {
+    Module::Runtime::use_module('Class::XSAccessor' => $__minimum_xsa_version)
+  } ) ? 0 : "$@" );
+
+  constant->import( BROKEN_GOTO => ($] < '5.008009') ? 1 : 0 );
+
+  constant->import( UNSTABLE_DOLLARAT => ($] < '5.013002') ? 1 : 0 );
+
+  constant->import( TRACK_UNDEFER_FAIL => (
+    $INC{'Test/Builder.pm'} || $INC{'Test/Builder2.pm'}
+      and
+    $0 =~ m|^ x?t / .+ \.t $|x
+  ) ? 1 : 0 );
+}
 
 # Yes this method is undocumented
 # Yes it should be a private coderef like all the rest at the end of this file
 # No we can't do that (yet) because the DBIC-CDBI compat layer overrides it
 # %$*@!?&!&#*$!!!
 sub _mk_group_accessors {
-    my($self, $maker, $group, @fields) = @_;
-    my $class = Scalar::Util::blessed $self || $self;
+  my($self, $maker, $group, @fields) = @_;
+  my $class = Scalar::Util::blessed $self || $self;
 
-    no strict 'refs';
-    no warnings 'redefine';
+  no strict 'refs';
+  no warnings 'redefine';
 
-    # So we don't have to do lots of lookups inside the loop.
-    $maker = $self->can($maker) unless ref $maker;
+  # So we don't have to do lots of lookups inside the loop.
+  $maker = $self->can($maker) unless ref $maker;
 
-    foreach (@fields) {
-        if( $_ eq 'DESTROY' ) {
-            Carp::carp("Having a data accessor named DESTROY in ".
-                       "'$class' is unwise.");
-        }
+  for (@fields) {
 
-        my ($name, $field) = (ref $_)
-            ? (@$_)
-            : ($_, $_)
-        ;
+    my ($name, $field) = (ref $_) ? (@$_) : ($_, $_);
 
-        my $alias = "_${name}_accessor";
+    for (qw/DESTROY AUTOLOAD CLONE/) {
+      Carp::carp("Having a data accessor named '$name' in '$class' is unwise.")
+        if $name eq $_;
+    }
 
-        for my $meth ($name, $alias) {
+    my $alias = "_${name}_accessor";
 
-            # the maker may elect to not return anything, meaning it already
-            # installed the coderef for us (e.g. lack of Sub::Name)
-            my $cref = $self->$maker($group, $field, $meth)
-                or next;
+    for my $meth ($name, $alias) {
 
-            my $fq_meth = "${class}::${meth}";
+      # the maker may elect to not return anything, meaning it already
+      # installed the coderef for us (e.g. lack of Sub::Name)
+      my $cref = $self->$maker($group, $field, $meth)
+        or next;
 
-            *$fq_meth = Sub::Name::subname($fq_meth, $cref);
-                #unless defined &{$class."\:\:$field"}
-        }
+      my $fq_meth = "${class}::${meth}";
+
+      *$fq_meth = Sub::Name::subname($fq_meth, $cref);
+        #unless defined &{$class."\:\:$field"}
     }
+  }
 };
 
 # coderef is setup at the end for clarity
@@ -123,10 +150,10 @@ be of the form [ $accessor, $field ].
 =cut
 
 sub mk_group_accessors {
-    my ($self, $group, @fields) = @_;
+  my ($self, $group, @fields) = @_;
 
-    $self->_mk_group_accessors('make_group_accessor', $group, @fields);
-    return;
+  $self->_mk_group_accessors('make_group_accessor', $group, @fields);
+  return;
 }
 
 =head2 mk_group_ro_accessors
@@ -148,9 +175,9 @@ rather than setting the value.
 =cut
 
 sub mk_group_ro_accessors {
-    my($self, $group, @fields) = @_;
+  my($self, $group, @fields) = @_;
 
-    $self->_mk_group_accessors('make_group_ro_accessor', $group, @fields);
+  $self->_mk_group_accessors('make_group_ro_accessor', $group, @fields);
 }
 
 =head2 mk_group_wo_accessors
@@ -172,9 +199,9 @@ value rather than getting the value.
 =cut
 
 sub mk_group_wo_accessors {
-    my($self, $group, @fields) = @_;
+  my($self, $group, @fields) = @_;
 
-    $self->_mk_group_accessors('make_group_wo_accessor', $group, @fields);
+  $self->_mk_group_accessors('make_group_wo_accessor', $group, @fields);
 }
 
 =head2 get_simple
@@ -193,7 +220,7 @@ name passed as an argument.
 =cut
 
 sub get_simple {
-    return $_[0]->{$_[1]};
+  return $_[0]->{$_[1]};
 }
 
 =head2 set_simple
@@ -212,7 +239,7 @@ for the field name passed as an argument.
 =cut
 
 sub set_simple {
-    return $_[0]->{$_[1]} = $_[2];
+  return $_[0]->{$_[1]} = $_[2];
 }
 
 
@@ -235,38 +262,38 @@ instances.
 =cut
 
 sub get_inherited {
-    my $class;
+  my $class;
 
-    if ( defined( $class = Scalar::Util::blessed $_[0] ) ) {
-        if (Scalar::Util::reftype $_[0] eq 'HASH') {
-          return $_[0]->{$_[1]} if exists $_[0]->{$_[1]};
-        }
-        else {
-          Carp::croak('Cannot get inherited value on an object instance that is not hash-based');
-        }
+  if ( defined( $class = Scalar::Util::blessed $_[0] ) ) {
+    if (Scalar::Util::reftype $_[0] eq 'HASH') {
+      return $_[0]->{$_[1]} if exists $_[0]->{$_[1]};
     }
     else {
-        $class = $_[0];
+      Carp::croak('Cannot get inherited value on an object instance that is not hash-based');
     }
+  }
+  else {
+    $class = $_[0];
+  }
 
-    no strict 'refs';
-    no warnings 'uninitialized';
+  no strict 'refs';
+  no warnings 'uninitialized';
 
-    my $cag_slot = '::__cag_'. $_[1];
-    return ${$class.$cag_slot} if defined(${$class.$cag_slot});
+  my $cag_slot = '::__cag_'. $_[1];
+  return ${$class.$cag_slot} if defined(${$class.$cag_slot});
 
-    # we need to be smarter about recalculation, as @ISA (thus supers) can very well change in-flight
-    my $cur_gen = mro::get_pkg_gen ($class);
-    if ( $cur_gen != ${$class.'::__cag_pkg_gen__'} ) {
-        @{$class.'::__cag_supers__'} = $_[0]->get_super_paths;
-        ${$class.'::__cag_pkg_gen__'} = $cur_gen;
-    }
+  # we need to be smarter about recalculation, as @ISA (thus supers) can very well change in-flight
+  my $cur_gen = mro::get_pkg_gen ($class);
+  if ( $cur_gen != ${$class.'::__cag_pkg_gen__'} ) {
+    @{$class.'::__cag_supers__'} = $_[0]->get_super_paths;
+    ${$class.'::__cag_pkg_gen__'} = $cur_gen;
+  }
 
-    for (@{$class.'::__cag_supers__'}) {
-        return ${$_.$cag_slot} if defined(${$_.$cag_slot});
-    };
+  for (@{$class.'::__cag_supers__'}) {
+    return ${$_.$cag_slot} if defined(${$_.$cag_slot});
+  };
 
-    return undef;
+  return undef;
 }
 
 =head2 set_inherited
@@ -290,17 +317,17 @@ hash-based object.
 =cut
 
 sub set_inherited {
-    if (defined Scalar::Util::blessed $_[0]) {
-        if (Scalar::Util::reftype $_[0] eq 'HASH') {
-            return $_[0]->{$_[1]} = $_[2];
-        } else {
-            Carp::croak('Cannot set inherited value on an object instance that is not hash-based');
-        };
+  if (defined Scalar::Util::blessed $_[0]) {
+    if (Scalar::Util::reftype $_[0] eq 'HASH') {
+      return $_[0]->{$_[1]} = $_[2];
     } else {
-        no strict 'refs';
-
-        return ${$_[0].'::__cag_'.$_[1]} = $_[2];
+      Carp::croak('Cannot set inherited value on an object instance that is not hash-based');
     };
+  } else {
+    no strict 'refs';
+
+    return ${$_[0].'::__cag_'.$_[1]} = $_[2];
+  };
 }
 
 =head2 get_component_class
@@ -315,17 +342,17 @@ Returns: $value
 
 Gets the value of the specified component class.
 
-    __PACKAGE__->mk_group_accessors('component_class' => 'result_class');
+ __PACKAGE__->mk_group_accessors('component_class' => 'result_class');
 
-    $self->result_class->method();
+ $self->result_class->method();
 
-    ## same as
-    $self->get_component_class('result_class')->method();
+ ## same as
+ $self->get_component_class('result_class')->method();
 
 =cut
 
 sub get_component_class {
-    return $_[0]->get_inherited($_[1]);
+  return $_[0]->get_inherited($_[1]);
 };
 
 =head2 set_component_class
@@ -341,25 +368,36 @@ Returns: $new_value
 Inherited accessor that automatically loads the specified class before setting
 it. This method will die if the specified class could not be loaded.
 
-    __PACKAGE__->mk_group_accessors('component_class' => 'result_class');
-    __PACKAGE__->result_class('MyClass');
+ __PACKAGE__->mk_group_accessors('component_class' => 'result_class');
+ __PACKAGE__->result_class('MyClass');
 
-    $self->result_class->method();
+ $self->result_class->method();
 
 =cut
 
 sub set_component_class {
-    if ($_[2]) {
-        local $^W = 0;
-        require Class::Inspector;
-        if (Class::Inspector->installed($_[2]) && !Class::Inspector->loaded($_[2])) {
-            eval "require $_[2]";
+  if (defined $_[2] and length $_[2]) {
+    # disable warnings, and prevent $_ being eaten away by a behind-the-scenes
+    # module loading
+    local ($^W, $_);
 
-            Carp::croak("Could not load $_[1] '$_[2]': ", $@) if $@;
-        };
-    };
+    if (__CAG_ENV__::UNSTABLE_DOLLARAT) {
+      my $err;
+      {
+        local $@;
+        eval { Module::Runtime::use_package_optimistically($_[2]) }
+          or $err = $@;
+      }
+      Carp::croak("Could not load $_[1] '$_[2]': $err") if defined $err;
 
-    return $_[0]->set_inherited($_[1], $_[2]);
+    }
+    else {
+      eval { Module::Runtime::use_package_optimistically($_[2]) }
+        or Carp::croak("Could not load $_[1] '$_[2]': $@");
+    }
+  };
+
+  return $_[0]->set_inherited($_[1], $_[2]);
 };
 
 =head1 INTERNAL METHODS
@@ -375,7 +413,7 @@ inherited from. This is what drives the traversal done by L</get_inherited>.
 =cut
 
 sub get_super_paths {
-    return @{mro::get_linear_isa( ref($_[0]) || $_[0] )};
+  return @{mro::get_linear_isa( ref($_[0]) || $_[0] )};
 };
 
 =head2 make_group_accessor
@@ -529,62 +567,6 @@ it under the same terms as perl itself.
 ########################################################################
 ########################################################################
 
-BEGIN {
-
-  die "Huh?! No minimum C::XSA version?!\n"
-    unless $__minimum_xsa_version;
-
-  local $@;
-  my $err;
-
-
-  $err = eval { require Sub::Name; 1; } ? undef : do {
-    delete $INC{'Sub/Name.pm'};   # because older perls suck
-    $@;
-  };
-  *__CAG_ENV__::NO_SUBNAME = $err
-    ? sub () { $err }
-    : sub () { 0 }
-  ;
-
-
-  $err = eval {
-    require Class::XSAccessor;
-    Class::XSAccessor->VERSION($__minimum_xsa_version);
-    require Sub::Name;
-    1;
-  } ? undef : do {
-    delete $INC{'Sub/Name.pm'};   # because older perls suck
-    delete $INC{'Class/XSAccessor.pm'};
-    $@;
-  };
-  *__CAG_ENV__::NO_CXSA = $err
-    ? sub () { $err }
-    : sub () { 0 }
-  ;
-
-
-  *__CAG_ENV__::BROKEN_GOTO = ($] < '5.008009')
-    ? sub () { 1 }
-    : sub () { 0 }
-  ;
-
-
-  *__CAG_ENV__::UNSTABLE_DOLLARAT = ($] < '5.013002')
-    ? sub () { 1 }
-    : sub () { 0 }
-  ;
-
-
-  *__CAG_ENV__::TRACK_UNDEFER_FAIL = (
-    $INC{'Test/Builder.pm'} || $INC{'Test/Builder2.pm'}
-      and
-    $0 =~ m|^ x?t / .+ \.t $|x
-  ) ? sub () { 1 }
-    : sub () { 0 }
-  ;
-}
-
 # Autodetect unless flag supplied
 my $xsa_autodetected;
 if (! defined $USE_XS) {
@@ -685,9 +667,9 @@ $gen_accessor = sub {
       # this block over and over again
       my $resolved_implementation = $cached_implementation->{$current_class} || do {
         if (
-          $current_class->can('get_simple') == $original_simple_getter
+          ($current_class->can('get_simple')||0) == $original_simple_getter
             &&
-          $current_class->can('set_simple') == $original_simple_setter
+          ($current_class->can('set_simple')||0) == $original_simple_setter
         ) {
           # nothing has changed, might as well use the XS crefs
           #
@@ -729,7 +711,7 @@ $gen_accessor = sub {
       # if after this shim was created someone wrapped it with an 'around',
       # we can not blindly reinstall the method slot - we will destroy the
       # wrapper. Silently chain execution further...
-      if ( !$expected_cref or $expected_cref != $current_class->can($methname) ) {
+      if ( !$expected_cref or $expected_cref != ($current_class->can($methname)||0) ) {
 
         # there is no point in re-determining it on every subsequent call,
         # just store for future reference