rsscache 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93d9d21a9a587043e1db22b3f64164308c755eee
-  data.tar.gz: 5e81b40fe30dc757fd46797d03bf670ba553206d
+  metadata.gz: 13d621b5f6fada69a9b0d44f228f5a109114ae5b
+  data.tar.gz: 2f3b4b9553374db248914d72b8f6e2e612559c9b
 SHA512:
-  metadata.gz: cfd87ca7214dde36963ee7a2bede8a41e1bf164a67159c688f93a34e83e80138a53f1d3a2eead31e1436bd9f4e12935333960e23a666982d1619743f077c8874
-  data.tar.gz: 7ac379f1d015f2a068616d4a0abd576124937c40cdf4e071bf7439580884ad384bcb428f72743f2e03f3eec6849291720865d439a80bccd90b836fa75e1a9f84
+  metadata.gz: a38232230077fb48b0eb518883f90e23d48410e0603c4af46db6401558f73c9093239100525f3812733f1cdd19fcba1be9a3892fbf25b48fe92f90c79ee381f9
+  data.tar.gz: 54febc9ada04ee92d908fb02110187b8bd70053b4aa0a7e96e8b190d54a0c487d7a8934fe5ad28fe83721eb63e8a5f64bd832773ea9be22fef5e15b384783322

data/lib/rsscache.rb

@@ -11,13 +11,15 @@ require 'timeout'
 
 class RSScache
   
-  attr_reader :err_report
+  attr_reader :err_report, :dx
 
-  def initialize(rsslist, feedsfilepath='.', debug: true)
+  def initialize(rsslist=nil, filepath: '.', debug: true)
 
+    rsslist ||= File.join(filepath, 'rsscache.xml')
     @dx = open_dynarex(rsslist)
-    @rsslist, @feedsfilepath = rsslist, feedsfilepath
-    FileUtils.mkdir_p feedsfilepath
+    @filepath = filepath
+    @cache_filepath = File.join(filepath, 'rsscache')
+    FileUtils.mkdir_p @cache_filepath
     
     @err_report = []
     @debug = debug
@@ -46,7 +48,7 @@ class RSScache
       
     end    
     
-    save_dynarex()
+    save()
   end
 
   # refresh each RSS feed
@@ -89,43 +91,77 @@ class RSScache
 
       end
     end
+    
     puts '@dx: ' + @dx.to_xml(pretty: true) if @debug
-    save_dynarex()
+    save()
 
   end
 
   alias update refresh
 
-  def open_dynarex(x)
+  def save()
 
-    if x.lines.length == 1 and File.exists?(x) and \
-                                      File.extname(x) == '.txt' then
-      Dynarex.new.import x
-    else
-      Dynarex.new x
-    end
-  end
+    @dx.save File.join(@filepath, 'rsscache.xml')
+    File.write File.join(@filepath, 'rsscache.txt'), @dx.to_s
 
-  def save_dynarex()
-
-    if @rsslist.lines.length == 1 and File.exists?(@rsslist)
+  end
 
-      if File.extname(@rsslist) == '.txt'then
+  
+  private
+  
+  def raw_doc(s)
+    
+    heading = '<?dynarex schema="rsscache[title]/feed(uid, title, ' + 
+      'url, refresh_rate, next_refresh, filename)"?>'
+    
+raw_dx=<<EOF
+#{heading}
+title: RSS Feeds to be cached
 
-        File.write @rsslist, @dx.to_s
+--+
 
-      else
+#{s.strip.lines.map {|x| 'url: ' + x }.join }
+EOF
+    
+  end
+  
+  def fetch(url, timeout: 2)
 
-        @dx.save
+    puts 'inside fetch: url: '  + url.inspect if @debug
+    
+    begin
+      Timeout::timeout(timeout){
 
-      end
+        buffer = open(url).read.force_encoding("utf-8")
+        return [buffer, 200]
+      }
+    rescue Timeout::Error => e
+      ['connection timed out', 408]
+    rescue OpenURI::HTTPError => e
+      ['400 bad request', 400]
+    end    
+    
+  end
+  
+  def open_dynarex(raw_s)
 
+    s, _ = RXFHelper.read(raw_s)
+    puts 'inside open_dynarex s: ' + s.inspect if @debug
+    
+    case s
+    when /^<?dynarex/
+      Dynarex.new.import s
+    when /^</
+      Dynarex.new s
+    else
+      Dynarex.new.import raw_doc(s)
     end
+    
   end
 
-  # checks for any updates and saves the latest RSS file to 
-  #                                       the cache if there is
-  #
+  # checks for any updates and save the 
+  # latest RSS file to the cache if there are updates
+  #  
   def updates?(feed)
 
     if @debug then
@@ -134,10 +170,22 @@ class RSScache
     end
     
     # fetch the feeds from the web
-    buffer, code = fetch(feed.url)
+    begin
+      buffer, code = fetch(feed.url)
+    rescue
+      puts 'RSScache::updates?: fetch() warning for feed ' + feed.url \
+          + ' ' + ($!).inspect
+      return
+    end
 
     if code == 200 then
-      rss = SimpleRSS.parse(buffer)
+      begin
+        rss = SimpleRSS.parse(buffer)
+      rescue
+        puts 'RSScache::updates?: err: 100 SimpleRSS warning for feed ' \
+            + feed.url + ' ' + ($!).inspect
+        return
+      end
     else
       @err_report << [feed.url, code]
       return false
@@ -151,11 +199,18 @@ class RSScache
 
     end
     
-    rssfile = File.join(@feedsfilepath, feed.filename)
+    rssfile = File.join(@cache_filepath, feed.filename)
 
     if File.exists? rssfile then
 
-      rss_cache = SimpleRSS.parse File.read(rssfile)
+      begin
+        rss_cache = SimpleRSS.parse File.read(rssfile)
+      rescue
+        puts 'RSScache::updates?: err: 200 SimpleRSS warning for feed ' \
+            + feed.url + ' ' + ($!).inspect        
+        FileUtils.rm rssfile
+        return false 
+      end
       new_rss_items = rss.items - rss_cache.items
       (File.write rssfile, rss.source; return true) if new_rss_items.any?
       
@@ -169,24 +224,7 @@ class RSScache
     end
     
     return false
-  end
-  
-  private
+  end  
   
-  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.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - James Robertson

metadata.gz.sig

@@ -1,3 +1,3 @@
-m.RpXD���F��=աkY�/�@�*�鷗-��'$��̹A�7�6ɚwCdb�/�{-�M���H��Zb*!Q[ľߺ:]�p��
-�,><�Q�V-�t�h4
-whu��Vj�4�b-КQ�-f�wLZ��+��/�/!�!�
�b#K�g��9�E�!E
���e��]�bg$҆NT��vQMB���36:�8ƌ��:���2�����0ڈ���З.�ZJPS/$zI���~��GI>����M�\s )�h�����)�G
+�XTa��
+Bϴڨ�r�Sջ�B�jM�+Z<SezH0*%cb���n�����_�Y�2�K�M�֭�����*��
+�'���������f,���w��7�W!��}�d�8]�g�q����(Ñ�iۗM��tm�=�"e�Sh�č��s�|�