rss_timeline 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d9ef3c897983856ec364cdccb3292e423fd85ee
-  data.tar.gz: 31612b7ff8e986e2dbadaa1fee7547a7ec6f4371
+  metadata.gz: 639253db51c59a5e10d6a2303e5f02ec4cac55db
+  data.tar.gz: 24151e07742f8b43931bf2ef735d11dcc492b3ab
 SHA512:
-  metadata.gz: 462205305835b1486af6181a76acb98df75abdb10c47d11b28faf881235ab14ec3ca1c0ea5d566c67b713fe05a068f0ef0be329a4038abf32156ea46a67a652f
-  data.tar.gz: 3d128d42f77e7ec71dc5eb06b58914b2e016ae934aeaa3c6263f91e4a5337d6a8249322e66ec3a3e881cb019d13ab0d3f7ebf464f426a8d0ca527e925e2aa9b7
+  metadata.gz: e3ada7acf96385bd7d4d693bce9d40bfa07b26107119649c4f9c36bda8149ec8b18427adfb4d07d359f080de05c23f53cfdcb53fa54a43737071ceaad799a8c9
+  data.tar.gz: 2b58f0f1387eaa709fc4ec345916e82818055053a0e436f70c4649d33ab0a2ca197e0946c391424dba05777d41647211850ecef6708985b5444629c670340e4c

data/lib/rss_timeline.rb

@@ -12,27 +12,32 @@ class RSStimeline
   
   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)
     
-    puts 'inside initialize'
+    @source_feeds, @debug, @rssfile, @newupdate = feeds, debug, rssfile, false
+    @target_filepath = target_filepath
 
-    @source_feeds = feeds
+    puts 'inside initialize' if @debug
 
-    # create a cache directory if it doesn't alread exist
-    FileUtils.mkdir_p 'cache'
+    @filepath = File.join(filepath, 'rss_timeline')
+    @cache_filepath = File.join(@filepath, 'cache')
+
+    # create a cache directory if it doesn't already exist
+    FileUtils.mkdir_p @cache_filepath
 
     if File.exists? rssfile then
-      @timeline = RSScreator.new rssfile
-    else
-      @timeline = RSScreator.new
+      @timeline =RSScreator.new rssfile
+    else      
+
+      @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
-    @rssfile = rssfile
-    @newupdate = false
+    puts '@timeline.xslt : ' + @timeline.xslt.inspect if @debug
 
   end
 
@@ -44,29 +49,46 @@ class RSStimeline
     # 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', feed[6..-1].gsub(/\W+/,'').\
+      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)
 
-        new_rss_items = rss.items - rss_cache.items
+        fresh, old = [rss.items, rss_cache.items].map do |feed|
+          feed.clone.each {|x| x.delete :guid }
+        end
+        
+        new_items = fresh - old
+        
+        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}
-        File.write rssfile, rss.source if new_rss_items.any?
+        
+        if new_rss_items.any? then
+          puts 'new_rss_items: ' + new_rss_items.inspect if @debug
+          updated = true
+          File.write rssfile, rss.source 
+        end
         
       else
 
+        updated = true
         add_new rss.items.first
         File.write rssfile, rss.source
         
       end
     end
         
-    save()
+    save() if updated
     
   end
   
@@ -110,6 +132,8 @@ class RSStimeline
   
   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)
@@ -118,13 +142,17 @@ class RSStimeline
   
   def new_item(x)
     
-    {
+    h = {
       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()
@@ -134,7 +162,8 @@ class RSStimeline
     on_update()
     @newupdate = false
     
-    @timeline.save @rssfile        
+    @timeline.save File.join(@filepath, @rssfile)
+    @timeline.save File.join(@target_filepath, @rssfile) if @target_filepath
     
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rss_timeline
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   UtkkA/5alscVe1rFL0gDY+bBheYVtTWDEkNYn8lwqtRp0d/fWsXUFg5d5BvTCrF+
   FZcCmMq+Tfz/tQ==
   -----END CERTIFICATE-----
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2018-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple-rss
@@ -59,20 +59,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.11
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: An RSS aggregator which generates an RSS file