newsfetcher 0.86 → 0.87

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 006d29ea1d74a5041324ea30fe6d3d9139b1ca482d439e2ced42a77b3e5c338b
-  data.tar.gz: 792522304d04f84d50f855ccc81770114a82bdf9f11b06f455082953393b3bc8
+  metadata.gz: 6b822d63d603e3bb424e7e5222a71f0c399dd8f771c26c284c9100344e17f827
+  data.tar.gz: 20cefc24db63cb25b31a9bdd1406af0bb2e98286ca467a7fc244186824391332
 SHA512:
-  metadata.gz: f30983e345e236ae0b244fdb3d90bfbb99388d90a2233f59cad72bea37651c6fa70d9f5c25c49761a93ddb32cd39bdb2741b9fe4de7293af32fb3d62356856f1
-  data.tar.gz: 6533060a58ce4caf9ed0d94f328bc15840f30cb57e7603fe725b544070bc4dd5149445ce5238ff6702a4d5c2e8205886ddcd5d42d50e0696bcc1aea467cd01e7
+  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/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

data/lib/newsfetcher.rb

@@ -42,6 +42,7 @@ module NewsFetcher
     application/xml
     text/xml
   ]
+
 end
 
 require_relative 'newsfetcher/extensions/string'

data/newsfetcher.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'newsfetcher'
-  s.version       = '0.86'
+  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'
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   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'
 

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.86'
+  version: '0.87'
 platform: ruby
 authors:
 - John Labovitz
@@ -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
@@ -365,7 +365,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.5
 specification_version: 4
 summary: Monitor RSS/Atom feeds and deliver new items by email
 test_files: