datetime now handles optional using a wrap on value_string

diff --git a/lib/Reaction/UI/ViewPort/Field/Mutable/DateTime.pm b/lib/Reaction/UI/ViewPort/Field/Mutable/DateTime.pm
index 71428e5..8bde97f 100644 (file)
--- a/lib/Reaction/UI/ViewPort/Field/Mutable/DateTime.pm
+++ b/lib/Reaction/UI/ViewPort/Field/Mutable/DateTime.pm
@@ -12,6 +12,17 @@ class 'Reaction::UI::ViewPort::Field::Mutable::DateTime',
   has value_string =>
     ( is => 'rw', isa => 'Str', lazy_build => 1, trigger_adopt('value_string') );
 
+  around value_string => sub {
+    my $orig = shift;
+    my $self = shift;
+    if (@_ && defined($_[0]) && !ref($_[0]) && $_[0] eq ''
+        && !$self->value_is_required) {
+      $self->clear_value;
+      return undef;
+    }
+    return $self->$orig(@_);
+  };
+
   implements adopt_value_string => as {
     my ($self) = @_;
     my $value = $self->value_string;
@@ -21,8 +32,6 @@ class 'Reaction::UI::ViewPort::Field::Mutable::DateTime',
       $self->value($dt);
     } else {
       $self->message("Could not parse date or time");
-      $self->clear_value;
-      $self->needs_sync(1);
     }
   };
 

diff --git a/lib/Reaction/UI/ViewPort/Field/Role/Mutable.pm b/lib/Reaction/UI/ViewPort/Field/Role/Mutable.pm
index cb48dce..4d58745 100644 (file)
--- a/lib/Reaction/UI/ViewPort/Field/Role/Mutable.pm
+++ b/lib/Reaction/UI/ViewPort/Field/Role/Mutable.pm
@@ -16,17 +16,6 @@ role Mutable, which {
   has needs_sync => (is => 'rw', isa => 'Int', default => 0);
   has message    => (is => 'rw', isa => 'Str');
 
-  around value => sub {
-    my $orig = shift;
-    my $self = shift;
-    if (@_ && !ref($_[0]) && defined($_[0]) && !length($_[0])) { # ''
-      unless ($self->value_is_required) {
-        return $self->clear_value;
-      }
-    }
-    $self->$orig(@_);
-  };
-
   after clear_value => sub {
     shift->needs_sync(1);
   };
@@ -38,7 +27,7 @@ role Mutable, which {
 
   implements sync_to_action => as {
     my ($self) = @_;
-    return unless $self->needs_sync && $self->has_value;
+    return unless $self->needs_sync;
     my $attr = $self->attribute;
 
     if ($self->has_value) {
@@ -56,10 +45,10 @@ role Mutable, which {
       confess "No writer for attribute" unless defined($writer);
       $self->model->$writer($value);
     } else {
-      my $predicate = $attr->get_predicate;
+      my $predicate = $attr->predicate;
       confess "No predicate for attribute" unless defined($predicate);
       if ($self->model->$predicate) {
-        my $clearer = $attr->get_clearer;
+        my $clearer = $attr->clearer;
         confess "${predicate} returned true but no clearer for attribute"
           unless defined($clearer);
         $self->model->$clearer;