Index: /trunk/Bookmark.pm
===================================================================
--- /trunk/Bookmark.pm (revision 65)
+++ /trunk/Bookmark.pm (revision 66)
@@ -2,4 +2,5 @@
use Moose;
+use HTTP::Date qw{time2isoz};
has id => ( is => 'ro' );
@@ -15,4 +16,10 @@
has tags => ( is => 'rw' );
has bookmark_uri => ( is => 'rw' );
+has exists => ( is => 'ro' );
+
+sub created { scalar localtime $_[0]->ctime }
+sub updated { scalar localtime $_[0]->mtime }
+sub created_iso { (my $iso = time2isoz($_[0]->ctime)) =~ s/\D//g; return $iso; }
+sub updated_iso { (my $iso = time2isoz($_[0]->ctime)) =~ s/\D//g; return $iso; }
sub BUILD {
Index: /trunk/BookmarkController.pm
===================================================================
--- /trunk/BookmarkController.pm (revision 65)
+++ /trunk/BookmarkController.pm (revision 66)
@@ -119,7 +119,9 @@
$template->process(
'bookmark.tt',
- {
- uri => $self->request->param('uri'),
- title => $self->request->param('title') || '',
+ {
+ bookmark => {
+ uri => $self->request->param('uri'),
+ title => $self->request->param('title') || '',
+ },
},
\my $output,
@@ -337,14 +339,8 @@
} else {
# display the bookmark form for this bookmark
- # TODO: these should probably be methods on the Bookmark class
- $bookmark->{exists} = 1;
- $bookmark->{created} = localtime($bookmark->ctime);
- $bookmark->{updated} = localtime($bookmark->mtime);
- ($bookmark->{created_iso} = time2isoz($bookmark->ctime)) =~ s/\D//g;
- ($bookmark->{updated_iso} = time2isoz($bookmark->mtime)) =~ s/\D//g;
my $template = Template->new;
$template->process(
'bookmark.tt',
- $bookmark,
+ { bookmark => $bookmark },
\my $output,
);
Index: /trunk/Bookmarks.pm
===================================================================
--- /trunk/Bookmarks.pm (revision 65)
+++ /trunk/Bookmarks.pm (revision 66)
@@ -63,4 +63,5 @@
return Bookmark->new({
%$bookmark,
+ exists => 1,
tags => [ $self->get_tags({ uri => $bookmark->{uri} }) ],
base_uri => $self->base_uri,
Index: /trunk/bookmark.tt
===================================================================
--- /trunk/bookmark.tt (revision 65)
+++ /trunk/bookmark.tt (revision 66)
@@ -1,5 +1,5 @@
- Bookmark: [% title or uri %]
+ Bookmark: [% bookmark.title or bookmark.uri %]