pluto-models 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad263401c798a7b1d893eb500232872a8afc0ca8
-  data.tar.gz: 1a49217497e1b15de32024bdc53fcef480bf0195
+  metadata.gz: b81d3634465206e2bac108bcff1629627a250fd0
+  data.tar.gz: c5b02063eb4ac615fd6e2be6fef55847a24be435
 SHA512:
-  metadata.gz: 11ff9b19fbe322bd20748edc5f6ce993b0235565c9501a2db45ce67d74f2655596d09a937162d1a98060d4129114cea3b03f6a685bd46d79da0270f1e5eaf889
-  data.tar.gz: b88a9638733715423053eeae0e81dde8d622d34c087e767ee6480c8108da1bd6b102dae3dd70c60db709abc1c94625c49f9f074bd8dbc98d5e7a6fd62c7123c2
+  metadata.gz: c925c6718b7ee40814b4bda67fb99fb19347adc5cba20a030ea1dcddb1d48311050cc3c358e77e103459c9fc650aa38641ea3c6200b32eb03e2d7497e9944264
+  data.tar.gz: 61364d47455fca58c1cc02282d712f846df860162a1455327c774ce73e6cd73af9545f2f5c2fad5effa7b0519e6e192d13302f9e80af29c8b1f56a12665d911d

data/Manifest.txt

@@ -14,6 +14,7 @@ lib/pluto/schema.rb
 lib/pluto/version.rb
 test/data/ruby.ini
 test/helper.rb
+test/test_delete_removed.rb
 test/test_filter.rb
 test/test_helpers.rb
 test/test_site.rb

data/lib/pluto/models/feed.rb

@@ -125,6 +125,37 @@ class Feed < ActiveRecord::Base
     end  # each item
 
 
+    ###
+    #  delete (old) feed items if no longer in feed AND
+    #   date range is in (lastest/current) feed list
+    #
+    #  thanks to Harry Wood
+    #   see https://github.com/feedreader/pluto/pull/16
+    #    for more comments
+
+    #
+    #  todo/fix: use a delete feature/command line flag to make it optional - why? why not?
+
+
+    guids_in_feed = data.items.map {|item| item.guid}
+    earliest_still_in_feed = data.items.min_by(&:published).published
+
+    items_no_longer_present =
+      Item
+        .where(feed_id: id)
+        .where.not(published: nil)
+        .where("published > ?", earliest_still_in_feed)
+        .where.not(guid: guids_in_feed)
+
+    unless items_no_longer_present.empty?
+      logger.info "#{items_no_longer_present.size} items no longer present in the feed (presumed removed at source). Deleting from pluto db"
+      items_no_longer_present.each do |item|
+        logger.info "** DELETE | #{item.title}"
+        item.destroy
+      end
+    end
+
+
     #  update  cached value last published for item
     ##  todo/check: force reload of items - why? why not??
     last_item_rec = items.latest.limit(1).first  # note limit(1) will return relation/arrar - use first to get first element or nil from ary

data/lib/pluto/version.rb

@@ -4,7 +4,7 @@ module Pluto
 
   MAJOR = 1
   MINOR = 5
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/test_delete_removed.rb

@@ -0,0 +1,66 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_delete_removed.rb
+#  or better
+#     rake test
+
+require 'helper'
+
+class TestDeleteRemoved < MiniTest::Test
+
+  def test_delete_removed
+
+    feed = Feed.create!(
+      key: 'test',
+      title: 'Feed title'
+    )
+
+    feed_data = FeedParser::Feed.new
+    feed_data.title = 'Feed data title'
+    feed_data.items = []
+
+    item_data = FeedParser::Item.new
+    item_data.guid = 'https://myblog.com/?p=1113'
+    item_data.title = 'Good post #3'
+    item_data.published = Time.now
+    feed_data.items << item_data
+
+    item_data = FeedParser::Item.new
+    item_data.guid = 'https://myblog.com/?p=1112'
+    item_data.title = 'Spam post #2'
+    item_data.published = Time.now - 10.minutes
+    feed_data.items << item_data
+
+    item_data = FeedParser::Item.new
+    item_data.guid = 'https://myblog.com/?p=1111'
+    item_data.title = 'Good post #1'
+    item_data.published = Time.now - 20.minutes
+
+    feed_data.items << item_data
+
+    feed.deep_update_from_struct!( feed_data )
+
+    assert_equal(3, Item.count)
+
+
+    feed_data.items = []
+
+    item_data = FeedParser::Item.new
+    item_data.guid = 'https://myblog.com/?p=1113'
+    item_data.title = 'Good post #2'
+    item_data.published = Time.now
+    feed_data.items << item_data
+
+    item_data = FeedParser::Item.new
+    item_data.guid = 'https://myblog.com/?p=1111'
+    item_data.title = 'Good post #1'
+    item_data.published = Time.now - 20.minutes
+    feed_data.items << item_data
+
+    feed.deep_update_from_struct!( feed_data )
+
+    assert_equal(2, Item.count)
+  end
+end # class TestDeleteRemoved

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluto-models
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2019-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -203,6 +203,7 @@ files:
 - lib/pluto/version.rb
 - test/data/ruby.ini
 - test/helper.rb
+- test/test_delete_removed.rb
 - test/test_filter.rb
 - test/test_helpers.rb
 - test/test_site.rb