pluto-update 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b534e9fb9d14aca449c32058b71a07a982614abe
-  data.tar.gz: 1fd0907569cc6873315aefdc50fd253f1d74dc94
+  metadata.gz: 537a23fa41963fdb77dfea36a67d3971673b0ec4
+  data.tar.gz: ca620b5fb7c8e25e236095576919be7b0d48155a
 SHA512:
-  metadata.gz: a876af41b04b12cd62adf1b94ed224565b73199ae5db6ce06470dc55bb1b84593c67e0774d1ea5611ec08155a9f0517c19c22a5cd43737fc8cbc48d648df595b
-  data.tar.gz: 96bdd000fa51b8e84cf6b20ab91b8b1cc7f023c2f17a1d36122d2a3cd82aa75f336b67a0f81b9d68eec1fe60bed00ed3aa48c4753e7ef84e5b28e700b9262172
+  metadata.gz: e6d7563a0cc2e7b6a3e2081ef2b1c1c6e1e30c7ba115220efa4cbd7f7c1356b85ccb0e42e665a78d6663a92dc9d2aacc8237c456eafa449cf77a7bb93e324a26
+  data.tar.gz: b3fba603c49a729c325f0935457739a9d73c04d36d58482921999e63888ba8cf4df4f00e54865314c56909fabedfc19affe767a645e747767c537862bf469124

data/README.md

@@ -33,16 +33,70 @@ title = Planet Ruby
   feed  = http://vienna-rb.at/atom.xml
 ```
 
-For more samples, see [`nytimes.ini`](https://github.com/feedreader/pluto.samples/blob/master/nytimes.ini),
-[`js.ini`](https://github.com/feedreader/pluto.samples/blob/master/js.ini),
-[`dart.ini`](https://github.com/feedreader/pluto.samples/blob/master/dart.ini),
-[`haskell.ini`](https://github.com/feedreader/pluto.samples/blob/master/haskell.ini),
-[`viennarb.ini`](https://github.com/feedreader/pluto.samples/blob/master/viennarb.ini),
-[`beer.ini`](https://github.com/feedreader/pluto.samples/blob/master/beer.ini),
-[`football.ini`](https://github.com/feedreader/pluto.samples/blob/master/football.ini).
+For more samples, see [`nytimes.ini`](https://github.com/feedreader/planets/blob/master/nytimes.ini),
+[`js.ini`](https://github.com/feedreader/planets/blob/master/js.ini),
+[`dart.ini`](https://github.com/feedreader/planets/blob/master/dart.ini),
+[`haskell.ini`](https://github.com/feedreader/planets/blob/master/haskell.ini),
+[`viennarb.ini`](https://github.com/feedreader/planets/blob/master/viennarb.ini),
+[`beer.ini`](https://github.com/feedreader/planets/blob/master/beer.ini),
+[`football.ini`](https://github.com/feedreader/planets/blob/master/football.ini).
 
 
 
+### Shortcuts / Helpers
+
+#### Meetup
+
+```
+meetup = vienna-rb
+```
+
+gets auto-completed to
+
+```
+link = http://www.meetup.com/vienna-rb
+feed = http://www.meetup.com/vienna-rb/events/rss/vienna.rb/
+```
+
+#### Google Groups
+
+```
+googlegroups = beerdb
+```
+
+gets auto-completed to
+
+```
+link = https://groups.google.com/group/beerdb
+feed = https://groups.google.com/forum/feed/beerdb/topics/atom.xml?num=15
+```
+
+#### GitHub Project
+
+```
+github = jekyll/jekyll
+```
+
+gets auto-completed to
+
+```
+link = https://github.com/jekyll/jekyll
+feed = https://github.com/jekyll/jekyll/commits/master.atom
+```
+
+#### Rubygems
+
+```
+rubygems = jekyll
+```
+
+gets auto-completed to
+
+```
+link = http://rubygems.org/gems/jekyll
+feed = http://rubygems.org/gems/jekyll/versions.atom
+```
+
 
 ## License
 

data/lib/pluto/update/refresher.rb

@@ -82,8 +82,7 @@ private
     subscriber = Subscriber.new
     subscriber.debug = debug? ? true : false    # pass along debug flag
 
-    site_key = site_rec.key
-    subscriber.update_subscriptions_for( site_key, site_config )
+    subscriber.update_subscriptions_for( site_rec.key, site_config )
   end
 
 

data/lib/pluto/update/subscriber.rb

@@ -13,15 +13,16 @@ class Subscriber
   def debug?()       @debug || false;  end
 
 
-  def update_subscriptions( config, opts={} )
-    # !!!! -- depreciated API - remove - do NOT use anymore
-    puts "*** warn - [Pluto::Subscriber] depreciated API -- use update_subscriptions_for( site_key )"
-    update_subscriptions_for( 'planet', config, opts )  # default to planet site_key
-  end
-
-
+  def update_subscriptions_for( name, config, opts={} )
+
+    ## note: allow (optional) config of site key too
+    site_key = config['key'] || config['slug']
+    if site_key.nil?
+      ## if no key configured; use (file)name; remove -_ chars
+      ##   e.g. jekyll-meta becomes jekyllmeta etc.
+      site_key = name.downcase.gsub( /[\-_]/, '' )
+    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)
@@ -44,7 +45,7 @@ class Subscriber
     site_rec.update_attributes!( site_attribs )
 
     # -- log update activity
-    Activity.create!( text: "update subscriptions >#{site_key}<" )
+    Activity.create!( text: "update subscriptions for site >#{site_key}<" )
 
     #### todo/fix:
     ##  double check - how to handle delete
@@ -62,7 +63,8 @@ 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','name','name2','title2','subtitle',
+      next if ['key','slug',
+               'title','name','name2','title2','subtitle',
                'source', 'url',
                'include','includes','exclude','excludes',
                'feeds',
@@ -92,10 +94,47 @@ class Subscriber
         avatar:   feed_hash[ 'avatar' ] || feed_hash[ 'face'],
         github:   feed_hash[ 'github'  ],
         twitter:  feed_hash[ 'twitter' ],
-        meetup:   feed_hash[ 'meetup' ],
+        ## meetup:   feed_hash[ 'meetup' ],  -- remove from schema - virtual attrib ?? - why? why not??
       }
       feed_attribs[:encoding] = feed_hash['encoding']||feed_hash['charset']    if feed_hash['encoding']||feed_hash['charset']
 
+#####
+##
+# auto-fill; convenience helpers
+
+    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
+
+    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
+
+    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
+
+    if feed_hash['rubygems']
+## 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
+
 
       puts "Updating feed subscription >#{feed_key}< - >#{feed_attribs[:feed_url]}<..."
 

data/lib/pluto/update/updater.rb

@@ -9,13 +9,13 @@ class Updater
 
   ### fix!!!!!: change config    to text   - yes/no - why? why not??
   #   or pass along struct
-  #      - with hash and text and format(e.g. ini/yml) as fields???
+  #      - with hash and text and format(e.g. ini) as fields???
   #
   #   - why? - we need to get handle on md5 digest/hash plus on plain text, ideally to store in db
   ##  - pass along unparsed text!! - not hash struct
   #      - will get saved in db plus we need to generate md5 hash
-  #    - add filename e.g. ruby.ini|ruby.conf|ruby.yml as opt ??
-  #           or add config format as opt e.g. ini or yml?
+  #    - add filename e.g. ruby.ini|ruby.conf as opt ??
+  #           or add config format as opt e.g. ini?
 
   def initialize( opts, config )
     @opts    = opts
@@ -25,12 +25,21 @@ class Updater
   attr_reader :opts, :config
 
   def run( arg )
-    arg = arg.downcase.gsub('.ini','').gsub('.yml','')  # remove file extension if present
+    arg = arg.downcase.gsub('.ini','')  # remove file extension if present
 
     update_for( arg )
   end
 
-  def update_for( site_key )
+  def update_for( name )
+
+    ## note: allow (optional) config of site key too
+    site_key = config['key'] || config['slug']
+    if site_key.nil?
+      ## if no key configured; use (file)name; remove -_ chars
+      ##   e.g. jekyll-meta becomes jekyllmeta etc.
+      site_key = name.downcase.gsub( /[\-_]/, '' )
+    end
+
     ###################
     # step 1) update subscriptions
     subscriber = Subscriber.new

data/lib/pluto/update/version.rb

@@ -4,7 +4,7 @@
 module PlutoUpdate
 
   MAJOR = 1
-  MINOR = 2
+  MINOR = 3
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 

metadata

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