[Jifty-commit] r4298 - in jifty/trunk: . lib/Jifty/Plugin/OAuth/Model

[jifty-commit at lists.jifty.org]

Author: sartak
Date: Tue Oct 23 12:20:03 2007
New Revision: 4298

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/META.yml
   jifty/trunk/lib/Jifty/Plugin/OAuth/Model/AccessToken.pm
   jifty/trunk/lib/Jifty/Plugin/OAuth/Model/RequestToken.pm
   jifty/trunk/t/TestApp-Plugin-OAuth/lib/TestApp/Plugin/OAuth/Model/User.pm

Log:
 r44064 at onn:  sartak | 2007-10-23 12:19:36 -0400
 Ah ha, plugins need to be very careful about loading appclass models, because classloader isn't set up for them yet


Modified: jifty/trunk/META.yml
==============================================================================
--- jifty/trunk/META.yml	(original)
+++ jifty/trunk/META.yml	Tue Oct 23 12:20:03 2007
@@ -40,10 +40,10 @@
   Module::CoreList: 0
   Module::Install::Admin: 0.50
   Module::Refresh: 0.09
-  Net::OAuth::AccessTokenRequest: 0.04
-  Net::OAuth::ProtectedResourceRequest: 0.04
+  Net::OAuth::AccessTokenRequest: 0
+  Net::OAuth::ProtectedResourceRequest: 0
   Net::OAuth::Request: 0.04
-  Net::OAuth::RequestTokenRequest: 0.04
+  Net::OAuth::RequestTokenRequest: 0
   Net::OpenID::Consumer: 0
   Net::Server::Fork: 0
   Net::Server::PreFork: 0

Modified: jifty/trunk/lib/Jifty/Plugin/OAuth/Model/AccessToken.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/OAuth/Model/AccessToken.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/OAuth/Model/AccessToken.pm	Tue Oct 23 12:20:03 2007
@@ -6,8 +6,9 @@
 use base qw( Jifty::Plugin::OAuth::Token Jifty::Record );
 
 # kludge 1: you cannot call Jifty->app_class within schema {}
-my $app_user;
-BEGIN { $app_user = Jifty->app_class('Model', 'User') }
+# kludge 3: due to the loading order, you can't really do this
+#my $app_user;
+#BEGIN { $app_user = Jifty->app_class('Model', 'User') }
 
 use Jifty::DBI::Schema;
 use Jifty::Record schema {

Modified: jifty/trunk/lib/Jifty/Plugin/OAuth/Model/RequestToken.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/OAuth/Model/RequestToken.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/OAuth/Model/RequestToken.pm	Tue Oct 23 12:20:03 2007
@@ -6,8 +6,9 @@
 use base qw( Jifty::Plugin::OAuth::Token Jifty::Record );
 
 # kludge 1: you cannot call Jifty->app_class within schema {}
-my $app_user;
-BEGIN { $app_user = Jifty->app_class('Model', 'User') }
+# kludge 3: due to the loading order, you can't really do this
+#my $app_user;
+#BEGIN { $app_user = Jifty->app_class('Model', 'User') }
 
 use Jifty::DBI::Schema;
 use Jifty::Record schema {

Modified: jifty/trunk/t/TestApp-Plugin-OAuth/lib/TestApp/Plugin/OAuth/Model/User.pm
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-OAuth/lib/TestApp/Plugin/OAuth/Model/User.pm	(original)
+++ jifty/trunk/t/TestApp-Plugin-OAuth/lib/TestApp/Plugin/OAuth/Model/User.pm	Tue Oct 23 12:20:03 2007
@@ -1,11 +1,18 @@
-package TestApp::Plugin::OAuth::Model::User;
-use base qw/Jifty::Record/;
+use strict;
+use warnings;
 
+package TestApp::Plugin::OAuth::Model::User;
 use Jifty::DBI::Schema;
-use Jifty::Record schema {
+
+use TestApp::Plugin::OAuth::Record schema {
     column 'tasty' =>
-        type is 'boolean';
+        type is 'boolean',
+        default is 'f';
+
 };
 
+use Jifty::Plugin::User::Mixin::Model::User;
+use Jifty::Plugin::Authentication::Password::Mixin::Model::User;
+
 1;