[Jifty-commit] r491 - in jifty/trunk: lib/Jifty/Script

[jifty-commit at lists.jifty.org]

Author: trs
Date: Mon Jan  9 21:34:06 2006
New Revision: 491

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Script/Action.pm
   jifty/trunk/lib/Jifty/Script/Model.pm

Log:
 r8206 at wintermute:  tom | 2006-01-09 21:32:47 -0500
 Should be ApplicationClass not ApplicationName


Modified: jifty/trunk/lib/Jifty/Script/Action.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Script/Action.pm	(original)
+++ jifty/trunk/lib/Jifty/Script/Action.pm	Mon Jan  9 21:34:06 2006
@@ -47,7 +47,7 @@
 
 =head2 run
 
-Creates a skeleton file under C<lib/I<Application>/Action/I<Action>>, as
+Creates a skeleton file under C<lib/I<ApplicationClass>/Action/I<Action>>, as
 well as a skeleton tests file.
 
 =cut
@@ -61,8 +61,8 @@
 
     Jifty->new( no_handle => 1 );
     my $root = Jifty::Util->app_root;
-    my $appname = Jifty->config->framework("ApplicationName");
-    my $path = "$root/lib/$appname/Action/$action.pm";
+    my $appclass = Jifty->config->framework("ApplicationClass");
+    my $path = "$root/lib/$appclass/Action/$action.pm";
 
     my $actionFile = <<"EOT";
 use strict;
@@ -70,12 +70,12 @@
 
 =head1 NAME
 
-@{[$appname]}::Action::@{[$action]}
+@{[$appclass]}::Action::@{[$action]}
 
 =cut
 
-package @{[$appname]}::Action::@{[$action]};
-use base qw/@{[$appname]}::Action Jifty::Action/;
+package @{[$appclass]}::Action::@{[$action]};
+use base qw/@{[$appclass]}::Action Jifty::Action/;
 
 =head2 arguments
 
@@ -128,11 +128,11 @@
 use Jifty::Test tests => 1;
 
 # Make sure we can load the action
-use_ok('@{[$appname]}::Action::@{[$action]}');
+use_ok('@{[$appclass]}::Action::@{[$action]}');
 
 EOT
 
-    $self->_write("$root/lib/$appname/Action/$action.pm" => $actionFile,
+    $self->_write("$root/lib/$appclass/Action/$action.pm" => $actionFile,
                   "$root/t/00-action-$action.t" => $testFile,
                  );
 }

Modified: jifty/trunk/lib/Jifty/Script/Model.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Script/Model.pm	(original)
+++ jifty/trunk/lib/Jifty/Script/Model.pm	Mon Jan  9 21:34:06 2006
@@ -46,7 +46,7 @@
 
 =head2 run
 
-Creates a skeleton file under C<lib/I<Application>/Model/I<Model>>, as
+Creates a skeleton file under C<lib/I<ApplicationClass>/Model/I<Model>>, as
 well as a skeleton tests file.
 
 =cut
@@ -60,18 +60,18 @@
 
     Jifty->new( no_handle => 1 );
     my $root = Jifty::Util->app_root;
-    my $appname = Jifty->config->framework("ApplicationName");
-    my $path = "$root/lib/$appname/Model/$model.pm";
+    my $appclass = Jifty->config->framework("ApplicationClass");
+    my $path = "$root/lib/$appclass/Model/$model.pm";
 
     my $modelFile = <<"EOT";
-package @{[$appname]}::Model::@{[$model]}::Schema;
+package @{[$appclass]}::Model::@{[$model]}::Schema;
 use Jifty::DBI::Schema;
 
 # Your column definitions go here.  See L<Jifty::DBI::Schema> for
 # documentation about how to write column definitions.
 
-package @{[$appname]}::Model::@{[$model]};
-use base qw/@{[$appname]}::Record/;
+package @{[$appclass]}::Model::@{[$model]};
+use base qw/@{[$appclass]}::Record/;
 
 # Your model-specific methods go here.
 
@@ -94,14 +94,14 @@
 use Jifty::Test tests => 11;
 
 # Make sure we can load the model
-use_ok('@{[$appname]}::Model::@{[$model]}');
+use_ok('@{[$appclass]}::Model::@{[$model]}');
 
 # Grab a system use
-my \$system_user = @{[$appname]}::CurrentUser->superuser;
+my \$system_user = @{[$appclass]}::CurrentUser->superuser;
 ok(\$system_user, "Found a system user");
 
 # Try testing a create
-my \$o = @{[$appname]}::Model::@{[$model]}->new(current_user => \$system_user);
+my \$o = @{[$appclass]}::Model::@{[$model]}->new(current_user => \$system_user);
 my (\$id) = \$o->create();
 ok(\$id, "$model create returned success");
 ok(\$o->id, "New $model has valid id set");
@@ -113,7 +113,7 @@
 isnt(\$o->id, \$id, "And it is different from the previous one");
 
 # Searches in general
-my \$collection =  @{[$appname]}::Model::@{[$model]}Collection->new(current_user => \$system_user);
+my \$collection =  @{[$appclass]}::Model::@{[$model]}Collection->new(current_user => \$system_user);
 \$collection->unlimit;
 is(\$collection->count, 2, "Finds two records");
 
@@ -132,7 +132,7 @@
 
 EOT
 
-    $self->_write("$root/lib/$appname/Model/$model.pm" => $modelFile,
+    $self->_write("$root/lib/$appclass/Model/$model.pm" => $modelFile,
                   "$root/t/00-model-$model.t" => $testFile,
                  );
 }