pluto-models 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f17253773a7629dbd311e1d3aecb9babfbf50cd
-  data.tar.gz: 57f21b6e70a575e104bbf9d8fbf57cde52148d92
+  metadata.gz: 6690b769ee8041814fe15af85acc647ced2c4f33
+  data.tar.gz: 797c2054af4bc2975495e9a7ba61ddf922d5f770
 SHA512:
-  metadata.gz: e56ba1c10d02aeec5807a7cc5527711729b74300d4d0b11d472dfc710d5d0338a7d1c2deb348dee41bdcffe7a33f267515aa76b2170b46a83a01580e8af6ef4e
-  data.tar.gz: d3372c8160a1401ae7da82c739348e672aa138a99d1d2b69bdf7374f7c0691dbae7b583fc0a6d6b35f3175055bc0193121018f4bcf0c49c580d85c79cfa3dcc7
+  metadata.gz: 1dca815302f8ffffbb8902241bf4db7388a2b747839cf88ee7be68ce2dc392de935127e994b1428454229516cd0efcb169e08b17ac46e20fbaecd6e526263b23
+  data.tar.gz: af2731d41d1837c7ea81f7ac466c2714ed421e9a8ae0897e5e7dd989c9055f26daf594ffeb0b7469f0a396521c2b7912f5e6b92c61c401e98bf3cc976e5a7d56

data/lib/pluto/models/feed.rb

@@ -31,10 +31,18 @@ class Feed < ActiveRecord::Base
   #
   #  todo: check if we can use alias_method :name, :title   - works for non-existing/on-demand-generated method too??
 
-  def name()        title;    end  # alias for title
-  def description() summary;  end  # alias for summary  -- also add descr shortcut??
-  def link()        url;      end  # alias for url
-  def feed()        feed_url; end  # alias for feed_url
+  def name()        title;    end  # alias    for title
+  def description() summary;  end  # alias    for summary
+  def desc()        summary;  end  # alias(2) for summary
+  def link()        url;      end  # alias    for url
+  def feed()        feed_url; end  # alias    for feed_url
+
+  def author_name()  author;  end # alias    for author
+  def owner_name()   author;  end # alias(2) for author
+  def owner()        author;  end # alias(3) for author
+  def author_email() email;   end # alias    for email
+  def author_email() email;   end # alias(2) for email
+
 
   def url?()           read_attribute(:url).present?;       end
   def title?()         read_attribute(:title).present?;     end

data/lib/pluto/models/item.rb

@@ -16,9 +16,11 @@ class Item < ActiveRecord::Base
   ##################################
   # attribute reader aliases
   def name()        title;    end  # alias for title
-  def description() summary;  end  # alias for summary  -- also add descr shortcut??
+  def description() summary;  end  # alias     for summary  -- also add descr shortcut??
+  def desc()        summary;  end  # alias (2) for summary  -- also add descr shortcut??
   def link()        url;      end  # alias for url
 
+
   def self.latest
     # note: order by first non-null datetime field
     #   coalesce - supported by sqlite (yes), postgres (yes)

data/lib/pluto/models/site.rb

@@ -15,7 +15,15 @@ class Site < ActiveRecord::Base
   def name()        title;    end  # alias for title
   def fetched_at()  fetched;  end  # - legacy attrib reader -- remove!!!
 
-end
+  def owner_name()  author;  end  # alias    for author
+  def owner()       author;  end  # alias(2) for author
+  def author_name() author;  end  # alias(3) for author
+
+  def owner_email()  email;  end  # alias    for email
+  def author_email() email;  end  # alias(2) for email
+
+end # class Site
+
 
   end # module Model
 end # module Pluto

data/lib/pluto/schema.rb

@@ -6,22 +6,27 @@ class CreateDb < ActiveRecord::Migration
 
   def up
     create_table :sites do |t|
-      t.string   :title,     :null => false    # e.g Planet Ruby, Planet JavaScript, etc.
-      t.string   :key,       :null => false    # e.g. ruby, js, etc.
+      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 
+      ## note: make sure to use same fields for update check as feed
 
-      t.datetime :fetched   #  last fetched/checked date -- make not null ??
+      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
@@ -31,7 +36,6 @@ class CreateDb < ActiveRecord::Migration
       # note: do NOT store body content (that is, text) and md5 digest
       #   use git! and github! commit will be http_etag!!
 
-      t.datetime :fetched    # last fetched/checked date
 
       #############
       # more fields
@@ -39,13 +43,18 @@ class CreateDb < ActiveRecord::Migration
       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.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, rss 0.7 etc.
+
       t.string  :title        # user supplied title
       t.string  :auto_title   # "fallback" - auto(fill) title from feed
 
@@ -66,10 +75,16 @@ class CreateDb < ActiveRecord::Migration
       t.datetime :built      # from feed lastBuiltDate(rss)
       t.datetime :touched    # from feed updated(atom)
 
+
       ### 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   :github   # github handle  (optional)
       t.string   :twitter  # twitter handle (optional)
-      t.string   :avatar   # gravator or hackergotchi handle (optional)
+      t.string   :meetup   # meetup handle (optional)
+
 
       ### add class/kind field e.g.
       # - personal feed/blog/site, that is, individual author
@@ -79,16 +94,14 @@ class CreateDb < ActiveRecord::Migration
       # - other  (link blog?, podcast?) - why? why not??
 
       ############
-      # filters
+      # 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 :last_published # cache last (latest) published for items
-
-      t.string  :key,      :null => false
-      t.string  :format      # e.g. atom (1.0), rss 2.0, rss 0.7 etc.
+      t.datetime :last_published  # cache last (latest) published for items - e.g. latest date from publisehd 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
@@ -99,7 +112,6 @@ class CreateDb < ActiveRecord::Migration
       t.string   :md5       # md5 hash of body
       t.text     :body      # last http response body (complete feed!)
 
-      t.datetime :fetched    # last fetched/checked date
 
       t.timestamps   # created_at, updated_at
     end
@@ -122,9 +134,9 @@ class CreateDb < ActiveRecord::Migration
       t.datetime :touched     # from feed updated (atom)
 
       ## todo: add :last_updated_at ??  (NOTE: updated_at already take by auto-timestamps)
-      t.references :feed, :null => false
+      t.references :feed, null: false
 
-      t.datetime :fetched   # last fetched/check date
+      t.datetime :fetched   # last fetched/check date via pluto
       t.timestamps   # created_at, updated_at
 
       ## t.string   :author

data/lib/pluto/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluto-models
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-14 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props