pluto-update 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49adc91fcbc3b7df6d0ee5aed048fa0df4abb186
-  data.tar.gz: 16b22d7a9993c287f592176acd9991ac5d42e3c5
+  metadata.gz: 3cab5151cc7be3216603e278be99cf277f8272e3
+  data.tar.gz: f263272dc082e8711c86b35b483d5c728ae3e84b
 SHA512:
-  metadata.gz: c0db8f9b7dcb72009df75b4cc001fe522e579f4b55bc8292b7ab5d19f4166aead75084b0da9356444dddd00b999a372e9972abaedf9230497706db138d766f80
-  data.tar.gz: 0fc2ba83226d96ca4b9a71829079c7232322997963230a99cda0948ae4591dc4071725ddc287a2485dcdb083ec8fc1015c0399a50238ff78901f0dd39d908d00
+  metadata.gz: c9f15b1922b07931ced857ae9da048cce89d13fe3bde2fdec09600869752aaa9424fca3dd1e42d6f2ae159b59e797c8fc8cc5cdc6533bbab0d70cb0c0776855d
+  data.tar.gz: 2d3a986e53d7d81a8817753ed9272056b0fe59cf7835af224237d9fc595de2be3fd0f4770b4b042ec03ddd16a4aa8b27577225f8ffc8c0e1fac17c6700a579e4

data/Manifest.txt

@@ -6,9 +6,7 @@ lib/pluto/update.rb
 lib/pluto/update/feed_refresher.rb
 lib/pluto/update/site_fetcher.rb
 lib/pluto/update/site_refresher.rb
-lib/pluto/update/site_updater.rb
 lib/pluto/update/version.rb
 test/data/ruby.ini
 test/helper.rb
 test/test_refresh.rb
-test/test_site.rb

data/Rakefile

@@ -18,7 +18,7 @@ Hoe.spec 'pluto-update' do
   self.history_file = 'HISTORY.md'
 
   self.extra_deps = [
-    ['pluto-models',      '>= 1.3.2'],
+    ['pluto-models',      '>= 1.4.0'],
     ['pluto-feedfetcher', '>= 0.1.0'],
     ['fetcher',           '>= 0.4.4'],
     ['preproc',           '>= 0.1.0'],

data/lib/pluto/update.rb

@@ -15,7 +15,6 @@ require 'pluto/update/version'   # Note: let version always go first
 require 'pluto/update/feed_refresher'
 require 'pluto/update/site_refresher'
 require 'pluto/update/site_fetcher'
-require 'pluto/update/site_updater'
 
 
 

data/lib/pluto/update/feed_refresher.rb

@@ -69,7 +69,7 @@ private
     # on error or if http-not modified etc. skip update/processing
     return  if feed_xml.nil?
 
-    feed = FeedUtils::Parser.parse( feed_xml )
+    feed = FeedParser::Parser.parse( feed_xml )
 
     ## fix/todo: reload feed_red   - fetched date updated etc.
     ##  check if needed for access to fetched date
@@ -93,17 +93,8 @@ private
 
     ## fix/todo: pass debug flag as opts - debug: true|false !!!!!!
     # fix/todo: find a better name - why? why not?? => use update_from_struct!
-    feed_rec.save_from_struct!( feed )  
-
-    #  update  cached value last published for item
-    last_item_rec = feed_rec.items.latest.limit(1).first  # note limit(1) will return relation/arrar - use first to get first element or nil from ary
-    if last_item_rec.present?
-      if last_item_rec.published?
-        feed_rec.update_attributes!( last_published: last_item_rec.published )
-      else # try touched
-        feed_rec.update_attributes!( last_published: last_item_rec.touched )
-      end
-    end
+    feed_rec.deep_update_from_struct!( feed )
+
   end  # method refresh_feed_worker
 
 end # class FeedRefresher

data/lib/pluto/update/site_refresher.rb

@@ -50,15 +50,8 @@ private
 
     site_config = INI.load( site_text )
 
-    site_updater = SiteUpdater.new
-    site_updater.debug = debug? ? true : false    # pass along debug flag
-
-    ### todo/fix:
-    ##   allow passing in as first arg database rec!!!
-    ##   - if passed in database rec - do NOT lookup record by site_config.key!!!
-    ##       use existing key (lets you change/update key without creating a new duplicate site entry, for example)
-    ##   - or use a new method (instead of overloading arg) ?? - why? why not??
-    site_updater.update_subscriptions_for( site_rec.key, site_config )
+    ### site_rec.debug = debug? ? true : false    # pass along debug flag
+    site_rec.deep_update_from_hash!( site_config )
   end
 
 end # class SiteRefresher

data/lib/pluto/update/version.rb

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

data/test/test_refresh.rb

@@ -19,8 +19,7 @@ class TestRefresh < MiniTest::Test
     site_text   = File.read( "#{PlutoUpdate.root}/test/data/ruby.ini")
     site_config = INI.load( site_text )
 
-    site_updater = Pluto::SiteUpdater.new
-    site_updater.update_subscriptions_for( 'ruby', site_config )
+    Site.deep_create_or_update_from_hash!( 'ruby', site_config )
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluto-update
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2015-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pluto-models
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: pluto-feedfetcher
   requirement: !ruby/object:Gem::Requirement
@@ -112,12 +112,10 @@ files:
 - lib/pluto/update/feed_refresher.rb
 - lib/pluto/update/site_fetcher.rb
 - lib/pluto/update/site_refresher.rb
-- lib/pluto/update/site_updater.rb
 - lib/pluto/update/version.rb
 - test/data/ruby.ini
 - test/helper.rb
 - test/test_refresh.rb
-- test/test_site.rb
 homepage: https://github.com/feedreader/pluto.update
 licenses:
 - Public Domain
@@ -145,5 +143,4 @@ signing_key:
 specification_version: 4
 summary: pluto-update - planet feed 'n' subscription updater
 test_files:
-- test/test_site.rb
 - test/test_refresh.rb

data/lib/pluto/update/site_updater.rb

@@ -1,162 +0,0 @@
-# encoding: utf-8
-
-
-module Pluto
-
-class SiteUpdater
-
-  include LogUtils::Logging
-  include Models
-
-  def debug=(value)  @debug = value;   end
-  def debug?()       @debug || false;  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
-
-    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)
-      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}"
-
-    site_rec = Site.find_by_key( site_key )
-    if site_rec.nil?
-      site_rec             = Site.new
-      site_attribs[ :key ] = site_key
-
-      ## use object_id: site.id and object_type: Site
-      ## change - model/table/schema!!!
-      Activity.create!( text: "new site >#{site_key}< - #{site_attribs[ :title ]}" )
-    end
-    site_rec.update_attributes!( site_attribs )
-
-    # -- log update activity
-    Activity.create!( text: "update subscriptions for site >#{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)
-    logger.debug "after site.subscriptions.delete_all - count: #{site_rec.subscriptions.count}"
-
-    config.each do |key, value|
-
-      ## 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 ['key','slug',
-               'title','name','name2','title2','subtitle',
-               'source', 'url',
-               'include','includes','exclude','excludes',
-               'feeds',
-               'author', 'owner', 'email',
-               'planet','defaults'].include?( key )
-
-      ### todo/check:
-      ##   check value - must be hash
-      #     check if url or feed_url present
-      #      that is, check for required props/key-value pairs
-
-      feed_key   = key.to_s.dup
-      feed_hash  = value
-
-      # todo/fix: use title from feed?
-      #  e.g. fill up auto_title, auto_url, etc.
-
-      feed_attribs = {
-        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' ] || feed_hash[ 'name2' ] || feed_hash[ 'subtitle'],
-        includes: feed_hash[ 'includes' ] || feed_hash[ 'include' ],
-        excludes: feed_hash[ 'excludes' ] || feed_hash[ 'exclude' ],
-        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' ],  -- 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]}<..."
-
-      feed_rec = Feed.find_by_key( feed_key )
-      if feed_rec.nil?
-        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]}" )
-      end
-
-      feed_rec.update_attributes!( feed_attribs )
-
-      #  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_for
-
-end # class SiteUpdater
-
-end # module Pluto

data/test/test_site.rb

@@ -1,47 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_site.rb
-#  or better
-#     rake test
-
-require 'helper'
-
-class TestSite < MiniTest::Test
-
-  def setup
-    Site.delete_all
-    Feed.delete_all
-    Item.delete_all
-    Subscription.delete_all
-  end
-
-
-  def test_site_updater
-    site_text   = File.read( "#{PlutoUpdate.root}/test/data/ruby.ini")
-    site_config = INI.load( site_text )
-    pp site_config
-
-    assert_equal 0, Site.count
-    assert_equal 0, Feed.count
-
-    site_updater = Pluto::SiteUpdater.new
-    site_updater.update_subscriptions_for( 'ruby', site_config )
-
-    assert_equal 1, Site.count
-    assert_equal 3, Feed.count
-
-    ruby = Site.find_by_key!( 'ruby' )
-    assert_equal 'Planet Ruby', ruby.title
-    assert_equal 3, ruby.subscriptions.count
-    assert_equal 3, ruby.feeds.count
-
-    rubylang = Feed.find_by_key!( 'rubylang' )
-    assert_equal 'Ruby Lang News', rubylang.title
-    assert_equal 'http://www.ruby-lang.org/en/news', rubylang.url
-    assert_equal 'http://www.ruby-lang.org/en/feeds/news.rss', rubylang.feed_url
-  end
-
-end # class TestSite
-