[Jifty-commit] r2603 - in jifty/branches/template-declare: . lib/Jifty/Model t/TestApp/lib/TestApp/Model

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Fri Jan 26 09:27:21 2007
New Revision: 2603

Modified:
   jifty/branches/template-declare/   (props changed)
   jifty/branches/template-declare/lib/Jifty/Model/Metadata.pm
   jifty/branches/template-declare/lib/Jifty/Model/Session.pm
   jifty/branches/template-declare/t/TestApp-Plugin-REST/lib/TestApp/Plugin/REST/Model/User.pm
   jifty/branches/template-declare/t/TestApp/lib/TestApp/Model/User.pm

Log:
 r21401 at hualien (orig r2602):  jesse | 2007-01-26 22:25:56 +0800
  r21400 at hualien:  jesse | 2007-01-26 22:20:28 +0800
  * Modernization of model declarations for compatibility with new Object::Declare based Jifty::DBI
 


Modified: jifty/branches/template-declare/lib/Jifty/Model/Metadata.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Model/Metadata.pm	(original)
+++ jifty/branches/template-declare/lib/Jifty/Model/Metadata.pm	Fri Jan 26 09:27:21 2007
@@ -19,13 +19,15 @@
 
 =cut
 
-package Jifty::Model::Metadata::Schema;
+package Jifty::Model::Metadata;
+
 use Jifty::DBI::Schema;
+use Jifty::Record schema {
 
 column data_key => type is 'text';
 column value    => type is 'text';
+};
 
-package Jifty::Model::Metadata;
 use version;
 
 use base qw( Jifty::Record );

Modified: jifty/branches/template-declare/lib/Jifty/Model/Session.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Model/Session.pm	(original)
+++ jifty/branches/template-declare/lib/Jifty/Model/Session.pm	Fri Jan 26 09:27:21 2007
@@ -14,8 +14,9 @@
 
 =cut
 
-package Jifty::Model::Session::Schema;
+package Jifty::Model::Session;
 use Jifty::DBI::Schema;
+use Jifty::Record schema {
 
 column session_id => type is 'varchar(32)';
 column data_key => type is 'text';
@@ -26,8 +27,7 @@
 column updated => type is 'timestamp',
   filters are 'Jifty::DBI::Filter::DateTime';
 column key_type => type is 'varchar(32)';
-
-package Jifty::Model::Session;
+};
 
 use base qw( Jifty::Record );
 use DateTime ();
@@ -90,20 +90,14 @@
     return $self->SUPER::create(%args);
 }
 
-=head2 set_value [VALUE]
+=head2 before_set_value [VALUE]
 
 Updates the C<updated> column, in addition to setting the value.
 
 =cut
 
-sub set_value {
-    my $self  = shift;
-    my $value = shift;
-
-    return undef unless $self->id;
-
-    $self->set_updated( DateTime->now );
-    $self->_set( column => 'value', value => $value );
+sub before_set_value {
+    shift->set_updated( DateTime->now );
 }
 
 1;

Modified: jifty/branches/template-declare/t/TestApp-Plugin-REST/lib/TestApp/Plugin/REST/Model/User.pm
==============================================================================
--- jifty/branches/template-declare/t/TestApp-Plugin-REST/lib/TestApp/Plugin/REST/Model/User.pm	(original)
+++ jifty/branches/template-declare/t/TestApp-Plugin-REST/lib/TestApp/Plugin/REST/Model/User.pm	Fri Jan 26 09:27:21 2007
@@ -1,9 +1,12 @@
-package TestApp::Plugin::REST::Model::User::Schema;
+package TestApp::Plugin::REST::Model::User;
+use base qw/TestApp::Plugin::REST::Record/;
+
 use Jifty::DBI::Schema;
 
 # Your column definitions go here.  See L<Jifty::DBI::Schema> for
 # documentation about how to write column definitions.
 
+use Jifty::Record schema {
 column 'name' =>
   type is 'text',
   is mandatory;
@@ -13,11 +16,9 @@
 column 'tasty' =>
   type is 'boolean',
   is immutable;
+};
 
 
-package TestApp::Plugin::REST::Model::User;
-use base qw/TestApp::Plugin::REST::Record/;
-
 # Your model-specific methods go here.
 
 1;

Modified: jifty/branches/template-declare/t/TestApp/lib/TestApp/Model/User.pm
==============================================================================
--- jifty/branches/template-declare/t/TestApp/lib/TestApp/Model/User.pm	(original)
+++ jifty/branches/template-declare/t/TestApp/lib/TestApp/Model/User.pm	Fri Jan 26 09:27:21 2007
@@ -1,10 +1,13 @@
-package TestApp::Model::User::Schema;
+package TestApp::Model::User;
+use warnings;
+use strict;
+use base qw/TestApp::Record/;
 use Jifty::DBI::Schema;
 use Scalar::Defer;
 
 # Your column definitions go here.  See L<Jifty::DBI::Schema> for
 # documentation about how to write column definitions.
-
+use Jifty::Record schema  {
 column 'name' =>
   type is 'text',
   is mandatory;
@@ -24,11 +27,9 @@
   is immutable,
   default is defer { DateTime->now },
   filters are 'Jifty::DBI::Filter::DateTime';
+};
 
 
-package TestApp::Model::User;
-use base qw/TestApp::Record/;
-
 # Your model-specific methods go here.
 sub current_user_can {
     return 1;