[Jifty-commit] jifty branch, master, updated. 29e28bc2deb2fb5b5a65aa578696d0c7f25a81c3

[Jifty commits]

The branch, master has been updated
       via  29e28bc2deb2fb5b5a65aa578696d0c7f25a81c3 (commit)
      from  8922e575e6c25488e73155160530199aea69740e (commit)

Summary of changes:
 lib/Jifty/Plugin/REST/Dispatcher.pm |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit 29e28bc2deb2fb5b5a65aa578696d0c7f25a81c3
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Oct 27 12:16:34 2010 -0400

    Expand valid_values when describing an action's params via REST
    
    This avoids serializing collection objects in not helpful ways.

diff --git a/lib/Jifty/Plugin/REST/Dispatcher.pm b/lib/Jifty/Plugin/REST/Dispatcher.pm
index 4415957..e7c9f5e 100644
--- a/lib/Jifty/Plugin/REST/Dispatcher.pm
+++ b/lib/Jifty/Plugin/REST/Dispatcher.pm
@@ -884,7 +884,11 @@ sub list_action_params {
     for my $arg ( keys %$arguments ) {
         $args{ $arg } = { };
         for ( @param_attrs ) {
-            my $val = $arguments->{ $arg }{ $_ };
+            # Valid values is special because sometimes it has a collection
+            # object that needs to be abstracted away
+            my $val = $_ eq 'valid_values'
+                        ? $action->valid_values($arg)
+                        : $arguments->{ $arg }{ $_ };
             $args{ $arg }->{ $_ } = Scalar::Defer::force($val)
                 if defined $val and length $val;
         }

-----------------------------------------------------------------------