rsscache 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 13d621b5f6fada69a9b0d44f228f5a109114ae5b
-  data.tar.gz: 2f3b4b9553374db248914d72b8f6e2e612559c9b
+SHA256:
+  metadata.gz: 3df82ccc1d24e4e666502ebd898c00c61128f20917f96a169f466cc593b5944f
+  data.tar.gz: 1ad412e71d760f5409feaa2f2f42a6df6316b71491e3951de3aa691b635c477b
 SHA512:
-  metadata.gz: a38232230077fb48b0eb518883f90e23d48410e0603c4af46db6401558f73c9093239100525f3812733f1cdd19fcba1be9a3892fbf25b48fe92f90c79ee381f9
-  data.tar.gz: 54febc9ada04ee92d908fb02110187b8bd70053b4aa0a7e96e8b190d54a0c487d7a8934fe5ad28fe83721eb63e8a5f64bd832773ea9be22fef5e15b384783322
+  metadata.gz: 5fb8b0761eaeb24ca6c3807a005a4b9e21d26a099d3e33e3e6f79e36f6cdd1bd6f270bb9ba4b0f2275f752bcff217a62505d882d6f79ad36dd37fa02d36533a5
+  data.tar.gz: 83ad0da6b90ec7f4feb6f9485baa594310bad384df5a330e17175ac78a2a28bc728b16e6be7e8afbc99bb33afb1e58073c2b6c12fdd2e653663e800fc6266d0d

data/lib/rsscache.rb

@@ -1,38 +1,39 @@
 #!/usr/bin/env ruby
-# 
+
 # file: rsscache.rb
 
 require 'dynarex'
 require 'open-uri'
 require 'simple-rss'
-require 'fileutils'
 require 'timeout'
+require 'rxfreadwrite'
 
 
 class RSScache
-  
+  include RXFReadWriteModule
+
   attr_reader :err_report, :dx
 
-  def initialize(rsslist=nil, filepath: '.', debug: true)
+  def initialize(rsslist=nil, filepath: '.', debug: false)
 
     rsslist ||= File.join(filepath, 'rsscache.xml')
     @dx = open_dynarex(rsslist)
     @filepath = filepath
     @cache_filepath = File.join(filepath, 'rsscache')
-    FileUtils.mkdir_p @cache_filepath
-    
+    FileX.mkdir_p @cache_filepath
+
     @err_report = []
     @debug = debug
 
   end
-  
-  # Import a list of URLs into the Dynarex document. 
+
+  # Import a list of URLs into the Dynarex document.
   # URLs which already exist are ignored.
   #
   def import(raw_s)
-    
-    s, _ = RXFHelper.read(raw_s)
-    
+
+    s, _ = RXFReader.read(raw_s)
+
     s.strip.lines.each do |raw_url|
 
       url = raw_url.chomp
@@ -45,24 +46,24 @@ class RSScache
         puts 'new URL found' if @debug
         @dx.create url: url
       end
-      
-    end    
-    
+
+    end
+
     save()
   end
 
   # refresh each RSS feed
   #
   def refresh
-    
+
     @err_report = []
 
     puts '@dx.to_xml'  + @dx.to_xml(pretty: true)  if @debug
-    
+
     @dx.all.each do |feed|
-      
+
       puts 'feed:' + feed.inspect if @debug
-      
+
       if feed.next_refresh.empty? or \
                              Time.now >= Time.parse(feed.next_refresh) then
 
@@ -70,7 +71,7 @@ class RSScache
 
         feed.refresh_rate = if feed.refresh_rate.empty? then
 
-          10 
+          10
 
         else
 
@@ -91,7 +92,7 @@ class RSScache
 
       end
     end
-    
+
     puts '@dx: ' + @dx.to_xml(pretty: true) if @debug
     save()
 
@@ -102,18 +103,18 @@ class RSScache
   def save()
 
     @dx.save File.join(@filepath, 'rsscache.xml')
-    File.write File.join(@filepath, 'rsscache.txt'), @dx.to_s
+    FileX.write File.join(@filepath, 'rsscache.txt'), @dx.to_s
 
   end
 
-  
+
   private
-  
+
   def raw_doc(s)
-    
-    heading = '<?dynarex schema="rsscache[title]/feed(uid, title, ' + 
+
+    heading = '<?dynarex schema="rsscache[title]/feed(uid, title, ' +
       'url, refresh_rate, next_refresh, filename)"?>'
-    
+
 raw_dx=<<EOF
 #{heading}
 title: RSS Feeds to be cached
@@ -122,32 +123,32 @@ title: RSS Feeds to be cached
 
 #{s.strip.lines.map {|x| 'url: ' + x }.join }
 EOF
-    
+
   end
-  
+
   def fetch(url, timeout: 2)
 
     puts 'inside fetch: url: '  + url.inspect if @debug
-    
+
     begin
       Timeout::timeout(timeout){
 
-        buffer = open(url).read.force_encoding("utf-8")
+        buffer = URI.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
+
   end
-  
+
   def open_dynarex(raw_s)
 
-    s, _ = RXFHelper.read(raw_s)
+    s, _ = RXFReader.read(raw_s)
     puts 'inside open_dynarex s: ' + s.inspect if @debug
-    
+
     case s
     when /^<?dynarex/
       Dynarex.new.import s
@@ -156,19 +157,19 @@ EOF
     else
       Dynarex.new.import raw_doc(s)
     end
-    
+
   end
 
-  # checks for any updates and save the 
+  # checks for any updates and save the
   # latest RSS file to the cache if there are updates
-  #  
+  #
   def updates?(feed)
 
     if @debug then
-      puts 'inside updates?' 
+      puts 'inside updates?'
       puts 'feed: ' + feed.inspect
     end
-    
+
     # fetch the feeds from the web
     begin
       buffer, code = fetch(feed.url)
@@ -192,39 +193,39 @@ EOF
     end
 
     if feed.filename.empty? then
-      
+
       filename = feed.url[6..-1].gsub(/\W+/,'').\
                           reverse.slice(0,40).reverse.downcase + '.xml'
       feed.filename = filename
 
     end
-    
+
     rssfile = File.join(@cache_filepath, feed.filename)
 
-    if File.exists? rssfile then
+    if FileX.exists? rssfile then
 
       begin
-        rss_cache = SimpleRSS.parse File.read(rssfile)
+        rss_cache = SimpleRSS.parse FileX.read(rssfile)
       rescue
         puts 'RSScache::updates?: err: 200 SimpleRSS warning for feed ' \
-            + feed.url + ' ' + ($!).inspect        
-        FileUtils.rm rssfile
-        return false 
+            + feed.url + ' ' + ($!).inspect
+        FileX.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?
-      
+      (FileX.write rssfile, rss.source; return true) if new_rss_items.any?
+
     else
 
-      File.write rssfile, rss.source
+      FileX.write rssfile, rss.source
       feed.title = rss.title if feed.title.empty?
 
       return true
-      
+
     end
-    
+
     return false
-  end  
-  
-  
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsscache
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - James Robertson
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwMjA0MTUwMTQ0WhcN
-  MTkwMjA0MTUwMTQ0WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCc92mR
-  T6m1I0JF3lENRDv6liYXqJiStrmml5LWAEzI1kDXEXIeNziO9Jlo74rHwtrZxeJ0
-  vuPBwXwDsoLEz1uz94hq1cfgRXXrj6K9A5YA8fQAvsFyKqxaS3Dtg5heQbgv5DUl
-  p2dzrc057LaES5E5bdBmH2DVHoaHGyya17u4T2sz42gKkv3CURgRopj05JF3a0AZ
-  WFE/N1xbD7ioffsKuPbGds6eL1eYk0qajutC0KIaRUqiTgzaTmntS1mDdz7nJMRM
-  7bVGP3cI1XfAGj/IqqfnapgYsVurPw9pzYGgBgH3XT/lKZW+xWfxpzkZH/ydpaF9
-  XU61J04M6xm9pPMFAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFCTDqdNBDLPNgRVZx02eHi9sOV7vMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBABRCQKjdYT2lYH/XVGjB
-  XabbdBuro3lsCqzm95wtF2qTyw60gNpXuP+FBbQbnf4YMrYe4N8+lDXdY6xs8KMP
-  F8CoEBQSS0FqX1p4PT+5IDFEq/5Mmu46P9ZTS3bC5jlClr+IyclMdWl8yElWfer8
-  1KXDv1bwr1yjhc0vgAmnnUzk+V9fgDHQf58sTPlDa1k0T396x+BJ3i0xnLTOi2iU
-  0sAYj5+mVEGRx284sLHwgieDyxrLQMdPhDBnx5pPgJaQCw8xMS1S8DSX4gQAj+PK
-  5tiFhikiYyE9RjMYlZVwdfKc9yEGPhxY2J3V8RufP3HE6GHrV2lk5d9yFVcEqq+q
-  T1k=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjExMTE4MTk1NDM3WhcN
+  MjIxMTE4MTk1NDM3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDl/WSn
+  rif0WGHmqi3lDo4hCKqsnTvQJFFBoYyGPd8nQPrXd1D6+o0B8qbihDaayk0itqVF
+  MAZpErc/X7G49/DsFHsCIggXezeu52Pjwos99kGla6qJoPUwP9uC4SMbUXrbfDOD
+  ONtkhEscM1vjZWfQketPUXxEpoQjQAgvEWP6JJ1wHIKf8zuxGgnOqXeyeMmI92sm
+  8zOo/Tph2scpEePy8LMxj1t7WY2IKnHAjVI2bwv0t4iqzoBTGArsoKFa9CJvlEPn
+  KC+XCfbOyPHDYZ9rMp1VjuzE73FNvLaZyemytRITy/xZcnCRJuQJ1M5lmG1k7VGo
+  h12tG5hepRnU+y5eYbc7locMlm+BA0zJO6h76O16ssTXdPGmWIx0bqvH+tnE3Y1p
+  ge/EpMmSPaY4DwpCrUOVB2lXkWEvCTxaEUfigbro+tNnGrlolMLzYunGh/rIPwf6
+  JlPQofTjBLEZZ4HnvsZrcpDbKg1UAJ8DRKuGMO8vW3+SIluXMoDfkDSornsCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUMZkI563V
+  qEbcdqMHGxFBtvTHazwwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAGq7ekyOf3MP2SWidstI5qt1pOcyY0IsjJbU9KWiS
+  K9mCa3DxPks6EFHswXTEBb91S/523He3iHw3XIx0wNgDycH6/hxXoylhG37He/RG
+  UZVIYjs7TaVqHpslQkGcO0/tGXzQ35mooF8XiB88l08sBiEunZU3quCwG0ja6A0V
+  VOZ/0X3SqdOgrhagTMsjDnz7ssiP/H6hIAoFBhF7D3X+Vavo6wMhSwGMoeFmQh67
+  CUipnJc6MBLlq8AxZcTYhulLOxTjefUxpbPxLV+pubf9xyG4rjkpv7lMap6wENLS
+  KzCP36ihBrIbQ6QFi1stEPDDXMNiIYbT4liyv1Ij0VUfnhZ8XtdlTrDzTeTQ2JjA
+  RAxFbgUVr0H2AyzRphwLN5UUUGYhsZOS4G+ObMbXYFHTDBlJBj0GIYi7yt48E6FE
+  G9akldSLDKgsN9vmwihdlnktMrNa8HUDxodpx5FFzXDsza/qaExLHJA4hPkbgeiC
+  4DQl3q4AK/bNTpTtJNtNQxts
   -----END CERTIFICATE-----
-date: 2018-02-04 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -38,20 +43,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.90
+        version: 1.9.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.90
+        version: 1.9.8
 - !ruby/object:Gem::Dependency
   name: simple-rss
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +66,7 @@ dependencies:
         version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,9 +76,9 @@ dependencies:
         version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.3
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -98,10 +103,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
-summary: This gem helps reduce unnessecary requests to webservers by caching RSS feeds
+summary: This gem helps reduce unnecessary requests to webservers by caching RSS feeds
   where the RSS feeds are updated infrequently
 test_files: []