Choices doesn't inflate single values, ChooseOne produces better debug info on valida...

diff --git a/lib/Reaction/UI/ViewPort/Field/Mutable/ChooseOne.pm b/lib/Reaction/UI/ViewPort/Field/Mutable/ChooseOne.pm
index 1948baa..80f3fd2 100644 (file)
--- a/lib/Reaction/UI/ViewPort/Field/Mutable/ChooseOne.pm
+++ b/lib/Reaction/UI/ViewPort/Field/Mutable/ChooseOne.pm
@@ -14,8 +14,15 @@ class ChooseOne is 'Reaction::UI::ViewPort::Field', which {
     my $value = shift;
     if (defined $value) {
       $value = $self->str_to_ident($value) if (!ref $value);
-      my $checked = $self->attribute->check_valid_value($self->model, $value);
-      confess "${value} is not a valid value" unless defined($checked);
+      my $attribute = $self->attribute;
+      my $checked = $attribute->check_valid_value($self->model, $value);
+      unless (defined $checked) {
+        require Data::Dumper; 
+        my $serialised = Data::Dumper->new([ $value ])->Indent(0)->Dump;
+        $serialised =~ s/^\$VAR1 = //; $serialised =~ s/;$//;
+        confess "${serialised} is not a valid value for ${\$attribute->name} on "
+                ."${\$attribute->associated_class->name}";
+      }
       $value = $checked;
     }
     $orig->($self, $value);

diff --git a/lib/Reaction/UI/ViewPort/Field/Role/Choices.pm b/lib/Reaction/UI/ViewPort/Field/Role/Choices.pm
index 09874a5..df8615d 100644 (file)
--- a/lib/Reaction/UI/ViewPort/Field/Role/Choices.pm
+++ b/lib/Reaction/UI/ViewPort/Field/Role/Choices.pm
@@ -16,7 +16,7 @@ role Choices, which {
     my ($self, $str) = @_;
     my $u = URI->new('','http');
     $u->query($str);
-    return { $u->query_form };
+    return ($u->query_keywords ? ($u->query_keywords)[0] : { $u->query_form });
   };
 
   implements obj_to_str => as {