newsfetcher 0.84 → 0.86

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb18377fe7a1b55c9a1f9778b6824294ab8c65cad6f8260d388b61629247de48
-  data.tar.gz: a0648cec658c5299075ac08a3e5524a766d14aac20f0b8efd37603a607e4be93
+  metadata.gz: 006d29ea1d74a5041324ea30fe6d3d9139b1ca482d439e2ced42a77b3e5c338b
+  data.tar.gz: 792522304d04f84d50f855ccc81770114a82bdf9f11b06f455082953393b3bc8
 SHA512:
-  metadata.gz: 636aad38f91c50934a524f7862143bc0b31b7b544b5a2f82686dcf51ce6ac3a91d361e407fb55190b7c13465e396c241bfc550b1f660e13176644c53eb4f8f3f
-  data.tar.gz: 3b5710a57847e4653c822b57242437df7d21576bcedc39d5ba1eb7b91df605e9e6590ff23434fb4121dc1f904ba155085c24e78bf2142a20f6a54387260e5300
+  metadata.gz: f30983e345e236ae0b244fdb3d90bfbb99388d90a2233f59cad72bea37651c6fa70d9f5c25c49761a93ddb32cd39bdb2741b9fe4de7293af32fb3d62356856f1
+  data.tar.gz: 6533060a58ce4caf9ed0d94f328bc15840f30cb57e7603fe725b544070bc4dd5149445ce5238ff6702a4d5c2e8205886ddcd5d42d50e0696bcc1aea467cd01e7

data/bin/newsfetcher

@@ -1,10 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'newsfetcher'
+require_relative '../lib/newsfetcher'
 
-begin
-  Simple::CommandParser.run(ARGV)
-rescue Simple::CommandParser::UsageError => error
-  warn error
-  exit(1)
-end
+Simple::CommandParser.run!(ARGV)

data/lib/newsfetcher/item.rb

@@ -8,6 +8,7 @@ module NewsFetcher
     attr_accessor :uri
     attr_accessor :author
     attr_accessor :content
+    attr_accessor :links
 
     include SetParams
     include Simple::Printer::Printable
@@ -23,13 +24,20 @@ module NewsFetcher
         uri = nil
       end
       id = entry.entry_id || uri or raise Error, "Can't determine ID or URL for entry"
+      content = (entry.content || entry.summary)&.to_s
+      if entry.respond_to?(:links)
+        links = (entry.links.map { |l| Addressable::URI.parse(l) rescue nil } - [uri]).compact
+      else
+        links = nil
+      end
       super(
         id: id.to_s,
-        uri: uri,
+        uri:,
         date: entry.published || Time.now,
         title: entry.title,
         author: entry.respond_to?(:author) ? entry.author&.sub(/^by\s+/i, '') : nil,
-        content: (entry.content || entry.summary)&.to_s,
+        content:,
+        links:,
       )
     end
 
@@ -40,6 +48,7 @@ module NewsFetcher
         :title,
         :uri,
         :author,
+        :links,
       ]
     end
 

data/lib/newsfetcher/subscription.rb

@@ -264,6 +264,13 @@ module NewsFetcher
                 html << Scrubber.text_to_html(item.content)
               end
             end
+            if item.links
+              item.links.each do |link|
+                html.ul do
+                  html.a(link.prettify, href: link)
+                end
+              end
+            end
           end
         end
       end.to_html

data/lib/newsfetcher.rb

@@ -44,17 +44,17 @@ module NewsFetcher
   ]
 end
 
-require 'newsfetcher/extensions/string'
-require 'newsfetcher/extensions/mail'
-require 'newsfetcher/extensions/addressable-uri'
+require_relative 'newsfetcher/extensions/string'
+require_relative 'newsfetcher/extensions/mail'
+require_relative 'newsfetcher/extensions/addressable-uri'
 
-require 'newsfetcher/error'
-require 'newsfetcher/fetcher'
-require 'newsfetcher/history'
-require 'newsfetcher/item'
-require 'newsfetcher/profile'
-require 'newsfetcher/scrubber'
-require 'newsfetcher/subscription'
+require_relative 'newsfetcher/error'
+require_relative 'newsfetcher/fetcher'
+require_relative 'newsfetcher/history'
+require_relative 'newsfetcher/item'
+require_relative 'newsfetcher/profile'
+require_relative 'newsfetcher/scrubber'
+require_relative 'newsfetcher/subscription'
 
 module NewsFetcher
 
@@ -82,5 +82,5 @@ module NewsFetcher
 
 end
 
-require 'newsfetcher/command'
-Path.new(__FILE__).dirname.glob('newsfetcher/commands/*.rb').each { |p| require p }
+require_relative 'newsfetcher/command'
+Path.new(__FILE__).dirname.glob('newsfetcher/commands/*.rb').each { |p| require_relative p }

data/newsfetcher.gemspec

@@ -1,8 +1,6 @@
-require_relative 'lib/newsfetcher/version'
-
 Gem::Specification.new do |s|
   s.name          = 'newsfetcher'
-  s.version       = NewsFetcher::VERSION
+  s.version       = '0.86'
   s.summary       = 'Monitor RSS/Atom feeds and deliver new items by email'
   s.author        = 'John Labovitz'
   s.email         = 'johnl@johnlabovitz.com'
@@ -19,23 +17,23 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'addressable', '~> 2.8'
   s.add_dependency 'addressable-prettify', '~> 0.2'
-  s.add_dependency 'erb', '~> 4.0'
+  s.add_dependency 'erb', '~> 6.0'
   s.add_dependency 'faraday', '~> 2.14'
-  s.add_dependency 'feedjira', '~> 3.2'
-  s.add_dependency 'loofah', '~> 2.24'
-  s.add_dependency 'mail', '~> 2.8'
+  s.add_dependency 'feedjira', '~> 4.0'
+  s.add_dependency 'loofah', '~> 2.25'
+  s.add_dependency 'mail', '~> 2.9'
   s.add_dependency 'maildir', '~> 2.2'
-  s.add_dependency 'ostruct', '0.6'
+  s.add_dependency 'ostruct', '~> 0.6'
   s.add_dependency 'path', '~> 2.1'
   s.add_dependency 'rubypants', '~> 0.7'
   s.add_dependency 'sassc', '~> 2.4'
   s.add_dependency 'set_params', '~> 0.3'
   s.add_dependency 'simple-builder', '~> 0.4'
-  s.add_dependency 'simple-command-parser', '~> 1.1'
-  s.add_dependency 'simple-configurator', '~> 0.1'
+  s.add_dependency 'simple-command-parser', '~> 1.2'
+  s.add_dependency 'simple-configurator', '~> 0.2'
   s.add_dependency 'simple-printer', '~> 0.4'
 
-  s.add_development_dependency 'minitest', '~> 5.26'
+  s.add_development_dependency 'minitest', '~> 6.0'
   s.add_development_dependency 'minitest-power_assert', '~> 0.3'
   s.add_development_dependency 'rake', '~> 13.3'
   s.add_development_dependency 'simple-rake-tasks', '~> 0.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newsfetcher
 version: !ruby/object:Gem::Version
-  version: '0.84'
+  version: '0.86'
 platform: ruby
 authors:
 - John Labovitz
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -71,42 +71,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: loofah
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.24'
+        version: '2.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.24'
+        version: '2.25'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: maildir
   requirement: !ruby/object:Gem::Requirement
@@ -125,14 +125,14 @@ dependencies:
   name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
@@ -211,28 +211,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: simple-configurator
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: simple-printer
   requirement: !ruby/object:Gem::Requirement
@@ -253,14 +253,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.26'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.26'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: minitest-power_assert
   requirement: !ruby/object:Gem::Requirement
@@ -343,7 +343,6 @@ files:
 - lib/newsfetcher/profile.rb
 - lib/newsfetcher/scrubber.rb
 - lib/newsfetcher/subscription.rb
-- lib/newsfetcher/version.rb
 - message/stylesheet.css
 - newsfetcher.gemspec
 - test/history_test.rb
@@ -366,7 +365,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Monitor RSS/Atom feeds and deliver new items by email
 test_files:

data/lib/newsfetcher/version.rb

@@ -1,5 +0,0 @@
-module NewsFetcher
-
-  VERSION = '0.84'
-
-end