revert r620

diff --git a/lib/Reaction/Types/DateTime.pm b/lib/Reaction/Types/DateTime.pm
index ef944cc..d6294d2 100644 (file)
--- a/lib/Reaction/Types/DateTime.pm
+++ b/lib/Reaction/Types/DateTime.pm
@@ -1,12 +1,12 @@
 package Reaction::Types::DateTime;
 
 use MooseX::Types
-    -declare => [qw/DateTimeObject SpanSet TimeRangeCollection/];
+    -declare => [qw/DateTime SpanSet TimeRangeCollection/];
 
 use MooseX::Types::Moose qw/Object ArrayRef/;
 use DateTime;
 
-subtype DateTimeObject,
+subtype DateTime,
   as Object,
   where { $_->isa('DateTime') },
   message { "Must be of the form YYYY-MM-DD HH:MM:SS" };

diff --git a/lib/Reaction/UI/ViewPort/Action.pm b/lib/Reaction/UI/ViewPort/Action.pm
index 5e4b0f0..1e92025 100644 (file)
--- a/lib/Reaction/UI/ViewPort/Action.pm
+++ b/lib/Reaction/UI/ViewPort/Action.pm
@@ -164,7 +164,7 @@ class Action is Object, which {
     $self->_build_simple_field(attribute => $attr, class => Password, %$args);
   };
 
-  implements _build_fields_for_type_Reaction_Types_DateTime_DateTimeObject => as {
+  implements _build_fields_for_type_Reaction_Types_DateTime_DateTime => as {
     my ($self, $attr, $args) = @_;
     $self->_build_simple_field(attribute => $attr, class => DateTime, %$args);
   };

diff --git a/lib/Reaction/UI/ViewPort/Collection/Grid/Member.pm b/lib/Reaction/UI/ViewPort/Collection/Grid/Member.pm
index 8696faa..aae25dd 100644 (file)
--- a/lib/Reaction/UI/ViewPort/Collection/Grid/Member.pm
+++ b/lib/Reaction/UI/ViewPort/Collection/Grid/Member.pm
@@ -32,7 +32,7 @@ class Member is 'Reaction::UI::ViewPort::Object', which {
     $_[0]->(@_[1,2], { layout => 'value/string', %{ $_[3] || {} } })
   };
 
-  around _build_fields_for_type_Reaction_Types_DateTime_DateTimeObject => sub {
+  around _build_fields_for_type_Reaction_Types_DateTime_DateTime => sub {
     $_[0]->(@_[1,2], { layout => 'value/date_time', %{ $_[3] || {} } })
   };
 

diff --git a/lib/Reaction/UI/ViewPort/Field/DateTime.pm b/lib/Reaction/UI/ViewPort/Field/DateTime.pm
index 4a932f2..50d26cf 100644 (file)
--- a/lib/Reaction/UI/ViewPort/Field/DateTime.pm
+++ b/lib/Reaction/UI/ViewPort/Field/DateTime.pm
@@ -2,11 +2,11 @@ package Reaction::UI::ViewPort::Field::DateTime;
 
 use Scalar::Util 'blessed';
 use Reaction::Class;
-use Reaction::Types::DateTime 'DateTimeObject';
+use Reaction::Types::DateTime;
 use aliased 'Reaction::UI::ViewPort::Field';
 
 class DateTime is Field, which {
-  has '+value' => (isa => DateTimeObject);
+  has '+value' => (isa => DateTime);
 
   has value_string_default_format => (
     isa => 'Str', is => 'rw', required => 1, default => sub { "%F %H:%M:%S" }

diff --git a/lib/Reaction/UI/ViewPort/Field/Mutable/Boolean.pm b/lib/Reaction/UI/ViewPort/Field/Mutable/Boolean.pm
index 633f910..0007bc8 100644 (file)
--- a/lib/Reaction/UI/ViewPort/Field/Mutable/Boolean.pm
+++ b/lib/Reaction/UI/ViewPort/Field/Mutable/Boolean.pm
@@ -7,6 +7,7 @@ class Boolean is 'Reaction::UI::ViewPort::Field::Boolean', which{
 
   implements adopt_value_string => as {
     my ($self) = @_;
+warn "WAHEY ".$self->value_string." ".$self;
     $self->value($self->value_string);
   };
 

diff --git a/lib/Reaction/UI/ViewPort/Object.pm b/lib/Reaction/UI/ViewPort/Object.pm
index 73facb9..4fa04d9 100644 (file)
--- a/lib/Reaction/UI/ViewPort/Object.pm
+++ b/lib/Reaction/UI/ViewPort/Object.pm
@@ -157,7 +157,7 @@ class Object is 'Reaction::UI::ViewPort', which {
     $self->_build_simple_field(attribute => $attr, class => String, %$args);
   };
 
-  implements _build_fields_for_type_Reaction_Types_DateTime_DateTimeObject => as {
+  implements _build_fields_for_type_Reaction_Types_DateTime_DateTime => as {
     my ($self, $attr, $args) = @_;
     $self->_build_simple_field(attribute => $attr, class => DateTime, %$args);
   };

diff --git a/lib/Reaction/UI/Widget/Field/Mutable/Boolean.pm b/lib/Reaction/UI/Widget/Field/Mutable/Boolean.pm
index 7d98085..5317ba0 100644 (file)
--- a/lib/Reaction/UI/Widget/Field/Mutable/Boolean.pm
+++ b/lib/Reaction/UI/Widget/Field/Mutable/Boolean.pm
@@ -9,6 +9,7 @@ class Boolean is 'Reaction::UI::Widget::Field::Mutable', which {
   };
   
   implements fragment is_checked {
+    warn "WAH: ".$_{viewport}->value_string."; ".$_{viewport}->value." WAAAH ".$_{viewport};
     if ($_{viewport}->value) {
       render 'is_checked_yes';
     } else {

diff --git a/t/lib/RTest/TestDB/Bar.pm b/t/lib/RTest/TestDB/Bar.pm
index d841696..ab36958 100644 (file)
--- a/t/lib/RTest/TestDB/Bar.pm
+++ b/t/lib/RTest/TestDB/Bar.pm
@@ -6,12 +6,12 @@ use DBIx::Class 0.07;
 use base qw/DBIx::Class Reaction::Object/;
 use Reaction::Class;
 use Reaction::Types::Core 'NonEmptySimpleStr';
-use Reaction::Types::DateTime 'DateTimeObject';
+use Reaction::Types::DateTime 'DateTime';
 use Reaction::Types::File 'File';
 
 has 'name' => (isa => NonEmptySimpleStr, is => 'rw', required => 1);
 has 'foo' => (isa => 'RTest::TestDB::Foo', is => 'rw', required => 1);
-has 'published_at' => (isa => DateTimeObject, is => 'rw');
+has 'published_at' => (isa => DateTime, is => 'rw');
 has 'avatar' => (isa => File, is => 'rw');
 
 __PACKAGE__->load_components(qw/InflateColumn::DateTime Core/);