pluto 0.8.1 → 0.8.2

data/Manifest.txt

@@ -15,5 +15,6 @@ lib/pluto/lister.rb
 lib/pluto/manifest_helpers.rb
 lib/pluto/models.rb
 lib/pluto/schema.rb
+lib/pluto/template_helpers.rb
 lib/pluto/updater.rb
 lib/pluto/version.rb

data/README.md

@@ -106,11 +106,6 @@ EXAMPLE
 ```
 title: Planet Ruby
 
-feeds:
-  - rubyflow
-  - edgerails
-  - rubyonrails
-  - railstutorial
 
 rubyflow:
   title: Ruby Flow

data/lib/pluto.rb

@@ -11,6 +11,8 @@ require 'uri'
 require 'pp'
 require 'optparse'
 require 'fileutils'
+require 'logger'
+require 'date'
 
 
 # 3rd party ruby gems/libs
@@ -37,6 +39,7 @@ require 'pluto/installer'
 require 'pluto/updater'
 require 'pluto/fetcher'
 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
@@ -72,6 +75,46 @@ module Pluto
 end  # module Pluto
 
 
+######
+# todo - move to utils or similar
+
+class Array
+
+  ## todo: check if there's already a builtin method for this
+  #
+  #  note:
+  #   in rails ary.in_groups(3)  results in
+  #          top-to-bottom, left-to-right.
+  #  and not left-to-right first and than top-to-bottom.
+  #
+  #  rename to in_groups_vertical(3) ???
+
+  def in_columns( cols )  # alias for convenience for chunks - needed? why? why not?
+    chunks( cols )
+  end
+
+  def chunks( number_of_chunks )
+    ## NB: use chunks - columns might be in use by ActiveRecord! 
+    ###
+    # e.g.
+    #  [1,2,3,4,5,6,7,8,9,10].columns(3)
+    #   becomes:
+    #  [[1,4,7,10],
+    #   [2,5,8],
+    #   [3,6,9]]
+
+    ## check/todo: make a copy of the array first??
+    #  for now reference to original items get added to columns
+    chunks = (1..number_of_chunks).collect { [] }
+    each_with_index do |item,index|
+      chunks[ index % number_of_chunks ] << item
+    end
+    chunks
+  end
+
+end
+
+
 if __FILE__ == $0
   Pluto.main
 else

data/lib/pluto/cli/main.rb

@@ -80,6 +80,114 @@ default_value opts.config_path
 flag [:c, :config] 
 
 
+## note: same as build (but without step 1) fetch)
+desc 'Merge planet template pack'
+arg_name 'FILE', multiple: true   ## todo/fix: check multiple will not print typeo???
+command [:merge, :m] do |c|
+
+  c.desc 'Output Path'
+  c.arg_name 'PATH'
+  c.default_value opts.output_path
+  c.flag [:o,:output]
+
+  c.desc 'Template Manifest'
+  c.arg_name 'MANIFEST'
+  c.default_value opts.manifest
+  c.flag [:t, :template]
+
+
+  c.action do |g,o,args|
+    logger.debug 'hello from merge command'
+
+    if args.length == 0
+      if File.exists?( 'pluto.yml' ) # check if pluto.yml exists, if yes add/use it
+        args = ['pluto.yml']  # create a new args w/ one item
+      elsif File.exists?( 'planet.yml' ) # check if planet.yml exists, if yes add/use it
+        args = ['planet.yml'] # create a new args w/ one item
+      else
+        puts '*** note: no arg passed in; no pluto.yml or planet.yml found in working folder'
+      end
+    end
+
+    args.each do |arg|
+      name = File.basename( arg, '.*' )
+
+      #####
+      # todo: add into method for reuse for build/merge/fetch
+      #   all use the same code
+ 
+      db_config = {
+        adapter:  'sqlite3',
+        database: "#{opts.output_path}/#{name}.db"
+      }
+ 
+      Pluto::Connecter.new.connect!( db_config )
+
+      config_path = arg.dup   # add .yml file extension if missing (for convenience)
+      config_path << '.yml'  unless config_path.ends_with?( '.yml' )
+
+      config = YAML.load_file( config_path )
+      
+      puts "dump >#{config_path}<:"
+      pp config
+    
+      Pluto::Formatter.new( opts, config ).run( name )
+    end
+    
+    puts 'Done.'
+  end
+end # command merge
+
+
+## note: same as build (but without step 2) merge)
+desc 'Fetch planet feeds'
+arg_name 'FILE', multiple: true   ## todo/fix: check multiple will not print typeo???
+command [:fetch, :f] do |c|
+
+  c.action do |g,o,args|
+    logger.debug 'hello from fetch command'
+
+    if args.length == 0
+      if File.exists?( 'pluto.yml' ) # check if pluto.yml exists, if yes add/use it
+        args = ['pluto.yml']  # create a new args w/ one item
+      elsif File.exists?( 'planet.yml' ) # check if planet.yml exists, if yes add/use it
+        args = ['planet.yml'] # create a new args w/ one item
+      else
+        puts '*** note: no arg passed in; no pluto.yml or planet.yml found in working folder'
+      end
+    end
+
+    args.each do |arg|
+      name = File.basename( arg, '.*' )
+
+      #####
+      # todo: add into method for reuse for build/merge/fetch
+      #   all use the same code
+ 
+      db_config = {
+        adapter:  'sqlite3',
+        database: "#{opts.output_path}/#{name}.db"
+      }
+ 
+      Pluto::Connecter.new.connect!( db_config )
+
+      config_path = arg.dup   # add .yml file extension if missing (for convenience)
+      config_path << '.yml'  unless config_path.ends_with?( '.yml' )
+
+      config = YAML.load_file( config_path )
+      
+      puts "dump >#{config_path}<:"
+      pp config
+    
+      Pluto::Fetcher.new( opts, config ).run
+    end
+    
+    puts 'Done.'
+  end
+end # command fetch
+
+
+
 desc 'Build planet'
 arg_name 'FILE', multiple: true   ## todo/fix: check multiple will not print typeo???
 command [:build, :b] do |c|
@@ -97,7 +205,17 @@ command [:build, :b] do |c|
 
   c.action do |g,o,args|
     logger.debug 'hello from build command'
-    
+
+    if args.length == 0
+      if File.exists?( 'pluto.yml' ) # check if pluto.yml exists, if yes add/use it
+        args = ['pluto.yml']  # create a new args w/ one item
+      elsif File.exists?( 'planet.yml' ) # check if planet.yml exists, if yes add/use it
+        args = ['planet.yml'] # create a new args w/ one item
+      else
+        puts '*** note: no arg passed in; no pluto.yml or planet.yml found in working folder'
+      end
+    end
+
     args.each do |arg|
 
       name = File.basename( arg, '.*' )

data/lib/pluto/fetcher.rb

@@ -14,7 +14,6 @@ class Fetcher
 
 
   def run
-
     updater = Updater.new
 
     # pass along debug/verbose setting/switch
@@ -22,7 +21,6 @@ class Fetcher
 
     updater.update_subscriptions( config )
     updater.update_feeds
-
   end # method run
 
 

data/lib/pluto/formatter.rb

@@ -6,6 +6,8 @@ class Formatter
 
   include Models
   include ManifestHelper
+  
+  include TemplateHelper  # e.g. lets us use time_ago_in_words, strip_tags, etc.
 
   def initialize( opts, config )
     @opts    = opts
@@ -15,6 +17,8 @@ class Formatter
   attr_reader :opts
 
   def site
+    ### fix !!!!!!!!!!
+    ## fix/todo: change to db record for site
     @config
   end
 

data/lib/pluto/models.rb

@@ -14,7 +14,8 @@ class Feed < ActiveRecord::Base
     #   coalesce - supported by sqlite (yes), postgres (yes)
 
     # note: if not published_at,touched_at or built_at use hardcoded 1999-01-01 for now
-    order( "coalesce(published_at,touched_at,built_at,'1999-01-01') desc" )
+    ## order( "coalesce(published_at,touched_at,built_at,'1999-01-01') desc" )
+    order( "coalesce(latest_published_at,'1999-01-01') desc" )
   end
 
 

data/lib/pluto/schema.rb

@@ -31,6 +31,8 @@ class CreateDb < ActiveRecord::Migration
       t.datetime :touched_at    # from feed updated(atom)
 
       # -- our own (meta) fields
+      t.datetime :latest_published_at # cache latest item published_at
+
       t.string  :key,      :null => false
       t.string  :format      # e.g. atom (1.0), rss 2.0, rss 0.7 etc.
       t.string  :etag      # last etag

data/lib/pluto/template_helpers.rb

@@ -0,0 +1,49 @@
+module Pluto
+
+####
+# fix: rename to DateHelper
+
+module TemplateHelper
+
+  def strip_tags( hypertext )
+    ### tobe done
+    ## strip markup tags; return plain text
+    hypertext.gsub( /<[^>]+>/, '' )
+  end
+
+
+  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  "about 1 hour ago"   ## use one instead of 1 ?? why? why not?
+      # 90 mins up to 24 hours
+      when 90...1440        then  "about %d hours ago" % (distance_in_minutes.to_f / 60.0).round
+      # 24 hours up to 42 hours
+      when 1440...2520      then "1 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
+      when 43200...86400    then "about %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                       "about a year ago"  #todo: use over a year ago???
+    end
+  end
+
+
+end # module TemplateHelper
+end # module Pluto

data/lib/pluto/updater.rb

@@ -111,6 +111,11 @@ class Updater
 
   def update_feeds( opts={} )
 
+    if debug?
+      ## turn on logging for sql too
+      ActiveRecord::Base.logger = Logger.new( STDOUT )
+    end
+
     ### move to feedutils
     ### logger.debug "using stdlib RSS::VERSION #{RSS::VERSION}"
 
@@ -157,17 +162,34 @@ class Updater
       #    generator
       #    published_at,built_at,touched_at,fetched_at
       #    summary,title2
+      
+      ## fix:
+      ## weird rss exception error on windows w/ dates
+      #  e.g. /lib/ruby/1.9.1/rss/rss.rb:37:in `w3cdtf': wrong number of arguments (1 for 0) (ArgumentError)
+      #
+      #  move to_datetime to feedutils!! if it works
+      
+      
       feed_attribs = {
         fetched_at:   feed_fetched_at,
         format:       feed.format,
-        published_at: feed.published? ? feed.published : nil,
-        touched_at:   feed.updated?   ? feed.updated   : nil,
-        built_at:     feed.built?     ? feed.built     : nil,
+        published_at: feed.published? ? feed.published.to_datetime : nil,
+        touched_at:   feed.updated?   ? feed.updated.to_datetime   : nil,
+        built_at:     feed.built?     ? feed.built.to_datetime     : nil,
         summary:      feed.summary?   ? feed.summary   : nil,
         title2:       feed.title2?    ? feed.title2    : nil,
         generator:    feed.generator
       }
 
+      if debug?
+        ## puts "*** dump feed_attribs:"
+        ## pp feed_attribs
+        puts "*** dump feed_attribs w/ class types:"
+        feed_attribs.each do |key,value|
+          puts "  #{key}: >#{value}< : #{value.class.name}"
+        end
+      end
+
       feed_rec.update_attributes!( feed_attribs )
 
 
@@ -179,11 +201,20 @@ class Updater
           url:          item.url,
           summary:      item.summary?   ? item.summary   : nil,
           content:      item.content?   ? item.content   : nil,
-          published_at: item.published? ? item.published : nil,
-          touched_at:   item.updated?   ? item.updated   : nil,
+          published_at: item.published? ? item.published.to_datetime : nil,
+          touched_at:   item.updated?   ? item.updated.to_datetime   : nil,
           feed_id:      feed_rec.id    # add feed_id fk_ref
         }
 
+        if debug?
+          puts "*** dump item_attribs w/ class types:"
+          item_attribs.each do |key,value|
+            next if [:summary,:content].include?( key )   # skip summary n content
+            puts "  #{key}: >#{value}< : #{value.class.name}"
+          end
+        end
+
+
         rec = Item.find_by_guid( item.guid )
         if rec.nil?
           rec      = Item.new
@@ -197,11 +228,21 @@ class Updater
         rec.update_attributes!( item_attribs )
       end  # each item
 
+      #  update  cached value latest published_at for item
+      item_recs = feed_rec.items.latest.limit(1).all
+      unless item_recs.empty?
+        if item_recs[0].published_at?
+          feed_rec.latest_published_at = item_recs[0].published_at
+        else # try touched_at
+          feed_rec.latest_published_at = item_recs[0].touched_at
+        end
+        feed_rec.save!
+      end
+
     end # each feed
 
   end # method run
 
-
  
 end # class Fetcher
 

data/lib/pluto/version.rb

@@ -1,5 +1,5 @@
 
 module Pluto
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pluto
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakman
-  requirement: &78500880 !ruby/object:Gem::Requirement
+  requirement: &83915310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *78500880
+  version_requirements: *83915310
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &78500610 !ruby/object:Gem::Requirement
+  requirement: &83914830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *78500610
+  version_requirements: *83914830
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &78500310 !ruby/object:Gem::Requirement
+  requirement: &83914450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *78500310
+  version_requirements: *83914450
 - !ruby/object:Gem::Dependency
   name: feedutils
-  requirement: &78500050 !ruby/object:Gem::Requirement
+  requirement: &83914160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *78500050
+  version_requirements: *83914160
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &78499760 !ruby/object:Gem::Requirement
+  requirement: &83913880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *78499760
+  version_requirements: *83913880
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &78499510 !ruby/object:Gem::Requirement
+  requirement: &83913580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *78499510
+  version_requirements: *83913580
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &78499200 !ruby/object:Gem::Requirement
+  requirement: &83913340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *78499200
+  version_requirements: *83913340
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &78498960 !ruby/object:Gem::Requirement
+  requirement: &83913010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *78498960
+  version_requirements: *83913010
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &78498660 !ruby/object:Gem::Requirement
+  requirement: &83912770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *78498660
+  version_requirements: *83912770
 description: pluto - Another Planet Generator (Lets You Build Web Pages from Published
   Web Feeds)
 email: webslideshow@googlegroups.com
@@ -136,6 +136,7 @@ files:
 - lib/pluto/manifest_helpers.rb
 - lib/pluto/models.rb
 - lib/pluto/schema.rb
+- lib/pluto/template_helpers.rb
 - lib/pluto/updater.rb
 - lib/pluto/version.rb
 homepage: https://github.com/feedreader/pluto