Changeset 7 in bookmarks for trunk

Timestamp:

03/23/12 23:50:49 (13 years ago)

Author:

peter

Message:

• added a base_uri property to the Bookmarks class; if present, it adds a bookmark_uri key to bookmarks returned by get_bookmark() and get_resources()
• an individual bookmark can be returned as JSON by passing a "?format=json" parameter to the individual bookmark GET request

Location:

trunk

Files:

• BookmarkApp.pm (modified) (4 diffs)
• Bookmarks.pm (modified) (3 diffs)

trunk/BookmarkApp.pm

@@ -11 +11 @@
 use Bookmarks;
 
+use URI;
+my $base_uri = URI->new;
+$base_uri->scheme('http');
+$base_uri->host($ENV{SERVER_NAME});
+$base_uri->port($ENV{SERVER_PORT});
+$base_uri->path($ENV{SCRIPT_NAME} . '/');
+
 my $dbname = 'new.db';
 my $dbh = DBI->connect("dbi:SQLite:dbname=$dbname", "", "", { RaiseError => 1 });
 my $bookmarks = Bookmarks->new({
     dbh => $dbh,
+    base_uri => $base_uri,
 });
 
@@ -72 +80 @@
         return decode_utf8(
             encode_json({
-                resources => \@resources,
+                bookmarks => \@resources,
             })
         );
@@ -102 +110 @@
     my $id = $self->param('id');
     my $field = $self->param('field');
+    my $format = $self->query->param('format') || 'html';
 
     my $bookmark = $bookmarks->get_bookmark({ id => $id });
@@ -114 +123 @@
             return ref $value eq 'ARRAY' ? join(',', @{ $value }) : $value;
         } else {
-            # display the bookmark form for this bookmark
-            $bookmark->{exists} = 1;
-            $bookmark->{created} = "Created " . localtime($bookmark->{ctime});
-            $bookmark->{created} .= '; Updated ' . localtime($bookmark->{mtime}) unless $bookmark->{ctime} == $bookmark->{mtime};
-            $self->header_props(
-                -type    => 'text/html',
-                -charset => 'UTF-8',
-            );
-            return $self->tt_process(
-                'bookmark.tt',
-                $bookmark,
-            );
+            if ($format eq 'json') {
+                $self->header_props(
+                    -type    => 'application/json',
+                    -charset => 'UTF-8',
+                );
+                return decode_utf8(encode_json($bookmark));
+            } else {
+                # display the bookmark form for this bookmark
+                $bookmark->{exists} = 1;
+                $bookmark->{created} = "Created " . localtime($bookmark->{ctime});
+                $bookmark->{created} .= '; Updated ' . localtime($bookmark->{mtime}) unless $bookmark->{ctime} == $bookmark->{mtime};
+                $self->header_props(
+                    -type    => 'text/html',
+                    -charset => 'UTF-8',
+                );
+                return $self->tt_process(
+                    'bookmark.tt',
+                    $bookmark,
+                );
+            }
         }
     } else {

trunk/Bookmarks.pm

@@ -4 +4 @@
 use Bookmark;
 
-has dbh => ( is => 'ro');
+has dbh      => ( is => 'ro' );
+has base_uri => ( is => 'ro' );
 
 sub get_bookmark {
@@ -24 +25 @@
         $sth_tag->execute($bookmark->{uri});
         $bookmark->{tags} = [ map { $$_[0] } @{ $sth_tag->fetchall_arrayref } ];
+        if ($self->base_uri) {
+            $bookmark->{bookmark_uri} = $self->base_uri . $bookmark->{id};
+        }
     }
     return $bookmark;
@@ -46 +50 @@
         $sth_tag->execute($resource->{uri});
         $resource->{tags} = [ map { $$_[0] } @{ $sth_tag->fetchall_arrayref } ];
+        if ($self->base_uri) {
+            $resource->{bookmark_uri} = $self->base_uri . $resource->{id};
+        }
         push @resources, $resource;
     }