Get the vhost based repository displatcher for shadowcat working, I think

diff --git a/lib/Gitalist/Git/CollectionOfRepositories/FromDirectoryRecursive.pm b/lib/Gitalist/Git/CollectionOfRepositories/FromDirectoryRecursive.pm
index 08ba2d7..b23c949 100644 (file)
--- a/lib/Gitalist/Git/CollectionOfRepositories/FromDirectoryRecursive.pm
+++ b/lib/Gitalist/Git/CollectionOfRepositories/FromDirectoryRecursive.pm
@@ -1,8 +1,6 @@
 use MooseX::Declare;
 
-class Gitalist::Git::CollectionOfRepositories::FromDirectoryRecursive
-    with Gitalist::Git::CollectionOfRepositories {
-
+class Gitalist::Git::CollectionOfRepositories::FromDirectoryRecursive {
     use MooseX::Types::Common::String qw/NonEmptySimpleStr/;
     use MooseX::Types::Path::Class qw/Dir/;
 
@@ -44,6 +42,7 @@ class Gitalist::Git::CollectionOfRepositories::FromDirectoryRecursive
         map { Gitalist::Git::Repository->new($_, $self->_get_repo_name("$_")) } $self->_find_repos( $self->repo_dir )
       ];
     }
+    with 'Gitalist::Git::CollectionOfRepositories';
 }                         # end class
 
 __END__

diff --git a/lib/Gitalist/Git/CollectionOfRepositories/Vhost.pm b/lib/Gitalist/Git/CollectionOfRepositories/Vhost.pm
index d8499ed..8daf00c 100644 (file)
--- a/lib/Gitalist/Git/CollectionOfRepositories/Vhost.pm
+++ b/lib/Gitalist/Git/CollectionOfRepositories/Vhost.pm
@@ -2,12 +2,27 @@ use MooseX::Declare;
 
 class Gitalist::Git::CollectionOfRepositories::Vhost
     with Gitalist::Git::CollectionOfRepositories {
+    use MooseX::Types::Moose qw/ HashRef Str /;
     use MooseX::Types::Common::String qw/NonEmptySimpleStr/;
     use MooseX::Types::Path::Class qw/Dir/;
+    use Moose::Util::TypeConstraints;
+
+    sub BUILDARGS { # FIXME - This is fuck ugly!
+        my ($class, @args) = @_;
+        my $args = $class->next::method(@args);
+        my %collections = %{ delete $args->{collections} };
+        foreach my $name (keys %collections) {
+            my %args = %{$collections{$name}};
+            my $class = delete $args{class};
+            Class::MOP::load_class($class);
+            $collections{$name} = $class->new(%args);
+        }
+        my $ret = { %$args, collections => \%collections };
+        return $ret;
+    }
 
     has vhost_dispatch => (
         isa => HashRef,
-        sa => HashRef,
         traits => ['Hash'],
         required => 1,
         handles => {
@@ -30,6 +45,7 @@ class Gitalist::Git::CollectionOfRepositories::Vhost
         required => 1,
     );
 
+    role_type 'Gitalist::Git::CollectionOfRepositories';
     has chosen_collection => (
         does => 'Gitalist::Git::CollectionOfRepositories',
         handles => [qw/
@@ -38,7 +54,7 @@ class Gitalist::Git::CollectionOfRepositories::Vhost
         /],
         default => sub {
             my $self = shift;
-            $self->_get_collection($self->_get_collection_name_for_vhost($self->vhost) || $self->_get_collection_name_for_vhost('default'));
+            $self->_get_collection($self->_get_collection_name_for_vhost($self->vhost) || $self->_get_collection_name_for_vhost('_default_'));
         },
         lazy => 1,
     );
@@ -56,10 +72,11 @@ Gitalist::Git::CollectionOfRepositories::Vhost
         vhost_dispatch => {
             "git.shadowcat.co.uk" => "foo",
             "git.moose.perl.org" => "bar",
+            "_default_" => "foo",
         },
         collections => {
-            foo => Gitalist::Git::CollectionOfRepositories::XXX->new(),
-            bar => Gitalist::Git::CollectionOfRepositories::XXX->new,
+            foo => { class => Gitalist::Git::CollectionOfRepositories::XXX', %args },
+            bar => { class => Gitalist::Git::CollectionOfRepositories::XXX', %args },
         }
     );
     my $repository_list = $repo->repositories;

diff --git a/lib/Gitalist/Model/CollectionOfRepos.pm b/lib/Gitalist/Model/CollectionOfRepos.pm
index 1071d82..6fdcf2c 100644 (file)
--- a/lib/Gitalist/Model/CollectionOfRepos.pm
+++ b/lib/Gitalist/Model/CollectionOfRepos.pm
@@ -117,7 +117,7 @@ sub build_per_context_instance {
 
     my $class = $self->class;
 
-    $ctx->log->debug("Using class '$class'") if $c->debug;
+    $ctx->log->debug("Using class '$class'") if $ctx->debug;
 
     return $class->new(%args);
 }

diff --git a/t/model_collectionofrepos.t b/t/model_collectionofrepos.t
index 834ba62..0225ee6 100644 (file)
--- a/t/model_collectionofrepos.t
+++ b/t/model_collectionofrepos.t
@@ -27,6 +27,7 @@ my $run_options = {};
 my $mock_ctx_meta = Class::MOP::Class->create_anon_class( superclasses => ['Moose::Object'] );
 $mock_ctx_meta->add_method('run_options' => sub { $run_options });
 $mock_ctx_meta->add_attribute($_, accessor => $_, required => 1) for qw/request response/;
+$mock_ctx_meta->add_method('debug' => sub {});
 $mock_ctx_meta->add_attribute('stash', accessor => 'stash', required => 1, default => sub { {} });
 $mock_ctx_meta->add_around_method_modifier( stash => sub { # Nicked straight from Catalyst.pm
     my $orig = shift;
@@ -46,11 +47,12 @@ $mock_log->add_method($_ => sub {}) for qw/ warn info debug /;
 my $logger = $mock_log->name->new;
 $mock_ctx_meta->add_method('log' => sub { $logger });
 
+my $host = "example.gitalist.com";
 our $ctx_gen = sub {
     my ($cb, %args) = @_;
     my $ctx = $mock_ctx_meta->new_object(
         response    => Catalyst::Response->new,
-        request     => Catalyst::Request->new,
+        request     => Catalyst::Request->new(uri => URI->new("http://$host/")),
         stash       => {},
         %args
     );
@@ -150,6 +152,57 @@ throws_ok { Gitalist::Model::CollectionOfRepos->COMPONENT($ctx_gen->(), { repos
     ok $i->fanciness, "The TestModelFancy is fancy (so --model-args worked)";
 }
 
+sub test_vhost_instance {
+    test_with_config({
+        class    => 'Gitalist::Git::CollectionOfRepositories::Vhost',
+        args     => {
+            vhost_dispatch => {
+                "git.shadowcat.co.uk" => "default",
+                "git.moose.perl.org" => "moose",
+                "git.catalyst.perl.org" => "catgit",
+                "_default_" => "default",
+            },
+            collections => {
+                moose => { class => 'Gitalist::Git::CollectionOfRepositories::FromDirectory', repo_dir => "$FindBin::Bin/lib/repositories_sets/moose" },
+                catgit => { class => 'Gitalist::Git::CollectionOfRepositories::FromDirectory', repo_dir => "$FindBin::Bin/lib/repositories_sets/catgit" },
+                default => { class => 'Gitalist::Git::CollectionOfRepositories::FromDirectoryRecursive', repo_dir => "$FindBin::Bin/lib/repositories_sets"},
+            }
+        },
+    });
+}
+
+my $c_name = "$FindBin::Bin/lib/repositories_sets/catgit/Catalyst-Runtime/.git";
+my $m_name = "$FindBin::Bin/lib/repositories_sets/moose/Moose/.git";
+{
+    my $i = test_vhost_instance();
+    is scalar($i->repositories->flatten), 2, 'Found 2 repos on test vhost';
+    my @r = $i->repositories->flatten;
+    my @paths = sort map { $_->path . "" } $i->repositories->flatten;
+    is_deeply \@paths, [sort $c_name, $m_name];
+}
+
+{
+    $host = "git.moose.perl.org";
+    my $i = test_vhost_instance();
+    is scalar($i->repositories->flatten), 1, 'Found 1 repos on moose vhost';
+    is $i->repositories->[0]->path.'', $m_name;
+}
+
+{
+    $host = "git.catalyst.perl.org";
+    my $i = test_vhost_instance();
+    is scalar($i->repositories->flatten), 1, 'Found 1 repos on catalyst vhost';
+    is $i->repositories->[0]->path.'', $c_name;
+}
+
+{
+    $host = "git.shadowcat.co.uk";
+    my $i = test_vhost_instance();
+    is scalar($i->repositories->flatten), 2, 'Found 2 repos on git.shadowcat vhost';
+    my @paths = sort map { $_->path . "" } $i->repositories->flatten;
+    is_deeply \@paths, [sort $c_name, $m_name];
+}
+
 sub test_with_config {
     my ($config, %opts) = @_;
     my $msg = delete $opts{msg} || 'Built Model without exception';