pluto-feedfetcher 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f4eed6539db8183401c2da47b91e42ecc59aaa3
-  data.tar.gz: 4cbf9edd2c859a5b6b643e901789b3c84e0dce9d
+  metadata.gz: 2400c2cabca1baec24873c06c7a45ca3af9d381a
+  data.tar.gz: '09dda2a27accb6953fbd197424bd1b360099982a'
 SHA512:
-  metadata.gz: 493a4e41cdc0628aab781058f442a316d254a358925893e3f17db4e1be2221472b4199351e485390cb4844e0b14b9e495f42746bd9bd43324c7f2bbff9b4bdd5
-  data.tar.gz: d199ce23f2b41e4cd140c4b23e82193bd1fa7adcf8f92e2ccd02e325865b514ad3fd3cea9ba2c952c8ecd1fc90ebe1b1a7d823ec1189d6dec532440b36aec1ff
+  metadata.gz: 5bfcad496fc5f6c3008f520e19c3bb22d3db32b615a647ce56545ba26e29158b574409b29e80e5c3627082b833e58a3a7d682ab0810ef58171dd2382344cc630
+  data.tar.gz: 8e61e9f1b671398dbe73ed6c543d2b1adacc4706b47821437cdeacea3f53d2f76e7f6545149c392fc13d5697308d2f796c8da182954e13b74fc9c6650ee33ca1

data/README.md

@@ -1,10 +1,10 @@
 # pluto-feedfetcher gem - fetch web feeds (w/ conditional HTTP get e.g. use etags, if-modified-since etc.)
 
-* home  :: [github.com/feedreader/pluto.feed.fetcher](https://github.com/feedreader/pluto.feed.fetcher)
-* bugs  :: [github.com/feedreader/pluto.feed.fetcher/issues](https://github.com/feedreader/pluto.feed.fetcher/issues)
+* home  :: [github.com/feedreader/pluto](https://github.com/feedreader/pluto)
+* bugs  :: [github.com/feedreader/pluto/issues](https://github.com/feedreader/pluto/issues)
 * gem   :: [rubygems.org/gems/pluto-feedfetcher](https://rubygems.org/gems/pluto-feedfetcher)
 * rdoc  :: [rubydoc.info/gems/pluto-feedfetcher](http://rubydoc.info/gems/pluto-feedfetcher)
-* forum :: [groups.google.com/group/feedreader](http://groups.google.com/group/feedreader)
+* forum :: [groups.google.com/group/wwwmake](http://groups.google.com/group/wwwmake)
 
 
 
@@ -15,11 +15,12 @@ TBD
 
 ## License
 
+![](https://publicdomainworks.github.io/buttons/zero88x31.png)
+
 The `pluto-feedfetcher` scripts are dedicated to the public domain.
 Use it as you please with no restrictions whatsoever.
 
 ## Questions? Comments?
 
-Send them along to the [Planet Pluto and Friends Forum/Mailing List](http://groups.google.com/group/feedreader).
+Send them along to the [wwwmake Forum/Mailing List](http://groups.google.com/group/wwwmake).
 Thanks!
-

data/Rakefile

@@ -8,10 +8,10 @@ Hoe.spec 'pluto-feedfetcher' do
   self.summary = "pluto-feedfetcher - fetch web feeds (w/ conditional HTTP get e.g. use etags, if-modified-since etc.)"
   self.description = summary
 
-  self.urls    = ['https://github.com/feedreader/pluto.feed.fetcher']
+  self.urls    = ['https://github.com/feedreader/pluto']
 
   self.author  = 'Gerald Bauer'
-  self.email   = 'feedreader@googlegroups.com'
+  self.email   = 'wwwmake@googlegroups.com'
 
   # switch extension to .markdown for gihub formatting
   self.readme_file  = 'README.md'

data/lib/pluto/feedfetcher.rb

@@ -16,5 +16,4 @@ require 'pluto/feedfetcher/cond_get_with_cache'
 
 
 # say hello
-puts PlutoFeedFetcher.banner   if $DEBUG || (defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG) 
-
+puts PlutoFeedFetcher.banner   if $DEBUG || (defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG)

data/lib/pluto/feedfetcher/basic.rb

@@ -42,11 +42,11 @@ class FeedFetcherBasic
     ### todo/fix:
     ###  return feed_xml !!! - move FeedUtils::Parser.parse to update or someting !!!
 
-    puts "Before parsing feed >#{feed_key}<..."
+    logger.info "Before parsing feed >#{feed_key}<..."
+
 
-    
     feed_xml
-    
+
     ## fix/todo: check for feed.nil?   -> error parsing!!!
     #    or throw exception
     # feed = FeedUtils::Parser.parse( feed_xml )
@@ -61,17 +61,17 @@ private
     response = @worker.get( url )
 
     ## if debug?
-      puts "http status #{response.code} #{response.message}"
+      logger.debug "http status #{response.code} #{response.message}"
 
-      puts "http header - server: #{response.header['server']} - #{response.header['server'].class.name}"
-      puts "http header - etag: #{response.header['etag']} - #{response.header['etag'].class.name}"
-      puts "http header - last-modified: #{response.header['last-modified']} - #{response.header['last-modified'].class.name}"
+      logger.debug "http header - server: #{response.header['server']} - #{response.header['server'].class.name}"
+      logger.debug "http header - etag: #{response.header['etag']} - #{response.header['etag'].class.name}"
+      logger.debug "http header - last-modified: #{response.header['last-modified']} - #{response.header['last-modified'].class.name}"
     ## end
 
     xml = response.body
 
     ###
-    # NB: Net::HTTP will NOT set encoding UTF-8 etc.
+    # Note: Net::HTTP will NOT set encoding UTF-8 etc.
     # will mostly be ASCII
     # - try to change encoding to UTF-8 ourselves
     logger.debug "xml.encoding.name (before): #{xml.encoding.name}"
@@ -83,7 +83,7 @@ private
     # for now "hardcoded" to utf8 - what else can we do?
     # - note: force_encoding will NOT change the chars only change the assumed encoding w/o translation
     xml = xml.force_encoding( Encoding::UTF_8 )
-    logger.debug "xml.encoding.name (after): #{xml.encoding.name}"      
+    logger.debug "xml.encoding.name (after): #{xml.encoding.name}"
 
     xml
   end

data/lib/pluto/feedfetcher/cond_get_with_cache.rb

@@ -36,7 +36,7 @@ class FeedFetcherCondGetWithCache
     rescue SocketError => e
       ## catch socket error for unknown domain names (e.g. pragdave.blogs.pragprog.com)
       ###  will result in SocketError -- getaddrinfo: Name or service not known
-      puts "*** error: fetching feed '#{feed_key}' - #{e.to_s}"
+      logger.error "*** error: fetching feed '#{feed_key}' - #{e.to_s}"
       Activity.create!( text: "*** error: fetching feed '#{feed_key}' - #{e.to_s}" )
 
       ### todo/fix: update feed rec in db
@@ -47,8 +47,8 @@ class FeedFetcherCondGetWithCache
     @worker.use_cache = false   # fix/todo: restore old use_cache setting instead of false
 
     if response.code == '304'  # not modified (conditional GET - e.g. using etag/last-modified)
-      puts "OK - fetching feed '#{feed_key}' - HTTP status #{response.code} #{response.message}"
-      puts "no change; request returns not modified (304); skipping parsing feed"
+      logger.info "OK - fetching feed '#{feed_key}' - HTTP status #{response.code} #{response.message}"
+      logger.info "no change; request returns not modified (304); skipping parsing feed"
       return nil   # no updates available; nothing to do
     end
 
@@ -56,8 +56,8 @@ class FeedFetcherCondGetWithCache
 
     if response.code != '200'   # note Net::HTTP response.code is a string in ruby
 
-      puts "*** error: fetching feed '#{feed_key}' - HTTP status #{response.code} #{response.message}"
-      
+      logger.error "*** error: fetching feed '#{feed_key}' - HTTP status #{response.code} #{response.message}"
+
       feed_attribs = {
         http_code:          response.code.to_i,
         http_server:        response.header[ 'server' ],
@@ -65,21 +65,21 @@ class FeedFetcherCondGetWithCache
         http_last_modified: nil,
         body:               nil,
         md5:                nil,
-        fetched:            feed_fetched 
+        fetched:            feed_fetched
       }
       feed_rec.update_attributes!( feed_attribs )
-      
+
       ## add log error activity -- in future add to error log - better - why? why not?
       Activity.create!( text: "*** error: fetching feed '#{feed_key}' - HTTP status #{response.code} #{response.message}" )
 
       return nil  #  sorry; no feed for parsing available
     end
 
-    puts "OK - fetching feed '#{feed_key}' - HTTP status #{response.code} #{response.message}"
+    logger.info "OK - fetching feed '#{feed_key}' - HTTP status #{response.code} #{response.message}"
 
     feed_xml = response.body
     ###
-    # NB: Net::HTTP will NOT set encoding UTF-8 etc.
+    # Note: Net::HTTP will NOT set encoding UTF-8 etc.
     # will mostly be ASCII
     # - try to change encoding to UTF-8 ourselves
     logger.debug "feed_xml.encoding.name (before): #{feed_xml.encoding.name}"
@@ -95,7 +95,7 @@ class FeedFetcherCondGetWithCache
       feed_xml_cleaned = feed_xml.dup.force_encoding( Encoding::UTF_8 )
       unless feed_xml_cleaned.valid_encoding?
 
-         puts "*** warn: feed '#{feed_key}' charset encoding not valid utf8 - trying latin1"
+         logger.warn "*** warn: feed '#{feed_key}' charset encoding not valid utf8 - trying latin1"
          Activity.create!( text: "*** warn: feed '#{feed_key}' charset encoding not valid utf8 - trying latin1" )
          # Some of it might be old Windows code page
          # -- (Windows Code Page CP1252 is ISO_8859_1 is Latin-1 - check ??)
@@ -103,11 +103,11 @@ class FeedFetcherCondGetWithCache
          # tell ruby the encoding
          # encode to utf-8
          ## use all in code encode ?? e.g. feed_xml_cleaned = feed_xml.encode( Encoding::UTF_8, Encoding::ISO_8859_1 )
-         feed_xml_cleaned = feed_xml.dup.force_encoding( Encoding::ISO_8859_1 ).encode( Encoding::UTF_8 ) 
+         feed_xml_cleaned = feed_xml.dup.force_encoding( Encoding::ISO_8859_1 ).encode( Encoding::UTF_8 )
       end
       feed_xml = feed_xml_cleaned
     rescue EncodingError => e
-      puts "*** warn: feed '#{feed_key}' charset encoding to utf8 failed; throwing out invalid bits - #{e.to_s}"
+      logger.warn "*** warn: feed '#{feed_key}' charset encoding to utf8 failed; throwing out invalid bits - #{e.to_s}"
       Activity.create!( text: "*** warn: feed '#{feed_key}' charset encoding to utf8 failed; throwing out invalid bits - #{e.to_s}" )
 
       # Force it to UTF-8, throwing out invalid bits
@@ -128,14 +128,14 @@ class FeedFetcherCondGetWithCache
 
     last_feed_md5 = feed_rec.md5
     feed_md5 = Digest::MD5.hexdigest( feed_xml )
-    
+
     if last_feed_md5 && last_feed_md5 == feed_md5
       # not all servers handle conditional gets, so while not much can be
       # done about the bandwidth, but if the response body is identical
       # the downstream processing (parsing, caching, ...) can be avoided.
       #  - thanks to planet mars -fido.rb for the idea, cheers.
-      
-      puts "no change; md5 digests match; skipping parsing feed"
+
+      logger.info "no change; md5 digests match; skipping parsing feed"
       return nil   # no updates available; nothing to do
     end
 
@@ -150,9 +150,9 @@ class FeedFetcherCondGetWithCache
     }
 
     ## if debug?
-      puts "http header - server: #{response.header['server']} - #{response.header['server'].class.name}"
-      puts "http header - etag: #{response.header['etag']} - #{response.header['etag'].class.name}"
-      puts "http header - last-modified: #{response.header['last-modified']} - #{response.header['last-modified'].class.name}"
+      logger.debug "http header - server: #{response.header['server']} - #{response.header['server'].class.name}"
+      logger.debug "http header - etag: #{response.header['etag']} - #{response.header['etag'].class.name}"
+      logger.debug "http header - last-modified: #{response.header['last-modified']} - #{response.header['last-modified'].class.name}"
     ## end
 
     ### note: might crash w/ encoding errors when saving in postgress
@@ -165,7 +165,7 @@ class FeedFetcherCondGetWithCache
       feed_rec.update_attributes!( feed_attribs )
     rescue Exception => e
       # log db error; and continue
-      puts "*** error: updating feed database record '#{feed_key}' - #{e.to_s}"
+      logger.error "*** error: updating feed database record '#{feed_key}' - #{e.to_s}"
       Activity.create!( text: "*** error: updating feed database record '#{feed_key}' - #{e.to_s}" )
       return nil  #  sorry; corrupt feed; parsing not possible; fix char encoding - make it an option in config??
     end
@@ -173,8 +173,8 @@ class FeedFetcherCondGetWithCache
 
     logger.debug "feed_xml:"
     logger.debug feed_xml[ 0..300 ] # get first 300 chars
-      
-    puts "Before parsing feed >#{feed_key}<..."
+
+    logger.info "Before parsing feed >#{feed_key}<..."
 
     ### move to feedutils
     ### logger.debug "using stdlib RSS::VERSION #{RSS::VERSION}"

data/lib/pluto/feedfetcher/version.rb

@@ -4,7 +4,7 @@ module PlutoFeedFetcher
 
   MAJOR = 0
   MINOR = 1
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version
@@ -21,4 +21,3 @@ module PlutoFeedFetcher
   end
 
 end # module PlutoFeedFetcher
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluto-feedfetcher
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2017-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pluto-models
@@ -58,17 +58,17 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.16'
 description: pluto-feedfetcher - fetch web feeds (w/ conditional HTTP get e.g. use
   etags, if-modified-since etc.)
-email: feedreader@googlegroups.com
+email: wwwmake@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -84,7 +84,7 @@ files:
 - lib/pluto/feedfetcher/basic.rb
 - lib/pluto/feedfetcher/cond_get_with_cache.rb
 - lib/pluto/feedfetcher/version.rb
-homepage: https://github.com/feedreader/pluto.feed.fetcher
+homepage: https://github.com/feedreader/pluto
 licenses:
 - Public Domain
 metadata: {}
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: pluto-feedfetcher - fetch web feeds (w/ conditional HTTP get e.g. use etags,