rsscache 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84fa149159bb76649987604cc50dd3757ad3f486
-  data.tar.gz: fa60fefe08b19db3c7d85ce0acc7c8ba2d554175
+  metadata.gz: 5b838408f4d649f230f22d35461504cfcf79eaa7
+  data.tar.gz: 84d46f51886170671fd00322b07a7fd407636fc2
 SHA512:
-  metadata.gz: 680703919349df43fac9486865c203f18befddb981c48fafe9205579e34c17c0dcdfa618c4f79a324248a99a91a7c4cc944202543c1fc480820b96f07266a7e5
-  data.tar.gz: 1913b72ca2e1c593e6dcf2a647e5a61299845f8efa691d60edd75e34e483dddb74ece6b99badcbb27f83886355c7b56d060f5568c2fca0b9f53200cd7c1e21a0
+  metadata.gz: 5264cf9eddfab278f6d2bf28b6d08881dfaff5f73502f0965d1c5ae0112e19a6f962f09fdbebd088c492ef16cdb1af589b275a0bc9d2842f27321dd221fad712
+  data.tar.gz: e14f1de3d4ce568916366d1896cd0425a34037a51990db64c758d27b10a752fef69c3ed318fea8a91ec264bcd719883938f51572926f1f5d494feb4fbaf2731f

data/lib/rsscache.rb

@@ -1,24 +1,31 @@
 #!/usr/bin/env ruby
-
+# 
 # file: rsscache.rb
 
 require 'dynarex'
 require 'open-uri'
 require 'simple-rss'
 require 'fileutils'
+require 'timeout'
 
 
 class RSScache
+  
+  attr_reader :err_report
 
   def initialize(rsslist, feedsfilepath=Dir.pwd)
 
     @dx = open_dynarex(rsslist)
     @rsslist, @feedsfilepath = rsslist, feedsfilepath
     FileUtils.mkdir_p feedsfilepath
+    
+    @err_report = []
 
   end
 
   def refresh
+    
+    @err_report = []
 
     @dx.all.each do |feed|
 
@@ -90,16 +97,25 @@ class RSScache
   def updates?(feed)
 
     # fetch the feeds from the web
-    rss = SimpleRSS.parse(open(feed.url))
+    buffer, code = fetch(feed.url)
 
-    
-    rssfile = if feed.filename.empty? then
+    if code == 200 then
+      rss = SimpleRSS.parse(buffer)
+    else
+      @err_report << [feed.url, code]
+      return false
+    end
+
+    if feed.filename.empty? then
+      
       filename = feed.url[6..-1].gsub(/\W+/,'').\
                           reverse.slice(0,40).reverse.downcase + '.xml'
       feed.filename = filename
-      File.join(@feedsfilepath, filename)      
+
     end
     
+    rssfile = File.join(@feedsfilepath, feed.filename)
+
     if File.exists? rssfile then
 
       rss_cache = SimpleRSS.parse File.read(rssfile)
@@ -117,4 +133,23 @@ class RSScache
     
     return false
   end
+  
+  private
+  
+  def fetch(url, timeout: 2)
+
+    begin
+      Timeout::timeout(timeout){
+
+        buffer = open(url).read
+        return [buffer, 200]
+      }
+    rescue Timeout::Error => e
+      ['connection timed out', 408]
+    rescue OpenURI::HTTPError => e
+      ['400 bad request', 400]
+    end    
+    
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsscache
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson