rclass stuff ripped out of everything but widget classes

1 files changed, 53 insertions, 51 deletions

diff --git a/lib/Catalyst/Model/Reaction/InterfaceModel/DBIC.pm b/lib/Catalyst/Model/Reaction/InterfaceModel/DBIC.pm
index 4c6534f..4ba28f4 100644
--- a/lib/Catalyst/Model/Reaction/InterfaceModel/DBIC.pm
+++ b/lib/Catalyst/Model/Reaction/InterfaceModel/DBIC.pm
@@ -9,60 +9,62 @@ use Class::MOP;
 #XXX so yeah, thisis kinda hacky. big whop though, i need it.
 #this may just all together go away in the future
 
-class DBIC, is 'Reaction::Object', is 'Catalyst::Component', which {
-
-  has '_schema' => (isa => 'DBIx::Class::Schema', is => 'ro', required => 1);
-  has '_im_class' => (is => 'ro', required => 1);
-
-  implements 'COMPONENT' => as {
-    my ($class, $app, $args) = @_;
-    my %cfg = %{ Catalyst::Utils::merge_hashes($class->config, $args) };
-
-    my $im_class = $cfg{im_class};
-    Class::MOP::load_class($im_class);
-
-    #XXXthis could be cut out later for a more elegant method
-    my @domain_models = $im_class->domain_models;
-    confess "Unable to locate domain model in ${im_class}"
-      if @domain_models < 1;
-    confess 'ModelBase does not yet support multiple domain models'
-      if @domain_models > 1;
-    my $domain_model = shift @domain_models;
-    my $schema_class = $domain_model->_isa_metadata;
-    Class::MOP::load_class($schema_class);
-
-    my $params = $cfg{db_params} || {};
-    my $schema = $schema_class
-      ->connect($cfg{db_dsn}, $cfg{db_user}, $cfg{db_password}, $params);
-    return $class->new(_schema => $schema, _im_class => $im_class);
-  };
-
-  implements 'ACCEPT_CONTEXT' => as {
-    my ($self, $ctx) = @_;
-    return $self->CONTEXTUAL_CLONE($ctx) unless ref $ctx;
-    return $ctx->stash->{ref($self)} ||= $self->CONTEXTUAL_CLONE($ctx);
-  };
-
-  #XXXto do build in support for RestrictByUser natively or by subclass
-  implements 'CONTEXTUAL_CLONE' => as {
-    my ($self, $ctx) = @_;
-    my $schema = $self->_schema->clone;
-
-    my $im_class = $self->_im_class;
-
-    #XXXthis could be cut out later for a more elegant method
-    my @domain_models = $im_class->domain_models;
-    confess "Unable to locate domain model in ${im_class}"
-      if @domain_models < 1;
-    confess 'ModelBase does not yet support multiple domain models'
-      if @domain_models > 1;
-    my $domain_model = shift @domain_models;
-
-    return $im_class->new($domain_model->name => $schema);
-  };
+use namespace::clean -except => [ qw(meta) ];
+extends 'Reaction::Object', 'Catalyst::Component';
+
+
+
+has '_schema' => (isa => 'DBIx::Class::Schema', is => 'ro', required => 1);
+has '_im_class' => (is => 'ro', required => 1);
+sub COMPONENT {
+  my ($class, $app, $args) = @_;
+  my %cfg = %{ Catalyst::Utils::merge_hashes($class->config, $args) };
+
+  my $im_class = $cfg{im_class};
+  Class::MOP::load_class($im_class);
+
+  #XXXthis could be cut out later for a more elegant method
+  my @domain_models = $im_class->domain_models;
+  confess "Unable to locate domain model in ${im_class}"
+    if @domain_models < 1;
+  confess 'ModelBase does not yet support multiple domain models'
+    if @domain_models > 1;
+  my $domain_model = shift @domain_models;
+  my $schema_class = $domain_model->_isa_metadata;
+  Class::MOP::load_class($schema_class);
+
+  my $params = $cfg{db_params} || {};
+  my $schema = $schema_class
+    ->connect($cfg{db_dsn}, $cfg{db_user}, $cfg{db_password}, $params);
+  return $class->new(_schema => $schema, _im_class => $im_class);
+};
+sub ACCEPT_CONTEXT {
+  my ($self, $ctx) = @_;
+  return $self->CONTEXTUAL_CLONE($ctx) unless ref $ctx;
+  return $ctx->stash->{ref($self)} ||= $self->CONTEXTUAL_CLONE($ctx);
+};
+
+#XXXto do build in support for RestrictByUser natively or by subclass
+sub CONTEXTUAL_CLONE {
+  my ($self, $ctx) = @_;
+  my $schema = $self->_schema->clone;
+
+  my $im_class = $self->_im_class;
 
+  #XXXthis could be cut out later for a more elegant method
+  my @domain_models = $im_class->domain_models;
+  confess "Unable to locate domain model in ${im_class}"
+    if @domain_models < 1;
+  confess 'ModelBase does not yet support multiple domain models'
+    if @domain_models > 1;
+  my $domain_model = shift @domain_models;
+
+  return $im_class->new($domain_model->name => $schema);
 };
 
+__PACKAGE__->meta->make_immutable;
+
+
 
 1;