pluto 0.8.4 → 0.8.5

data/lib/pluto/models/feed.rb

@@ -20,13 +20,22 @@ class Feed < ActiveRecord::Base
     order( "coalesce(latest_published_at,'1911-01-01') desc" )
   end
 
+  ##################################
+  # attribute reader aliases
+  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 url?()           read_attribute(:url).present?;       end
   def title?()         read_attribute(:title).present?;     end
+  def title2?()        read_attribute(:title2).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 title2()   read_attribute_w_fallbacks( :title2,   :auto_title2 );   end
   def feed_url() read_attribute_w_fallbacks( :feed_url, :auto_feed_url ); end
 
 

data/lib/pluto/models/item.rb

@@ -7,7 +7,14 @@ class Item < ActiveRecord::Base
   include Pluto::ActiveRecordMethods  # e.g. read_attribute_w_fallbacks
 
   belongs_to :feed
-  
+
+  ##################################
+  # attribute reader aliases
+  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 self.latest
     # note: order by first non-null datetime field
     #   coalesce - supported by sqlite (yes), postgres (yes)

data/lib/pluto/models/site.rb

@@ -6,6 +6,12 @@ class Site < ActiveRecord::Base
   
   has_many :subscriptions
   has_many :feeds, :through => :subscriptions
+  has_many :items, :through => :feeds
+
+  ##################################
+  # attribute reader aliases
+  def name()        title;    end  # alias for title
+
 end
 
   end # module Models

data/lib/pluto/refresher.rb

@@ -60,7 +60,11 @@ class Refresher
         touched_at:   feed.updated?   ? feed.updated   : nil,
         built_at:     feed.built?     ? feed.built     : nil,
         summary:      feed.summary?   ? feed.summary   : nil,
-        title2:       feed.title2?    ? feed.title2    : nil,
+        ### todo/fix: add/use
+        # auto_title:     ???,
+        # auto_url:       ???,
+        # auto_feed_url:  ???,
+        auto_title2:  feed.title2?    ? feed.title2    : nil,
         generator:    feed.generator
       }
 

data/lib/pluto/schema.rb

@@ -19,16 +19,18 @@ class CreateDb < ActiveRecord::Migration
     end
 
     create_table :feeds do |t|
-      t.string  :title        # user supplied titled
+      t.string  :title        # user supplied title
       t.string  :auto_title   # "fallback" - auto(fill) title from feed
 
+      t.string  :title2        # user supplied title2
+      t.string  :auto_title2   # "fallback" - auto(fill) title2 from feed e.g. subtitle (atom)
+
       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  :generator   # feed generator (e.g. wordpress, etc.)  from feed

data/lib/pluto/subscriber.rb

@@ -34,10 +34,17 @@ class Subscriber
     # -- log update action
     Action.create!( title: 'update subscriptions' )
 
+    # clean out subscriptions and add again
+    logger.debug "before site.subscriptions.delete_all - count: #{site_rec.subscriptions.count}"
+    site_rec.subscriptions.destroy_all  # note: use destroy_all NOT delete_all (delete_all tries by default only nullify)
+    logger.debug "after site.subscriptions.delete_all - count: #{site_rec.subscriptions.count}"
 
     config.each do |key, value|
-      
-      next if ['title','name','feeds'].include?( key )   # skip "top-level" feed keys e.g. title, etc.
+
+      ## todo: downcase key - why ??? why not???
+
+      # skip "top-level" feed keys e.g. title, etc. or planet planet sections (e.g. planet,defaults)
+      next if ['title','title2','name','feeds','planet','defaults'].include?( key )   
 
       ### todo/check:
       ##   check value - must be hash
@@ -50,8 +57,9 @@ class Subscriber
       # todo: use title from feed?
       feed_attribs = {
         feed_url: feed_hash[ 'feed' ]  || feed_hash[ 'feed_url' ],
-        url:      feed_hash[ 'link' ]  || feed_hash[ 'site' ] || feed_hash[ 'url' ],
-        title:    feed_hash[ 'title' ] || feed_hash[ 'name' ] || feed_hash[ 'author' ]
+        url:      feed_hash[ 'link' ]  || feed_hash[ 'url' ],
+        title:    feed_hash[ 'title' ] || feed_hash[ 'name' ],
+        title2:   feed_hash[ 'title2' ]
       }
 
       puts "Updating feed subscription >#{feed_key}< - >#{feed_attribs[:feed_url]}<..."
@@ -68,9 +76,10 @@ class Subscriber
       end
       
       feed_rec.update_attributes!( feed_attribs )
-      
-      ## todo:
-      #  add subscription records  (feed,site)  - how? 
+
+      #  add subscription record
+      #   note: subscriptions get cleaned out on update first (see above)
+      site_rec.subscriptions.create!( feed_id: feed_rec.id )   
     end
 
   end # method update_subscriptions

data/lib/pluto/template_helpers.rb

@@ -68,7 +68,7 @@ module TemplateHelper
   #   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
+    href = "#{href}.css"  unless href.ends_with?( '.css' )   # auto-add .css if not present
     "<link rel='stylesheet' type='text/css' href='#{href}'>"
   end
 

data/lib/pluto/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pluto
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakman
-  requirement: &74627180 !ruby/object:Gem::Requirement
+  requirement: &80642240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *74627180
+  version_requirements: *80642240
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &74626900 !ruby/object:Gem::Requirement
+  requirement: &80642000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *74626900
+  version_requirements: *80642000
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &74626660 !ruby/object:Gem::Requirement
+  requirement: &80641710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *74626660
+  version_requirements: *80641710
 - !ruby/object:Gem::Dependency
   name: feedutils
-  requirement: &74626360 !ruby/object:Gem::Requirement
+  requirement: &80641470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *74626360
+  version_requirements: *80641470
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &74626110 !ruby/object:Gem::Requirement
+  requirement: &80641170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *74626110
+  version_requirements: *80641170
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &74625810 !ruby/object:Gem::Requirement
+  requirement: &80640910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *74625810
+  version_requirements: *80640910
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &74625560 !ruby/object:Gem::Requirement
+  requirement: &80640610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *74625560
+  version_requirements: *80640610
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &74641630 !ruby/object:Gem::Requirement
+  requirement: &80640330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *74641630
+  version_requirements: *80640330
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &74641390 !ruby/object:Gem::Requirement
+  requirement: &80640060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *74641390
+  version_requirements: *80640060
 description: pluto - Another Planet Generator (Lets You Build Web Pages from Published
   Web Feeds)
 email: feedreader@googlegroups.com