more schema name and front page updates

lib/RavLog/Controller/Root.pm

@@ -12,6 +12,9 @@ sub begin : Private
 {
    my ( $self, $c ) = @_;
 
+   if( $c->model('DB::Config')->find('front page')->value ne 'blog' ) {
+        $c->stash('blog_page' => 1 );
+    }
    $c->stash->{pages} =
       [ $c->model('DB::Page')->search( display_in_drawer => 1 )->all() ];
    $c->stash->{activelink} = { home => 'activelink' };    # set it to home unless overridden.
@@ -66,23 +69,30 @@ sub default : Local
 
 sub front_page : Path Args(0) {
     my ( $self, $c ) = @_;
+
     my $front_page = $c->model('DB::Config')->find('front page');
+    $c->stash( activelink => { 'home' => 'activelink' } );
     if( $front_page->value eq 'blog' ) {
         $self->blog_index($c);
     }
     else {
-        $c->forward( $front_page->value );
+        my $page = $c->model('DB::Page')
+          ->search( { name => { like => $c->ravlog_url_to_query($front_page->value) } } )->first();
+        $c->stash->{page}    = $page;
+        $c->stash( template => 'page.tt' );
     }
 }
 
 sub blog_index {
+   my ( $self, $c ) = @_;
    my @articles = $c->model('DB::Article')->get_latest_articles();
    $c->stash->{articles} = [@articles];
    $c->stash->{template} = 'blog_index.tt';
 }
 
 sub blog : Path('/blog') Args(0) {
-    my ( $self, $c ) = @_
+    my ( $self, $c ) = @_;
+    $c->stash( activelink => { 'blog' => 'activelink' } );
     $self->blog_index($c);
 }
 

lib/RavLog/Schema.pm

@@ -5,6 +5,6 @@ use warnings;
 
 use base 'DBIx::Class::Schema';
 
-__PACKAGE__->load_classes;
+__PACKAGE__->load_namespaces;
 
 1;

lib/RavLog/Schema/Result/Config.pm

@@ -6,7 +6,7 @@ use warnings;
 use base 'DBIx::Class';
 
 __PACKAGE__->load_components( "Core" );
-__PACKAGE__->table("links");
+__PACKAGE__->table("config");
 __PACKAGE__->add_columns(
    "name",
    {

ravlog.pl

@@ -7,7 +7,7 @@
     description => 'a writers blog',
   },
   'Model::DB' => {
-    schema_class => 'RavLog::Schema::DB',
+    schema_class => 'RavLog::Schema',
     connect_info => [
         'dbi:mysql:dbname=ravlog;user=ravlog_admin;password=rlpw'
     ],

root/templates/default/layout.tt

@@ -32,6 +32,9 @@
 				<br class="clear"/>
 				<ul id="tab_content">
 				<li id="home" class='[% activelink.home %]'><a href="/">Home</a></li>
+                [% IF blog_page %]
+                <li id="blog_page" class="blog [% activelink.blog %]"><a href="/blog">Blog</a></li>
+                [% END %]
 				[% FOREACH page = pages %]
 				<li id="[% page.name %]"class='[% activelink.${c.ravlog_txt_to_url(page.name)} %]' ><a href="[% c.base_uri %]/page/[% c.ravlog_txt_to_url(page.name) %]">[% page.name %]</a></li>
 				[% END %]

script/create_login.pl

@@ -1,13 +1,13 @@
 #!/usr/bin/env perl
 
 use lib './lib';
-use RavLog::Schema::DB;
+use RavLog::Schema;
 use Data::Dumper;
 use Config::Any::Perl;
 
 my $cfg = Config::Any::Perl->load('ravlog_local.pl');
 
-my $db = RavLog::Schema::DB->connect($cfg->{'Model::DB'}->{connect_info}->[0]);
+my $db = RavLog::Schema->connect($cfg->{'Model::DB'}->{connect_info}->[0]);
 
 if(!defined $db) {
 	print "Can't connect to database!\n";

script/create_sql.pl

@@ -1,12 +1,12 @@
 #!/usr/bin/env perl
 use lib './lib';
-use RavLog::Schema::DB;
+use RavLog::Schema;
 use Data::Dumper;
 use Config::Any::Perl;
 
 my $cfg = Config::Any::Perl->load('ravlog.pl');
 
-my $db = RavLog::Schema::DB->connect($cfg->{RavLog}->{connect_info});
+my $db = RavLog::Schema->connect($cfg->{RavLog}->{connect_info});
 
 #$db->deploy();
 $db->create_ddl_dir();

script/deploy.pl

@@ -1,9 +1,9 @@
 use lib './lib';
-use RavLog::Schema::DB;
+use RavLog::Schema;
 use Data::Dumper;
 use Config::Any::YAML;
 
-my $db = RavLog::Schema::DB->connect('dbi:SQLite:./mydb.db');
+my $db = RavLog::Schema->connect('dbi:SQLite:./mydb.db');
 
 if(!defined $db) {
 	print "Can't connect to database!\n";

t/comments.t

@@ -6,7 +6,7 @@ use Test::WWW::Mechanize::Catalyst;
 use String::Random qw(random_string random_regex);
 
 my $mech = Test::WWW::Mechanize::Catalyst->new(catalyst_app => 'RavLog');
-my $schema = RavLog::Schema::DB->connect('dbi:mysql:dbname=ravlog;user=ravlog_admin;password=rlpw');
+my $schema = RavLog::Schema->connect('dbi:mysql:dbname=ravlog;user=ravlog_admin;password=rlpw');
 
 $mech->get_ok( '/test_test/view', 'Request should succeed' );
 warn $mech->content;

t/db.t

@@ -1,12 +1,13 @@
 use strict;
 use warnings;
-use Test::More tests => 4;
+use Test::More;
 use lib 't/lib';
 
 
-use_ok( 'RavLog::Schema::DB');
+use_ok( 'RavLog::Schema');
+use_ok( 'RavLog::Schema::Result::User');
 
-my $schema = RavLog::Schema::DB->connect('dbi:mysql:dbname=ravlog;user=ravlog_admin;password=rlpw');
+my $schema = RavLog::Schema->connect('dbi:mysql:dbname=ravlog;user=ravlog_admin;password=rlpw');
 
 ok($schema, 'get db schema');
 
@@ -28,3 +29,5 @@ foreach my $article (@articles)
 
 my $article = $schema->resultset('Article')->new_result({});
 ok( $article, 'new result for Article worked' );
+
+done_testing;