pluto 0.8.3 → 0.8.4

data/Manifest.txt

@@ -5,6 +5,7 @@ Rakefile
 bin/pluto
 config/pluto.index.yml
 lib/pluto.rb
+lib/pluto/activerecord.rb
 lib/pluto/cli/main.rb
 lib/pluto/cli/opts.rb
 lib/pluto/connecter.rb
@@ -13,7 +14,12 @@ lib/pluto/formatter.rb
 lib/pluto/installer.rb
 lib/pluto/lister.rb
 lib/pluto/manifest_helpers.rb
-lib/pluto/models.rb
+lib/pluto/models/action.rb
+lib/pluto/models/feed.rb
+lib/pluto/models/item.rb
+lib/pluto/models/site.rb
+lib/pluto/models/subscription.rb
+lib/pluto/models/utils.rb
 lib/pluto/refresher.rb
 lib/pluto/schema.rb
 lib/pluto/subscriber.rb

data/README.md

@@ -7,7 +7,7 @@ from published web feeds.
 * bugs  :: [github.com/feedreader/pluto/issues](https://github.com/feedreader/pluto/issues)
 * gem   :: [rubygems.org/gems/pluto](https://rubygems.org/gems/pluto)
 * rdoc  :: [rubydoc.info/gems/pluto](http://rubydoc.info/gems/pluto)
-
+* forum :: [groups.google.com/group/feedreader](http://groups.google.com/group/feedreader)
 
 ## Usage
 
@@ -50,13 +50,13 @@ GLOBAL OPTIONS
     --help            - Show this message
 
 COMMANDS
-    build, b    - Build planet
-    install, i  - Install template pack
-    list, ls, l - List installed template packs
-    fetch, f    - Fetch planet feeds
-    merge, m    - Merge planet template pack
-    about, a    - (Debug) Show more version info
-    help        - Shows a list of commands or help for one command
+    build, b      - Build planet
+    install, i    - Install template pack
+    list, ls, l   - List installed template packs
+    update, up, u - Update planet feeds
+    merge, m      - Merge planet template pack
+    about, a      - (Debug) Show more version info
+    help          - Shows a list of commands or help for one command
 ~~~~
 
 
@@ -109,18 +109,18 @@ EXAMPLE
 ~~~
 
 
-#### `fetch` Command
+#### `update` Command
 
 ~~~
 NAME
-    fetch - Fetch planet feeds
+    update - Update planet feeds
 
 SYNOPSIS
-    pluto [global options] fetch FILE
+    pluto [global options] update FILE
 
 EXAMPLE
-    pluto fetch ruby.yml
-    pluto f ruby
+    pluto update ruby.yml
+    pluto u ruby
 ~~~
 
 
@@ -144,7 +144,6 @@ EXAMPLE
 
 
 
-
 ### Planet Configuration Sample 
 
 `ruby.ini`:
@@ -153,19 +152,19 @@ EXAMPLE
 title = Planet Ruby
 
 [rubyflow]
-  title    = Ruby Flow
-  feed_url = http://feeds.feedburner.com/Rubyflow?format=xml
-  url      = http://rubyflow.com
+  title  = Ruby Flow
+  link   = http://rubyflow.com
+  feed   = http://feeds.feedburner.com/Rubyflow?format=xml
 
 [rubyonrails]
-  title    = Ruby on Rails Blog
-  feed_url = http://weblog.rubyonrails.org/feed/atom.xml
-  url      = http://weblog.rubyonrails.org
+  title = Ruby on Rails Blog
+  link  = http://weblog.rubyonrails.org
+  feed  = http://weblog.rubyonrails.org/feed/atom.xml
 
 [viennarb]
-  title    = vienna.rb Blog
-  url      = http://vienna-rb.at
-  feed_url = http://vienna-rb.at/atom.xml
+  title = vienna.rb Blog
+  link  = http://vienna-rb.at
+  feed  = http://vienna-rb.at/atom.xml
 ```
 
 or `ruby.yml`:
@@ -175,25 +174,28 @@ title: Planet Ruby
 
 
 rubyflow:
-  title:    Ruby Flow
-  feed_url: http://feeds.feedburner.com/Rubyflow?format=xml
-  url:      http://rubyflow.com
+  title: Ruby Flow
+  link:  http://rubyflow.com
+  feed:  http://feeds.feedburner.com/Rubyflow?format=xml
 
 rubyonrails:
-  title:    Ruby on Rails Blog
-  feed_url: http://weblog.rubyonrails.org/feed/atom.xml
-  url:      http://weblog.rubyonrails.org
+  title: Ruby on Rails Blog
+  link:  http://weblog.rubyonrails.org
+  feed:  http://weblog.rubyonrails.org/feed/atom.xml
 
 viennarb:
-  title:    vienna.rb Blog
-  url:      http://vienna-rb.at
-  feed_url: http://vienna-rb.at/atom.xml
+  title: vienna.rb Blog
+  link:  http://vienna-rb.at
+  feed:  http://vienna-rb.at/atom.xml
 ```
 
 For more samples, see [`nytimes.yml`](https://github.com/feedreader/pluto.samples/blob/master/nytimes.yml),
 [`js.yml`](https://github.com/feedreader/pluto.samples/blob/master/js.yml),
-[`dart.yml`](https://github.com/feedreader/pluto.samples/blob/master/dart.yml).
-
+[`dart.yml`](https://github.com/feedreader/pluto.samples/blob/master/dart.yml),
+[`haskell.yml`](https://github.com/feedreader/pluto.samples/blob/master/haskell.yml),
+[`viennarb.yml`](https://github.com/feedreader/pluto.samples/blob/master/viennarb.yml),
+[`beer.yml`](https://github.com/feedreader/pluto.samples/blob/master/beer.yml),
+[`football.yml`](https://github.com/feedreader/pluto.samples/blob/master/football.yml).
 
 ## Install
 
@@ -232,6 +234,5 @@ Use it as you please with no restrictions whatsoever.
 
 ## Questions? Comments?
 
-Questions? Comments?
 Send them along to the [Planet Pluto and Friends Forum/Mailing List](http://groups.google.com/group/feedreader).
 Thanks!

data/lib/pluto/activerecord.rb

@@ -0,0 +1,18 @@
+module Pluto
+
+module ActiveRecordMethods
+
+  def read_attribute_w_fallbacks( *keys )
+    ### todo: use a different name e.g.:
+    ##   read_attribute_cascade ??  - does anything like this exists already?
+    ## why? why not?
+    keys.each do |key|
+      value = read_attribute( key )
+      return value unless value.nil?
+    end
+    value # fallthrough? return latest value (will be nil)
+  end
+
+
+end # module ActiveRecordMethods
+end # module Pluto

data/lib/pluto/cli/main.rb

@@ -160,6 +160,60 @@ default_value opts.config_path
 flag [:c, :config] 
 
 
+### note: mostly for debugging lets you fetch individual feeds
+desc 'Fetch feeds'
+arg_name 'FEED', multiple: true   ## todo/fix: check multiple will not print typeo???
+command [:fetch, :f] do |c|
+
+  c.desc 'Database path'
+  c.arg_name 'PATH'
+  c.default_value opts.db_path
+  c.flag [:d, :dbpath]
+
+  c.desc 'Database name'
+  c.arg_name 'NAME'
+  c.default_value opts.db_name
+  c.flag [:n, :dbname]
+
+  c.action do |g,o,args|
+    logger.debug 'hello from fetch command'
+
+    ##  turn on debug flag by default; no need to passing --verbose
+    LogUtils::Logger.root.level = :debug
+    opts.verbose = true
+
+    # add dbname as opts property
+
+    #####
+    # todo: add into method for reuse for build/merge/fetch
+    #   all use the same code
+ 
+    db_config = {
+      adapter:  'sqlite3',
+      database: "#{opts.db_path}/#{opts.db_name}"
+    }
+
+    Pluto::Connecter.new.connect!( db_config )
+
+    args.each do |arg|
+      feed_rec = Pluto::Models::Feed.find_by_key!( arg )
+
+      puts "feed_rec:"
+      pp feed_rec
+
+      fetcher = Pluto::Fetcher.new
+      fetcher.debug = true  # by default debug is true (only used for debuggin! - save feed to file, etc.)
+
+      feed = fetcher.feed_by_rec( feed_rec )
+      ## pp feed
+    end
+
+    puts 'Done.'
+  end
+end # command fetch
+
+
+
 ## 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???
@@ -206,12 +260,12 @@ end # command merge
 
 
 ## note: same as build (but without step 2) merge)
-desc 'Fetch planet feeds'
+desc 'Update planet feeds'
 arg_name 'FILE', multiple: true   ## todo/fix: check multiple will not print typeo???
-command [:fetch, :f] do |c|
+command [:update, :up, :u] do |c|
 
   c.action do |g,o,args|
-    logger.debug 'hello from fetch command'
+    logger.debug 'hello from update command'
 
     args = expand_config_args( args )   # add missing .ini|.yml extension if missing or add default config (e.g. pluto.ini)
 

data/lib/pluto/cli/opts.rb

@@ -9,13 +9,24 @@ class Opts
 
   def merge_gli_options!( options={} )
     @verbose = true     if options[:verbose] == true
-    
+
+    @db_path   = options[:dbpath]  if options[:dbpath].present?
+    @db_name   = options[:dbname]  if options[:dbname].present?
+
     @config_path = options[:config]    if options[:config].present?
     @output_path = options[:output]    if options[:output].present?
-    
+
     @manifest       =   options[:template]  if options[:template].present?
   end
 
+  def db_path
+    @db_path || '.'
+  end
+
+  def db_name
+    @db_name || 'pluto.db'
+  end
+
 
   def manifest=(value)
     @manifest = value

data/lib/pluto/fetcher.rb

@@ -3,9 +3,67 @@ module Pluto
 
 class Fetcher
 
-## todo: add fetch_feed machinery here
-#    now in refresher
+  include LogUtils::Logging
 
+  def initialize
+    @worker  = ::Fetcher::Worker.new
+  end
+
+  def debug=(value)  @debug = value;   end
+  def debug?()       @debug || false;  end
+
+
+  def feed_by_rec( feed_rec )
+    feed_url = feed_rec.feed_url
+    feed_key = feed_rec.key
+    
+    feed_xml = fetch_feed( feed_url )
+
+    logger.debug "feed_xml:"
+    logger.debug feed_xml[ 0..300 ] # get first 300 chars
+
+    #  if opts.verbose?  # also write a copy to disk
+    if debug?
+      logger.debug "saving feed to >./#{feed_key}.xml<..."
+      File.open( "./#{feed_key}.xml", 'w' ) do |f|
+        f.write( feed_xml )
+      end
+    end
+      
+    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 )
+  end
+
+
+  def fetch_feed( url )
+    ### fix: use worker.get( url )  # check http response code etc.
+    
+    xml = @worker.read( url )
+
+    ###
+    # NB: Net::HTTP will NOT set encoding UTF-8 etc.
+    # will mostly be ASCII
+    # - try to change encoding to UTF-8 ourselves
+    logger.debug "xml.encoding.name (before): #{xml.encoding.name}"
+
+    #####
+    # NB: ASCII-8BIT == BINARY == Encoding Unknown; Raw Bytes Here
+
+    ## NB:
+    # for now "hardcoded" to utf8 - what else can we do?
+    # - note: force_encoding will NOT change the chars only change the assumed encoding w/o translation
+    xml = xml.force_encoding( Encoding::UTF_8 )
+    logger.debug "xml.encoding.name (after): #{xml.encoding.name}"      
+
+    xml
+  end
+  
 end # class Fetcher
 
 end # module Pluto

data/lib/pluto/models/action.rb

@@ -0,0 +1,12 @@
+module Pluto
+  module Models
+
+
+class Action < ActiveRecord::Base
+  self.table_name = 'actions'
+
+end
+
+
+  end # module Models
+end # module Pluto

data/lib/pluto/models/feed.rb

@@ -0,0 +1,51 @@
+module Pluto
+  module Models
+
+class Feed < ActiveRecord::Base
+  self.table_name = 'feeds'
+
+  include Pluto::ActiveRecordMethods  # e.g. read_attribute_w_fallbacks
+
+  has_many :items
+  has_many :subscriptions
+  has_many :sites, :through => :subscriptions
+
+
+  def self.latest
+    # note: order by first non-null datetime field
+    #   coalesce - supported by sqlite (yes), postgres (yes)
+
+    # note: if not published_at,touched_at or built_at use hardcoded 1911-01-01 for now
+    ## order( "coalesce(published_at,touched_at,built_at,'1911-01-01') desc" )
+    order( "coalesce(latest_published_at,'1911-01-01') desc" )
+  end
+
+
+  def url?()           read_attribute(:url).present?;       end
+  def title?()         read_attribute(:title).present?;     end
+  def feed_url?()      read_attribute(:feed_url).present?;  end
+
+  def url()      read_attribute_w_fallbacks( :url,      :auto_url );      end
+  def title()    read_attribute_w_fallbacks( :title,    :auto_title );    end
+  def feed_url() read_attribute_w_fallbacks( :feed_url, :auto_feed_url ); end
+
+
+  def published_at?()  read_attribute(:published_at).present?;  end
+  def touched_at?()    read_attribute(:touched_at).present?;    end
+
+  def published_at
+    ## todo/fix: use a new name - do NOT squeeze convenience lookup into existing
+    #    db backed attribute
+
+    read_attribute_w_fallbacks(
+       :published_at,  # try touched_at (aka updated (ATOM))
+       :touched_at,    # try build_at (aka lastBuildDate (RSS))
+       :built_at
+    )
+  end
+
+end  # class Feed
+
+
+  end # module Models
+end # module Pluto

data/lib/pluto/models/item.rb

@@ -0,0 +1,35 @@
+module Pluto
+  module Models
+
+class Item < ActiveRecord::Base
+  self.table_name = 'items'
+
+  include Pluto::ActiveRecordMethods  # e.g. read_attribute_w_fallbacks
+
+  belongs_to :feed
+  
+  def self.latest
+    # note: order by first non-null datetime field
+    #   coalesce - supported by sqlite (yes), postgres (yes)
+
+    # note: if not published_at,touched_at or built_at use hardcoded 1911-01-01 for now
+    order( "coalesce(published_at,touched_at,'1911-01-01') desc" )
+  end
+
+  def published_at?()  read_attribute(:published_at).present?;  end
+
+  def published_at
+    ## todo/fix: use a new name - do NOT squeeze convenience lookup into existing
+    #    db backed attribute
+
+    read_attribute_w_fallbacks(
+      :published_at,
+      :touched_at      # try touched_at (aka updated)
+    )
+  end
+
+end  # class Item
+
+
+  end # module Models
+end # module Pluto

data/lib/pluto/models/site.rb

@@ -0,0 +1,12 @@
+module Pluto
+  module Models
+
+class Site < ActiveRecord::Base
+  self.table_name = 'sites'
+  
+  has_many :subscriptions
+  has_many :feeds, :through => :subscriptions
+end
+
+  end # module Models
+end # module Pluto

data/lib/pluto/models/subscription.rb

@@ -0,0 +1,14 @@
+module Pluto
+  module Models
+
+
+class Subscription < ActiveRecord::Base
+  self.table_name = 'subscriptions'
+  
+  belongs_to :site
+  belongs_to :feed
+end
+
+
+  end # module Models
+end # module Pluto

data/lib/pluto/models/utils.rb

@@ -0,0 +1,43 @@
+module Pluto
+  module Models
+
+class ItemCursor
+
+  def initialize( items )
+    @items = items
+  end
+
+  def each
+    last_published_at = Time.local( 1911, 1, 1 )
+    last_feed_id      = -1     ## todo: use feed_key instead of id?? why? why not??
+    
+    @items.each do |item|
+
+      item_published_at = item.published_at  # cache published_at value ref
+
+      if last_published_at.year   == item_published_at.year  &&
+         last_published_at.month  == item_published_at.month &&
+         last_published_at.day    == item_published_at.day 
+        new_date = false
+      else
+        new_date = true
+      end
+
+      if last_feed_id == item.feed.id
+        new_feed = false
+      else
+        new_feed = true
+      end
+
+      yield( item, new_date, new_feed )
+      
+      last_published_at = item.published_at
+      last_feed_id      = item.feed.id
+    end
+  end # method each
+    
+end # class ItemCursor
+
+
+  end # module Models
+end # module Pluto

data/lib/pluto/refresher.rb

@@ -7,54 +7,20 @@ class Refresher
   include Models
 
   def initialize
-    @worker  = ::Fetcher::Worker.new
-  end
-
-  attr_reader :worker
-
-  def debug=(value)
-    @debug = value
-    ### logger.debug "[Updater] setting debug flag - debug? #{debug?}"
-  end
-
-  def debug?
-    @debug || false
-  end
-
-  def fetch_feed( url )
-    
-    ### fix: use worker.get( url )  # check http response code etc.
-    
-    xml = worker.read( url )
-
-    ###
-    # NB: Net::HTTP will NOT set encoding UTF-8 etc.
-    # will mostly be ASCII
-    # - try to change encoding to UTF-8 ourselves
-    logger.debug "xml.encoding.name (before): #{xml.encoding.name}"
-
-    #####
-    # NB: ASCII-8BIT == BINARY == Encoding Unknown; Raw Bytes Here
-
-    ## NB:
-    # for now "hardcoded" to utf8 - what else can we do?
-    # - note: force_encoding will NOT change the chars only change the assumed encoding w/o translation
-    xml = xml.force_encoding( Encoding::UTF_8 )
-    logger.debug "xml.encoding.name (after): #{xml.encoding.name}"      
-    xml
+    @worker  = Fetcher.new
   end
 
+  def debug=(value)  @debug = value;   end
+  def debug?()       @debug || false;  end
 
   def update_feeds( opts={} )
 
     if debug?
       ## turn on logging for sql too
       ActiveRecord::Base.logger = Logger.new( STDOUT )
+      @worker.debug = true   # also pass along worker debug flag if set
     end
 
-    ### move to feedutils
-    ### logger.debug "using stdlib RSS::VERSION #{RSS::VERSION}"
-
     # -- log update action
     Action.create!( title: 'update feeds' )
 
@@ -68,27 +34,7 @@ class Refresher
 
     Feed.all.each do |feed_rec|
 
-      feed_key = feed_rec.key
-      feed_url = feed_rec.feed_url
-      
-      feed_xml = fetch_feed( feed_url )
-
-      logger.debug "feed_xml:"
-      logger.debug feed_xml[ 0..300 ] # get first 300 chars
-
-      #  if opts.verbose?  # also write a copy to disk
-      if debug?
-        logger.debug "saving feed to >./#{feed_key}.xml<..."
-        File.open( "./#{feed_key}.xml", 'w' ) do |f|
-          f.write( feed_xml )
-        end
-      end
-      
-      puts "Before parsing feed >#{feed_key}<..."
-
-      ## fix/todo: check for feed.nil?   -> error parsing!!!
-      #    or throw exception
-      feed = FeedUtils::Parser.parse( feed_xml )
+      feed = @worker.feed_by_rec( feed_rec )
 
       feed_fetched_at = Time.now
 

data/lib/pluto/schema.rb

@@ -19,11 +19,18 @@ class CreateDb < ActiveRecord::Migration
     end
 
     create_table :feeds do |t|
-      t.string  :title,    :null => false
+      t.string  :title        # user supplied titled
+      t.string  :auto_title   # "fallback" - auto(fill) title from feed
+
+      t.string  :url          # user supplied site url
+      t.string  :auto_url     # "fallback" - auto(fill) url from feed
+
+      t.string  :feed_url       # user supplied feed url
+      t.string  :auto_feed_url  # "fallback" - auto discovery feed url from (site) url
+
       t.string  :title2     # e.g. subtitle (atom)
       t.text    :summary    # e.g. description (rss)
-      t.string  :url,      :null => false
-      t.string  :feed_url, :null => false
+
       t.string  :generator   # feed generator (e.g. wordpress, etc.)  from feed
       
       t.datetime :published_at  # from feed published(atom)+ pubDate(rss)

data/lib/pluto/subscriber.rb

@@ -6,14 +6,9 @@ class Subscriber
 
   include Models
 
-  def debug=(value)
-    @debug = value
-    ### logger.debug "[Updater] setting debug flag - debug? #{debug?}"
-  end
-
-  def debug?
-    @debug || false
-  end
+  def debug=(value)  @debug = value;   end
+  def debug?()       @debug || false;  end
+
 
   def update_subscriptions( config, opts={} )
 

data/lib/pluto/template_helpers.rb

@@ -60,16 +60,47 @@ module TemplateHelper
   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( hy, opts={} )   # hy -> hypertext
     ## turn into text
     # todo: add options for
     #   keep links, images, lists (?too), code, codeblocks
 
-    hy = whitelist( hy, [:br, :p, :ul, :ol, :li, :pre, :code], opts )
+    hy = whitelist( hy, [:br, :p, :ul, :ol, :li, :pre, :code, :blockquote, :q, :cite], opts )
 
    # strip bold
 #    hy = hy.gsub( /<b[^>]*>/, '**' )  # fix: will also swallow bxxx tags - add b space

data/lib/pluto/version.rb

@@ -1,5 +1,5 @@
 
 module Pluto
-  VERSION = '0.8.3'
+  VERSION = '0.8.4'
 end
 

data/lib/pluto.rb

@@ -31,7 +31,15 @@ require 'textutils'
 
 require 'pluto/version'   # let version always get first
 require 'pluto/schema'
-require 'pluto/models'
+require 'pluto/activerecord'
+
+require 'pluto/models/action'
+require 'pluto/models/feed'
+require 'pluto/models/item'
+require 'pluto/models/site'
+require 'pluto/models/subscription'
+require 'pluto/models/utils'
+
 require 'pluto/manifest_helpers'
 require 'pluto/connecter'
 
@@ -52,6 +60,10 @@ module Pluto
     "pluto #{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
   end
 
+  def self.generator   # convenience alias for banner (matches HTML generator meta tag)
+    banner
+  end
+
   def self.root
     "#{File.expand_path( File.dirname(File.dirname(__FILE__)) )}"
   end
@@ -77,8 +89,9 @@ module Pluto
 end  # module Pluto
 
 
+
 ######
-# todo - move to utils or similar
+# todo - move to ext/array.rb or similar
 
 class Array
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pluto
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakman
-  requirement: &75684250 !ruby/object:Gem::Requirement
+  requirement: &74627180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *75684250
+  version_requirements: *74627180
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &75684020 !ruby/object:Gem::Requirement
+  requirement: &74626900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *75684020
+  version_requirements: *74626900
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &75683730 !ruby/object:Gem::Requirement
+  requirement: &74626660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *75683730
+  version_requirements: *74626660
 - !ruby/object:Gem::Dependency
   name: feedutils
-  requirement: &75683490 !ruby/object:Gem::Requirement
+  requirement: &74626360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *75683490
+  version_requirements: *74626360
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &75683190 !ruby/object:Gem::Requirement
+  requirement: &74626110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *75683190
+  version_requirements: *74626110
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &75682950 !ruby/object:Gem::Requirement
+  requirement: &74625810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *75682950
+  version_requirements: *74625810
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &75682640 !ruby/object:Gem::Requirement
+  requirement: &74625560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *75682640
+  version_requirements: *74625560
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &75698770 !ruby/object:Gem::Requirement
+  requirement: &74641630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *75698770
+  version_requirements: *74641630
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &75698470 !ruby/object:Gem::Requirement
+  requirement: &74641390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *75698470
+  version_requirements: *74641390
 description: pluto - Another Planet Generator (Lets You Build Web Pages from Published
   Web Feeds)
 email: feedreader@googlegroups.com
@@ -126,6 +126,7 @@ files:
 - bin/pluto
 - config/pluto.index.yml
 - lib/pluto.rb
+- lib/pluto/activerecord.rb
 - lib/pluto/cli/main.rb
 - lib/pluto/cli/opts.rb
 - lib/pluto/connecter.rb
@@ -134,7 +135,12 @@ files:
 - lib/pluto/installer.rb
 - lib/pluto/lister.rb
 - lib/pluto/manifest_helpers.rb
-- lib/pluto/models.rb
+- lib/pluto/models/action.rb
+- lib/pluto/models/feed.rb
+- lib/pluto/models/item.rb
+- lib/pluto/models/site.rb
+- lib/pluto/models/subscription.rb
+- lib/pluto/models/utils.rb
 - lib/pluto/refresher.rb
 - lib/pluto/schema.rb
 - lib/pluto/subscriber.rb

data/lib/pluto/models.rb

@@ -1,94 +0,0 @@
-module Pluto
-  module Models
-
-class Feed < ActiveRecord::Base
-  self.table_name = 'feeds'
-
-  has_many :items
-  has_many :subscriptions
-  has_many :sites, :through => :subscriptions
-
-
-  def self.latest
-    # note: order by first non-null datetime field
-    #   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(latest_published_at,'1999-01-01') desc" )
-  end
-
-
-  def published_at?
-    read_attribute(:published_at).present?
-  end
-
-  def published_at
-    ## todo/fix: use a new name - do NOT squeeze convenience lookup into existing
-    #    db backed attribute
-
-    if read_attribute(:published_at).present?
-      read_attribute(:published_at)
-    elsif read_attribute(:touched_at).present?
-      ## try touched_at (aka updated (ATOM))
-      read_attribute(:touched_at)
-    else  ## try build_at (aka lastBuildDate (RSS))
-      read_attribute(:built_at)
-    end
-  end
-
-end  # class Feed
-
-class Item < ActiveRecord::Base
-  self.table_name = 'items'
-
-  belongs_to :feed
-  
-  def self.latest
-    # note: order by first non-null datetime field
-    #   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,'1999-01-01') desc" )
-  end
-
-  def published_at?
-    read_attribute(:published_at).present?
-  end
-
-  def published_at
-    ## todo/fix: use a new name - do NOT squeeze convenience lookup into existing
-    #    db backed attribute
-
-    if read_attribute(:published_at).present?
-      read_attribute(:published_at)
-    else  ## try touched_at (aka updated)
-      read_attribute(:touched_at)
-    end
-  end
-
-end  # class Item
-
-
-class Site < ActiveRecord::Base
-  self.table_name = 'sites'
-  
-  has_many :subscriptions
-  has_many :feeds, :through => :subscriptions
-end
-
-class Subscription < ActiveRecord::Base
-  self.table_name = 'subscriptions'
-  
-  belongs_to :site
-  belongs_to :feed
-end
-
-class Action < ActiveRecord::Base
-  self.table_name = 'actions'
-
-end
-
-
-  end # module Models
-end # module Pluto