[Jifty-commit] r1601 - in jifty/branches/moose: lib/Jifty

[jifty-commit at lists.jifty.org]

Author: audreyt
Date: Mon Jul 17 16:02:31 2006
New Revision: 1601

Modified:
   jifty/branches/moose/Makefile.PL
   jifty/branches/moose/lib/Jifty/Action.pm
   jifty/branches/moose/lib/Jifty/Param.pm
   jifty/branches/moose/lib/Jifty/Web.pm

Log:
* Support for declarative parameters via PARAM hash, which may
  contain deferred values.

Modified: jifty/branches/moose/Makefile.PL
==============================================================================
--- jifty/branches/moose/Makefile.PL	(original)
+++ jifty/branches/moose/Makefile.PL	Mon Jul 17 16:02:31 2006
@@ -45,6 +45,7 @@
 requires('Moose' => '0.11');
 requires('Params::Validate');
 requires('Pod::Simple'); #Pod::Simple::Text
+requires('Scalar::Defer');
 requires('String::Koremutake');
 requires('Test::Base' => 0.44);            # Test::Base::Filter
 requires('Test::HTTP::Server::Simple' => '0.02');

Modified: jifty/branches/moose/lib/Jifty/Action.pm
==============================================================================
--- jifty/branches/moose/lib/Jifty/Action.pm	(original)
+++ jifty/branches/moose/lib/Jifty/Action.pm	Mon Jul 17 16:02:31 2006
@@ -371,12 +371,12 @@
             # form_fields overrides stickiness of what the user last entered.
             $self->{_private_form_fields_hash}{$arg_name}
                 = Jifty::Web::Form::Field->new(
+                %$field_info,
                 action       => $self,
                 name         => $args{'argument'},
                 sticky       => $sticky,
                 sticky_value => $self->argument_value($args{'argument'}),
                 render_mode  => $args{'render_mode'},
-                %$field_info,
                 %args
                 );
 
@@ -783,7 +783,7 @@
         {
 
             return $self->validation_error(
-                $field => q{That doesn't look like a correct value} );
+                $field => _("That doesn't look like a correct value") );
         }
 
    # ... but still check through a validator function even if it's in the list

Modified: jifty/branches/moose/lib/Jifty/Param.pm
==============================================================================
--- jifty/branches/moose/lib/Jifty/Param.pm	(original)
+++ jifty/branches/moose/lib/Jifty/Param.pm	Mon Jul 17 16:02:31 2006
@@ -9,17 +9,16 @@
 
 =head1 DESCRIPTION
 
-C<Jifty::Action> is the meat of the L<Jifty> framework; it controls
-how form elements interact with the underlying model.  See also
-L<Jifty::Action::Record> for data-oriented actions, L<Jifty::Result>
-for how to return values from actions.
-
 =cut
 
 
 use base qw/Jifty::Web::Form::Field/;
 use Moose;
-has constructor => qw( is rw isa Bool ); # XXX - bad name
+has constructor         => qw( is rw isa Bool ); # XXX - bad name
+has valid_values        => qw( is rw isa Any );  # XXX - coercion
+has available_values    => qw( is rw isa Any );  # XXX - coercion
 no Moose;
 
+sub BUILDALL { 1; }
+
 1;

Modified: jifty/branches/moose/lib/Jifty/Web.pm
==============================================================================
--- jifty/branches/moose/lib/Jifty/Web.pm	(original)
+++ jifty/branches/moose/lib/Jifty/Web.pm	Mon Jul 17 16:02:31 2006
@@ -439,9 +439,10 @@
     # isn't a "shouldn't happen"
     return unless Jifty::Util->require( $class );
 
+    local $@;
     my $action;
     # XXX TODO bullet proof
-    eval { $action = $class->new( %args, arguments => {%arguments} ); };
+    eval { $action = $class->new( %args, arguments => \%arguments ); };
     if ($@) {
         my $err = $@;
         $self->log->fatal($err);