html/zone_days.html html/zone_next_pickup.html @@ -3,6 +3,7 @@ <h1>Zone - [% zone %]</h1> <ul> <li><a href="[% zone_uri %]/pickupdays">Pickup Days</a></li> + <li><a href="[% zone_uri %]/nextpickup">Next Pickup</a></li> </ul> </body> </html> html/zone.html @@ -23,6 +23,7 @@ sub handle_request { [ qr{^/zones\.json$} => \&zones_json ], [ qr{^/zones/([^/]+)$} => \&zone_html ], [ qr{^/zones/([^/]+)/pickupdays$} => \&zone_days ], + [ qr{^/zones/([^/]+)/nextpickup$} => \&zone_next_pickup ], ); for my $match (@func_map) { my ($regex, $todo) = @$match; @@ -80,6 +81,17 @@ sub zone_days { return $self->process_template('zone_days.html', \%param); } +sub zone_next_pickup { + my $self = shift; + my $req = shift; + my $zone = shift; + my %param = ( + zone => $zone, + day => $self->model->next_pickup($zone), + ); + return $self->process_template('zone_next_pickup.html', \%param); +} + sub response { my $self = shift; my $ct = shift; lib/App/VanTrash/Controller.pm @@ -1,6 +1,7 @@ package App::VanTrash::Model; use Moose; use YAML qw/LoadFile/; +use DateTime; has 'file' => (is => 'ro', isa => 'Str', default => 'trash-zone-times.yaml'); has 'zones' => (is => 'ro', lazy_build => 1); @@ -12,6 +13,21 @@ sub days { return [sort {$a cmp $b} @{ $self->hash->{$zone} }]; } +sub next_pickup { + my $self = shift; + my $zone = shift; + + my $days = $self->days($zone); + my $now = time; + for my $d (@$days) { + $d =~ m/^(\d+)-(\d+)-(\d+)$/; + my $dt = DateTime->new(year => $1, month => $2, day => $3); + next if $now > $dt->epoch; + return $d; + } + return "N/A"; +} + sub _build_zones { my $self = shift; return [sort {$a cmp $b} keys %{ $self->hash }]; lib/App/VanTrash/Model.pm 7940ee48cdc52205a14749adedd4114d13492a89 Luke Closs gravatar@5thplane.com http://github.com/lukec/vantrash/commit/d30d2826a1a3f09a2dbc6951e76c4e332d6a4206 d30d2826a1a3f09a2dbc6951e76c4e332d6a4206 2009-07-05T03:47:23-07:00 2009-07-05T03:47:23-07:00 add call to find the next trash day for a zone 091e7af3b2e6807cb49405b41f26decd12b9b690 Luke Closs gravatar@5thplane.com