pluto 0.8.10 → 0.9.0

data/Manifest.txt

@@ -23,7 +23,6 @@ lib/pluto/models/utils.rb
 lib/pluto/refresher.rb
 lib/pluto/schema.rb
 lib/pluto/subscriber.rb
-lib/pluto/template_helpers.rb
 lib/pluto/updater.rb
 lib/pluto/version.rb
 test/helper.rb

data/Rakefile

@@ -21,9 +21,9 @@ Hoe.spec 'pluto' do
     ['pakman',    '>= 0.5'], 
     ['fetcher',   '>= 0.4.1'],    # use min. 0.4.1 - added cache/conditional GET support
     ['logutils',  '>= 0.6'],
-    ['feedutils', '>= 0.3.2'],    #  use min. 0.3.2 - added fix for rss.item.guid missing; no more auto-summary in atom
+    ['feedutils', '>= 0.4.0'],    #  use min. 0.4.0 - added rss 2.0 - content:encoded; added fix for rss.item.guid missing; no more auto-summary in atom
     ['props',     '>= 1.0.2'],    #  use min. 1.0.2 - added ini support
-    ['textutils', '>= 0.6.8'],    # future: add some filters (for include/exclude)
+    ['textutils', '>= 0.7'],      #  use min. 0.7; moved hy/date helpers to gem; future: add some filters (for include/exclude)
     ['gli',       '>= 2.5.6']
     ## ['activerecord', '~> 3.2'],  #  NB:  soft dependency, will include activesupport,etc.
   ]

data/config/pluto.index.yml

@@ -12,6 +12,10 @@ top: https://raw.github.com/feedreader/pluto.top/master/top.txt
 
 news: https://raw.github.com/feedreader/pluto.news/master/news.txt
 
+feeds: https://raw.github.com/feedreader/pluto.feeds/master/feeds.txt
+
+classic: https://raw.github.com/feedreader/pluto.classic/master/classic.txt
+
 
 ####
 # all:

data/lib/pluto.rb

@@ -50,7 +50,6 @@ require 'pluto/refresher'
 require 'pluto/subscriber'
 require 'pluto/updater'
 require 'pluto/lister'
-require 'pluto/template_helpers'
 require 'pluto/formatter'
 
 require 'pluto/cli/opts'     ## fix: make sure fetcher/updater etc. do not depend on cli/opts

data/lib/pluto/fetcher.rb

@@ -18,7 +18,8 @@ class Fetcher
 
     ## if debug?
       puts "http status #{response.code} #{response.message}"
-      
+
+      puts "http header - server: #{response.header['server']} - #{response.header['server'].class.name}"
       puts "http header - etag: #{response.header['etag']} - #{response.header['etag'].class.name}"
       puts "http header - last-modified: #{response.header['last-modified']} - #{response.header['last-modified'].class.name}"
     ## end
@@ -66,9 +67,6 @@ class Fetcher
       
     puts "Before parsing feed >#{feed_key}<..."
 
-    ### move to feedutils
-    ### logger.debug "using stdlib RSS::VERSION #{RSS::VERSION}"
-
     ## fix/todo: check for feed.nil?   -> error parsing!!!
     #    or throw exception
     feed = FeedUtils::Parser.parse( feed_xml )
@@ -93,6 +91,15 @@ class Fetcher
       'last-modified' => feed_rec.http_last_modified
     }
 
+    ### fix bug in fetcher - do NOT use request_uri use uri.to
+    ## - add request_uri entry to (e.g. w/o host etc.)
+    ## - remove code here once fixed in fetcher
+    @worker.cache[ URI.parse( feed_url ).request_uri ] = {
+      'etag'          => feed_rec.http_etag,
+      'last-modified' => feed_rec.http_last_modified
+    }
+
+
     response = @worker.get( feed_url )
     @worker.use_cache = false   # fix/todo: restore old use_cache setting instead of false
 
@@ -110,6 +117,7 @@ class Fetcher
       
       feed_attribs = {
         http_code:          response.code.to_i,
+        http_server:        response.header[ 'server' ],
         http_etag:          nil,
         http_last_modified: nil,
         body:               nil,
@@ -155,6 +163,7 @@ class Fetcher
 
     feed_attribs = {
       http_code:          response.code.to_i,
+      http_server:        response.header[ 'server' ],
       http_etag:          response.header[ 'etag' ],
       http_last_modified: response.header[ 'last-modified' ], ## note: last_modified header gets stored as plain text (not datetime)
       body:               feed_xml,
@@ -163,6 +172,7 @@ class Fetcher
     }
 
     ## if debug?
+      puts "http header - server: #{response.header['server']} - #{response.header['server'].class.name}"
       puts "http header - etag: #{response.header['etag']} - #{response.header['etag'].class.name}"
       puts "http header - last-modified: #{response.header['last-modified']} - #{response.header['last-modified'].class.name}"
     ## end

data/lib/pluto/formatter.rb

@@ -7,7 +7,8 @@ class Formatter
   include Models
   include ManifestHelper
   
-  include TemplateHelper  # e.g. lets us use time_ago_in_words, strip_tags, etc.
+  include TextUtils::DateHelper  # e.g. lets us use time_ago_in_words
+  include TextUtils::HypertextHelper # e.g. lets us use link_to, strip_tags, sanitize, textify, etc.
 
   def initialize( opts, config )
     @opts    = opts

data/lib/pluto/models/feed.rb

@@ -27,13 +27,6 @@ class Feed < ActiveRecord::Base
   def link()        url;      end  # alias for url
   def feed()        feed_url; end  # alias for feed_url
 
-  def last_published_at() last_published; end # legay attrib reader - depreciated - remove!!
-  def fetched_at()        fetched;        end # legay attrib reader - depreciated - remove!!
-  def published_at()      published;      end # legay attrib reader - depreciated - remove!!
-  def touched_at()        touched;        end # legay attrib reader - depreciated - remove!!
-  def built_at()          built;          end # legay attrib reader - depreciated - remove!!
-
-
   def url?()           read_attribute(:url).present?;       end
   def title?()         read_attribute(:title).present?;     end
   def title2?()        read_attribute(:title2).present?;    end
@@ -87,18 +80,29 @@ class Feed < ActiveRecord::Base
 
 
   def update_from_struct!( data )
+
+    ## todo: move to FeedUtils::Feed ??? why? why not??
+    if data.generator
+      generator_full = ''
+      generator_full << data.generator
+      generator_full << " @version=#{data.generator_version}"   if data.generator_version
+      generator_full << " @uri=#{data.generator_uri}"           if data.generator_uri
+    else
+      generator_full = nil
+    end
+
     feed_attribs = {
         format:       data.format,
-        published:    data.published? ? data.published : nil,
-        touched:      data.updated?   ? data.updated   : nil,
-        built:        data.built?     ? data.built     : nil,
-        summary:      data.summary?   ? data.summary   : nil,
+        published:    data.published,
+        touched:      data.updated,
+        built:        data.built,
+        summary:      data.summary,
         ### todo/fix: add/use
         # auto_title:     ???,
         # auto_url:       ???,
         # auto_feed_url:  ???,
-        auto_title2:  data.title2?    ? data.title2    : nil,
-        generator:    data.generator
+        auto_title2:  data.title2,
+        generator:    generator_full
       }
 
     if debug?

data/lib/pluto/models/item.rb

@@ -14,11 +14,6 @@ class Item < ActiveRecord::Base
   def description() summary;  end  # alias for summary  -- also add descr shortcut??
   def link()        url;      end  # alias for url
 
-  def fetched_at()        fetched;        end # legay attrib reader - depreciated - remove!!
-  def published_at()      published;      end # legay attrib reader - depreciated - remove!!
-  def touched_at()        touched;        end # legay attrib reader - depreciated - remove!!
-
-
   def self.latest
     # note: order by first non-null datetime field
     #   coalesce - supported by sqlite (yes), postgres (yes)
@@ -52,10 +47,10 @@ class Item < ActiveRecord::Base
       guid:         data.guid,   # todo: only add for new records???
       title:        data.title,
       url:          data.url,
-      summary:      data.summary?   ? data.summary   : nil,
-      content:      data.content?   ? data.content   : nil,
-      published:    data.published? ? data.published : nil,
-      touched:      data.updated?   ? data.updated   : nil,
+      summary:      data.summary,
+      content:      data.content,
+      published:    data.published,
+      touched:      data.updated,
       feed_id:      feed_rec.id,    # add feed_id fk_ref
       fetched:      feed_rec.fetched
     }

data/lib/pluto/schema.rb

@@ -61,6 +61,7 @@ class CreateDb < ActiveRecord::Migration
       t.string   :http_etag    # last http header etag
       ## note: save last-modified header as text (not datetime) - pass through as is
       t.string   :http_last_modified   # last http header last-modified - note: save header as plain text!!! pass along in next request as-is
+      t.string   :http_server    # last http server header if present
 
       t.string   :md5       # md5 hash of body
       t.text     :body      # last http response body (complete feed!)

data/lib/pluto/version.rb

@@ -1,4 +1,4 @@
 
 module Pluto
-  VERSION = '0.8.10'
+  VERSION = '0.9.0'
 end

data/test/test_helpers.rb

@@ -10,66 +10,6 @@ require 'helper'
 
 class TestHelper < MiniTest::Unit::TestCase
 
-  include Pluto::TemplateHelper   #  lets us use textify, etc.
-
-  def test_textify
-    hyin =<<EOS
-<p><img style="float:left; margin-right:4px" src="http://photos1.meetupstatic.com/photos/event/7/c/b/2/event_244651922.jpeg" alt="photo" class="photo" />vienna.rb</p>
-<p>
-  <p>The cool guys from <a href="http://platogo.com/">Platogo</a> will sponsor (y)our drinks. Which is awesome.</p>
-  <p><strong>Talks</strong>*</p>
-  <p>Jakob Sommerhuber - sponsor talk</p>
-  <p>Martin Schürrer - Erlang/OTP in production for highly-available, scalable systems</p>
-  <p>Markus Prinz - How to improve your code</p>
-  <p>Gerald Bauer - working with Sinatra</p>
-  <p>Kathrin Folkendt - 'Chapter one' (lightning talk on getting started with Rails, and building her first web app)</p>
-  <p><em>*preliminary program</em></p>
-</p>
-<p>Vienna   - Austria</p>
-<p>Friday, October 11 at 6:00 PM</p>
-<p>Attending: 21</p>
-<p>Details: http://www.meetup.com/vienna-rb/events/130346182/</p>
-EOS
-
-    hystep1 = <<EOS
-‹p›♦vienna.rb‹/p›
-‹p›
-  ‹p›The cool guys from Platogo will sponsor (y)our drinks. Which is awesome.‹/p›
-  ‹p›Talks*‹/p›
-  ‹p›Jakob Sommerhuber - sponsor talk‹/p›
-  ‹p›Martin Schürrer - Erlang/OTP in production for highly-available, scalable systems‹/p›
-  ‹p›Markus Prinz - How to improve your code‹/p›
-  ‹p›Gerald Bauer - working with Sinatra‹/p›
-  ‹p›Kathrin Folkendt - 'Chapter one' (lightning talk on getting started with Rails, and building her first web app)‹/p›
-  ‹p›*preliminary program‹/p›
-‹/p›
-‹p›Vienna   - Austria‹/p›
-‹p›Friday, October 11 at 6:00 PM‹/p›
-‹p›Attending: 21‹/p›
-‹p›Details: www.meetup.com/vienna-rb/events/130346182/‹/p›
-EOS
-
-    hyout = <<EOS
-<p>♦vienna.rb</p>
-<p>
-  <p>The cool guys from Platogo will sponsor (y)our drinks. Which is awesome.</p>
-  <p>Talks*</p>
-  <p>Jakob Sommerhuber - sponsor talk</p>
-  <p>Martin Schürrer - Erlang/OTP in production for highly-available, scalable systems</p>
-  <p>Markus Prinz - How to improve your code</p>
-  <p>Gerald Bauer - working with Sinatra</p>
-  <p>Kathrin Folkendt - 'Chapter one' (lightning talk on getting started with Rails, and building her first web app)</p>
-  <p>*preliminary program</p>
-</p>
-<p>Vienna   - Austria</p>
-<p>Friday, October 11 at 6:00 PM</p>
-<p>Attending: 21</p>
-<p>Details: www.meetup.com/vienna-rb/events/130346182/</p>
-EOS
-
-    assert_equal( hyout, textify( hyin ) )
-
-    assert_equal( hystep1, textify( hyin, skip_restore: true ) )
-  end
+  ## add some tests; to be done
 
 end # class TestHelper

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pluto
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-06 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakman
-  requirement: &74547830 !ruby/object:Gem::Requirement
+  requirement: &85034260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *74547830
+  version_requirements: *85034260
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &74547550 !ruby/object:Gem::Requirement
+  requirement: &85034020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *74547550
+  version_requirements: *85034020
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &74547300 !ruby/object:Gem::Requirement
+  requirement: &85033740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +43,21 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *74547300
+  version_requirements: *85033740
 - !ruby/object:Gem::Dependency
   name: feedutils
-  requirement: &74547000 !ruby/object:Gem::Requirement
+  requirement: &85033490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *74547000
+  version_requirements: *85033490
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &74546740 !ruby/object:Gem::Requirement
+  requirement: &85033170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,21 +65,21 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *74546740
+  version_requirements: *85033170
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &74546440 !ruby/object:Gem::Requirement
+  requirement: &85032890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *74546440
+  version_requirements: *85032890
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &74546190 !ruby/object:Gem::Requirement
+  requirement: &85032620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *74546190
+  version_requirements: *85032620
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &74545900 !ruby/object:Gem::Requirement
+  requirement: &85032330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *74545900
+  version_requirements: *85032330
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &74545650 !ruby/object:Gem::Requirement
+  requirement: &85032040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *74545650
+  version_requirements: *85032040
 description: pluto - Another Planet Generator (Lets You Build Web Pages from Published
   Web Feeds)
 email: feedreader@googlegroups.com
@@ -144,7 +144,6 @@ files:
 - lib/pluto/refresher.rb
 - lib/pluto/schema.rb
 - lib/pluto/subscriber.rb
-- lib/pluto/template_helpers.rb
 - lib/pluto/updater.rb
 - lib/pluto/version.rb
 - test/helper.rb

data/lib/pluto/template_helpers.rb

@@ -1,173 +0,0 @@
-# encoding: UTF-8
-
-module Pluto
-
-
-module TemplateHelper
-
-  def strip_tags( ht )
-    ### tobe done
-    ## strip markup tags; return plain text
-    ht.gsub( /<[^>]+>/, '' )
-  end
-
-
-  def whitelist( ht, tags, opts={} )
-
-    # note: assumes properly escaped <> in ht/hypertext
-
-    ###############################################
-    # step one - save whitelisted tags use ‹tag›
-    tags.each do |tag|
-      # note: we strip all attribues
-      # note: match all tags case insensitive e.g. allow a,A or br,BR,bR etc.
-      #   downcase all tags
-
-      # convert xml-style empty tags to simple html emtpty tags
-      #  e.g. <br/> or <br /> becomses <br>
-      ht = ht.gsub( /<(#{tag})\s*\/>/i )       { |_| "‹#{$1.downcase}›" }   # eg. <br /> or <br/> becomes ‹br›
-
-      # make sure we won't swall <br> for <b> for example, thus use \s+ before [^>]
-      ht = ht.gsub( /<(#{tag})(\s+[^>]*)?>/i ) { |_| "‹#{$1.downcase}›" }   # opening tag <p>
-      ht = ht.gsub( /<\/(#{tag})\s*>/i )       { |_| "‹/#{$1.downcase}›" }  # closing tag e.g. </p>
-    end
-
-    ############################
-    # step two - clean tags
-
-    #   strip images - special treatment for debugging
-    ht = ht.gsub( /<img[^>]*>/i, '♦' )   # for debugging use black diamond e.g. ♦
-    ht = ht.gsub( /<\/img>/i, '' )   # should not exists
-
-    # strip all remaining tags
-    ht = ht.gsub( /<[^>]+>/, '' )
-    
-    pp ht  # fix: debugging indo - remove
-    
-    ############################################
-    # step three - restore whitelisted tags
-
-    return ht if opts[:skip_restore].present?   # skip step 3 for debugging
-
-    tags.each do |tag|
-#      ht = ht.gsub( /‹(#{tag})›/, "<\1>" )  # opening tag e.g. <p>
-#      ht = ht.gsub( /‹\/(#{tag})›/, "<\/\1>" )  # closing tag e.g. </p>
-      ht = ht.gsub( /‹(#{tag})›/ )   { |_| "<#{$1}>" }
-      ht = ht.gsub( /‹\/(#{tag})›/ ) { |_| "<\/#{$1}>" }  # closing tag e.g. </p>
-    end
-
-    ht
-  end  # method whitelist
-
-
-
-
-  ## move into own helper module???
-  ##  - any helper already for easy reuse
-  ##
-  #   rails style asset tag helpers and friends
-
-  def stylesheet_link_tag( href )
-    href = "#{href}.css"  unless href.ends_with?( '.css' )   # auto-add .css if not present
-    "<link rel='stylesheet' type='text/css' href='#{href}'>"
-  end
-
-  def image_tag( src, opts={} )
-    attributes = ""
-    opts.each do |key,value|
-      attributes << "#{key}='#{value}' "
-    end
-    "<img src='#{src}' #{attributes}>"
-  end
-
-  def link_to( text, href, opts={} )
-    attributes = ""
-    opts.each do |key,value|
-      attributes << "#{key}='#{value}' "
-    end
-    "<a href='#{href}' #{attributes}>#{text}</a>"
-  end
-
-
-  ##  change to simple_hypertext or
-  #     hypertext_simple or
-  #     sanitize ???
-
-  
-
-  def textify( ht, opts={} )   # ht -> hypertext
-    ## turn into text
-    # todo: add options for
-    #   keep links, images, lists (?too), code, codeblocks
-
-    ht = whitelist( ht, [:br, :p, :ul, :ol, :li, :pre, :code, :blockquote, :q, :cite], opts )
-
-   # strip bold
-#    ht = ht.gsub( /<b[^>]*>/, '**' )  # fix: will also swallow bxxx tags - add b space
-#    ht = ht.gsub( /<\/b>/, '**' )
-
-    # strip em
-#   ht = ht.gsub( /<em[^>]*>/, '__' )
-#   ht = ht.gsub( /<\/em>/, '__' )
-
-    # clean (prettify) literal urls (strip protocoll) 
-    ht = ht.gsub( /(http|https):\/\//, '' )
-
-#    ht = ht.gsub( /&nbsp;/, ' ' )
-
-#    # try to cleanup whitespaces
-#    # -- keep no more than two spaces
-#    ht = ht.gsub( /[ \t]{3,}/, '  ' )
-#    # -- keep no more than two new lines
-#    ht = ht.gsub( /\n{2,}/m, "\n\n" ) 
-#    # -- remove all trailing spaces
-#    ht = ht.gsub( /[ \t\n]+$/m, '' )
-#    # -- remove all leading spaces
-#    ht = ht.gsub( /^[ \t\n]+/m, '' ) 
-
-    ht
-  end
-
-
-####
-# fix: move to DateHelper  ??
-
-
-  def time_ago_in_words( from_time )
-    from_time = from_time.to_time
-    to_time   = Time.now
-    
-    ### todo: will not handle future dates??
-    ## what todo do??
-    ## use -1..-50000000000 ??  "future"
-
-    ## from_time, to_time = to_time, from_time if from_time > to_time
-
-    distance_in_minutes = ((to_time - from_time)/60.0).round
-
-    case distance_in_minutes
-      when 0..1             then  "just now"
-      when 2...45           then  "%d minutes ago" % distance_in_minutes
-      when 45...90          then  "an hour ago"   ## use one instead of 1 ?? why? why not?
-      # 90 mins up to 24 hours
-      when 90...1440        then  "%d hours ago" % (distance_in_minutes.to_f / 60.0).round
-      # 24 hours up to 42 hours
-      when 1440...2520      then "a day ago"   ## use one day ago - why? why not?
-      # 42 hours up to 30 days
-      when 2520...43200     then "%d days ago" % (distance_in_minutes.to_f / 1440.0).round
-      # 30 days up to 60 days
-      #  fix: use pluralize for months  - fix: change when - use just for a month ago
-      when 43200...86400    then "%d months ago" % (distance_in_minutes.to_f / 43200.0).round
-      # 60 days up to 365 days
-      when 86400...525600   then "%d months ago" % (distance_in_minutes.to_f / 43200.0).round
-      ## fix - add number of years ago
-      else                       "over a year ago"  #todo: use over a year ago???
-                                                    # fix: split into two - use
-                                                    #  1) a year ago
-                                                    #  2) (x) years ago
-    end
-  end
-
-
-end # module TemplateHelper
-end # module Pluto