switch to Moo accessors in IdiotBox.pm

[catagits/App-IdiotBox.git] / lib / App / IdiotBox.pm

diff --git a/lib/App/IdiotBox.pm b/lib/App/IdiotBox.pm
index 497cb98..af5bc38 100644 (file)
--- a/lib/App/IdiotBox.pm
+++ b/lib/App/IdiotBox.pm
@@ -1,7 +1,6 @@
 package App::IdiotBox;
 
 use Web::Simple __PACKAGE__;
-use Method::Signatures::Simple;
 use FindBin;
 use HTML::Zoom;
 use HTML::Zoom::FilterBuilder::Template;
@@ -42,13 +41,15 @@ use List::Util qw(first);
   }
 }
 
-default_config(
+has $_ => (is => 'ro') for qw(recent_announcements buckets);
+
+sub default_config {
   template_dir => 'share/html',
   store => 'SQLite',
   db_file => 'var/lib/idiotbox.db',
   base_url => 'http://localhost:3000/',
   base_dir => do { use FindBin; $FindBin::Bin },
-);
+}
 
 sub BUILD {
   my $self = shift;
@@ -61,26 +62,22 @@ sub BUILD {
   $store_class->bind($self);
 }
   
-dispatch {
+sub dispatch_request {
+  my $self = shift;
   sub (/) { $self->show_front_page },
-  subdispatch sub (/*/...) {
+  sub (/*/...) {
     my $bucket = $self->buckets->get({ slug => $_[1] });
-    [
-      sub (/) {
-        $self->show_bucket($bucket)
-      },
-      sub (/*/) {
-        $self->show_video($bucket->videos->get({ slug => $_[1] }));
-      }
-    ]
+    sub (/) {
+      $self->show_bucket($bucket)
+    },
+    sub (/*/) {
+      $self->show_video($bucket->videos->get({ slug => $_[1] }));
+    }
   }
-};
-
-method recent_announcements { $self->{recent_announcements} }
-
-method buckets { $self->{buckets} }
+}
 
-method show_front_page {
+sub show_front_page {
+  my $self = shift;
   my $ann = $self->recent_announcements;
   $self->html_response(
     front_page => sub {
@@ -103,7 +100,8 @@ method show_front_page {
   );
 }
 
-method show_bucket ($bucket) {
+sub show_bucket {
+  my ($self, $bucket) = @_;
   $self->html_response(bucket => sub {
     $_->select('.bucket-name')->replace_content($bucket->name)
       ->select('#video-list')->repeat_content($bucket->videos->map(sub {
@@ -119,7 +117,8 @@ method show_bucket ($bucket) {
   });
 }
 
-method show_video ($video) {
+sub show_video {
+  my ($self, $video) = @_;
   my $video_file = first {
     -e join('/', $self->config->{base_dir}, $_)
   } map {
@@ -141,22 +140,26 @@ method show_video ($video) {
   });
 }
 
-method html_response ($template_name, $selectors) {
+sub html_response {
+  my ($self, $template_name, $selectors) = @_;
   my $io = $self->_zoom_for($template_name => $selectors)->to_fh;
   return [ 200, [ 'Content-Type' => 'text/html' ], $io ]
 }
 
-method _template_filename_for ($name) {
+sub _template_filename_for {
+  my ($self, $name) = @_;
   $self->{config}{template_dir}.'/'.$name.'.html';
 }
 
-method _layout_zoom {
+sub _layout_zoom {
+  my $self = shift;
   $self->{layout_zoom} ||= HTML::Zoom->from_file(
     $self->_template_filename_for('layout')
   )
 }
 
-method _zoom_for ($template_name, $selectors) {
+sub _zoom_for {
+  my ($self, $template_name, $selectors) = @_;
   ($self->{zoom_for_template}{$template_name} ||= do {
     my @body;
     HTML::Zoom->from_file(
@@ -170,21 +173,24 @@ method _zoom_for ($template_name, $selectors) {
   })->apply($selectors);
 }
 
-method base_url {
+sub base_url {
+  my $self = shift;
   $self->{base_url} ||= do {
     (my $u = $self->config->{base_url}) =~ s/\/$//;
     "${u}/";
   }
 }
 
-method _run_cli {
+sub _run_cli {
+  my $self = shift;
   unless (@ARGV == 1 && $ARGV[0] eq 'import') {
     return $self->SUPER::_run_cli(@_);
   }
   $self->cli_import;
 }
 
-method _cli_usage {
+sub _cli_usage {
+  my $self = shift;
   "To import data into your idiotbox install, chdir into a directory\n".
   "containing video files and run:\n".
   "\n".
@@ -193,7 +199,8 @@ method _cli_usage {
   $self->SUPER::_cli_usage(@_);
 }
 
-method cli_import {
+sub cli_import {
+  my $self = shift;
   require App::IdiotBox::Importer;
   App::IdiotBox::Importer->run($self);
 }