[Bast-commits] r3670 - in DBIx-Class/0.08/trunk: . lib/DBIx/Class
ash at dev.catalyst.perl.org
ash at dev.catalyst.perl.org
Sat Aug 11 23:27:07 GMT 2007
Author: ash
Date: 2007-08-11 23:27:07 +0100 (Sat, 11 Aug 2007)
New Revision: 3670
Modified:
DBIx-Class/0.08/trunk/Changes
DBIx-Class/0.08/trunk/Makefile.PL
DBIx-Class/0.08/trunk/lib/DBIx/Class/Componentised.pm
Log:
Move to using Class::C3::Componentised
Modified: DBIx-Class/0.08/trunk/Changes
===================================================================
--- DBIx-Class/0.08/trunk/Changes 2007-08-11 22:15:22 UTC (rev 3669)
+++ DBIx-Class/0.08/trunk/Changes 2007-08-11 22:27:07 UTC (rev 3670)
@@ -12,6 +12,7 @@
- refactor Statistics to create debugging filehandle to fix bug with
closed STDERR, update docs and modify Versioned to use Statistics
(original fix from diz)
+ - Move to using Class::C3::Componentised
0.08004 2007-08-06 19:00:00
- fix storage connect code to not trigger bug via auto-viv
Modified: DBIx-Class/0.08/trunk/Makefile.PL
===================================================================
--- DBIx-Class/0.08/trunk/Makefile.PL 2007-08-11 22:15:22 UTC (rev 3669)
+++ DBIx-Class/0.08/trunk/Makefile.PL 2007-08-11 22:27:07 UTC (rev 3670)
@@ -9,6 +9,7 @@
requires 'SQL::Abstract' => 1.20;
requires 'SQL::Abstract::Limit' => 0.101;
requires 'Class::C3' => 0.13;
+requires 'Class::C3::Componentised' => 0;
requires 'Storable' => 0;
requires 'Carp::Clan' => 0;
requires 'DBI' => 1.40;
Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Componentised.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Componentised.pm 2007-08-11 22:15:22 UTC (rev 3669)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Componentised.pm 2007-08-11 22:27:07 UTC (rev 3670)
@@ -4,8 +4,7 @@
use strict;
use warnings;
-use Class::C3;
-use Class::Inspector;
+use base 'Class::C3::Componentised';
use Carp::Clan qw/^DBIx::Class/;
sub inject_base {
@@ -29,68 +28,9 @@
}
}
- # Yes, this is hack. But it *does* work. Please don't submit tickets about
- # it on the basis of the comments in Class::C3, the author was on #dbix-class
- # while I was implementing this.
-
- eval "package $target; import Class::C3;" unless exists $Class::C3::MRO{$target};
+ $class->next::method($target, @to_inject);
}
-sub load_components {
- my $class = shift;
- my $base = $class->component_base_class;
- my @comp = map { /^\+(.*)$/ ? $1 : "${base}::$_" } grep { $_ !~ /^#/ } @_;
- $class->_load_components(@comp);
- Class::C3::reinitialize();
-}
-
-sub load_own_components {
- my $class = shift;
- my @comp = map { "${class}::$_" } grep { $_ !~ /^#/ } @_;
- $class->_load_components(@comp);
-}
-
-sub _load_components {
- my ($class, @comp) = @_;
- foreach my $comp (@comp) {
- $class->ensure_class_loaded($comp);
- }
- $class->inject_base($class => @comp);
-}
-
-# Given a class name, tests to see if it is already loaded or otherwise
-# defined. If it is not yet loaded, the package is require'd, and an exception
-# is thrown if the class is still not loaded.
-#
-# TODO: handle ->has_many('rel', 'Class'...) instead of
-# ->has_many('rel', 'Some::Schema::Class'...)
-#
-# BUG: For some reason, packages with syntax errors are added to %INC on
-# require
-sub ensure_class_loaded {
- my ($class, $f_class) = @_;
-
- croak "Invalid class name $f_class"
- if ($f_class=~m/(?:\b:\b|\:{3,})/);
- return if Class::Inspector->loaded($f_class);
- eval "require $f_class"; # require needs a bareword or filename
- if ($@) {
- if ($class->can('throw_exception')) {
- $class->throw_exception($@);
- } else {
- croak $@;
- }
- }
-}
-
-# Returns true if the specified class is installed or already loaded, false
-# otherwise
-sub ensure_class_found {
- my ($class, $f_class) = @_;
- return Class::Inspector->loaded($f_class) ||
- Class::Inspector->installed($f_class);
-}
-
# Returns a true value if the specified class is installed and loaded
# successfully, throws an exception if the class is found but not loaded
# successfully, and false if the class is not installed
More information about the Bast-commits
mailing list