[Jifty-commit] r1579 - jifty/branches/moose/lib/Jifty
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Fri Jul 14 21:25:27 EDT 2006
Author: audreyt
Date: Fri Jul 14 21:25:26 2006
New Revision: 1579
Modified:
jifty/branches/moose/lib/Jifty/API.pm
jifty/branches/moose/lib/Jifty/Collection.pm
jifty/branches/moose/lib/Jifty/Config.pm
jifty/branches/moose/lib/Jifty/Continuation.pm
jifty/branches/moose/lib/Jifty/CurrentUser.pm
jifty/branches/moose/lib/Jifty/Handler.pm
jifty/branches/moose/lib/Jifty/LetMe.pm
jifty/branches/moose/lib/Jifty/Notification.pm
jifty/branches/moose/lib/Jifty/Request.pm
jifty/branches/moose/lib/Jifty/Response.pm
Log:
* Moosification, step #3
Modified: jifty/branches/moose/lib/Jifty/API.pm
==============================================================================
--- jifty/branches/moose/lib/Jifty/API.pm (original)
+++ jifty/branches/moose/lib/Jifty/API.pm Fri Jul 14 21:25:26 2006
@@ -11,11 +11,13 @@
=cut
use Jifty::Everything;
-use base qw/Class::Accessor::Fast Jifty::Object/;
+use base qw/Jifty::Object/;
require Module::Pluggable;
-__PACKAGE__->mk_accessors(qw(action_limits));
+use Moose;
+has action_limits => qw( is rw isa ArrayRef );
+no Moose;
=head1 METHODS
Modified: jifty/branches/moose/lib/Jifty/Collection.pm
==============================================================================
--- jifty/branches/moose/lib/Jifty/Collection.pm (original)
+++ jifty/branches/moose/lib/Jifty/Collection.pm Fri Jul 14 21:25:26 2006
@@ -32,7 +32,7 @@
=cut
-use base qw/Jifty::Object Jifty::DBI::Collection Class::Accessor::Fast/;
+use base qw/Jifty::Object Jifty::DBI::Collection/;
use Data::Page;
=head1 MODEL
@@ -46,7 +46,9 @@
=cut
-__PACKAGE__->mk_accessors(qw(pager));
+use Moose;
+has pager => qw( is rw isa Data::Page );
+no Moose;
=head2 add_record
Modified: jifty/branches/moose/lib/Jifty/Config.pm
==============================================================================
--- jifty/branches/moose/lib/Jifty/Config.pm (original)
+++ jifty/branches/moose/lib/Jifty/Config.pm Fri Jul 14 21:25:26 2006
@@ -21,11 +21,11 @@
Hash::Merge::set_behavior('RIGHT_PRECEDENT');
use File::Basename();
-use base qw/Class::Accessor::Fast/;
-
use vars qw/$CONFIG/;
-__PACKAGE__->mk_accessors(qw/stash/);
+use Moose;
+has stash => qw( is rw isa HashRef );
+no Moose;
=head1 METHODS
Modified: jifty/branches/moose/lib/Jifty/Continuation.pm
==============================================================================
--- jifty/branches/moose/lib/Jifty/Continuation.pm (original)
+++ jifty/branches/moose/lib/Jifty/Continuation.pm Fri Jul 14 21:25:26 2006
@@ -39,11 +39,12 @@
use Jifty::Everything;
use Storable 'dclone';
-use base qw/Class::Accessor::Fast/;
-
-__PACKAGE__->mk_accessors(qw(id parent
- request response code
- ));
+use Moose;
+has id => qw( is rw isa Str );
+has parent => qw( is rw isa Any ); # Jifty::Continuation | Str
+has request => qw( is rw isa Jifty::Request );
+has response => qw( is rw isa Jifty::Response );
+has code => qw( is rw isa CodeRef );
=head2 new PARAMHASH
Modified: jifty/branches/moose/lib/Jifty/CurrentUser.pm
==============================================================================
--- jifty/branches/moose/lib/Jifty/CurrentUser.pm (original)
+++ jifty/branches/moose/lib/Jifty/CurrentUser.pm Fri Jul 14 21:25:26 2006
@@ -3,9 +3,13 @@
package Jifty::CurrentUser;
-use base qw/Jifty::Object Class::Accessor::Fast/;
+use base qw/Jifty::Object/;
-__PACKAGE__->mk_accessors(qw(is_superuser is_bootstrap_user user_object));
+use Moose;
+has is_superuser => qw( is rw isa Bool );
+has is_bootstrap_user => qw( is rw isa Bool );
+has user_object => qw( is rw isa Object );
+no Moose;
=head1 NAME
Modified: jifty/branches/moose/lib/Jifty/Handler.pm
==============================================================================
--- jifty/branches/moose/lib/Jifty/Handler.pm (original)
+++ jifty/branches/moose/lib/Jifty/Handler.pm Fri Jul 14 21:25:26 2006
@@ -24,7 +24,6 @@
=cut
-use base qw/Class::Accessor::Fast/;
use Module::Refresh ();
BEGIN {
@@ -47,7 +46,14 @@
-__PACKAGE__->mk_accessors(qw(mason dispatcher static_handler cgi apache stash));
+use Moose;
+has mason => qw( is rw isa Jifty::View::Mason::Handler );
+has dispatcher => qw( is rw isa Any );
+has static_handler => qw( is rw isa Jifty::View::Static::Handler );
+has cgi => qw( is rw isa Object );
+has apache => qw( is rw isa Object );
+has stash => qw( is rw isa HashRef );
+no Moose;
=head2 new
Modified: jifty/branches/moose/lib/Jifty/LetMe.pm
==============================================================================
--- jifty/branches/moose/lib/Jifty/LetMe.pm (original)
+++ jifty/branches/moose/lib/Jifty/LetMe.pm Fri Jul 14 21:25:26 2006
@@ -6,9 +6,16 @@
use Math::BigInt::Calc;
use String::Koremutake ();
-use base qw/Jifty::Object Class::Accessor::Fast/;
+use base qw/Jifty::Object/;
-__PACKAGE__->mk_accessors ( qw/checksum_provided email path args until user/);
+use Moose;
+has checksum_provided => qw( is rw isa Str );
+has email => qw( is rw isa Str );
+has path => qw( is rw isa Str );
+has args => qw( is rw isa HashRef );
+has until => qw( is rw isa Str );
+has user => qw( is rw isa Object );
+no Moose;
=head1 NAME
Modified: jifty/branches/moose/lib/Jifty/Notification.pm
==============================================================================
--- jifty/branches/moose/lib/Jifty/Notification.pm (original)
+++ jifty/branches/moose/lib/Jifty/Notification.pm Fri Jul 14 21:25:26 2006
@@ -3,13 +3,21 @@
package Jifty::Notification;
-use base qw/Jifty::Object Class::Accessor::Fast/;
+use base qw/Jifty::Object/;
use Email::Send ();
use Email::Simple ();
use Email::Simple::Creator ();
-__PACKAGE__->mk_accessors(
- qw/body preface footer subject from _recipients _to_list to/);
+use Moose;
+has body => qw( is rw isa Str );
+has preface => qw( is rw isa Str );
+has footer => qw( is rw isa Str );
+has subject => qw( is rw isa Str );
+has from => qw( is rw isa Str );
+has to => qw( is rw isa Str );
+has _recipients => qw( is rw isa ArrayRef );
+has _to_list => qw( is rw isa ArrayRef );
+no Moose;
=head1 USAGE
Modified: jifty/branches/moose/lib/Jifty/Request.pm
==============================================================================
--- jifty/branches/moose/lib/Jifty/Request.pm (original)
+++ jifty/branches/moose/lib/Jifty/Request.pm Fri Jul 14 21:25:26 2006
@@ -3,8 +3,16 @@
package Jifty::Request;
-use base qw/Jifty::Object Class::Accessor::Fast/;
-__PACKAGE__->mk_accessors(qw(_top_request arguments just_validating path continuation_id continuation_type continuation_path));
+use base qw/Jifty::Object/;
+use Moose;
+has _top_request => qw( is rw isa Jifty::Request );
+has arguments => qw( is rw isa HashRef );
+has just_validating => qw( is rw isa Bool );
+has path => qw( is rw isa Str );
+has continuation_id => qw( is rw isa Str );
+has continuation_type => qw( is rw isa Str );
+has continuation_path => qw( is rw isa Str );
+no Moose;
use Jifty::JSON;
use Jifty::YAML;
Modified: jifty/branches/moose/lib/Jifty/Response.pm
==============================================================================
--- jifty/branches/moose/lib/Jifty/Response.pm (original)
+++ jifty/branches/moose/lib/Jifty/Response.pm Fri Jul 14 21:25:26 2006
@@ -15,9 +15,11 @@
=cut
-use base qw/Jifty::Object Class::Accessor::Fast/;
+use base qw/Jifty::Object/;
-__PACKAGE__->mk_accessors(qw(error));
+use Moose;
+has error => qw( is rw isa Str );
+no Moose;
=head2 new
More information about the Jifty-commit
mailing list