pluto-update 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdead23b2a541c471a85aae03aeaee4daf2bd045
-  data.tar.gz: 577b333fb67a054928929d227cad97106e129702
+  metadata.gz: da4ad0bcd2b1b1ce0288b8be1c0ebf5843a28cb0
+  data.tar.gz: 3c70a3e21a8b11411a579635405f61574d78df86
 SHA512:
-  metadata.gz: 802f8d8cacac8a8b032fe7d87820cf9799c695c9ec0bd0300f86ba847f2680f2841ee950ecac1c5ac74c0983421c347733af03c7d82fdecd0ff442d31bfb2951
-  data.tar.gz: 749e4a01c49a20dcf7e70922b45f3270eecbb5d388d216c402cb9479d6eb81219a94f390439216481c7bd519c984b0701b085f359ada6113c3f557c3dd1342ef
+  metadata.gz: 687fc3da86da794584d50a904e4ad64ba3db12d21a721fa7f9cb20cff69c6943d858c30c6b05a1f0659ae3f71ad130be4a9b778e633692e8ece89a7e341bdffb
+  data.tar.gz: 3b1281f1372dcfd3ed9e360e012d32f310985796975ca255b2fc25fd5f3061135289c927cd433670f746647e9a2cb5b9ce76b52b05f93396b423e6015275451d

data/Manifest.txt

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

data/Rakefile

@@ -18,10 +18,8 @@ Hoe.spec 'pluto-update' do
   self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
-    ['pluto-models',      '>= 1.5.3'],
-    ['pluto-feedfetcher', '>= 0.1.3'],
-    ['fetcher',           '>= 0.4.5'],
-    ['preproc',           '>= 0.1.0'],
+    ['pluto-models',      '>= 1.5.4'],
+    ['pluto-feedfetcher', '>= 0.1.4'],
   ]
 
   self.licenses = ['Public Domain']

data/lib/pluto/update.rb

@@ -5,11 +5,6 @@ require 'pluto/models'
 require 'pluto/feedfetcher'
 
 
-# more 3rd party gems
-require 'fetcher'    # fetch (text) documents
-require 'preproc'    # include preprocessor
-
-
 # our own code
 require 'pluto/update/version'   # Note: let version always go first
 require 'pluto/update/feed_refresher'
@@ -28,14 +23,9 @@ module Pluto
     SiteRefresher.new.refresh_sites
   end
 
-### convenience alias w/ update_  -- use refresh (only) - why? why not??
-  def self.update_feeds
-    FeedRefresher.new.refresh_feeds
-  end
-
-  def self.update_sites
-    SiteRefresher.new.refresh_sites
-  end
+  ### convenience aliases w/ update_  -- use refresh (only) - why? why not??
+  def self.update_feeds() refresh_feeds; end 
+  def self.update_sites() refresh_sites; end
 
 end  # module Pluto
 

data/lib/pluto/update/feed_refresher.rb

@@ -18,17 +18,12 @@ class FeedRefresher
     @worker  = FeedFetcherCondGetWithCache.new
   end
 
-  def debug=(value)  @debug = value;   end
-  def debug?()       @debug || false;  end
+  def debug?()  Pluto.config.debug?;  end
 
 
-  def refresh_feeds( opts={} )  # refresh (fetch+parse+update) all feeds
-    if debug?
-      ## turn on logging for sql too
-      ActiveRecord::Base.logger = Logger.new( STDOUT )
-      @worker.debug = true   # also pass along worker debug flag if set
-    end
 
+  def refresh_feeds( opts={} )  # refresh (fetch+parse+update) all feeds
+  
     start_time = Time.now
     Activity.create!( text: "start update feeds (#{Feed.count})" )
 
@@ -44,12 +39,7 @@ class FeedRefresher
 
 
   def refresh_feeds_for( site_key, opts={} ) # refresh (fetch+parse+update) feeds for site
-    if debug?
-      ## turn on logging for sql too
-      ActiveRecord::Base.logger = Logger.new( STDOUT )
-      @worker.debug = true   # also pass along worker debug flag if set
-    end
-
+  
     # -- log update activity
     Activity.create!( text: "update feeds >#{site_key}<" )
 
@@ -107,10 +97,6 @@ private
     #  move to_datetime to feedutils!! if it works
     ##   todo: move this comments to feedutils??
 
-
-    feed_rec.debug = debug? ? true : false    # pass along debug flag
-
-    ## 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.deep_update_from_struct!( feed )
 

data/lib/pluto/update/site_fetcher.rb

@@ -12,8 +12,8 @@ class SiteFetcher
     @worker  = Fetcher::Worker.new
   end
 
-  def debug=(value)  @debug = value;   end
-  def debug?()       @debug || false;  end
+  def debug?()  Pluto.config.debug?;  end
+
 
   def fetch( site_rec )
     ####################################################
@@ -45,18 +45,10 @@ class SiteFetcher
 
     if response.code == '304'  # not modified (conditional GET - e.g. using etag/last-modified)
 
-      if site_text.index('@include')
-        ## note: if the site_text includes @include
-        ##  we must revalidate complete file hierachy(tree) for now
-        ### continue;
-        ##
-        ##  fix/todo: use ahead-of-time preprocessor ?? in the future to simplify???
-      else
-        puts "OK - fetching site '#{site_key}' - HTTP status #{response.code} #{response.message}"
-        puts "no change; request returns not modified (304); skipping parsing site config"
-        return nil   # no updates available; nothing to do
-      end
-
+      puts "OK - fetching site '#{site_key}' - HTTP status #{response.code} #{response.message}"
+      puts "no change; request returns not modified (304); skipping parsing site config"
+      return nil   # no updates available; nothing to do
+ 
     elsif response.code != '200'   # note Net::HTTP response.code is a string in ruby
 
       puts "*** error: fetching site '#{site_key}' - HTTP status #{response.code} #{response.message}"
@@ -97,36 +89,10 @@ class SiteFetcher
     site_rec.update!( site_attribs )
 
 
-    #################
-    ### fix: add support for http_etag cache etc.  - how??
-    ###
-    ###   use from_text( text, base: base )  !!!!!!!!
-    ###    do NOT reissue first request
-    ##
-    ##  fix: use special case/method for update_with_includes!!!
-    ##    keep it simple w/o includes (do NOT mix in one method)
-    ##  split into two methods!!!
-
-    ## retry w/ preprocesser
-    ## refetch if @include found w/ all includes included
-    if site_text.index('@include')
-      site_text = InclPreproc.from_url( site_url ).read
-    end
-
     ## logger.debug "site_text:"
     ## logger.debug site_text[ 0..300 ] # get first 300 chars
 
     site_text
-
-    ###
-    ## todo/fix:
-    ### move INI.load out of this method!! - return site_text or nil
-    ##
-    ## puts "Before parsing site config >#{site_key}<..."
-    ##
-    # assume ini format for now
-    ## site_config = INI.load( site_text )
-    ## site_config
   end
 
 end # class SiteFetcher

data/lib/pluto/update/site_refresher.rb

@@ -18,16 +18,11 @@ class SiteRefresher
     @worker  = SiteFetcher.new
   end
 
-  def debug=(value)  @debug = value;   end
-  def debug?()       @debug || false;  end
+  def debug?()  Pluto.config.debug?;  end
 
-  def refresh_sites( opts={} )  # refresh (fetch+parse+update) all site configs
-    if debug?
-      ## turn on logging for sql too
-      ActiveRecord::Base.logger = Logger.new( STDOUT )
-      @worker.debug = true   # also pass along worker debug flag if set
-    end
 
+  def refresh_sites( opts={} )  # refresh (fetch+parse+update) all site configs
+ 
     start_time = Time.now
     Activity.create!( text: "start update sites (#{Site.count})" )
 
@@ -50,7 +45,6 @@ private
 
     site_config = INI.load( site_text )
 
-    ### site_rec.debug = debug? ? true : false    # pass along debug flag
     site_rec.deep_update_from_hash!( site_config )
   end
 

data/lib/pluto/update/version.rb

@@ -5,7 +5,7 @@ module PlutoUpdate
 
   MAJOR = 1
   MINOR = 6
-  PATCH = 2
+  PATCH = 3
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/helper.rb

@@ -2,19 +2,19 @@
 
 
 ## minitest setup
-
 require 'minitest/autorun'
 
 ## our own code
 require 'pluto/update'
 
 
-LogUtils::Logger.root.level = :debug
+Pluto.config.debug        = true
+Pluto.config.logger.level = :debug
 
 
 ## some shortcuts
-Log         = LogDb::Model::Log
-Prop        = ConfDb::Model::Prop
+Log          = LogDb::Model::Log
+Prop         = ConfDb::Model::Prop
 
 Site         = Pluto::Model::Site
 Feed         = Pluto::Model::Feed

data/test/test_refresh.rb

@@ -1,10 +1,7 @@
-# encoding: utf-8
-
 ###
 #  to run use
 #     ruby -I ./lib -I ./test test/test_refresh.rb
-#  or better
-#     rake test
+
 
 require 'helper'
 
@@ -16,7 +13,7 @@ class TestRefresh < MiniTest::Test
     Item.delete_all
     Subscription.delete_all
 
-    site_text   = File.read( "#{PlutoUpdate.root}/test/data/ruby.ini")
+    site_text   = File.read( "#{Pluto::Test.data_dir}/ruby.ini")
     site_config = INI.load( site_text )
 
     Site.deep_create_or_update_from_hash!( 'ruby', site_config )
@@ -25,11 +22,13 @@ class TestRefresh < MiniTest::Test
 
   def test_refresh_sites
     Pluto.refresh_sites
+
     assert true
   end
 
   def test_refresh_feeds
     Pluto.refresh_feeds
+
     assert true
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluto-update
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2020-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pluto-models
@@ -16,56 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.5.4
 - !ruby/object:Gem::Dependency
   name: pluto-feedfetcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
-- !ruby/object:Gem::Dependency
-  name: fetcher
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.5
-- !ruby/object:Gem::Dependency
-  name: preproc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +84,6 @@ files:
 - lib/pluto/update/site_fetcher.rb
 - lib/pluto/update/site_refresher.rb
 - lib/pluto/update/version.rb
-- test/data/ruby.ini
 - test/helper.rb
 - test/test_refresh.rb
 homepage: https://github.com/feedreader/pluto

data/test/data/ruby.ini

@@ -1,13 +0,0 @@
-title  = Planet Ruby
-source = https://github.com/feedreader/pluto/raw/master/pluto-update/test/data/ruby.ini
-
-[rubylang]
-  title = Ruby Lang News
-  link  = http://www.ruby-lang.org/en/news
-  feed  = http://www.ruby-lang.org/en/feeds/news.rss
-
-[rubyonrails]
-  title = Ruby on Rails News
-  link  = http://weblog.rubyonrails.org
-  feed  = http://weblog.rubyonrails.org/feed/atom.xml
-