Changeset 88 in bookmarks for trunk/lib/Bookmarks

Timestamp:

06/04/15 22:00:25 (9 years ago)

Author:

peter

Message:

Better separation of the model for searching and the web app controller/representation layer

• renamed Bookmarks::get_bookmarks() to search()
• Bookmarks::search() now returns a Bookmarks::Search object instead of a Bookmarks::List
• search results now reside in the Bookmarks::Search class

Location:

trunk/lib/Bookmarks

Files:

• Controller.pm (modified) (3 diffs)
• List.pm (modified) (1 diff)
• Search.pm (modified) (1 diff)

trunk/lib/Bookmarks/Controller.pm

@@ -7 +7 @@
 use JSON;
 use Bookmarks;
+use Bookmarks::List;
 use URI;
 use Template;
@@ -83 +84 @@
     my $offset = $self->request->param('offset');
 
-    my $list = $self->bookmarks->get_bookmarks({
-        query  => $query,
-        tags   => \@tags,
-        limit  => $limit,
-        offset => $offset,
+    my $list = Bookmarks::List->new({
+        bookmarks => $self->bookmarks,
+        search    => $self->bookmarks->search({
+            query  => $query,
+            tags   => \@tags,
+            limit  => $limit,
+            offset => $offset,
+        }),
     });
 
@@ -104 +108 @@
 
     # construct a feed from the most recent 12 bookmarks
-    my $list = $self->bookmarks->get_bookmarks({ query => $query, tags => \@tags, limit => 12 });
+    my $list = Bookmarks::List->new({
+        bookmarks => $self->bookmarks,
+        search    => $self->bookmarks->search({ query => $query, tags => \@tags, limit => 12 }),
+    });
     return $list->as_atom;
 }

trunk/lib/Bookmarks/List.pm

@@ -13 +13 @@
     is => 'ro',
     isa => 'Bookmarks::Search',
-    handles => [qw{query tags limit offset}],
+    handles => [qw{query tags limit offset results}],
 );
-has results => ( is => 'ro' );
 has title => (
     is => 'ro',

trunk/lib/Bookmarks/Search.pm

@@ -11 +11 @@
 has offset => (is => 'ro');
 
+has results => (is => 'rw', default => sub { [] });
+
 # module return
 1;