pluto-models 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd11efa85f9dedf8eace5016aee8f33e8c1d7eec
-  data.tar.gz: 2d4c4f5e9a919c65c7bc68883b4bc069a88d8393
+  metadata.gz: ad263401c798a7b1d893eb500232872a8afc0ca8
+  data.tar.gz: 1a49217497e1b15de32024bdc53fcef480bf0195
 SHA512:
-  metadata.gz: dadef8f729fb4991b346a5320b973fe2f76b7a00f128228907f7e59c2a55ca55ede3b49cf5411c9a1c3e1e2b04be136fc0957c2327c978c034efacd84136749d
-  data.tar.gz: ecd1033a25050c3c124179b9c4bb798e5d0886588aa9e4e35c5389d9950658b7df5994d8c5103904688b8245172514c41f0e4d261a90b252c0d34669b817f262
+  metadata.gz: 11ff9b19fbe322bd20748edc5f6ce993b0235565c9501a2db45ce67d74f2655596d09a937162d1a98060d4129114cea3b03f6a685bd46d79da0270f1e5eaf889
+  data.tar.gz: b88a9638733715423053eeae0e81dde8d622d34c087e767ee6480c8108da1bd6b102dae3dd70c60db709abc1c94625c49f9f074bd8dbc98d5e7a6fd62c7123c2

data/lib/pluto/connecter.rb

@@ -1,83 +1,85 @@
-# encoding: utf-8
-
-module Pluto
-
-
-# DB Connecter / Connection Manager
-#   lets you establish connection
-
-class Connecter
-
-  include LogUtils::Logging
-
-  def initialize
-    # do nothing for now
-  end
-
-
-  def debug=(value) @debug = value; end
-  def debug?()      @debug || false; end
-
-
-  def connect( config={} )
-
-    if config.empty?   # use/try DATABASE_URL from environment
-
-      logger.debug "ENV['DATBASE_URL'] - >#{ENV['DATABASE_URL']}<"
-
-      db = URI.parse( ENV['DATABASE_URL'] || 'sqlite3:///pluto.db' )
-
-      if db.scheme == 'postgres'
-        config = {
-          adapter:  'postgresql',
-          host:     db.host,
-          port:     db.port,
-          username: db.user,
-          password: db.password,
-          database: db.path[1..-1],
-          encoding: 'utf8'
-        }
-      else   # assume sqlite3
-        config = {
-          adapter:  db.scheme,       # sqlite3
-          database: db.path[1..-1]   # pluto.db (NB: cut off leading /, thus 1..-1)
-        }
-      end
-    end  # if config.nil?
-
-    puts 'db settings:'
-    pp config
-
-    ### for dbbrowser and other tools add to ActiveRecord
-
-    if ActiveRecord::Base.configurations.nil?   # todo/check: can this ever happen? remove?
-       puts "ActiveRecord configurations nil - set to empty hash"
-       ActiveRecord::Base.configurations = {}  # make it an empty hash
-    end
-
-    if debug?
-      puts 'ar configurations (before):'
-      pp ActiveRecord::Base.configurations
-    end
-
-    # note: for now always use pluto key for config storage
-    ActiveRecord::Base.configurations['pluto'] = config
-
-    if debug?
-      puts 'ar configurations (after):'
-      pp ActiveRecord::Base.configurations
-    end
-
-
-    # for debugging - disable for production use
-    if debug?
-      ActiveRecord::Base.logger = Logger.new( STDOUT )
-    end
-
-    ActiveRecord::Base.establish_connection( config )
-  end # method connect
-
-
-end # class Connecter
-
-end # module Pluto
+# encoding: utf-8
+
+module Pluto
+
+
+# DB Connecter / Connection Manager
+#   lets you establish connection
+
+class Connecter
+
+  include LogUtils::Logging
+
+  def initialize
+    # do nothing for now
+  end
+
+
+  def debug=(value) @debug = value; end
+  def debug?()      @debug || false; end
+
+
+  def connect( config={} )
+
+    if config.empty?   # use/try DATABASE_URL from environment
+
+      logger.debug "ENV['DATBASE_URL'] - >#{ENV['DATABASE_URL']}<"
+
+      db = URI.parse( ENV['DATABASE_URL'] || 'sqlite3:///pluto.db' )
+
+      if db.scheme == 'postgres'
+        config = {
+          adapter:  'postgresql',
+          host:     db.host,
+          port:     db.port,
+          username: db.user,
+          password: db.password,
+          database: db.path[1..-1],
+          encoding: 'utf8'
+        }
+      else   # assume sqlite3
+        config = {
+          adapter:  db.scheme,       # sqlite3
+          database: db.path[1..-1]   # pluto.db (NB: cut off leading /, thus 1..-1)
+        }
+      end
+    end  # if config.nil?
+
+    logger.info 'db settings:'
+    logger.info config.pretty_inspect
+
+    ### for dbbrowser and other tools add to ActiveRecord
+
+    if ActiveRecord::Base.configurations.nil?   # todo/check: can this ever happen? remove?
+       logger.debug "ActiveRecord configurations nil - set to empty hash"
+       ActiveRecord::Base.configurations = {}  # make it an empty hash
+    end
+
+    ## todo/fix: remove debug? option - why? why not?
+    ##    (just) use logger level eg. logger.debug
+    if debug?
+      logger.debug 'ar configurations (before):'
+      logger.debug ActiveRecord::Base.configurations.pretty_inspect
+    end
+
+    # note: for now always use pluto key for config storage
+    ActiveRecord::Base.configurations['pluto'] = config
+
+    if debug?
+      logger.debug 'ar configurations (after):'
+      logger.debug ActiveRecord::Base.configurations.pretty_inspect
+    end
+
+
+    # for debugging - disable for production use
+    if debug?
+      ActiveRecord::Base.logger = Logger.new( STDOUT )
+    end
+
+    ActiveRecord::Base.establish_connection( config )
+  end # method connect
+
+
+end # class Connecter
+
+end # module Pluto

data/lib/pluto/models.rb

@@ -78,7 +78,7 @@ module Pluto
 
     unless Model::Feed.table_exists?
       Pluto.create
-    end    
+    end
   end # method auto_migrate!
 
 
@@ -111,4 +111,4 @@ end  # module Pluto
 
 
 # say hello
-puts Pluto.banner   if $DEBUG || (defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG) 
+puts Pluto.banner   if $DEBUG || (defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG)

data/lib/pluto/models/feed.rb

@@ -4,7 +4,19 @@
 module Pluto
   module Model
 
+
 class Feed < ActiveRecord::Base
+
+## logging w/ ActiveRecord
+##   todo/check: check if logger instance method is present by default?
+##     only class method present?
+##   what's the best way to add logging to activerecord (use "builtin" machinery??)
+
+  def debug=(value)  @debug = value;   end
+  def debug?()       @debug || false;  end
+
+
+
   self.table_name = 'feeds'
 
   has_many :items
@@ -72,12 +84,11 @@ class Feed < ActiveRecord::Base
   end
 
 
-  def debug=(value)  @debug = value;   end
-  def debug?()       @debug || false;  end
-
 
   def deep_update_from_struct!( data )
 
+    logger = LogUtils::Logger.root
+
     ######
     ## check for filters (includes/excludes) if present
     ##  for now just check for includes
@@ -90,18 +101,18 @@ class Feed < ActiveRecord::Base
 
     data.items.each do |item|
       if includesFilter && includesFilter.match_item?( item ) == false
-        puts "** SKIPPING | #{item.title}"
-        puts "  no include terms match: #{includes}"
+        logger.info "** SKIPPING | #{item.title}"
+        logger.info "  no include terms match: #{includes}"
         next   ## skip to next item
       end
 
       item_rec = Item.find_by_guid( item.guid )
       if item_rec.nil?
         item_rec  = Item.new
-        puts "** NEW | #{item.title}"
+        logger.info "** NEW | #{item.title}"
       else
         ## todo: check if any attribs changed
-        puts "UPDATE | #{item.title}"
+        logger.info "UPDATE | #{item.title}"
       end
 
       item_rec.debug = debug? ? true : false  # pass along debug flag
@@ -133,6 +144,8 @@ class Feed < ActiveRecord::Base
 
   def update_from_struct!( data )
 
+    logger = LogUtils::Logger.root
+
 ##
 # todo:
 ##  strip all tags from summary (subtitle)
@@ -158,9 +171,9 @@ class Feed < ActiveRecord::Base
     if debug?
         ## puts "*** dump feed_attribs:"
         ## pp feed_attribs
-        puts "*** dump feed_attribs w/ class types:"
+        logger.debug "*** dump feed_attribs w/ class types:"
         feed_attribs.each do |key,value|
-          puts "  #{key}: >#{value}< : #{value.class.name}"
+          logger.debug "  #{key}: >#{value}< : #{value.class.name}"
         end
     end
 

data/lib/pluto/models/forward.rb

@@ -17,4 +17,3 @@ Activity = ActivityDb::Models::Activity
   Models = Model
 
 end # module Pluto
-

data/lib/pluto/models/item.rb

@@ -4,12 +4,22 @@ module Pluto
   module Model
 
 class Item < ActiveRecord::Base
+
+## logging w/ ActiveRecord
+##   todo/check: check if logger instance method is present by default?
+##     only class method present?
+##   what's the best way to add logging to activerecord (use "builtin" machinery??)
+
+  def debug=(value)  @debug = value;   end
+  def debug?()       @debug || false;  end
+
+
   self.table_name = 'items'
 
   belongs_to :feed
 
   ## todo/fix:
-  ##  use a module ref or something; do NOT include all methods - why? why not? 
+  ##  use a module ref or something; do NOT include all methods - why? why not?
   include TextUtils::HypertextHelper   ## e.g. lets us use strip_tags( ht )
   include FeedFilter::AdsFilter        ## e.g. lets us use strip_ads( ht )
 
@@ -46,11 +56,11 @@ class Item < ActiveRecord::Base
   end
 
 
-  def debug=(value)  @debug = value;   end
-  def debug?()       @debug || false;  end
-
 
   def update_from_struct!( data )
+
+    logger = LogUtils::Logger.root
+
     ## check: new item/record?  not saved?  add guid
     #   otherwise do not add guid  - why? why not?
 
@@ -68,10 +78,10 @@ class Item < ActiveRecord::Base
     }
 
     if debug?
-      puts "*** dump item_attribs w/ class types:"
+      logger.debug "*** 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}"
+        logger.debug "  #{key}: >#{value}< : #{value.class.name}"
       end
     end
 

data/lib/pluto/models/site.rb

@@ -4,15 +4,18 @@ module Pluto
   module Model
 
 class Site < ActiveRecord::Base
+
+
+
   self.table_name = 'sites'
-  
+
   has_many :subscriptions
   has_many :feeds, :through => :subscriptions
   has_many :items, :through => :feeds
 
   ##################################
   # attribute reader aliases
-  def name()        title;    end  # alias for title
+  def name()        title;   end  # alias for title
 
   def owner_name()  author;  end  # alias    for author
   def owner()       author;  end  # alias(2) for author
@@ -46,6 +49,8 @@ class Site < ActiveRecord::Base
 
   def deep_update_from_hash!( config, opts={} )
 
+    logger = LogUtils::Logger.root
+
     site_attribs = {
       title:   config['title']  || config['name'],   # support either title or name
       url:     config['source'] || config['url'],    # support source or url   for source url for auto-update (optional)
@@ -59,7 +64,6 @@ class Site < ActiveRecord::Base
     site_attribs[:key] = site_key   if site_key
 
 
-    logger = LogUtils::Logger.root
     logger.debug "site_attribs: #{site_attribs.inspect}"
 
     if new_record?
@@ -67,7 +71,7 @@ class Site < ActiveRecord::Base
       ## change - model/table/schema!!!
       Activity.create!( text: "new site >#{key}< - #{title}" )
     end
-    
+
     update_attributes!( site_attribs )
 
 
@@ -135,41 +139,41 @@ class Site < ActiveRecord::Base
 ##
 # auto-fill; convenience helpers
 
-    if feed_hash['meetup']
+      if feed_hash['meetup']
 ##  link/url      = http://www.meetup.com/vienna-rb
 ##  feed/feed_url = http://www.meetup.com/vienna-rb/events/rss/vienna.rb/
 
-      feed_attribs[:url]      = "http://www.meetup.com/#{feed_hash['meetup']}"    if feed_attribs[:url].nil?
-      feed_attribs[:feed_url] = "http://www.meetup.com/#{feed_hash['meetup']}/events/rss/#{feed_hash['meetup']}/"    if feed_attribs[:feed_url].nil?
-    end
+        feed_attribs[:url]      = "http://www.meetup.com/#{feed_hash['meetup']}"    if feed_attribs[:url].nil?
+        feed_attribs[:feed_url] = "http://www.meetup.com/#{feed_hash['meetup']}/events/rss/#{feed_hash['meetup']}/"    if feed_attribs[:feed_url].nil?
+      end
 
-    if feed_hash['googlegroups']
+      if feed_hash['googlegroups']
 ##  link/url      = https://groups.google.com/group/beerdb or
 ##                  https://groups.google.com/forum/#!forum/beerdb
 ##  feed/feed_url = https://groups.google.com/forum/feed/beerdb/topics/atom.xml?num=15
 
-      feed_attribs[:url]      = "https://groups.google.com/group/#{feed_hash['googlegroups']}"    if feed_attribs[:url].nil?
-      feed_attribs[:feed_url] = "https://groups.google.com/forum/feed//#{feed_hash['googlegroups']}/topics/atom.xml?num=15"    if feed_attribs[:feed_url].nil?
-    end
+        feed_attribs[:url]      = "https://groups.google.com/group/#{feed_hash['googlegroups']}"    if feed_attribs[:url].nil?
+        feed_attribs[:feed_url] = "https://groups.google.com/forum/feed//#{feed_hash['googlegroups']}/topics/atom.xml?num=15"    if feed_attribs[:feed_url].nil?
+      end
 
-    if feed_hash['github'] && feed_hash['github'].index('/')  ## e.g. jekyll/jekyll
+      if feed_hash['github'] && feed_hash['github'].index('/')  ## e.g. jekyll/jekyll
 ## link/url      = https://github.com/jekyll/jekyll
 ## feed/feed_url = https://github.com/jekyll/jekyll/commits/master.atom
 
-      feed_attribs[:url]      = "https://github.com/#{feed_hash['github']}"    if feed_attribs[:url].nil?
-      feed_attribs[:feed_url] = "https://github.com/#{feed_hash['github']}/commits/master.atom"    if feed_attribs[:feed_url].nil?
-    end
+        feed_attribs[:url]      = "https://github.com/#{feed_hash['github']}"    if feed_attribs[:url].nil?
+        feed_attribs[:feed_url] = "https://github.com/#{feed_hash['github']}/commits/master.atom"    if feed_attribs[:feed_url].nil?
+      end
 
-    if feed_hash['rubygems'] && feed_attribs[:url].nil? && feed_attribs[:feed_url].nil?
+      if feed_hash['rubygems'] && feed_attribs[:url].nil? && feed_attribs[:feed_url].nil?
 ## link/url      = http://rubygems.org/gems/jekyll
 ## feed/feed_url = http://rubygems.org/gems/jekyll/versions.atom
 
-      feed_attribs[:url]      = "http://rubygems.org/gems/#{feed_hash['rubygems']}"    if feed_attribs[:url].nil?
-      feed_attribs[:feed_url] = "http://rubygems.org/gems/#{feed_hash['rubygems']}/versions.atom"    if feed_attribs[:feed_url].nil?
-    end
+        feed_attribs[:url]      = "http://rubygems.org/gems/#{feed_hash['rubygems']}"    if feed_attribs[:url].nil?
+        feed_attribs[:feed_url] = "http://rubygems.org/gems/#{feed_hash['rubygems']}/versions.atom"    if feed_attribs[:feed_url].nil?
+      end
 
 
-      puts "Updating feed subscription >#{feed_key}< - >#{feed_attribs[:feed_url]}<..."
+      logger.info "Updating feed subscription >#{feed_key}< - >#{feed_attribs[:feed_url]}<..."
 
       feed_rec = Feed.find_by_key( feed_key )
       if feed_rec.nil?
@@ -186,7 +190,7 @@ class Site < ActiveRecord::Base
 
       #  add subscription record
       #   note: subscriptions get cleaned out on update first (see above)
-      subscriptions.create!( feed_id: feed_rec.id )   
+      subscriptions.create!( feed_id: feed_rec.id )
     end
 
   end # method deep_update_from_hash!
@@ -196,4 +200,3 @@ end # class Site
 
   end # module Model
 end # module Pluto
-

data/lib/pluto/models/subscription.rb

@@ -6,7 +6,7 @@ module Pluto
 
 class Subscription < ActiveRecord::Base
   self.table_name = 'subscriptions'
-  
+
   belongs_to :site
   belongs_to :feed
 end

data/lib/pluto/models/utils.rb

@@ -29,7 +29,7 @@ class ItemCursor
 #   new date also **always** starts new feed
 #  - e.g. used for grouping within day (follows planet planet convention)
 
-      if new_date || last_feed_id != item.feed.id 
+      if new_date || last_feed_id != item.feed.id
         new_feed = true
       else
         new_feed = false
@@ -41,7 +41,7 @@ class ItemCursor
       last_feed_id   = item.feed.id
     end
   end # method each
-    
+
 end # class ItemCursor
 
 

data/lib/pluto/schema.rb

@@ -1,153 +1,153 @@
-# encoding: utf-8
-
-module Pluto
-
-class CreateDb
-
-def up
-
-ActiveRecord::Schema.define do
-    create_table :sites do |t|
-      t.string   :key,       null: false    # e.g. ruby, js, etc.
-      t.string   :title,     null: false    # e.g Planet Ruby, Planet JavaScript, etc.
-
-      t.string   :author    # owner_name, author_name
-      t.string   :email     # owner_email, author_email
-      t.datetime :updated   # date for subscription list last updated via pluto
-
-      ############
-      # filters (site-wide)
-      t.string   :includes  # regex
-      t.string   :excludes  # regex
-
-
-      ######################
-      # for auto-update of feed list/site config
-
-      t.string   :url    # source url for auto-update (optional)
-
-      ## note: make sure to use same fields for update check as feed
-
-      t.datetime :fetched   #  date for last fetched/checked for feeds via pluto -- make not null ??
-      t.integer  :http_code   # last http status code e.g. 200,404,etc.
-      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
-
-      # note: do NOT store body content (that is, text) and md5 digest
-      #   use git! and github! commit will be http_etag!!
-      t.string   :md5       # md5 hash of body
-
-
-      #############
-      # more fields
-
-      t.timestamps  # created_at, updated_at
-    end
-
-
-    create_table :subscriptions do |t|   # has_many join table (sites/feeds)
-      t.references :site, null: false
-      t.references :feed, null: false
-      t.timestamps
-    end
-
-    create_table :feeds do |t|
-      t.string  :key,       null: false
-      t.string  :encoding,  null: false, default: 'utf8'  # charset encoding; default to utf8
-      t.string  :format      # e.g. atom (1.0), rss 2.0, etc.
-
-      t.string  :title          # user supplied title
-      t.string  :url            # user supplied site url
-      t.string  :feed_url       # user supplied feed url
-
-      t.string  :auto_title     # "fallback" - auto(fill) title from feed
-      t.string  :auto_url       # "fallback" - auto(fill) url from feed
-      t.string  :auto_feed_url  # "fallback" - auto discovery feed url from (site) url
-
-      t.text    :summary    # e.g. description (rss), subtitle (atom)
-      ## todo: add auto_summary  - why? why not?
-
-      t.string  :generator   # feed generator (e.g. wordpress, etc.)  from feed
-
-      t.datetime :updated    # from feed updated(atom) + lastBuildDate(rss)
-      t.datetime :published  # from feed published(atom) + pubDate(rss) - note: published basically an alias for created
-
-
-      ### extras (move to array for custom fields or similar??)
-      t.string   :author    # author_name, owner_name
-      t.string   :email     # author_email, owner_email
-      t.string   :avatar    # gravator or hackergotchi handle (optional)
-      t.string   :location  # e.g. Vienna > Austria,  Bamberg > Germany etc. (optional)
-
-      t.string   :github     # github handle  (optional)
-      t.string   :rubygems   # rubygems handle (optional)
-      t.string   :twitter    # twitter handle (optional)
-      t.string   :meetup     # meetup handle (optional)
-
-
-      ### add class/kind field e.g.
-      # - personal feed/blog/site, that is, individual author
-      # - team blog/site
-      # - org (anization) or com(pany blog/site)
-      # - newsfeed (composite)
-      # - other  (link blog?, podcast?) - why? why not??
-
-      ############
-      # filters (feed-wide)
-      t.string   :includes  # regex
-      t.string   :excludes  # regex
-      # todo: add generic filter list e.g. t.string :filters  (comma,pipe or space separated method names?)
-
-      # -- our own (meta) fields
-      t.datetime :items_last_updated  # cache last (latest) updated for items - e.g. latest date from updated item
-      t.datetime :fetched    # last fetched date via pluto
-
-      t.integer  :http_code   # last http status code e.g. 200,404,etc.
-      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!)
-
-
-      t.timestamps   # created_at, updated_at
-    end
-
-
-    create_table :items do |t|
-      t.string   :guid
-      t.string   :url
-
-      ## note: title may contain more than 255 chars!!
-      ## e.g. Rails Girls blog has massive titles in feed
-      ## cut-off/limit to 255 - why?? why not??
-      ##  also strip tags in titles - why? why not?? - see feed.title2/auto_title2
-
-      t.text     :title   # todo: add some :null => false ??
-      t.text     :summary  # e.g. description (rss), summary (atom)
-      t.text     :content
-
-      t.datetime :updated     # from feed updated (atom) + pubDate(rss)
-      t.datetime :published   # from feed published (atom) -- note: published is basically an alias for created
-
-      ## todo: add :last_updated_at ??  (NOTE: updated_at already take by auto-timestamps)
-      t.references :feed, null: false
-
-      t.datetime :fetched   # last fetched/check date via pluto
-      t.timestamps   # created_at, updated_at
-
-      ## t.string   :author
-      ## todo: add author/authors, category/categories
-    end
-
-end # block Schema.define
-
-end # method up
-
-end # class CreateDb
-
-end  # module Pluto
+# encoding: utf-8
+
+module Pluto
+
+class CreateDb
+
+def up
+
+ActiveRecord::Schema.define do
+    create_table :sites do |t|
+      t.string   :key,       null: false    # e.g. ruby, js, etc.
+      t.string   :title,     null: false    # e.g Planet Ruby, Planet JavaScript, etc.
+
+      t.string   :author    # owner_name, author_name
+      t.string   :email     # owner_email, author_email
+      t.datetime :updated   # date for subscription list last updated via pluto
+
+      ############
+      # filters (site-wide)
+      t.string   :includes  # regex
+      t.string   :excludes  # regex
+
+
+      ######################
+      # for auto-update of feed list/site config
+
+      t.string   :url    # source url for auto-update (optional)
+
+      ## note: make sure to use same fields for update check as feed
+
+      t.datetime :fetched   #  date for last fetched/checked for feeds via pluto -- make not null ??
+      t.integer  :http_code   # last http status code e.g. 200,404,etc.
+      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
+
+      # note: do NOT store body content (that is, text) and md5 digest
+      #   use git! and github! commit will be http_etag!!
+      t.string   :md5       # md5 hash of body
+
+
+      #############
+      # more fields
+
+      t.timestamps  # created_at, updated_at
+    end
+
+
+    create_table :subscriptions do |t|   # has_many join table (sites/feeds)
+      t.references :site, null: false
+      t.references :feed, null: false
+      t.timestamps
+    end
+
+    create_table :feeds do |t|
+      t.string  :key,       null: false
+      t.string  :encoding,  null: false, default: 'utf8'  # charset encoding; default to utf8
+      t.string  :format      # e.g. atom (1.0), rss 2.0, etc.
+
+      t.string  :title          # user supplied title
+      t.string  :url            # user supplied site url
+      t.string  :feed_url       # user supplied feed url
+
+      t.string  :auto_title     # "fallback" - auto(fill) title from feed
+      t.string  :auto_url       # "fallback" - auto(fill) url from feed
+      t.string  :auto_feed_url  # "fallback" - auto discovery feed url from (site) url
+
+      t.text    :summary    # e.g. description (rss), subtitle (atom)
+      ## todo: add auto_summary  - why? why not?
+
+      t.string  :generator   # feed generator (e.g. wordpress, etc.)  from feed
+
+      t.datetime :updated    # from feed updated(atom) + lastBuildDate(rss)
+      t.datetime :published  # from feed published(atom) + pubDate(rss) - note: published basically an alias for created
+
+
+      ### extras (move to array for custom fields or similar??)
+      t.string   :author    # author_name, owner_name
+      t.string   :email     # author_email, owner_email
+      t.string   :avatar    # gravator or hackergotchi handle (optional)
+      t.string   :location  # e.g. Vienna > Austria,  Bamberg > Germany etc. (optional)
+
+      t.string   :github     # github handle  (optional)
+      t.string   :rubygems   # rubygems handle (optional)
+      t.string   :twitter    # twitter handle (optional)
+      t.string   :meetup     # meetup handle (optional)
+
+
+      ### add class/kind field e.g.
+      # - personal feed/blog/site, that is, individual author
+      # - team blog/site
+      # - org (anization) or com(pany blog/site)
+      # - newsfeed (composite)
+      # - other  (link blog?, podcast?) - why? why not??
+
+      ############
+      # filters (feed-wide)
+      t.string   :includes  # regex
+      t.string   :excludes  # regex
+      # todo: add generic filter list e.g. t.string :filters  (comma,pipe or space separated method names?)
+
+      # -- our own (meta) fields
+      t.datetime :items_last_updated  # cache last (latest) updated for items - e.g. latest date from updated item
+      t.datetime :fetched    # last fetched date via pluto
+
+      t.integer  :http_code   # last http status code e.g. 200,404,etc.
+      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!)
+
+
+      t.timestamps   # created_at, updated_at
+    end
+
+
+    create_table :items do |t|
+      t.string   :guid
+      t.string   :url
+
+      ## note: title may contain more than 255 chars!!
+      ## e.g. Rails Girls blog has massive titles in feed
+      ## cut-off/limit to 255 - why?? why not??
+      ##  also strip tags in titles - why? why not?? - see feed.title2/auto_title2
+
+      t.text     :title   # todo: add some :null => false ??
+      t.text     :summary  # e.g. description (rss), summary (atom)
+      t.text     :content
+
+      t.datetime :updated     # from feed updated (atom) + pubDate(rss)
+      t.datetime :published   # from feed published (atom) -- note: published is basically an alias for created
+
+      ## todo: add :last_updated_at ??  (NOTE: updated_at already take by auto-timestamps)
+      t.references :feed, null: false
+
+      t.datetime :fetched   # last fetched/check date via pluto
+      t.timestamps   # created_at, updated_at
+
+      ## t.string   :author
+      ## todo: add author/authors, category/categories
+    end
+
+end # block Schema.define
+
+end # method up
+
+end # class CreateDb
+
+end  # module Pluto

data/lib/pluto/version.rb

@@ -3,8 +3,8 @@
 module Pluto
 
   MAJOR = 1
-  MINOR = 4
-  PATCH = 1
+  MINOR = 5
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/helper.rb

@@ -23,4 +23,3 @@ Subscription = Pluto::Model::Subscription
 
 
 Pluto.setup_in_memory_db
-

data/test/test_filter.rb

@@ -11,7 +11,7 @@ require 'helper'
 class TestFilter < MiniTest::Test
 
   def test_includes
-    
+
     feed1 = Feed.create!(
       key: 'test',
       title: 'Test',
@@ -26,7 +26,7 @@ class TestFilter < MiniTest::Test
     feed_data = FeedParser::Feed.new
     feed_data.title = 'Test'
     feed_data.items = []
-    
+
     item_data = FeedParser::Item.new
     item_data.title = 'Test #1'
     item_data.summary = 'Test'

data/test/test_helpers.rb

@@ -36,7 +36,7 @@ class TestHelper < MiniTest::Test
 
   def test_auto_migrate
     Pluto.auto_migrate!
-    
+
     assert true   ## if we get here it should workd
   end
 

data/test/test_site.rb

@@ -71,4 +71,3 @@ class TestSite < MiniTest::Test
 
 
 end # class TestSite
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluto-models
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props