[Jifty-commit] r546 - in jifty/trunk: . inc/Module lib/Jifty lib/Jifty/Web

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Fri Feb 3 13:16:02 EST 2006 

Author: alexmv
Date: Fri Feb  3 13:16:01 2006
New Revision: 546

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/inc/Module/AutoInstall.pm
   jifty/trunk/inc/Module/Install.pm
   jifty/trunk/inc/Module/Install/AutoInstall.pm
   jifty/trunk/inc/Module/Install/Base.pm
   jifty/trunk/inc/Module/Install/Can.pm
   jifty/trunk/inc/Module/Install/Fetch.pm
   jifty/trunk/inc/Module/Install/Include.pm
   jifty/trunk/inc/Module/Install/Makefile.pm
   jifty/trunk/inc/Module/Install/Metadata.pm
   jifty/trunk/inc/Module/Install/Scripts.pm
   jifty/trunk/inc/Module/Install/Share.pm
   jifty/trunk/inc/Module/Install/Win32.pm
   jifty/trunk/inc/Module/Install/WriteAll.pm
   jifty/trunk/lib/Jifty/Request.pm
   jifty/trunk/lib/Jifty/Web/PageRegion.pm

Log:
 r8893 at zoq-fot-pik:  chmrr | 2006-02-03 13:14:57 -0500
  * Fragments now go through the dispatcher
  * I really wanted defined-or; false action arguments were being
 ignored when looking through possible values in fragment requests


Modified: jifty/trunk/inc/Module/AutoInstall.pm
==============================================================================
--- jifty/trunk/inc/Module/AutoInstall.pm	(original)
+++ jifty/trunk/inc/Module/AutoInstall.pm	Fri Feb  3 13:16:01 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/AutoInstall.pm - /usr/local/share/perl/5.8.7/Module/AutoInstall.pm"
+#line 1 "inc/Module/AutoInstall.pm - /usr/lib/perl5/site_perl/5.8.7/Module/AutoInstall.pm"
 package Module::AutoInstall;
 $Module::AutoInstall::VERSION = '1.01';
 

Modified: jifty/trunk/inc/Module/Install.pm
==============================================================================
--- jifty/trunk/inc/Module/Install.pm	(original)
+++ jifty/trunk/inc/Module/Install.pm	Fri Feb  3 13:16:01 2006
@@ -1,4 +1,4 @@
-#line 1 "/home/jesse/svk/jifty.org/jifty/trunk/inc/Module/Install.pm - /usr/local/share/perl/5.8.7/Module/Install.pm"
+#line 1 "/home/chmrr/work/rt/local/jifty/inc/Module/Install.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install.pm"
 package Module::Install;
 
 use 5.004;

Modified: jifty/trunk/inc/Module/Install/AutoInstall.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/AutoInstall.pm	(original)
+++ jifty/trunk/inc/Module/Install/AutoInstall.pm	Fri Feb  3 13:16:01 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/AutoInstall.pm - /usr/local/share/perl/5.8.7/Module/Install/AutoInstall.pm"
+#line 1 "inc/Module/Install/AutoInstall.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/AutoInstall.pm"
 package Module::Install::AutoInstall;
 use Module::Install::Base; @ISA = qw(Module::Install::Base);
 

Modified: jifty/trunk/inc/Module/Install/Base.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Base.pm	(original)
+++ jifty/trunk/inc/Module/Install/Base.pm	Fri Feb  3 13:16:01 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Base.pm - /usr/local/share/perl/5.8.7/Module/Install/Base.pm"
+#line 1 "inc/Module/Install/Base.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Base.pm"
 package Module::Install::Base;
 
 # Suspend handler for "redefined" warnings

Modified: jifty/trunk/inc/Module/Install/Can.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Can.pm	(original)
+++ jifty/trunk/inc/Module/Install/Can.pm	Fri Feb  3 13:16:01 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Can.pm - /usr/local/share/perl/5.8.7/Module/Install/Can.pm"
+#line 1 "inc/Module/Install/Can.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Can.pm"
 package Module::Install::Can;
 use Module::Install::Base; @ISA = qw(Module::Install::Base);
 $VERSION = '0.01';
@@ -52,7 +52,6 @@
 # Fix Cygwin bug on maybe_command();
 if ($^O eq 'cygwin') {
     require ExtUtils::MM_Cygwin;
-    require ExtUtils::MM_Win32;
     if (!defined(&ExtUtils::MM_Cygwin::maybe_command)) {
         *ExtUtils::MM_Cygwin::maybe_command = sub {
             my ($self, $file) = @_;

Modified: jifty/trunk/inc/Module/Install/Fetch.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Fetch.pm	(original)
+++ jifty/trunk/inc/Module/Install/Fetch.pm	Fri Feb  3 13:16:01 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Fetch.pm - /usr/local/share/perl/5.8.7/Module/Install/Fetch.pm"
+#line 1 "inc/Module/Install/Fetch.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Fetch.pm"
 package Module::Install::Fetch;
 use Module::Install::Base; @ISA = qw(Module::Install::Base);
 

Modified: jifty/trunk/inc/Module/Install/Include.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Include.pm	(original)
+++ jifty/trunk/inc/Module/Install/Include.pm	Fri Feb  3 13:16:01 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Include.pm - /usr/local/share/perl/5.8.7/Module/Install/Include.pm"
+#line 1 "inc/Module/Install/Include.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Include.pm"
 package Module::Install::Include;
 use Module::Install::Base; @ISA = qw(Module::Install::Base);
 
@@ -6,5 +6,5 @@
 sub include_deps { +shift->admin->include_deps(@_) };
 sub auto_include { +shift->admin->auto_include(@_) };
 sub auto_include_deps { +shift->admin->auto_include_deps(@_) };
-sub auto_include_dependent_dists { +shift->admin->auto_include_dependent_dists(@_) }
+
 1;

Modified: jifty/trunk/inc/Module/Install/Makefile.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Makefile.pm	(original)
+++ jifty/trunk/inc/Module/Install/Makefile.pm	Fri Feb  3 13:16:01 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Makefile.pm - /usr/local/share/perl/5.8.7/Module/Install/Makefile.pm"
+#line 1 "inc/Module/Install/Makefile.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Makefile.pm"
 package Module::Install::Makefile;
 use Module::Install::Base; @ISA = qw(Module::Install::Base);
 

Modified: jifty/trunk/inc/Module/Install/Metadata.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Metadata.pm	(original)
+++ jifty/trunk/inc/Module/Install/Metadata.pm	Fri Feb  3 13:16:01 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Metadata.pm - /usr/local/share/perl/5.8.7/Module/Install/Metadata.pm"
+#line 1 "inc/Module/Install/Metadata.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Metadata.pm"
 package Module::Install::Metadata;
 
 use strict 'vars';

Modified: jifty/trunk/inc/Module/Install/Scripts.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Scripts.pm	(original)
+++ jifty/trunk/inc/Module/Install/Scripts.pm	Fri Feb  3 13:16:01 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Scripts.pm - /usr/local/share/perl/5.8.7/Module/Install/Scripts.pm"
+#line 1 "inc/Module/Install/Scripts.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Scripts.pm"
 package Module::Install::Scripts;
 use Module::Install::Base; @ISA = qw(Module::Install::Base);
 $VERSION = '0.02';

Modified: jifty/trunk/inc/Module/Install/Share.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Share.pm	(original)
+++ jifty/trunk/inc/Module/Install/Share.pm	Fri Feb  3 13:16:01 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Share.pm - /usr/local/share/perl/5.8.7/Module/Install/Share.pm"
+#line 1 "inc/Module/Install/Share.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Share.pm"
 package Module::Install::Share;
 
 use Module::Install::Base;

Modified: jifty/trunk/inc/Module/Install/Win32.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Win32.pm	(original)
+++ jifty/trunk/inc/Module/Install/Win32.pm	Fri Feb  3 13:16:01 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Win32.pm - /usr/local/share/perl/5.8.7/Module/Install/Win32.pm"
+#line 1 "inc/Module/Install/Win32.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Win32.pm"
 package Module::Install::Win32;
 use Module::Install::Base; @ISA = qw(Module::Install::Base);
 

Modified: jifty/trunk/inc/Module/Install/WriteAll.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/WriteAll.pm	(original)
+++ jifty/trunk/inc/Module/Install/WriteAll.pm	Fri Feb  3 13:16:01 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/WriteAll.pm - /usr/local/share/perl/5.8.7/Module/Install/WriteAll.pm"
+#line 1 "inc/Module/Install/WriteAll.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/WriteAll.pm"
 package Module::Install::WriteAll;
 use Module::Install::Base; @ISA = qw(Module::Install::Base);
 

Modified: jifty/trunk/lib/Jifty/Request.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Request.pm	(original)
+++ jifty/trunk/lib/Jifty/Request.pm	Fri Feb  3 13:16:01 2006
@@ -136,13 +136,17 @@
 
     my %actions = %{$data->{actions} || {}};
     for my $a (values %actions) {
+        my %arguments;
+        for my $arg (keys %{$a->{fields} || {}}) {
+            for my $type (qw/doublefallback fallback value/) {
+                $arguments{$arg} = $a->{fields}{$arg}{$type}
+                  if exists $a->{fields}{$arg}{$type};
+            }
+        }
         $self->add_action(moniker   => $a->{moniker},
                           class     => $a->{class},
                           # TODO: ORDER
-                          arguments => {map {$_ => $a->{fields}{$_}{value}
-                                                || $a->{fields}{$_}{fallback}
-                                                || $a->{fields}{$_}{doublefallback}}
-                                        keys %{$a->{fields} || {}} },
+                          arguments => \%arguments,
                          );
     }
 
@@ -174,7 +178,7 @@
 sub from_cgi {
     my $self = shift;
     my ($cgi) = @_;
-    
+
     my $path = $cgi->path_info;
     $path =~ s/\?.*//;
     $self->path( $path );

Modified: jifty/trunk/lib/Jifty/Web/PageRegion.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/PageRegion.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/PageRegion.pm	Fri Feb  3 13:16:01 2006
@@ -240,12 +240,22 @@
     # Merge in defaults
     %arguments = (%{ Jifty->web->request->arguments }, region => $self, 'J:ACTIONS' => '', %arguments);
 
-    ### XXX TODO this should create a new Jifty::Request and go
-    ### through the dispatcher
-    Jifty->handler->mason->interp->make_request(comp => $self->path,
-                                                args => [ %arguments ],
-                                                out_method => \$result,
-                                               )->exec;
+    # Make a fake request and throw it at the dispatcher
+    my $subrequest = Jifty::Request->new;
+    $subrequest->from_webform( %arguments );
+    $subrequest->path ($self->path );
+    local Jifty->web->{request} = $subrequest;
+
+    # Convince Mason to tack its response onto a variable and not send
+    # headers when it does so
+    Jifty->handler->mason->interp->out_method(sub {
+        HTML::Mason::Request->instance->auto_send_headers(0);
+        $result .= $_[0];
+    });
+
+    # Call into the dispatcher
+    Jifty->dispatcher->handle_request;
+
     if ($self->region_wrapper) {
         $result .= qq|</div>|;
     }

More information about the Jifty-commit mailing list