pluto-update 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39836180edc940c1dd06d5161c18d7991c551715
-  data.tar.gz: 74c2f94f4da7e426bdc7c806672f9625dc35d081
+  metadata.gz: b534e9fb9d14aca449c32058b71a07a982614abe
+  data.tar.gz: 1fd0907569cc6873315aefdc50fd253f1d74dc94
 SHA512:
-  metadata.gz: adf0ec25e897b3eb3d0f1f44fe9178b4303eec1b535bf9ac98390002e87f3cc86e0208b3284a43215842053fdcc5db5ebe5eb99417badb0085aa806e0ee1a7ba
-  data.tar.gz: 7b8035080c0d059e14c455a4c9591c50b5966904429e9149e2c35512e671d869b15c6322cad6321dbf3293cd89d2c10e47cd652da156f0544b09d111d2e5a48e
+  metadata.gz: a876af41b04b12cd62adf1b94ed224565b73199ae5db6ce06470dc55bb1b84593c67e0774d1ea5611ec08155a9f0517c19c22a5cd43737fc8cbc48d648df595b
+  data.tar.gz: 96bdd000fa51b8e84cf6b20ab91b8b1cc7f023c2f17a1d36122d2a3cd82aa75f336b67a0f81b9d68eec1fe60bed00ed3aa48c4753e7ef84e5b28e700b9262172

data/README.md

@@ -1,7 +1,7 @@
 #  pluto-update gem - planet feed 'n' subscription updater
 
-* home  :: [github.com/feedreader/pluto-update](https://github.com/feedreader/pluto-update)
-* bugs  :: [github.com/feedreader/pluto-update/issues](https://github.com/feedreader/pluto-update/issues)
+* home  :: [github.com/feedreader/pluto.update](https://github.com/feedreader/pluto.update)
+* bugs  :: [github.com/feedreader/pluto.update/issues](https://github.com/feedreader/pluto.update/issues)
 * gem   :: [rubygems.org/gems/pluto-update](https://rubygems.org/gems/pluto-update)
 * rdoc  :: [rubydoc.info/gems/pluto-update](http://rubydoc.info/gems/pluto-update)
 * forum :: [groups.google.com/group/feedreader](http://groups.google.com/group/feedreader)

data/Rakefile

@@ -8,7 +8,7 @@ Hoe.spec 'pluto-update' do
   self.summary = "pluto-update - planet feed 'n' subscription updater"
   self.description = summary
 
-  self.urls    = ['https://github.com/feedreader/pluto-update']
+  self.urls    = ['https://github.com/feedreader/pluto.update']
 
   self.author  = 'Gerald Bauer'
   self.email   = 'feedreader@googlegroups.com'

data/lib/pluto/update/subscriber.rb

@@ -20,10 +20,14 @@ class Subscriber
   end
 
 
+
   def update_subscriptions_for( site_key, config, opts={} )
     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)
+      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)
+      author:  config['author'] || config['owner'],
+      email:   config['email'],
+      updated: Time.now,   ## track last_update via pluto (w/ update_subscription_for fn)
     }
 
     logger.debug "site_attribs: #{site_attribs.inspect}"
@@ -42,6 +46,12 @@ class Subscriber
     # -- log update activity
     Activity.create!( text: "update subscriptions >#{site_key}<" )
 
+    #### todo/fix:
+    ##  double check - how to handle delete
+    ##    feeds might get referenced by other sites
+    ##   cannot just delete feeds; only save to delete join table (subscriptions)
+    ##   check if feed "lingers" on with no reference (to site)???
+
     # 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)
@@ -52,10 +62,11 @@ class Subscriber
       ## 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',
+      next if ['title','name','name2','title2','subtitle',
                'source', 'url',
                'include','includes','exclude','excludes',
                'feeds',
+               'author', 'owner', 'email',
                'planet','defaults'].include?( key )
 
       ### todo/check:
@@ -70,27 +81,33 @@ class Subscriber
       #  e.g. fill up auto_title, auto_url, etc.
 
       feed_attribs = {
-        feed_url: feed_hash[ 'feed' ]  || feed_hash[ 'feed_url' ],
-        url:      feed_hash[ 'link' ]  || feed_hash[ 'url' ],
+        feed_url: feed_hash[ 'feed' ]  || feed_hash[ 'feed_url' ] || feed_hash[ 'xml_url' ],
+        url:      feed_hash[ 'link' ]  || feed_hash[ 'url' ] || feed_hash[ 'html_url' ],
         title:    feed_hash[ 'title' ] || feed_hash[ 'name' ],
-        title2:   feed_hash[ 'title2' ],
+        title2:   feed_hash[ 'title2' ] || feed_hash[ 'name2' ] || feed_hash[ 'subtitle'],
         includes: feed_hash[ 'includes' ] || feed_hash[ 'include' ],
         excludes: feed_hash[ 'excludes' ] || feed_hash[ 'exclude' ],
- ## todo/future: add option for adding encoding - might not always be utf8 !!!!
- ##       encoding: feed_hash[ 'encoding' ] || feed_hash[ 'charset' ] || 'utf8',  ## default to utf8 
+        author:   feed_hash[ 'author' ] || feed_hash[ 'owner' ],
+        email:    feed_hash[ 'email' ],
+        avatar:   feed_hash[ 'avatar' ] || feed_hash[ 'face'],
+        github:   feed_hash[ 'github'  ],
+        twitter:  feed_hash[ 'twitter' ],
+        meetup:   feed_hash[ 'meetup' ],
       }
+      feed_attribs[:encoding] = feed_hash['encoding']||feed_hash['charset']    if feed_hash['encoding']||feed_hash['charset']
+
 
       puts "Updating feed subscription >#{feed_key}< - >#{feed_attribs[:feed_url]}<..."
 
       feed_rec = Feed.find_by_key( feed_key )
       if feed_rec.nil?
-        feed_rec             = Feed.new
-        feed_attribs[ :key ] = feed_key
+        feed_rec           = Feed.new
+        feed_attribs[:key] = feed_key
 
         ## use object_id: feed.id and object_type: Feed
         ## change - model/table/schema!!!
         ## todo: add parent_action_id - why? why not?
-        Activity.create!( text: "new feed >#{feed_key}< - #{feed_attribs[ :title ]}" )
+        Activity.create!( text: "new feed >#{feed_key}< - #{feed_attribs[:title]}" )
       end
 
       feed_rec.update_attributes!( feed_attribs )

data/lib/pluto/update/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluto-update
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.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: pluto-models
@@ -85,7 +85,7 @@ files:
 - lib/pluto/update/subscriber.rb
 - lib/pluto/update/updater.rb
 - lib/pluto/update/version.rb
-homepage: https://github.com/feedreader/pluto-update
+homepage: https://github.com/feedreader/pluto.update
 licenses:
 - Public Domain
 metadata: {}