Changeset 17

Timestamp:

11/22/10 12:54:02 (14 years ago)

Author:

nanardon

Message:

• start adding test

Location:

server/trunk/web

Files:

• lib/Sophie/Controller/Distrib.pm (modified) (8 diffs)
• lib/Sophie/Controller/Root.pm (modified) (2 diffs)
• lib/Sophie/View/Ajax.pm (modified) (2 diffs)
• lib/Sophie/View/TT.pm (modified) (1 diff)
• root/static/sophie.css (modified) (1 diff, 1 prop)
• root/static/sophie.ico (added)
• root/static/sophie.png (added)
• root/templates/html/distrib/index.html (modified) (1 diff, 1 prop)
• root/templates/html/distrib/index.tt (modified) (1 diff, 1 prop)
• root/templates/html/distrib/list_release.html (modified) (1 prop)
• root/templates/html/distrib/list_release.tt (modified) (1 diff, 1 prop)
• root/templates/html/index.html (modified) (1 prop)
• root/templates/includes/header.tt (modified) (1 diff)
• root/templates/includes/rpmslist.tt (modified) (1 prop)
• t/controller_Distrib.t (modified) (1 diff)

server/trunk/web/lib/Sophie/Controller/Distrib.pm

@@ -37 +37 @@
     $rs = $rs->search(name => $distribution)->search_related('Release');
     if (!$release) {
-        @{$c->stash->{xmlrpc}} = map { $_->version } $rs->all;
-        return $c->stash->{xmlrpc};
+        return $c->stash->{xmlrpc} = [ map { $_->version } $rs->all ];
+        
     }
     $rs = $rs->search(version => $release)->search_related('Arch');
     if (!$arch) {
-        @{$c->stash->{xmlrpc}} = map { $_->arch } $rs->all;
-        return $c->stash->{xmlrpc};
+        return $c->stash->{xmlrpc} = [ map { $_->arch } $rs->all ];
     }
     $rs = $rs->search(arch => $arch)->search_related('Medias');
-    @{$c->stash->{xmlrpc}} = map { $_->label } $rs->all;
+    $c->stash->{xmlrpc} = [ map { $_->label } $rs->all ];
     $c->stash->{xmlrpc}
 }
@@ -96 +95 @@
 sub list_release :Path :Args(1) {
     my ( $self, $c, $distribution ) = @_;
-    $c->forward('list', [ $distribution ]);
+    $c->stash->{dist}{distribution} = $distribution;
+    $c->forward('list', [ $c->stash->{dist} ] );
 }
 
 sub list_arch :Path :Args(2) {
     my ( $self, $c, $distribution, $release ) = @_;
-    $c->forward('list', [ $distribution, $release ]);
+    $c->stash->{dist}{distribution} = $distribution;
+    $c->stash->{dist}{release} = $release;
+    $c->forward('list', [ $c->stash->{dist} ] );
 }
 
@@ -107 +109 @@
 sub distrib_view :PathPrefix :Chained :CaptureArgs(3) {
     my ( $self, $c, $distribution, $release, $arch ) = @_;
-    $c->stash->{distrib} = [ $distribution, $release, $arch ];
+    $c->stash->{dist}{distribution} = $distribution;
+    $c->stash->{dist}{release} = $release;
+    $c->stash->{dist}{arch} = $arch;
+    $c->stash->{distrib} = $c->stash->{dist};
 }
 
 sub distrib :Chained('distrib_view') PathPart('') {
     my ( $self, $c ) = @_;
-    $c->forward('list', $c->stash->{distrib});
-    $c->forward('rpms',    $c->stash->{distrib});
+    $c->forward('list', $c->stash->{dist});
+    $c->forward('rpms', $c->stash->{dist});
     # TODO store properly results
     # No call from json here
@@ -120 +125 @@
 sub media :Chained('distrib_view') PathPart('media') {
     my ( $self, $c ) = @_;
-    $c->forward('struct', $c->stash->{distrib});
+    $c->forward('struct', [ $c->stash->{dist} ]);
 }
 
 sub rpms :XMLRPC {
     my ( $self, $c, $distribution, $release, $arch ) = @_;
+
+    if (ref $distribution) {
+        ($distribution, $release, $arch) = (
+            $distribution->{distribution},
+            $distribution->{release},
+            $distribution->{arch},
+        );
+    }
+    
     @{$c->stash->{rpm}} = map {
             { 
@@ -149 +163 @@
 sub srpms :XMLRPC {
     my ( $self, $c, $distribution, $release, $arch ) = @_;
+
+    if (ref $distribution) {
+        ($distribution, $release, $arch) = (
+            $distribution->{distribution},
+            $distribution->{release},
+            $distribution->{arch},
+        );
+    }
+
     @{$c->stash->{rpm}} = map {
             { 
@@ -173 +196 @@
 sub list_rpms :Chained('distrib_view') PathPart('rpms') {
     my ( $self, $c ) = @_;
-    $c->forward('rpms', $c->stash->{distrib});
+    $c->forward('rpms', $c->stash->{dist});
 }
 
 sub list_srpms :Chained('distrib_view') PathPart('srpms') {
     my ( $self, $c ) = @_;
-    $c->forward('srpms',    $c->stash->{distrib});
+    $c->forward('srpms', $c->stash->{dist});
 }
 
@@ -190 +213 @@
 sub media_rpms : XMLRPC {
     my ( $self, $c, $distribution, $release, $arch, $media ) = @_;
+    
+    if (ref $distribution) {
+        ($distribution, $release, $arch, $media) = (
+            $distribution->{distribution},
+            $distribution->{release},
+            $distribution->{arch},
+            $release,
+        );
+    }
+    
     @{$c->stash->{rpm}} = map {
             { 
@@ -215 +248 @@
 sub media_list_rpms :Chained('_media_list_rpms') PathPart('') {
     my ( $self, $c ) = @_;
-    $c->forward('media_rpms', [ @{$c->stash->{distrib}}, $c->stash->{media} ]);
+    $c->forward('media_rpms', [ @{$c->stash->{dist}}, $c->stash->{media} ]);
 }
 sub media_rpm_byname :Chained('_media_list_rpms') PathPart('rpms/by_name') {

server/trunk/web/lib/Sophie/Controller/Root.pm

@@ -25 +25 @@
 sub begin : Private {
     my ( $self, $c ) = @_;
+
+    if ($c->req->path =~ m:[^/]+\/$:) {
+        my $path = $c->req->path;
+        $path =~ s:/*$::;
+        $c->res->redirect($c->uri_for("/$path"));
+        return;
+    }
 
     if (($c->req->query_keywords || '') =~ /([^\w]|^)json([^\w]|$)/ ||
@@ -80 +87 @@
     } elsif (!$c->stash->{current_view}) {
     }
-    $c->stash->{$c->action} = $c->stash->{xmlrpc};
+    $c->stash->{data} = $c->stash->{xmlrpc};
     $c->model('Base')->storage->dbh->rollback;
 }

server/trunk/web/lib/Sophie/View/Ajax.pm

@@ -3 +3 @@
 use strict;
 use warnings;
+use Sophie;
 
 use base 'Catalyst::View::TT';
@@ -9 +10 @@
     TEMPLATE_EXTENSION => '.tt',
     render_die => 1,
-    __PACKAGE__->config(
-        TEMPLATE_EXTENSION => '.tt',
-        render_die => 1,
-        INCLUDE_PATH => [
-            Sophie->path_to( 'root', 'templates', 'html' ),
-        ],
-    )
+    INCLUDE_PATH => [
+        Sophie->path_to( 'root', 'templates', 'includes' ),
+        Sophie->path_to( 'root', 'templates', 'html' ),
+    ],
 );
 

server/trunk/web/lib/Sophie/View/TT.pm

@@ -3 +3 @@
 use strict;
 use warnings;
+use Sophie;
 
 use base 'Catalyst::View::TT';

server/trunk/web/root/static/sophie.css

@@ -1 @@
-// $Id$
+/* $Id$ */
+
+div#sophie_header {
+    border: outset;
+}
+
+#sophie_header p {
+    padding-left: 1em;
+}

server/trunk/web/root/templates/html/distrib/index.html

@@ -1 +1 @@
 <!-- $Id$ -->
-[% INCLUDE 'distrib/index.tt' %]
+[% INCLUDE 'distrib/index.tt' data = xmlrpc %]

server/trunk/web/root/templates/html/distrib/index.tt

@@ -2 +2 @@
 
 <ol>
-[% FOREACH k = xmlrpc %]
+[% FOREACH k = data %]
 <li><a href="[% c.uri_for('/', c.req.path, k) %]">[% k %]</a></li>
 [% END %]

server/trunk/web/root/templates/html/distrib/list_release.tt

@@ +1 @@
+<ol>
+[% FOREACH release = xmlrpc %]
+<li><a href="[% c.uri_for('/', c.req.path, release) %]">[% release %]</a></li>
 [% FOREACH f = c.forward('/distrib/list', [ 
     {
-        'distribution' => 'Mandriva',
-        'release' => 'cooker'
+        'distribution' => dist.distribution,
+        'release' => release,
     } 
 ]) %]
 [% f %]
 [% END %]
+[% END %]
+</ol>

server/trunk/web/root/templates/includes/header.tt

@@ -10 +10 @@
     <meta name="KEYWORDS" content="Sophie, rpm[% IF keywords.size -%], [%- keywords.join(', ') | html -%][% END %]">
     <meta name="REVISIT-AFTER" content="[% IF metarevisite %][% metarevisite %][% ELSE %]15[% END %] days">
-    <link rel="icon" href="[%- c.uri_for('/static', 'images', 'favicon.ico') -%]" type="image/x-icon">
+    <link rel="icon" href="[%- c.uri_for('/static', 'sophie.ico') -%]" type="image/x-icon">
 </head>
 <body>
+
+    <div id="sophie_header">
+    <img src="[% c.uri_for('/static', 'sophie.png') -%]" style="float:left">
+    <div style="float:left">
+        <p id="sitename">Sophie</p>
+        <p id="sophie_menu">fff</p>
+    </div>
+    <div style="clear:both"></div>
+    </div>

server/trunk/web/t/controller_Distrib.t

@@ -2 +2 @@
 use warnings;
 use Test::More;
+require RPC::XML;
+use HTTP::Request;
+
+# know existing data:
+my $distribution = 'Mandriva';
 
 BEGIN { use_ok 'Catalyst::Test', 'Sophie' }
 BEGIN { use_ok 'Sophie::Controller::Distrib' }
 
+sub xmlrpcreq {
+    my (@xmlargs) = @_;
+    my $str = RPC::XML::request->new( @xmlargs )->as_string;
+
+    my $req = HTTP::Request->new( POST => 'http://localhost/rpc' );
+    $req->header( 'Content-Length'  => length($str) );
+    $req->header( 'Content-Type'    => 'text/xml' );
+    $req->content( $str );
+    return $req;
+}
+
 ok( request('/distrib')->is_success, 'Request should succeed' );
+ok( request("/distrib/$distribution")->is_success, 'Request should succeed' );
+ok( request( xmlrpcreq('distrib.list') ), "XMLRPC");
+ok( request( xmlrpcreq('distrib.list', $distribution) ), "XMLRPC");
 done_testing();