pluto-admin 0.2.0 → 0.2.1

data/Manifest.txt

@@ -7,11 +7,14 @@ lib/pluto/admin/public/feed-icon-10x10.png
 lib/pluto/admin/public/style.css
 lib/pluto/admin/server.rb
 lib/pluto/admin/version.rb
-lib/pluto/admin/views/_debug.erb
-lib/pluto/admin/views/_version.erb
 lib/pluto/admin/views/debug.erb
+lib/pluto/admin/views/feed.erb
 lib/pluto/admin/views/feeds.erb
+lib/pluto/admin/views/item.erb
 lib/pluto/admin/views/items.erb
 lib/pluto/admin/views/layout.erb
+lib/pluto/admin/views/shared/_debug.erb
+lib/pluto/admin/views/shared/_items.erb
+lib/pluto/admin/views/shared/_version.erb
 lib/pluto/admin/views/sites.erb
 lib/pluto/admin/views/timeline.erb

data/README.md

@@ -7,6 +7,7 @@ planet web admin - sintara web app ready to get mounted into your web app
 * bugs  :: [github.com/feedreader/pluto.admin/issues](https://github.com/feedreader/pluto.admin/issues)
 * gem   :: [rubygems.org/gems/pluto-admin](https://rubygems.org/gems/pluto-admin)
 * rdoc  :: [rubydoc.info/gems/pluto-admin](http://rubydoc.info/gems/pluto-admin)
+* forum :: [groups.google.com/group/feedreader](http://groups.google.com/group/feedreader)
 
 
 ## Usage
@@ -35,3 +36,9 @@ end
 
 The `pluto.admin` scripts are dedicated to the public domain.
 Use it as you please with no restrictions whatsoever.
+
+
+## Questions? Comments?
+
+Send them along to the [Planet Pluto and Friends Forum/Mailing List](http://groups.google.com/group/feedreader).
+Thanks!

data/Rakefile

@@ -11,7 +11,7 @@ Hoe.spec 'pluto-admin' do
   self.urls    = ['https://github.com/feedreader/pluto.admin']
 
   self.author  = 'Gerald Bauer'
-  self.email   = 'webslideshow@googlegroups.com'
+  self.email   = 'feedreader@googlegroups.com'
 
   # switch extension to .markdown for gihub formatting
   self.readme_file  = 'README.md'
@@ -29,4 +29,4 @@ Hoe.spec 'pluto-admin' do
   }
 
 
-end
+end

data/lib/pluto/admin/server.rb

@@ -50,11 +50,19 @@ class Server < Sinatra::Base
   def feeds_path
     "#{path_prefix}/feeds"
   end
+  
+  def feed_path( feed )
+    "#{path_prefix}/feed/#{feed.key}"
+  end
 
   def items_path
     "#{path_prefix}/items"
   end
-  
+
+  def item_path( item )
+    "#{path_prefix}/item/#{item.id}"
+  end
+
   def timeline_path
     "#{path_prefix}/time"
   end
@@ -67,6 +75,9 @@ class Server < Sinatra::Base
     url( '/' )
   end
 
+  def content_tag( tag, text )
+    "<#{tag}>#{text}</#{tag}>"
+  end
 
   def link_to( text, url, opts={} )
     attributes = ""
@@ -77,6 +88,38 @@ class Server < Sinatra::Base
   end
 
 
+  def render_items( items, opts={} )
+    erb( 'shared/_items'.to_sym,
+         layout: false,
+         locals: {
+                    items: items,
+                    show_feed: opts[:show_feed].present?
+                  })
+  end
+
+  def prettify_xml( xml )
+    require 'rexml/document'
+    
+    begin
+      d = REXML::Document.new( xml )
+    
+      # d.write( pretty_xml="", 2 )
+      # pretty_xml  # return prettified xml
+    
+      formatter = REXML::Formatters::Pretty.new( 2 )  # indent=2
+      formatter.compact = true # This is the magic line that does what you need!
+      pretty_xml = formatter.write( d.root, "" )  # todo/checl: what's 2nd arg used for ??
+      pretty_xml
+    rescue Exception => ex
+      "warn: prettify_xml failed: #{ex}\n\n\n" + xml
+    end
+  end
+
+
+  def h( text )
+    Rack::Utils.escape_html(text)
+  end
+
   ##############################################
   # Controllers / Routing / Request Handlers
 
@@ -88,10 +131,20 @@ class Server < Sinatra::Base
     erb :sites   # needed or default fallthrough possible ???
   end
 
+  get '/feed/:key' do |key|
+    @feed = Feed.find_by_key!( key )
+    erb :feed
+  end
+
   get '/feeds' do
     erb :feeds   # needed or default fallthrough possible ???
   end
 
+  get '/item/:id' do |id|
+    @item = Item.find( id )
+    erb :item
+  end
+
   get '/items' do
     erb :items   # needed or default fallthrough possible ???
   end

data/lib/pluto/admin/version.rb

@@ -1,4 +1,4 @@
 
 module PlutoAdmin
-   VERSION = '0.2.0'
+   VERSION = '0.2.1'
 end

data/lib/pluto/admin/views/debug.erb

@@ -11,5 +11,5 @@
   timeline_path: <%= timeline_path %>
 </pre>
 
-<%= erb :'_debug' %>
+<%= erb :'shared/_debug' %>
 

data/lib/pluto/admin/views/feed.erb

@@ -0,0 +1,100 @@
+
+<% feed = @feed %>
+
+<h2>
+ 
+  <span class='key'><%= feed.key %></span>
+
+  <a href='<%= feed.url %>'>
+     <b><%= feed.title %></b>
+   </a>
+
+  <!-- fix: use class format ?? -->
+  <span class='key'>
+     <%= feed.format %>
+  </span>
+
+
+   <a href='<%= feed.feed_url %>'>
+     <img src='<%= url( "/feed-icon-10x10.png" )%>'></img>
+   </a>
+
+  <span class='key'>
+    -   
+  Update:
+   <% if feed.fetched %>
+      <%= feed.fetched.strftime( '%b %d, %Y %H:%M' ) %>
+   <% else %>
+        ---
+   <% end %>
+  </span>
+</h2>
+
+<p>
+
+       <%# if feed.summary || feed.title2 %>
+       <% if feed.summary %>
+         <%= feed.summary %> <!-- rss/description -->
+         <%#= feed.title2 %>  <!-- atom/subtitle -->
+       <% else %>
+          --no-summary--
+       <% end %>
+</p>
+ 
+<p>  published: 
+     <% if feed.published? %>
+        <%= feed.published.strftime( '%b %d, %Y %H:%M' )  %>
+     <% else %>
+         ---
+     <% end %>
+
+      <br> updated:
+     <% if feed.touched? %>
+       <%= feed.touched.strftime( '%b %d, %Y %H:%M' ) %>
+     <% else %>
+        ---
+     <% end %>
+
+       <br> last-build:
+       <% if feed.built? %>
+        <%= feed.built.strftime( '%b %d, %Y %H:%M' ) %>
+     <% else %>
+        ---
+     <% end %>
+      
+      <br> generator:
+    <% if feed.generator %>
+       <%= feed.generator %>
+    <% else %>
+       ---
+    <% end %>
+</p>
+
+<p>  HTTP 
+      <!-- make <> 200,304  red/bold??? -->
+      <%= feed.http_code %>
+
+     | last-modified: 
+     
+     <% if feed.http_last_modified %>
+       <%= feed.http_last_modified %>
+     <% else %>
+         ---
+     <% end %>
+
+      | etag: 
+     <% if feed.http_etag %>
+       <%= feed.http_etag %>
+     <% else %>
+         ---
+     <% end %>
+</p>
+
+<%= render_items( feed.items.latest ) %>
+
+<h3>Source</h3>
+
+<% if feed.body %>
+  <pre><code><%= h prettify_xml( feed.body ) %>
+  </code></pre>
+<% end %>

data/lib/pluto/admin/views/feeds.erb

@@ -2,17 +2,16 @@
 <h2><%= Feed.count %> Feeds</h2>
 
 <table>
-<% Feed.latest.all.each do |feed| %>
+<% Feed.latest.each do |feed| %>
  <tr>
    <td class='key'><%= feed.key %></td>
    <td>
-       <a href='<%= feed.url %>'>
-         <b><%= feed.title %></b>
-       </a>
+      <%= link_to( content_tag( :b, feed.title ), feed_path( feed )) %>
        <span class='count'>(<%= feed.items.count %>)</span> <br>
-       <% if feed.summary || feed.title2 %>
+       <%# if feed.summary || feed.title2 %>
+       <% if feed.summary %>
          <%= feed.summary %> <!-- rss/description -->
-         <%= feed.title2 %>  <!-- atom/subtitle -->
+         <%#= feed.title2 %>  <!-- atom/subtitle -->
        <% else %>
           --no-summary--
        <% end %>
@@ -22,22 +21,22 @@
                            </a> 
    </td>
    <td>
-     <% if feed.published_at? %>
-        <%= feed.published_at.strftime( '%b %d, %Y %H:%M' )  %>
+     <% if feed.published? %>
+        <%= feed.published.strftime( '%b %d, %Y %H:%M' )  %>
      <% else %>
          --no-published--
      <% end %>
    </td>
    <td>
-     <% if feed.touched_at %>
-       <%= feed.touched_at.strftime( '%b %d, %Y %H:%M' ) %>
+     <% if feed.touched? %>
+       <%= feed.touched.strftime( '%b %d, %Y %H:%M' ) %>
      <% else %>
         --no-updated--
      <% end %>
    </td>
    <td>
-     <% if feed.built_at %>
-        <%= feed.built_at.strftime( '%b %d, %Y %H:%M' ) %>
+     <% if feed.built? %>
+        <%= feed.built.strftime( '%b %d, %Y %H:%M' ) %>
      <% else %>
         --no-last-build--
      <% end %>
@@ -50,13 +49,30 @@
     <% end %>
    </td>
    <td>
-    <% if feed.fetched_at %>
-      <%= feed.fetched_at.strftime( '%b %d, %Y %H:%M' ) %>
+    <% if feed.fetched %>
+      <%= feed.fetched.strftime( '%b %d, %Y %H:%M' ) %>
     <% else %>
         --no-fetched--
     <% end %>
    </td>
-   <td><%= feed.etag %></td>
+   <td>
+      <!-- make <> 200,304  red/bold??? -->
+      <%= feed.http_code %> 
+   </td>
+   <td>
+     <% if feed.http_etag %>
+       <%= feed.http_etag %>
+     <% else %>
+         --no-etag--
+     <% end %>
+   </td>
+   <td>
+     <% if feed.http_last_modified %>
+        <%= feed.http_last_modified %>
+     <% else %>
+         --no-last-modified--
+     <% end %>
+   </td>
  </tr>
 <% end %>
 </table>

data/lib/pluto/admin/views/item.erb

@@ -0,0 +1,82 @@
+
+<% item = @item %>
+
+<p>
+  <%= link_to item.feed.title, feed_path( item.feed ) %> 
+</p>
+
+<h2>
+ <%= link_to item.title, item.url %>
+  
+  <!-- fix: use class format ?? -->
+  <span class='key'>
+     <%= item.feed.format %>
+  </span>
+
+   <a href='<%= item.feed.feed_url %>'>
+     <img src='<%= url( "/feed-icon-10x10.png" )%>'></img>
+   </a> 
+
+  <span class='key'>  
+  - 
+  Update: 
+    <% if item.fetched %>
+      <%= item.fetched.strftime( '%b %d, %Y %H:%M' ) %>
+    <% else %>
+        ---
+    <% end %>
+  </span>
+</h2>
+
+<p>
+ guid: <span class='key'><%= item.guid %></span>
+ 
+ <br>
+
+ published:
+     <% if item.published? %>
+        <%= item.published.strftime( '%b %d, %Y %H:%M' )  %>
+     <% else %>
+         ---
+     <% end %>
+ 
+ <br>
+  updated: 
+     <% if item.touched? %>
+       <%= item.touched.strftime( '%b %d, %Y %H:%M' ) %>
+     <% else %>
+        ---
+     <% end %>
+</p>
+
+
+<% if item.summary? %>
+  <h3>Summary
+   <span class='key'><%= item.summary.length %> bytes</span>
+  </h3>
+  <div>
+<pre><code><%= h item.summary %>
+</code></pre>
+  </div>
+<% else %>
+    <h3>Summary</h3>
+     <p>
+      --no-summary--
+     </p>
+<% end %>
+
+ 
+<% if item.content? %>
+  <h3>Content
+   <span class='key'><%= item.content.length %> bytes</span>
+  </h3>
+  <div>
+<pre><code><%= h item.content %>
+</code></pre>
+  </div>
+<% else %>
+   <h3>Content</h3>
+   <p>
+    --no-content--
+  </p>
+<% end %>

data/lib/pluto/admin/views/items.erb

@@ -1,60 +1,2 @@
 
-<h2><%= Item.count %> Items</h2>
-
-<table>
-<% Item.latest.all.each do |item| %>
- <tr>
-   <td><a href='<%= item.url %>'>
-          <%= item.title %>
-       </a>
-   </td>
-
-   <td>
-    <% if item.summary? %>
-       <%= item.summary.length %>
-    <% else %>
-      --no-summary--
-    <% end %>
-   </td>
-
-   <td>
-    <% if item.content? %>
-       <%= item.content.length %>
-    <% else %>
-      --no-content--
-    <% end %>
-   </td>
-
-   <td class='key'><%= item.guid %></td>
-
-   <td>
-     <% if item.published_at? %>
-        <%= item.published_at.strftime( '%b %d, %Y %H:%M' )  %>
-     <% else %>
-         --no-published--
-     <% end %>
-   </td>
-   <td>
-     <% if item.touched_at %>
-       <%= item.touched_at.strftime( '%b %d, %Y %H:%M' ) %>
-     <% else %>
-        --no-updated--
-     <% end %>
-   </td>
-   <td><a href='<%= item.feed.url %>'>
-         <%= item.feed.title %>
-       </a>
-       <a href='<%= item.feed.feed_url %>'>
-         <img src='<%= url( "/feed-icon-10x10.png" )%>'></img>
-       </a>
-   </td>
-   <td>
-    <% if item.fetched_at %>
-      <%= item.fetched_at.strftime( '%b %d, %Y %H:%M' ) %>
-    <% else %>
-        --no-fetched--
-    <% end %>
-   </td>
- </tr>
-<% end %>
-</table>
+<%= render_items( Item.latest, show_feed: true ) %>

data/lib/pluto/admin/views/layout.erb

@@ -1,23 +1,23 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <meta charset='UTF-8'>
-  <title>Pluto / Admin</title>
+  <meta charset='utf-8'>
+  <title>Pluto Admin</title>
   <link href="<%= url('/style.css') %>" rel='stylesheet'>
 </head>
 <body>
 
 <p>
-  Pluto |
-    <%= link_to 'Sites', sites_path %> <span class='count'>(<%= Site.count %>)</span> &bull;
-    <%= link_to 'Feeds', feeds_path %> <span class='count'>(<%= Feed.count %>)</span> &bull;
-    <%= link_to 'Items', items_path %> <span class='count'>(<%= Item.count %>)</span>  &bull;
+  Pluto Admin |
+    <%= link_to 'Sites', sites_path %> <span class='count'>(<%= Site.count %>)</span> &nbsp;
+    <%= link_to 'Feeds', feeds_path %> <span class='count'>(<%= Feed.count %>)</span> &nbsp;
+    <%= link_to 'Items', items_path %> <span class='count'>(<%= Item.count %>)</span>  &nbsp;
     <%= link_to 'Timeline', timeline_path %> <span class='count'>(<%= Action.count %>)</span>
 </p>
 
 <%= yield %>
 
-<%= erb :'_version' %>
+<%= erb :'shared/_version' %>
 
 </body>
 </html>

data/lib/pluto/admin/views/shared/_items.erb

@@ -0,0 +1,55 @@
+
+<h2><%= items.count %> Items</h2>
+
+<table>
+<% items.each_with_index do |item,index| %>
+ <tr>
+  <td class='count'>
+    [<%= index+1 %>]
+  </td>
+   <td>
+     <%= link_to item.title, item_path( item ) %>
+   </td>
+
+   <td>
+    <% if item.summary? %>
+       <%= item.summary.length %>
+    <% else %>
+      --no-summary--
+    <% end %>
+   </td>
+
+   <td>
+    <% if item.content? %>
+       <%= item.content.length %>
+    <% else %>
+      --no-content--
+    <% end %>
+   </td>
+
+   <td class='key'><%= item.guid %></td>
+
+   <td>
+     <% if item.published? %>
+        <%= item.published.strftime( '%b %d, %Y %H:%M' )  %>
+     <% else %>
+         --no-published--
+     <% end %>
+   </td>
+   <td>
+     <% if item.touched? %>
+       <%= item.touched.strftime( '%b %d, %Y %H:%M' ) %>
+     <% else %>
+        --no-updated--
+     <% end %>
+   </td>
+   
+<% if show_feed %>
+   <td>
+     <%= link_to item.feed.title, feed_path( item.feed ) %>
+   </td>
+<% end %>
+
+ </tr>
+<% end %>
+</table>

data/lib/pluto/admin/views/sites.erb

@@ -3,18 +3,19 @@
 <h2><%= Site.count %> Sites</h2>
 
 <table>
-<% Site.all.each do |site| %>
+<% Site.order(:id).each do |site| %>
  <tr>
    <td class='key'><%= site.key %></td>
    <td><%= site.title %>
         <span class='count'>(<%= site.feeds.count %>)</span>
    </td>
    <td>
-     <ul>
-       <% site.feeds.each do |feed| %>
-         <li><%= feed.title %></li>
+       <% site.feeds.order(:title).each_with_index do |feed,index| %>
+         <% if index > 0 %>
+            &bull;
+         <% end %>
+         <%= link_to feed.title, feed_path( feed ) %>
        <% end %>
-     </ul>
    </td>
   </tr>
 <% end %>

data/lib/pluto/admin/views/timeline.erb

@@ -2,7 +2,7 @@
 <h2>Timeline</h2>
 
 <table>
-<% Action.order( 'created_at DESC' ).all.each do |action| %>
+<% Action.order( 'created_at DESC' ).each do |action| %>
  <tr>
    <td><%= action.title %></td>
    <td><%= action.object %></td>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pluto-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-21 00:00:00.000000000 Z
+date: 2013-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &68931870 !ruby/object:Gem::Requirement
+  requirement: &73749590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *68931870
+  version_requirements: *73749590
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &68931620 !ruby/object:Gem::Requirement
+  requirement: &73749270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *68931620
+  version_requirements: *73749270
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &68931310 !ruby/object:Gem::Requirement
+  requirement: &73749030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *68931310
+  version_requirements: *73749030
 description: planet web admin - sintara web app ready to get mounted into your web
   app
-email: webslideshow@googlegroups.com
+email: feedreader@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -61,12 +61,15 @@ files:
 - lib/pluto/admin/public/style.css
 - lib/pluto/admin/server.rb
 - lib/pluto/admin/version.rb
-- lib/pluto/admin/views/_debug.erb
-- lib/pluto/admin/views/_version.erb
 - lib/pluto/admin/views/debug.erb
+- lib/pluto/admin/views/feed.erb
 - lib/pluto/admin/views/feeds.erb
+- lib/pluto/admin/views/item.erb
 - lib/pluto/admin/views/items.erb
 - lib/pluto/admin/views/layout.erb
+- lib/pluto/admin/views/shared/_debug.erb
+- lib/pluto/admin/views/shared/_items.erb
+- lib/pluto/admin/views/shared/_version.erb
 - lib/pluto/admin/views/sites.erb
 - lib/pluto/admin/views/timeline.erb
 homepage: https://github.com/feedreader/pluto.admin