[Jifty-commit] r3326 - in jifty/trunk: lib/Jifty/Script lib/Jifty/View/Declare t/TestApp/t

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Sat Jun  2 18:20:04 2007
New Revision: 3326

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/META.yml
   jifty/trunk/Makefile.PL
   jifty/trunk/lib/Jifty/Script/Server.pm
   jifty/trunk/lib/Jifty/View/Declare/Handler.pm
   jifty/trunk/t/TestApp/t/16-template-region.t

Log:
 r57870 at pinglin:  jesse | 2007-06-02 18:18:43 -0400
 Template::DEeclare now gets a hashref of all the arguments set() in the dispatcher.


Modified: jifty/trunk/META.yml
==============================================================================
--- jifty/trunk/META.yml	(original)
+++ jifty/trunk/META.yml	Sat Jun  2 18:20:04 2007
@@ -2,7 +2,7 @@
 build_requires: 
   ExtUtils::MakeMaker: 6.11
 distribution_type: module
-generated_by: Module::Install version 0.67
+generated_by: Module::Install version 0.650
 license: Perl
 meta-spec: 
   url: http://module-build.sourceforge.net/META-spec-v1.3.html

Modified: jifty/trunk/Makefile.PL
==============================================================================
--- jifty/trunk/Makefile.PL	(original)
+++ jifty/trunk/Makefile.PL	Sat Jun  2 18:20:04 2007
@@ -61,6 +61,7 @@
 requires('SQL::ReservedWords');
 requires('Template::Declare' => '0.07');                # Template::Declare::Tags
 requires('Test::Base');
+requires('Test::LongString');
 requires('Test::More' => 0.62 ),
 requires('Test::Pod::Coverage'),
 requires('Test::WWW::Mechanize' => 1.04 ),

Modified: jifty/trunk/lib/Jifty/Script/Server.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Script/Server.pm	(original)
+++ jifty/trunk/lib/Jifty/Script/Server.pm	Sat Jun  2 18:20:04 2007
@@ -93,7 +93,6 @@
         if $self->{sigready};
     Log::Log4perl->get_logger($server_class)->less_logging(3)
         if $self->{quiet};
-
     $server_class->new(port => $self->{port})->run;
 }
 

Modified: jifty/trunk/lib/Jifty/View/Declare/Handler.pm
==============================================================================
--- jifty/trunk/lib/Jifty/View/Declare/Handler.pm	(original)
+++ jifty/trunk/lib/Jifty/View/Declare/Handler.pm	Sat Jun  2 18:20:04 2007
@@ -74,7 +74,8 @@
         shift;    # Turn the method into a function
         goto &Template::Declare::Tags::outs_raw;
     };
-    my $content = Template::Declare::Tags::show_page( $template );
+    
+    my $content = Template::Declare::Tags::show_page( $template, Jifty->web->request->arguments );
     return unless defined $content && length $content;
 
     my $r = Jifty->handler->apache;

Modified: jifty/trunk/t/TestApp/t/16-template-region.t
==============================================================================
--- jifty/trunk/t/TestApp/t/16-template-region.t	(original)
+++ jifty/trunk/t/TestApp/t/16-template-region.t	Sat Jun  2 18:20:04 2007
@@ -9,9 +9,9 @@
 use Jifty::Test::WWW::Mechanize;
 
 my @tests = (
-    {
-        url  => "/foo/list",
-        text => q|list!<span>1</span>
+    {   url  => "/foo/list",
+        text => q|list!
+<span>1</span>
 <span>2</span><script type="text/javascript">
 new Region('special',{'id':3},'/foo/item',null);
 </script><div id="region-special">
@@ -26,12 +26,16 @@
 isa_ok( $server, 'Jifty::Server' );
 my $URL = $server->started_ok;
 
+use Test::LongString;
 
 my $mech = Jifty::Test::WWW::Mechanize->new;
 foreach my $test (@tests) {
-    $mech->get_ok( $URL . $test->{url}, "get '$URL: /jifty/jifty/trunk/t/TestApp/t/15-template-subclass.t $test->{url}'" );
-#    diag $mech->content;
-    $mech->content_like(qr{$test->{text}}, "found the test content");
+    $mech->get_ok(
+        $URL . $test->{url},
+        "get '$URL: /jifty/jifty/trunk/t/TestApp/t/15-template-subclass.t $test->{url}'"
+    );
+    is_string( $mech->content, $test->{text}, "found the test content" );
+
 }
 
 1;