pluto-update 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2c39c679b5e97b024fba66c5d5df0225830b862
-  data.tar.gz: 7e8c0bf4cc0202b10d213b51461f23cb38c9c117
+  metadata.gz: cdead23b2a541c471a85aae03aeaee4daf2bd045
+  data.tar.gz: 577b333fb67a054928929d227cad97106e129702
 SHA512:
-  metadata.gz: 51cf3485b408140293d2c4285ab7e78f38c8765fb24bd11b8b66d029949051814adf0a1f1b794ce3dab9179b3b40970ed47efb04c8e7b1d9fbf717bd5edbeffa
-  data.tar.gz: 0ab85c28798d5791cba798aa1969766392fdda84ee784663e16f629a7ac954d7396f8bbf32f3874acf1aa1cb5204952ef9771ceb17995483206d4439f3279fe8
+  metadata.gz: 802f8d8cacac8a8b032fe7d87820cf9799c695c9ec0bd0300f86ba847f2680f2841ee950ecac1c5ac74c0983421c347733af03c7d82fdecd0ff442d31bfb2951
+  data.tar.gz: 749e4a01c49a20dcf7e70922b45f3270eecbb5d388d216c402cb9479d6eb81219a94f390439216481c7bd519c984b0701b085f359ada6113c3f557c3dd1342ef

data/Rakefile

@@ -18,8 +18,8 @@ Hoe.spec 'pluto-update' do
   self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
-    ['pluto-models',      '>= 1.5.2'],
-    ['pluto-feedfetcher', '>= 0.1.2'],
+    ['pluto-models',      '>= 1.5.3'],
+    ['pluto-feedfetcher', '>= 0.1.3'],
     ['fetcher',           '>= 0.4.5'],
     ['preproc',           '>= 0.1.0'],
   ]

data/lib/pluto/update/feed_refresher.rb

@@ -64,12 +64,31 @@ class FeedRefresher
 
 private
   def refresh_feed_worker( feed_rec )
-    feed_xml = @worker.fetch( feed_rec )
+    text = @worker.fetch( feed_rec )
 
     # on error or if http-not modified etc. skip update/processing
-    return  if feed_xml.nil?
+    return  if text.nil?
+
+    parser = FeedParser::Parser.new( text )
+    feed = if parser.is_xml?
+             parser.parse_xml
+           elsif parser.is_json?    ## support JSON Feed
+             parser.parse_json
+             ##  note: reading/parsing microformat is for now optional
+             ##    microformats gem requires nokogiri
+             ##       nokogiri (uses libxml c-extensions) makes it hard to install (sometime)
+             ##       thus, if you want to use it, please opt-in to keep the install "light"
+           elsif defined?( Microformats ) && parser.is_microformats?
+             parser.parse_microformats
+           else  ## unknown feed format - return error; do NOT fallback assuming xml for now
+             logger.error "*** error: unknown feed format (is XML or JSON?) for '#{feed_rec.key}' - #{feed_rec.feed_url} starting with: #{text.lstrip[0..20]}"
+             Activity.create!( text: "*** error: unknown feed format (is XML or JSON?) for '#{feed_rec.key}' - #{feed_rec.feed_url} starting with: #{text.lstrip[0..20]}" )
+             
+             nil  ## note: return nil for no feed / processing error
+          end
+
+    return  if feed.nil?
 
-    feed = FeedParser::Parser.parse( feed_xml )
 
     ## fix/todo: reload feed_red   - fetched date updated etc.
     ##  check if needed for access to fetched date

data/lib/pluto/update/version.rb

@@ -5,7 +5,7 @@ module PlutoUpdate
 
   MAJOR = 1
   MINOR = 6
-  PATCH = 1
+  PATCH = 2
   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.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-26 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pluto-models
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: pluto-feedfetcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: fetcher
   requirement: !ruby/object:Gem::Requirement