@@ -6,7 +6,7 @@ This file documents the revision history for Perl extension Mango. - Updated XML::Atom PREREQ and test - Mango->share now uses module_dir and falls back to ../../share when using local INC files - - Added mango.pl to create app/config/data/components + - Added mango.pl to create app/config/data/components/database 0.01000_06 Sep 09 20:01:22 2007 - Fixed Template->share when Mango has never been installed Changes @@ -34,6 +34,7 @@ requires 'Catalyst::Plugin::Static::Simple'; requires 'Catalyst::Action::RenderView'; requires 'Catalyst::Action::REST' => '0.40'; requires 'Catalyst::Plugin::Authentication' => '0.09999'; +requires 'Catalyst::Plugin::Authorization::Roles'; requires 'Catalyst::Plugin::Session'; requires 'Catalyst::Plugin::Session::State::Cookie'; requires 'Catalyst::Plugin::Session::Store::File'; Makefile.PL @@ -3,8 +3,9 @@ use strict; use warnings; BEGIN { - use Catalyst::Helper; + use base qw/Catalyst::Helper/; use Catalyst::Utils; + use DateTime; use Path::Class qw/file dir/; use YAML; use Mango::Schema; @@ -12,46 +13,79 @@ BEGIN { sub mk_app { my ($self, $name) = @_; - my $helper = Catalyst::Helper->new; + + ## set defaults + $self->{'adminuser'} ||= 'admin'; + $self->{'adminpass'} ||= 'admin'; + $self->{'adminrole'} ||= 'admin'; ## make the Catalyst app - $helper->mk_app($name); + $self->SUPER::mk_app($name); ## add database - $self->add_database($helper); + $self->add_database; ## inject plugins - $self->add_plugins($helper); + $self->add_plugins; # add config - $self->add_config($helper); + $self->add_config; ## add contollers/models/views - $self->mk_stuff($helper); + $self->mk_stuff; return; }; sub add_database { - my ($self, $helper) = @_; - my $dir = dir($helper->{'dir'}, 'data'); + my $self = shift; + my $dir = dir($self->{'dir'}, 'data'); my $file = file($dir, 'mango.db'); - $helper->mk_dir($dir); - - my $schema = Mango::Schema->connect("dbi:SQLite:$file"); - $schema->deploy; + if (! -e $file) { + $self->mk_dir($dir); + my $adminuser = $self->{'adminuser'}; + my $adminpass = $self->{'adminpass'}; + my $adminrole = $self->{'adminrole'}; + + my $schema = Mango::Schema->connect("dbi:SQLite:$file"); + $schema->deploy; + print "created \"$file\"\n"; + + $schema->resultset('Users')->create({ + id => 1, + username => $adminuser, + password => $adminpass, + created => DateTime->now, + updated => DateTime->now + }); + print "created admin user/pass ($adminuser:$adminpass)\n"; + + $schema->resultset('Roles')->create({ + id => 1, + name => $adminrole, + description => 'Administrators', + created => DateTime->now, + updated => DateTime->now + }); + print "created admin role ($adminrole)\n"; + + $schema->resultset('UsersRoles')->create({ + user_id => 1, + role_id => 1 + }); + }; return; }; sub add_plugins { - my ($self, $helper) = @_; - my $file = file($helper->{'mod'} . '.pm'); + my $self = shift; + my $file = file($self->{'mod'} . '.pm'); my $contents = $file->slurp; if ($contents !~ /\+Mango::Catalyst::Plugin/i) { - $contents =~ s/-Debug ConfigLoader/-Debug ConfigLoader Session Session::Store::File Session::State::Cookie +Mango::Catalyst::Plugin::I18N +Mango::Catalyst::Plugin::Authentication +Mango::Catalyst::Plugin::Forms/; + $contents =~ s/-Debug ConfigLoader/-Debug ConfigLoader Session Session::Store::File Session::State::Cookie +Mango::Catalyst::Plugin::I18N +Mango::Catalyst::Plugin::Authentication +Mango::Catalyst::Plugin::Forms Authorization::Roles/; my $io = $file->open('>'); $io->print($contents); @@ -63,8 +97,8 @@ sub add_plugins { }; sub add_config { - my ($self, $helper) = @_; - my $file = file($helper->{'dir'}, $helper->{'appprefix'} . '.yml'); + my $self = shift; + my $file = file($self->{'dir'}, $self->{'appprefix'} . '.yml'); my $config = YAML::LoadFile($file); $config->{'authentication'} = { @@ -78,12 +112,13 @@ sub add_config { }, store => { class => '+Mango::Catalyst::Plugin::Authentication::Store' - } + }, } } }; $config->{'connection_info'} = ['dbi:SQLite:data/mango.db']; $config->{'default_view'} = 'XHTML'; + $config->{'authorization'}->{'mango'}->{'admin_role'} = $self->{'adminrole'}; YAML::DumpFile($file, $config); @@ -91,27 +126,48 @@ sub add_config { }; sub mk_stuff { - my ($self, $helper) = @_; - my $c = $helper->{'c'}; - my $m = $helper->{'m'}; - my $v = $helper->{'v'}; - - $helper->render_file('model_carts', file($m, 'Carts.pm')); - $helper->render_file('model_orders', file($m, 'Orders.pm')); - $helper->render_file('model_products', file($m, 'Products.pm')); - $helper->render_file('model_profiles', file($m, 'Profiles.pm')); - $helper->render_file('model_roles', file($m, 'Roles.pm')); - $helper->render_file('model_users', file($m, 'Users.pm')); - $helper->render_file('model_wishlists', file($m, 'Wishlists.pm')); - - $helper->render_file('view_atom', file($v, 'Atom.pm')); - $helper->render_file('view_html', file($v, 'HTML.pm')); - $helper->render_file('view_rss', file($v, 'RSS.pm')); - $helper->render_file('view_text', file($v, 'Text.pm')); - $helper->render_file('view_xhtml', file($v, 'XHTML.pm')); - - $helper->render_file('controller_cart', file($c, 'Cart.pm')); - $helper->render_file('controller_wishlists', file($c, 'Wishlists.pm')); + my $self = shift; + my $c = $self->{'c'}; + my $m = $self->{'m'}; + my $v = $self->{'v'}; + + $self->render_file('model_carts', file($m, 'Carts.pm')); + $self->render_file('model_orders', file($m, 'Orders.pm')); + $self->render_file('model_products', file($m, 'Products.pm')); + $self->render_file('model_profiles', file($m, 'Profiles.pm')); + $self->render_file('model_roles', file($m, 'Roles.pm')); + $self->render_file('model_users', file($m, 'Users.pm')); + $self->render_file('model_wishlists', file($m, 'Wishlists.pm')); + + $self->render_file('view_atom', file($v, 'Atom.pm')); + $self->render_file('view_html', file($v, 'HTML.pm')); + $self->render_file('view_rss', file($v, 'RSS.pm')); + $self->render_file('view_text', file($v, 'Text.pm')); + $self->render_file('view_xhtml', file($v, 'XHTML.pm')); + + $self->mk_dir(dir($c, 'Admin')); + $self->mk_dir(dir($c, 'Admin', 'Products')); + + $self->render_file('controller_admin', + file($c, 'Admin.pm')); + $self->render_file('controller_admin_roles', + file($c, 'Admin', 'Roles.pm')); + $self->render_file('controller_admin_users', + file($c, 'Admin', 'Users.pm')); + $self->render_file('controller_admin_products', + file($c, 'Admin', 'Products.pm')); + $self->render_file('controller_admin_products_attributes', + file($c, 'Admin', 'Products', 'Attributes.pm')); + $self->render_file('controller_cart', + file($c, 'Cart.pm')); + $self->render_file('controller_login', + file($c, 'Login.pm')); + $self->render_file('controller_logout', + file($c, 'Logout.pm')); + $self->render_file('controller_products', + file($c, 'Products.pm')); + $self->render_file('controller_wishlists', + file($c, 'Wishlists.pm')); }; 1; @@ -255,4 +311,84 @@ BEGIN { use base qw/Mango::Catalyst::Controller::Wishlists/; }; +1; +__controller_login__ +package [% name %]::Controller::Login; +use strict; +use warnings; + +BEGIN { + use base qw/Mango::Catalyst::Controller::Login/; +}; + +1; +__controller_logout__ +package [% name %]::Controller::Logout; +use strict; +use warnings; + +BEGIN { + use base qw/Mango::Catalyst::Controller::Logout/; +}; + +1; +__controller_products__ +package [% name %]::Controller::Products; +use strict; +use warnings; + +BEGIN { + use base qw/Mango::Catalyst::Controller::Products/; +}; + +1; +__controller_admin__ +package [% name %]::Controller::Admin; +use strict; +use warnings; + +BEGIN { + use base qw/Mango::Catalyst::Controller::Admin/; +}; + +1; +__controller_admin_roles__ +package [% name %]::Controller::Admin::Roles; +use strict; +use warnings; + +BEGIN { + use base qw/Mango::Catalyst::Controller::Admin::Roles/; +}; + +1; +__controller_admin_users__ +package [% name %]::Controller::Admin::Users; +use strict; +use warnings; + +BEGIN { + use base qw/Mango::Catalyst::Controller::Admin::Users/; +}; + +1; +__controller_admin_products__ +package [% name %]::Controller::Admin::Products; +use strict; +use warnings; + +BEGIN { + use base qw/Mango::Catalyst::Controller::Admin::Products/; +}; + +1; +__controller_admin_products_attributes__ +package [% name %]::Controller::Admin::Products::Attributes; +use strict; +use warnings; + +BEGIN { + use base qw/Mango::Catalyst::Controller::Admin::Products::Attributes/; +}; + 1; \ No newline at end of file lib/Catalyst/Helper/Mango.pm @@ -9,12 +9,18 @@ BEGIN { use Pod::Usage; }; -my $help = 0; -my $version = 0; +my $help = 0; +my $version = 0; +my $adminuser; +my $adminpass; +my $adminrole; GetOptions( - 'help|?' => \$help, - 'version' => \$version + 'help|?' => \$help, + 'version' => \$version, + 'admin-user' => \$adminuser, + 'admin-pass' => \$adminpass, + 'admin-role' => \$adminrole ) || pod2usage(1); if ($version) { @@ -25,9 +31,15 @@ if ($version) { pod2usage(1) if ($help || !$ARGV[0]); -Catalyst::Helper::Mango->mk_app($ARGV[0]); +my $helper = Catalyst::Helper::Mango->new({ + adminuser => $adminuser, + adminpass => $adminpass, + adminrole => $adminrole +}); -print "Created starter directories and files\n"; +$helper->mk_app($ARGV[0]); + +print "created starter directories and files\n"; 1; __END__ @@ -42,8 +54,11 @@ mango [options] application-name Options: - --help Show this message - --version The installed version + --help Show this message + --version The installed version + --admin-user The username for the admin account (Default: admin) + --admin-pass The password for the admin account (Default: admin) + --admin-role The name of the admin role (Default: admin) Example: @@ -54,31 +69,70 @@ Example: The C<mango.pl> script creates a skeleton framework for a new Mango based application using the recommend style of subclassing for easy customization. - Created MyProject - Created MyProject\lib\MyProject - Created MyProject\lib\MyProject\Cart.pm - Created MyProject\lib\MyProject\Cart - Created MyProject\lib\MyProject\Cart\Item.pm - Created MyProject\lib\MyProject\Storage - Created MyProject\lib\MyProject\Storage\Cart.pm - Created MyProject\lib\MyProject\Storage\Cart - Created MyProject\lib\MyProject\Storage\Cart\Item.pm - Created MyProject\lib\MyProject\Order.pm - Created MyProject\lib\MyProject\Order - Created MyProject\lib\MyProject\Order\Item.pm - Created MyProject\lib\MyProject\Storage\Order.pm - Created MyProject\lib\MyProject\Storage\Order - Created MyProject\lib\MyProject\Storage\Order\Item.pm - Created MyProject\lib\MyProject\Checkout.pm - Created MyProject\t - Created MyProject\t\pod_syntax.t - Created MyProject\t\pod_spelling.t - Created MyProject\t\basic.t - Created MyProject\t\pod_coverage.t - Created MyProject\.cvsignore - Created MyProject\Makefile.PL - Created MyProject\MANIFEST - Created MyProject\script\myapp_handel.pl + created "MyApp" + created "MyApp/script" + created "MyApp/lib" + created "MyApp/root" + created "MyApp/root/static" + created "MyApp/root/static/images" + created "MyApp/t" + created "MyApp/lib/MyApp" + created "MyApp/lib/MyApp/Model" + created "MyApp/lib/MyApp/View" + created "MyApp/lib/MyApp/Controller" + created "MyApp/myapp.yml" + created "MyApp/lib/MyApp.pm" + created "MyApp/lib/MyApp/Controller/Root.pm" + created "MyApp/README" + created "MyApp/Changes" + created "MyApp/t/01app.t" + created "MyApp/t/02pod.t" + created "MyApp/t/03podcoverage.t" + created "MyApp/root/static/images/catalyst_logo.png" + created "MyApp/root/static/images/btn_120x50_built.png" + created "MyApp/root/static/images/btn_120x50_built_shadow.png" + created "MyApp/root/static/images/btn_120x50_powered.png" + created "MyApp/root/static/images/btn_120x50_powered_shadow.png" + created "MyApp/root/static/images/btn_88x31_built.png" + created "MyApp/root/static/images/btn_88x31_built_shadow.png" + created "MyApp/root/static/images/btn_88x31_powered.png" + created "MyApp/root/static/images/btn_88x31_powered_shadow.png" + created "MyApp/root/favicon.ico" + created "MyApp/Makefile.PL" + created "MyApp/script/myapp_cgi.pl" + created "MyApp/script/myapp_fastcgi.pl" + created "MyApp/script/myapp_server.pl" + created "MyApp/script/myapp_test.pl" + created "MyApp/script/myapp_create.pl" + created "MyApp/data" + created "MyApp/data/mango.db" + created admin user/pass (admin:admin) + created admin role (admin) + created "MyApp/lib/MyApp/Model/Carts.pm" + created "MyApp/lib/MyApp/Model/Orders.pm" + created "MyApp/lib/MyApp/Model/Products.pm" + created "MyApp/lib/MyApp/Model/Profiles.pm" + created "MyApp/lib/MyApp/Model/Roles.pm" + created "MyApp/lib/MyApp/Model/Users.pm" + created "MyApp/lib/MyApp/Model/Wishlists.pm" + created "MyApp/lib/MyApp/View/Atom.pm" + created "MyApp/lib/MyApp/View/HTML.pm" + created "MyApp/lib/MyApp/View/RSS.pm" + created "MyApp/lib/MyApp/View/Text.pm" + created "MyApp/lib/MyApp/View/XHTML.pm" + created "MyApp/lib/MyApp/Controller/Admin" + created "MyApp/lib/MyApp/Controller/Admin/Products" + created "MyApp/lib/MyApp/Controller/Admin.pm" + created "MyApp/lib/MyApp/Controller/Admin/Roles.pm" + created "MyApp/lib/MyApp/Controller/Admin/Users.pm" + created "MyApp/lib/MyApp/Controller/Admin/Products.pm" + created "MyApp/lib/MyApp/Controller/Admin/Products/Attributes.pm" + created "MyApp/lib/MyApp/Controller/Cart.pm" + created "MyApp/lib/MyApp/Controller/Login.pm" + created "MyApp/lib/MyApp/Controller/Logout.pm" + created "MyApp/lib/MyApp/Controller/Products.pm" + created "MyApp/lib/MyApp/Controller/Wishlists.pm" + created starter directories and files See L<Mango::Manual::QuickStart> for more information on creating your first Mango based application. script/mango.pl 40954f76ce6e1de2e993375074f3b84dd9231405 claco claco@52a70e3a-55ec-0310-b14e-7917f69ecacc http://github.com/claco/mango/commit/b9053071786aee7846e6413df6eaff6bf066d2cd b9053071786aee7846e6413df6eaff6bf066d2cd 2007-10-08T19:48:54-07:00 2007-10-08T19:48:54-07:00 r2083@NP5660: claco | 2007-10-08 22:54:00 -0400 Mango helper now creates database, user/password/admin role git-svn-id: http://svn.icantfocus.com/CPAN/Mango/trunk@1979 52a70e3a-55ec-0310-b14e-7917f69ecacc 9cb3ae52c4368bfd5fb3db26cac31d558aa98f69 claco claco@52a70e3a-55ec-0310-b14e-7917f69ecacc