Changeset 112 in bookmarks for trunk/lib/Bookmarks/List.pm

Timestamp:

02/17/16 22:05:50 (8 years ago)

Author:

peter

Message:

• Added the sidebar resource.
• Moved the list resources to list.
• Respond with a 406 if the required modules are not available for XBEL, Atom, or CSV.

File:

• trunk/lib/Bookmarks/List.pm (modified) (9 diffs)

trunk/lib/Bookmarks/List.pm

@@ -32 +32 @@
             text => 'JSON',
             type => 'application/json',
+            path => 'list',
             query => {
                 %$query,
@@ -40 +41 @@
             text => 'XBEL',
             type => 'application/xml',
+            path => 'list',
             query => {
                 %$query,
@@ -56 +58 @@
             text => 'CSV',
             type => 'text/csv',
+            path => 'list',
             query => {
                 %$query,
@@ -64 +67 @@
             text => 'URI List',
             type => 'text/uri-list',
+            path => 'list',
             query => {
                 %$query,
@@ -72 +76 @@
             text => 'HTML',
             type => 'text/html',
+            path => 'list',
             query => {
                 %$query,
@@ -105 +110 @@
 sub as_xbel {
     my $self = shift;
-    require XML::XBEL;
-    #TODO: conditional support; if XML::XBEL is not present, return a 5xx response
+
+    eval { require XML::XBEL; } or
+        return [406, ['Content-Type' => 'text/plain'], ['This server does not support XBEL lists']];
 
     my $xbel = XML::XBEL->new;
@@ -147 +153 @@
 sub as_csv {
     my $self = shift;
-    require Text::CSV::Encoded;
+
+    eval { require Text::CSV::Encoded } or
+        return [406, ['Content-Type' => 'text/plain'], ['This server does not support CSV lists']];
+
     my $csv = Text::CSV::Encoded->new({ encoding_out => 'utf8' });
     my $text = qq{id,uri,title,tags,ctime,mtime\n};
@@ -182 +191 @@
     my $template = Template->new({ INCLUDE_PATH => File::Basename::dirname($INC{'Bookmarks/List.pm'}) });
 
-    my @all_tags = $self->bookmarks->get_tags({ selected => @{ $self->tags }[0] });
-    my @cotags = $self->bookmarks->get_cotags({ search => $self->search });
-
     $template->process(
-        'list.tt',
+        'html_list.tt',
         {
             base_url     => $self->bookmarks->base_uri,
             title        => $self->title,
             query        => $self->query,
-            selected_tag => @{ $self->tags }[0],
-            search_tags  => $self->tags,
             links        => [ $self->_get_list_links('text/html', { q => $self->query, tag => $self->tags }) ],
-            all_tags     => \@all_tags,
-            cotags       => \@cotags,
             resources    => $self->results,
             pages        => $self->search->pages,
@@ -207 +209 @@
     my $self = shift;
 
-    require XML::Atom;
+    eval { require XML::Atom } or
+        return [406, ['Content-Type' => 'text/plain'], ['This server does not support Atom lists']];
+
     $XML::Atom::DefaultVersion = "1.0";