rss_timeline 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 639253db51c59a5e10d6a2303e5f02ec4cac55db
-  data.tar.gz: 24151e07742f8b43931bf2ef735d11dcc492b3ab
+SHA256:
+  metadata.gz: e7d0917dcf6a4513e264221316f73df4adac9a0837f253e5ed74b04bbbfb8069
+  data.tar.gz: 05ab3115b5903debd742932fe16fd764194224cd2398992e542c0049a5614aad
 SHA512:
-  metadata.gz: e3ada7acf96385bd7d4d693bce9d40bfa07b26107119649c4f9c36bda8149ec8b18427adfb4d07d359f080de05c23f53cfdcb53fa54a43737071ceaad799a8c9
-  data.tar.gz: 2b58f0f1387eaa709fc4ec345916e82818055053a0e436f70c4649d33ab0a2ca197e0946c391424dba05777d41647211850ecef6708985b5444629c670340e4c
+  metadata.gz: bcc1eb504d8e6619ab4749230d9094f5e4610ed08e1da76ab2f2db8124c0885e7f36287585a08a6c42123be084cb489db97d82775834ebbd9dae54c3fc452a68
+  data.tar.gz: f36f5f339757d11a464b7632f9da9bb31aeb784c456889c96cb90c815792c26159834eca245410daa9d5dc3ab152664e2db3ee1d06315992636e5ac78ddf29d6

data/lib/rss_timeline.rb

@@ -4,17 +4,18 @@
 
 require 'simple-rss'
 require 'open-uri'
-require 'fileutils'
 require 'rss_creator'
+require 'rxfreadwrite'
 
 
 class RSStimeline
-  
+  include RXFReadWriteModule
+
   attr_accessor :rssfile
 
-  def initialize(feeds=[], rssfile: 'timeline.rss', xslt: nil, 
+  def initialize(feeds=[], rssfile: 'timeline.rss', xslt: nil,
                  filepath: '.', debug: false, target_filepath: nil)
-    
+
     @source_feeds, @debug, @rssfile, @newupdate = feeds, debug, rssfile, false
     @target_filepath = target_filepath
 
@@ -24,18 +25,18 @@ class RSStimeline
     @cache_filepath = File.join(@filepath, 'cache')
 
     # create a cache directory if it doesn't already exist
-    FileUtils.mkdir_p @cache_filepath
+    FileX.mkdir_p @cache_filepath
 
-    if File.exists? rssfile then
-      @timeline =RSScreator.new rssfile
-    else      
+    if FileX.exists? rssfile then
+      @timeline = RSScreator.new rssfile
+    else
 
-      @timeline =RSScreator.new
+      @timeline = RSScreator.new
       self.title = 'My RSStimeline feed'
-      self.description = 'Generated using the RSStimeline gem'            
-      
+      self.description = 'Generated using the RSStimeline gem'
+
     end
-    
+
     @timeline.xslt = xslt if xslt
     puts '@timeline.xslt : ' + @timeline.xslt.inspect if @debug
 
@@ -44,127 +45,135 @@ class RSStimeline
   def update()
 
     # fetch the feeds from the web
-    feeds = @source_feeds.map {|feed| [feed, SimpleRSS.parse(open(feed))] }
+    feeds = @source_feeds.map do |feed|
+      #force_encoding('UTF-8')
+      [feed, SimpleRSS.parse(URI.open(feed).read.force_encoding('UTF-8'))]
+    end
 
     # check for each feed from the cache.
     # if the feed is in the cache, compare the 2 to find any new items.
     # New items should be added to the main timeline RSS feed
-    
+
     updated = false
 
     feeds.each do |feed, rss|
 
       rssfile = File.join(@cache_filepath, feed[6..-1].gsub(/\W+/,'').\
                                              reverse.slice(0,40).reverse)
-      
+
       if File.exists? rssfile then
 
-        rss_cache = SimpleRSS.parse File.read(rssfile)
+        rss_cache = SimpleRSS.parse FileX.read(rssfile).force_encoding('UTF-8')
 
         fresh, old = [rss.items, rss_cache.items].map do |feed|
           feed.clone.each {|x| x.delete :guid }
         end
-        
+
+
         new_items = fresh - old
-        
+
+        if @debug then
+          puts 'fresh: ' + fresh.inspect
+          puts 'old: ' + old.inspect
+          puts 'new_items: ' + new_items.inspect
+        end
+
         new_rss_items = new_items.map do |x|
           rss.items.find {|y| y[:title] == x[:title]}
         end
-        
+
         new_rss_items.reverse.each {|item| add_new item}
-        
+
         if new_rss_items.any? then
           puts 'new_rss_items: ' + new_rss_items.inspect if @debug
           updated = true
-          File.write rssfile, rss.source 
+          FileX.write rssfile, rss.source
         end
-        
+
       else
 
         updated = true
         add_new rss.items.first
-        File.write rssfile, rss.source
-        
+        FileX.write rssfile, rss.source
+
       end
     end
-        
+
     save() if updated
-    
+
   end
-  
+
   def description()
     @timeline.description
   end
-  
+
   def description=(val)
     @timeline.description = val
   end
-  
+
   def link(val)
     @timeline.link
   end
-  
+
   def link=(val)
     @timeline = val
   end
-  
+
   def title()
     @timeline.title
   end
-  
+
   def title=(val)
     @timeline.title = val
   end
-  
+
   protected
-  
+
   def on_new_item(item)
-    # you can override this method to create your 
+    # you can override this method to create your
     #                                  own notifier, callback, or webhook
   end
-  
+
   def on_update()
-    # you can override this method to create your 
+    # you can override this method to create your
     #                                  own notifier, callback, or webhook
-  end    
-  
+  end
+
   private
-  
+
   def add_new(item)
-    
+
     puts 'inside add_new: ' + item.inspect if @debug
-    
+
     @timeline.add item: new_item(item), id: nil
     @newupdate = true
     on_new_item(item)
-    
+
   end
-  
+
   def new_item(x)
-    
+
     h = {
-      title: x[:title], 
-      link: x[:link], 
-      description: x[:description], 
+      title: x[:title],
+      link: x[:link],
+      description: x[:description],
       date: x[:date] || Time.now.strftime("%a, %d %b %Y %H:%M:%S %z")
     }
-    
+
     puts 'inside new_item: ' + h.inspect if @debug
-    
+
     h
-    
+
   end
-  
+
   def save()
-    
-    #return unless @newupdate
-    
-    on_update()
+
     @newupdate = false
-    
+
     @timeline.save File.join(@filepath, @rssfile)
     @timeline.save File.join(@target_filepath, @rssfile) if @target_filepath
-    
+    on_update()
+
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rss_timeline
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE3MDMxNDEzNTEyN1oXDTE4MDMxNDEzNTEyN1owSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBANw+TZR6TmXbOqWm3wd4+9vHKqr5u9Fc34kQMk4XPhlvWL6cOgKPMKB/8e0g
-  5VLqFe1Z6Baih0SK7KMiQTfOgJHBWuvf3sEm1O6dSrhZk0MXGOG37XEcmezgvGEf
-  xD82LMrJU35O8pX8Cwz4Y4Ar2iWtD+PldtyZt9MZhPVj74pxZh6zIPxBOk/NJOK4
-  geZaawUOoFszKYpmjxSYMQk42/goI80LxyrHViIVaBqU2w//YVc+roM2/Qdq46mC
-  X3FEaI6xIkdTMR9tpWPHRi0m6QxyUYKiFPzOIfdj7RAEZrzUjnJvcG8S7kh395XC
-  91znHhbDa0isqSpP89mj34KiR4cCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUE2Wo8Q7zPXc/+H87M84TFb+YiocwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEALeA6lhp6
-  +3NWXuSSa7FyBNZfZAhT3doF6CkPIVaRViXxIw5G0/I85FEWRwNzldiZKgiLSH2M
-  5ThHHeorTuUAFlbt6KsrHMQU8phBzVwoFUPL5uWhdURHPXOIXaccsRS+uvss2+M4
-  7ovs+SO1mAyOv6Woa9Zf4JqQlDegNpQSs1pHNnfJETX8He200eDqd0v4VXTqOb6a
-  5p/fLjo1KKkw2vYZxhb5bRU8Kq3fiiQ4hHe8DTPe+xN1/rCttbCCxmrNQa3qq8Ud
-  UtkkA/5alscVe1rFL0gDY+bBheYVtTWDEkNYn8lwqtRp0d/fWsXUFg5d5BvTCrF+
-  FZcCmMq+Tfz/tQ==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjExMTE4MjAxMzM1WhcN
+  MjIxMTE4MjAxMzM1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDYKlzN
+  KH/j7oHZwXPLafmGaNIE3UnTuZTPLiCbA+X1mObp6e8SovbKJ3WvOylNJlYviuYs
+  NnqPNQkvEod9UO8KgAZQj0wlEgWanwy7KR1DUV+0D/Kun/8Dl0v/UE/rSj9ydq2s
+  /VcWUh8oQb4wG56Z1p9SK+Mc2TCX+FL2K9pT56ucPbM24oTjl94nEtEY5cFdyrOa
+  AEGFy1/Oi2Iu9eXJqLdjgz0FE415GDVjYkXogDLG00bAM52nWci4n6WCz0NaX/FS
+  /0Tub2lRyAdJrWudSTrYOzPnzo6PK0Pjh+I4tDfxLTEiFTPIkell+4JKCvXHvEea
+  Un3WaXbfXSwOWlCj+5zY72eFBQZ2IT62q3qzWWi+PD3dAtZM9dIK0L2kEuglxfbc
+  V6B7qqJ9fQD4gTusK/MVHNxMPaIT6UETylCOVpAKJZ0tEj8sCTWU0D2bIdRSSfEc
+  RWVlFXpJesLEEop6+iury3JvxihI9S076m7E55ojJMpFACe8L8KXXf7Q5kECAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUAKcS66Hl
+  dLaIygyjsXnSn8Gc57swJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAkWHEHy5EGJHkge8TV3hzuOH/GYQeoakANku7H4v2
+  SuitANiu/DqbFrLcxtRYCnJw0GZOvpE6fB/5ismWaPw0binwkOfHmhQTsJMQmEo8
+  fnwBfuItZ77wNKugBwHdseIV56sN37B/3Xdz1MPBOVk+UdykaSmk13XvPAZIz2aT
+  i13sS30Wa7gj2BxxjzYgDXsn5hniFTrc4Xf5bb99PudQXz51Mc7UxeaQ12NgqsCq
+  dYahrHrep87Kr4mFPl1nfvqM3OArdV720fwePgciO7suRIXPfI8qVnABIlFpWHoo
+  uT7Xa9HSWeV7zMgohnPRGVbF+r2yPsVUXPZmb+coXUV4WHsCLypaDojqCanNouyo
+  uV5AKfB2wO57X83nRdJ8OzrUzCZVxYX3WpTbUIn/n0k4h7CoCRinO/wUM9aCEuyL
+  9TjZeJfzvcT9qoVK2mzNoDK6P7AL4m7kfnLfQUIc2aF5x9/zIcBi5tEMDcnujsKH
+  l5hjs/75OfrhM2lNdizSwpSW
   -----END CERTIFICATE-----
-date: 2018-02-03 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple-rss
@@ -42,7 +46,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
@@ -52,29 +56,29 @@ dependencies:
         version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: rss_creator
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 0.4.2
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -99,8 +103,7 @@ 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: An RSS aggregator which generates an RSS file