newsfetcher 0.85 → 0.87

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0579bb8a9cf7eb109782ed98b7f38a49c6be3c0959d139df070a1ca87b76833
-  data.tar.gz: 49ab3d91511500f363f679439c4892ae0cbff6b8b614916d4e295c9cb0f712f4
+  metadata.gz: 6b822d63d603e3bb424e7e5222a71f0c399dd8f771c26c284c9100344e17f827
+  data.tar.gz: 20cefc24db63cb25b31a9bdd1406af0bb2e98286ca467a7fc244186824391332
 SHA512:
-  metadata.gz: 541e173927f3726bc50b107d33eae98e97a9abd57d86ddb2c0bb96ed9a8db9eab4c9ac78c6bbb6f70319d689eff04381a3dc98514ab2be5db16c351cdf71b519
-  data.tar.gz: 888e0742c7f2d189dee6f104ed850b9b60c22459279567fa2059e6c45f0271b5358126b6b56a3a1f992b88e04d413ba2b6bebbcd39e21497d0977dbf9a816e53
+  metadata.gz: afa5c0d81d76cb20a8229cd7cfa215f013343a546a282c3d39b749c5d3518530a6acebcb6a6356ce19149e361cfd4847a5b4dcae76b55e1d7fb8edaa473f82bc
+  data.tar.gz: 61ac122ca9b74c773a6411697c28943cca4f66d3ca9b438cca518953f292b7221003a05fcf9a9c92e9f30f5facca829d546416185e15d7364e75cd6d5a2714b6

data/lib/newsfetcher/command.rb

@@ -12,7 +12,7 @@ module NewsFetcher
       config = config_file.exist? ? BaseConfig.load(config_file) : BaseConfig.make
       config.log_level = @log_level.downcase.to_sym if @log_level
       config.max_threads = @max_threads&.to_i if @max_threads
-      @profile = Profile.new(dir: dir, config: config) or raise Error, "Profile not loaded"
+      @profile = Profile.new(dir:, config:) or raise Error, "Profile not loaded"
     end
 
   end

data/lib/newsfetcher/commands/add.rb

@@ -8,8 +8,8 @@ module NewsFetcher
         super
         uri, path, id = *args
         raise Error, "No URI specified" unless uri
-        dir = @profile.add_subscription(uri: uri, id: id, path: path)
-        warn "Added subscription: #{dir}"
+        subscription = @profile.add_subscription(uri:, id:, path:)
+        warn "Added subscription: #{subscription.id}"
       end
 
     end

data/lib/newsfetcher/extensions/addressable-uri.rb

@@ -4,12 +4,12 @@ module Addressable
 
     def make_subscription_id
       [
-        host.to_s \
-          .sub(/^(www|ssl|en|feeds|rss|blogs?|news).*?\./i, '') \
+        host.to_s
+          .sub(/^(www|ssl|en|feeds?|rss|blogs?|news?|old)[\d\-]?.*?\./i, '')
           .sub(/\.(com|org|net|info|edu|co\.uk|wordpress\.com|blogspot\.com|feedburner\.com)$/i, ''),
-        path.to_s \
+        path.to_s
           .gsub(/\b(\.?feeds?|index|atom|rss|rss2|xml|rdf|php|blog|posts|default)\b/i, ''),
-        query.to_s \
+        query.to_s
           .gsub(/\b(format|feed|type|q)=(atom|rss\.xml|rss2?|xml)/i, ''),
       ] \
         .join(' ')

data/lib/newsfetcher/fetcher.rb

@@ -11,7 +11,7 @@ module NewsFetcher
     include SetParams
 
     def self.get(uri)
-      new(uri: uri).tap(&:get)
+      new(uri:).tap(&:get)
     end
 
     def initialize(**params)

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/profile.rb

@@ -7,7 +7,7 @@ module NewsFetcher
 
     include SetParams
 
-    def initialize(params={})
+    def initialize(...)
       super
       setup_logger
       setup_styles
@@ -59,7 +59,7 @@ module NewsFetcher
         subscription_dir = subscriptions_dir / id
         begin
           subscription_config = @config.load(subscription_dir / ConfigFileName)
-        rescue Config::Error => e
+        rescue Simple::Configurator::Error => e
           raise "#{id}: #{e}"
         end
         Subscription.new(id: id, dir: subscription_dir, config: subscription_config, styles: @styles)
@@ -74,14 +74,14 @@ module NewsFetcher
       raise Error, "Bad URI: #{uri}" unless uri.absolute?
       id ||= uri.make_subscription_id
       id = "#{path}/#{id}" if path
-      subscription_dir = subscriptions_dir / id
-      raise Error, "Subscription already exists in #{subscription_dir}" if subscription_dir.exist?
-      subscription_dir.mkpath
-      config = @config.make(uri: uri)
-      config_file = subscription_dir / ConfigFileName
+      dir = subscriptions_dir / id
+      raise Error, "Subscription already exists in #{dir}" if dir.exist?
+      dir.mkpath
+      config = @config.make(uri:)
+      config_file = dir / ConfigFileName
       config.save(config_file)
-      $logger.info { "Saved new subscription to #{config_file}" }
-      subscription_dir
+      $logger.info { "Added new subscription: #{id} (#{config_file})" }
+      Subscription.new(id:, dir:, config:, styles: @styles)
     end
 
   end

data/lib/newsfetcher/subscription.rb

@@ -12,7 +12,7 @@ module NewsFetcher
     include SetParams
     include Simple::Printer::Printable
 
-    def initialize(**params)
+    def initialize(...)
       @title = nil
       @items = []
       super
@@ -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

@@ -42,19 +42,20 @@ module NewsFetcher
     application/xml
     text/xml
   ]
+
 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
 

data/newsfetcher.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'newsfetcher'
-  s.version       = '0.85'
+  s.version       = '0.87'
   s.summary       = 'Monitor RSS/Atom feeds and deliver new items by email'
   s.author        = 'John Labovitz'
   s.email         = 'johnl@johnlabovitz.com'
@@ -20,20 +20,20 @@ Gem::Specification.new do |s|
   s.add_dependency 'erb', '~> 6.0'
   s.add_dependency 'faraday', '~> 2.14'
   s.add_dependency 'feedjira', '~> 4.0'
-  s.add_dependency 'loofah', '~> 2.24'
+  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.2'
+  s.add_dependency 'simple-command-parser', '~> 1.3'
   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'

data/test/main_test.rb

@@ -48,9 +48,9 @@ module NewsFetcher
         assert { feed }
         uri = feed[:uri]
         assert { uri }
-        dir = @profile.add_subscription(uri: uri, id: id, path: path)
-        assert { dir.exist? }
-        dir
+        subscription = @profile.add_subscription(uri: uri, id: id, path: path)
+        assert { subscription.dir.exist? }
+        subscription
       end
       subscriptions = @profile.find_subscriptions
       assert { subscriptions.count == initial_subscriptions.count }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newsfetcher
 version: !ruby/object:Gem::Version
-  version: '0.85'
+  version: '0.87'
 platform: ruby
 authors:
 - John Labovitz
@@ -85,14 +85,14 @@ dependencies:
     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
@@ -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,14 +211,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: simple-configurator
   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
@@ -365,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.5
 specification_version: 4
 summary: Monitor RSS/Atom feeds and deliver new items by email
 test_files: