pluto 0.6.0 → 0.7.0

data/Manifest.txt

@@ -12,12 +12,16 @@ lib/pluto/formatter.rb
 lib/pluto/models.rb
 lib/pluto/schema.rb
 lib/pluto/server.rb
+lib/pluto/server/public/feed-icon-10x10.png
 lib/pluto/server/public/style.css
 lib/pluto/server/views/_debug.erb
 lib/pluto/server/views/_version.erb
 lib/pluto/server/views/debug.erb
+lib/pluto/server/views/feeds.erb
 lib/pluto/server/views/index.erb
+lib/pluto/server/views/items.erb
 lib/pluto/server/views/layout.erb
+lib/pluto/server/views/sites.erb
 lib/pluto/updater.rb
 lib/pluto/version.rb
 templates/blank.html.erb

data/lib/pluto/server/public/style.css

@@ -1,6 +1,79 @@
+    /* fix: use sass w/ variables */
+   body {
+    font-family: sans-serif;
+    background-color: #F4F4F4;
+    color: #333333;
+   }
+   
+   a, a:visited {
+    text-decoration: none;
+    color: maroon;
+   }
+  
+   a:hover {
+    text-decoration: underline;
+    color: #1E68A6;
+    background-color: yellow;
+   }
 
-/* for testing some colors */
+   .item {
+    background-color: white;
+    border: 1px solid #9E9E9E;
+    padding: 0px 15px 15px 15px;
+    margin-bottom:  12px;
+   }
+   
+   .item_title {
+    margin-top: 0;
+    font-size: 16px;
+   }
+   
+   .feed_title {
+     margin-bottom: 5px;
+     font-size: 12px;
+   }
+   
+   .colright {
+     margin-left: 20px;
+   }
+   
+   ul.subscriptions {
+     list-style: none;
+     margin-left: 0;
+     padding-left: 0;
+   }
+   
+   /* fix: use .small instead */
+   .smaller {
+     font-size: 12px;
+     /* color: #666666; */ /* lighter gray than text gray */
+   }
+   
+   .item_content {
+    font-size: 14px;
+   }
 
-p { color: maroon;
-    background-color: grey; }
 
+/** key, count styles ***********/
+
+.key, .count
+{
+    font-size: 12px;
+    color: grey;
+}
+
+
+
+/** version block **********/
+
+.version {
+  text-align: center;
+  margin-top: 10px;
+  color: grey; }
+  .version a, .version span {
+    font-size: 12px;
+    color: grey; }
+
+/***************************/
+
+div.feedflare  { display: none; }

data/lib/pluto/server/views/_debug.erb

@@ -1,16 +1,16 @@
-<h3>Debug</h3>
+<h3>Request</h3>
 
 <pre>
-  request.scheme <%= request.scheme %>
-  request.script_name <%= request.script_name %>
-  request.path_info <%= request.path_info %>
-  request.port <%= request.port %>
-  request.request_method <%= request.request_method %>
-  request.query_string <%= request.query_string %>
-  request.host <%= request.host %>
-  request.referrer <%= request.referrer %>
-  request.user_agent <%= request.user_agent %>
-  request.url <%= request.url %>
-  request.path <%= request.path %>
-  request.ip <%= request.ip %>
+  request.scheme:         <%= request.scheme %>
+  request.script_name:    <%= request.script_name %>
+  request.path_info:      <%= request.path_info %>
+  request.port:           <%= request.port %>
+  request.request_method: <%= request.request_method %>
+  request.query_string:   <%= request.query_string %>
+  request.host:           <%= request.host %>
+  request.referrer:       <%= request.referrer %>
+  request.user_agent:     <%= request.user_agent %>
+  request.url:            <%= request.url %>
+  request.path:           <%= request.path %>
+  request.ip:             <%= request.ip %>
 </pre>

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

@@ -1,2 +1,14 @@
+
+
+<h3>Named Route Helpers</h3>
+
+<pre>
+  root_url:   <%= root_url %>
+  root_path:  <%= root_path %>
+  sites_path: <%= sites_path %>
+  feeds_path: <%= feeds_path %>
+  items_path: <%= items_path %>
+</pre>
+
 <%= erb :'_debug' %>
 

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

@@ -0,0 +1,13 @@
+
+<h2><%= Feed.count %> Feeds</h2>
+
+<table>
+<% Feed.all.each do |feed| %>
+ <tr>
+   <td class='key'><%= feed.key %></td>
+   <td><%= feed.title %>
+       <span class='count'>(<%= feed.items.count %>)</span>
+   </td>
+ </tr>
+<% end %>
+</table>

data/lib/pluto/server/views/index.erb

@@ -1,8 +1,3 @@
 
-<h1>pluto test page</h1>
 
-<p>test paragraph paragraph
-</p>
-
-<p>another test paragraph paragraph
-</p>
+<p>test page</p>

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

@@ -0,0 +1,12 @@
+
+<h2><%= Item.count %> Items</h2>
+
+<table>
+<% Item.all.each do |item| %>
+ <tr>
+   <td><%= item.title %></td>
+   <td class='key'><%= item.guid %></td>
+   <td><%= item.feed.title %></td>
+ </tr>
+<% end %>
+</table>

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

@@ -2,11 +2,18 @@
 <html>
 <head>
   <meta charset='UTF-8'>
-  <title>planet test site</title>
+  <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>
+</p>
+
 <%= yield %>
 
 <%= erb :'_version' %>

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

@@ -0,0 +1,21 @@
+
+
+<h2><%= Site.count %> Sites</h2>
+
+<table>
+<% Site.all.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>
+       <% end %>
+     </ul>
+   </td>
+  </tr>
+<% end %>
+</table>

data/lib/pluto/server.rb

@@ -37,23 +37,59 @@ class Server < Sinatra::Base
   include Models   # e.g. Feed, Item, Site, etc.
 
   #################
-  # Utilities 
-
-  def site_config_hash
-    h = {}
-    site = Site.first      # FIX: for now assume one planet per DB (fix later; allow planet key or similar)
-    if site.present?
-      h['title']  = site.title
-    else
-      h['title']  = 'Planet Untitled'
+  # Helpers
+
+  def path_prefix
+    request.env['SCRIPT_NAME']
+  end
+
+  def sites_path
+    "#{path_prefix}/sites"
+  end
+
+  def feeds_path
+    "#{path_prefix}/feeds"
+  end
+
+  def items_path
+    "#{path_prefix}/items"
+  end
+  
+  def root_path
+    "#{path_prefix}/"
+  end
+
+  def root_url
+    url( '/' )
+  end
+
+
+  def link_to( text, url, opts={} )
+    attributes = ""
+    opts.each do |key,value|
+      attributes << "#{key}='#{value}' "
     end
+    "<a href='#{url}' #{attributes}>#{text}</a>"
   end
 
+
   ##############################################
   # Controllers / Routing / Request Handlers
 
   get '/' do
-    erb :index, locals: { site: site_config_hash }
+    redirect( sites_path )
+  end
+
+  get '/sites' do
+    erb :sites   # needed or default fallthrough possible ???
+  end
+
+  get '/feeds' do
+    erb :feeds   # needed or default fallthrough possible ???
+  end
+
+  get '/items' do
+    erb :items   # needed or default fallthrough possible ???
   end
 
   # todo/fix: make a generic route for erb w /regex

data/lib/pluto/version.rb

@@ -1,6 +1,5 @@
 
 module Pluto
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end
 
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pluto
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakman
-  requirement: &83822120 !ruby/object:Gem::Requirement
+  requirement: &73611800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *83822120
+  version_requirements: *73611800
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &83821440 !ruby/object:Gem::Requirement
+  requirement: &73611130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *83821440
+  version_requirements: *73611130
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &83818890 !ruby/object:Gem::Requirement
+  requirement: &73610460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *83818890
+  version_requirements: *73610460
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &83844650 !ruby/object:Gem::Requirement
+  requirement: &73609750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *83844650
+  version_requirements: *73609750
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &83842540 !ruby/object:Gem::Requirement
+  requirement: &73609370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *83842540
+  version_requirements: *73609370
 description: pluto - Another Planet Generator (Lets You Build Web Pages from Published
   Web Feeds)
 email: webslideshow@googlegroups.com
@@ -90,12 +90,16 @@ files:
 - lib/pluto/models.rb
 - lib/pluto/schema.rb
 - lib/pluto/server.rb
+- lib/pluto/server/public/feed-icon-10x10.png
 - lib/pluto/server/public/style.css
 - lib/pluto/server/views/_debug.erb
 - lib/pluto/server/views/_version.erb
 - lib/pluto/server/views/debug.erb
+- lib/pluto/server/views/feeds.erb
 - lib/pluto/server/views/index.erb
+- lib/pluto/server/views/items.erb
 - lib/pluto/server/views/layout.erb
+- lib/pluto/server/views/sites.erb
 - lib/pluto/updater.rb
 - lib/pluto/version.rb
 - templates/blank.html.erb