Less madness with the environment. Not tested

[catagits/Gitalist.git] / lib / Gitalist / Model / CollectionOfRepos.pm

diff --git a/lib/Gitalist/Model/CollectionOfRepos.pm b/lib/Gitalist/Model/CollectionOfRepos.pm
index f631815..4cc901e 100644 (file)
--- a/lib/Gitalist/Model/CollectionOfRepos.pm
+++ b/lib/Gitalist/Model/CollectionOfRepos.pm
@@ -12,6 +12,7 @@ use namespace::autoclean;
 
 extends 'Catalyst::Model';
 
+with 'Catalyst::Component::ApplicationAttribute';
 with 'Catalyst::Component::InstancePerContext';
 
 my $repo_dir_t = subtype NonEmptySimpleStr,
@@ -50,6 +51,16 @@ has repos => (
     coerce => 1,
 );
 
+has class => (
+    isa => NonEmptySimpleStr,
+    is  => 'ro',
+);
+
+has args => (
+    isa     => 'HashRef',
+    is      => 'ro',
+    default => sub { {} },
+);
 
 has search_recursively => (
     is      => 'ro',
@@ -69,8 +80,10 @@ has whitelist => (
 
 sub _build_repo_dir {
     my $self = shift;
-    $ENV{GITALIST_REPO_DIR} ?
-        $ENV{GITALIST_REPO_DIR}
+    my $repo_dir = $self->_application->run_options->{repo_dir};
+
+    $repo_dir ?
+        $repo_dir
       : $self->has_config_repo_dir
       ? $self->config_repo_dir
         : '';
@@ -83,23 +96,41 @@ after BUILD => sub {
     $self->_repos_count || $self->repo_dir;
 };
 
-sub build_per_context_instance {
-    my ($self, $app) = @_;
+sub _default_model_class {
+    my($self) = @_;
 
-    my %args = (export_ok => $self->export_ok || '');
-    my $class;
     if($self->whitelist && -f $self->whitelist) {
-        $class = 'Gitalist::Git::CollectionOfRepositories::FromDirectory::WhiteList';
-        $args{repo_dir}  = $self->repo_dir;
-        $args{whitelist} = $self->whitelist;
+        return 'FromDirectory::WhiteList';
     } elsif ($self->_repos_count && !$self->search_recursively) {
-        $class = 'Gitalist::Git::CollectionOfRepositories::FromListOfDirectories';
-        $args{repos} = $self->repos;
-    } else {
-        $class = 'Gitalist::Git::CollectionOfRepositories::FromDirectoryRecursive';
-        $args{repo_dir} = $self->repo_dir;
+        return 'FromListOfDirectories';
+    } elsif($self->search_recursively) {
+        return 'FromDirectoryRecursive';
     }
 
+    return 'FromDirectory';
+}
+
+sub build_per_context_instance {
+    my ($self, $app) = @_;
+
+    my %args = (
+        export_ok => $self->export_ok || '',
+        %{ $self->args }
+    );
+
+    my $class = $self->class;
+    Class::MOP::load_class($class) if $class;
+
+    my $default = $self->_default_model_class;
+
+    $args{whitelist} = $self->whitelist if $default eq 'FromDirectory::WhiteList';
+    $args{repos}     = $self->repos     if $default eq 'FromListOfDirectories';
+    $args{repo_dir}  = $self->repo_dir  if $default =~ /\b(?:WhiteList|FromDirectory(?:Recursive)?)$/;
+
+    $class ||= "Gitalist::Git::CollectionOfRepositories::$default";
+
+    $app->log->debug("Using class '$class'");
+
     return $class->new(%args);
 }
 
@@ -107,6 +138,12 @@ __PACKAGE__->meta->make_immutable;
 
 __END__
 
+=encoding UTF-8
+
+=head1 NAME
+
+Gitalist::Model::CollectionOfRepos - Model::CollectionOfRepos module for Gitalist
+
 =head1 AUTHORS
 
 See L<Gitalist> for authors.