Changeset 88 in bookmarks for trunk

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

Files:

• bkmk (modified) (2 diffs)
• lib/Bookmarks.pm (modified) (3 diffs)
• lib/Bookmarks/Controller.pm (modified) (3 diffs)
• lib/Bookmarks/List.pm (modified) (1 diff)
• lib/Bookmarks/Search.pm (modified) (1 diff)
• scan (modified) (1 diff)

trunk/bkmk

@@ -46 +46 @@
     list => sub {
         my @tags = @_;
-        my $resources = $bookmarks->get_bookmarks({
+        my $resources = $bookmarks->search({
             tags => \@tags
         });
@@ -77 +77 @@
     dump => sub {
         my ($dump_file) = @_;
-        my $dump = [ map { $_->TO_JSON } @{ $bookmarks->get_bookmarks->results } ];
+        my $dump = [ map { $_->TO_JSON } @{ $bookmarks->search->results } ];
         $dump_file ? YAML::DumpFile($dump_file, $dump) : print Dump($dump);
     },

trunk/lib/Bookmarks.pm

@@ -7 +7 @@
 
 use Bookmark;
-use Bookmarks::List;
 use Bookmarks::Search;
 
@@ -100 +99 @@
 }
 
-sub get_bookmarks {
+sub search {
     my $self = shift;
     my $params = shift || {};
@@ -130 +129 @@
         });
     }
-    return Bookmarks::List->new({
-        bookmarks => $self,
-        search    => $search,
-        results   => \@resources,
-    });
+    $search->results(\@resources);
+
+    return $search;
 }
 

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;

trunk/scan

@@ -25 +25 @@
 my $csv = Text::CSV->new;
 
-for my $bookmark (@{ $bookmarks->get_bookmarks->results }) {
+for my $bookmark (@{ $bookmarks->search->results }) {
     printf "%3d %s\n", $bookmark->id, $bookmark->uri unless $CSV;
     my $response = $ua->head($bookmark->uri);