flnews_post_proc 1.45 → 1.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c48262d6fc3031346ffa1e2b528e11a696cef83b6d7c64fa98cdef444cf60247
-  data.tar.gz: 12e53f1d88d613d14671ed06f03c0e65ca5f438088c85a66c22d3e37beec9b61
+  metadata.gz: bfa512fc050add2e3d6ecddebcc81f1af8256880e6c94faa8b4f7ecba24275e7
+  data.tar.gz: 3932c50c12c18db1a8f277d69e29bf537b0d8ba6708d000c8f87fe97da1c993d
 SHA512:
-  metadata.gz: f1845950986bcb9919a4ad353c4913a9fca9427f2387bb8a4cbe7b1968eaf26f35d837f331dd9d3f9a1ab5c49b8e9a49d7868f89902c7b9f427d2592e73dc607
-  data.tar.gz: f87ff6d5bd9462ebf3988b23482b64d6bb3d7ced99fbeecb06cc6c271392b65b7d8a510cd69e7e83c6792775ffbceb6e6dc1a6313b0bb2abd335752f508655ba
+  metadata.gz: 4c84d0aa2a73c86ea0b43d4e35fb0073fd84c019848a4de8d8a4c876814e2d8fb23d54583c3c3ad708ab2191bffb95c510225c160ec785334e574f683d69e906
+  data.tar.gz: 32a8ed4b8641f2a44d93f665d726425a766e6cdb2b5491b5f80512935114c7f2c6154c26ede009ef07b05c597c84aa7482211a47114e3172e90673fb533e59d6

data/README.md

@@ -93,14 +93,14 @@ some users may not always agree with the result and for arbitrary reasons:
   Custom headers may be defined in the configuration file for the program  
   and will then be added to each outgoing post.
 
-* The Archive- and X-No-Archive headers are sometimes set to avoid that an
-  article be saved and stays available to search-engines (Google, notably).
-  Test-  postings, for example, do probably not justify at all that they would
-  be  referenced in search results. The post-processor program can impose the
-  Archive- and X-No-Archive header for all posts to certain newsgroups.
-
-  **ATTN** As of 2024, the X-No-Archive has lost most of its utility and it 
-  is the decision of server operators to honor it or not.
+* The Archive- and X-No-Archive headers are sometimes set to avoid that an 
+  article be saved and stays available to search-engines (Google, notably). 
+  Test-  postings, for example, do probably not justify at all that they would 
+  be  referenced in search results. The post-processor program can impose the 
+  Archive- and X-No-Archive header for all posts to certain newsgroups. 
+
+  **ATTN** As of 2024, the header “X-No-Archive“ has lost most of its utility 
+  and it is the decision of server operators to honor it or not.  
 
 * If a news post contains many references to either other posts or Web  
   pages, the text can be cluttered with URLs.  

data/bin/flnews_post_proc

@@ -1,5 +1,6 @@
 #!/bin/env ruby
 #encoding: UTF-8
+
 =begin
 /***************************************************************************
  *   ©2023-2024, Michael Uplawski <michael.uplawski@uplawski.eu>           *
@@ -32,7 +33,7 @@ self.extend(BasicLogging)
 
 msg = PROGNAME.dup << ' ' << PROGVERSION << ' starting' 
 msg = "–––––– " << msg << " ––––––"
-
+clear_log
 info msg
 # Get a configuration 
 config = Configuration::instance

data/lib/basic_logging.rb

@@ -48,15 +48,19 @@ module BasicLogging
 
   # set the log level 
   def set_level(lv)
-    if lv.respond_to?(:to_str)
+    if lv.respond_to?(:to_str) && Levels.keys.include?(lv.strip.to_sym)
       lv = Levels[lv.to_sym]
+    elsif lv.respond_to?(:to_sym) && Levels.keys.include?(lv)
+      lv = Levels[lv]
     end
 
     if(!lv || (lv.respond_to?(:to_int) && lv >= DEBUG && lv <= FATAL) )
       @@log_level = lv
     else
-      STDERR.puts __FILE__.dup << ": ERROR : invalid log level \"" << lv.to_s << "\""
-      STDERR.puts "Keepinng old log level " << Levels.keys.detect {| k| Levels[k] == @@log_level}.to_s
+      msg = __FILE__.dup << ": ERROR : invalid log level \"" << lv.to_s << "\""
+      msg << "\n" << "Keepinng old log level " << Levels.keys.detect {| k| Levels[k] == @@log_level}.to_s
+      STDERR.puts msg
+      puts msg
     end
   end
 
@@ -91,13 +95,27 @@ module BasicLogging
     end
   end
 
+  def target
+    @@target.path if @@target
+  end
+
+  def level
+    @@level.to_s if @@level
+  end
+
+  # Clear the log (-file)
+  def clear_log
+    if @@target && @@target.respond_to?(:truncate)
+      @@target.truncate(0) 
+    end
+  end
+
   alias :debug :log
   alias :info :log
   alias :warn :log
   alias :error :log
   alias :fatal :log
 
-  attr_reader :target, :log_level
 
   private 
 

data/lib/body.rb

@@ -87,7 +87,7 @@ class Body
             i = i.next
             line = @lines[i]
           end
-          # check if there is a citation, at all
+          # check if there is a quote, at all
           if(line.start_with?('>'))
             debug("\tfound intro " << ointro)
             # variables are part of the $intro.
@@ -119,9 +119,13 @@ class Body
   end
 
   def join 
-    return @lines.join("\r\n")
+    return @lines.join("\r\n") << "\r\n"
   end
- 
+  # ------->
+  # TODO : Concentrate all URL/URI munging functionality in 1 or 2 helper
+  # classes, e.g. Body::News and Body::Http
+  # <------ 
+  
   # Verify and possibly correct links in the post.
   # Simple.
   def handle_urls() 

data/lib/configuration.rb

@@ -25,7 +25,6 @@ class Configuration
   include Singleton
   include BasicLogging
 
-  self.extend(BasicLogging)
 
   def initialize() 
     debug 'Configuration::initialize()'
@@ -115,6 +114,7 @@ class Configuration
     if File::exist?(@config_file) && File::readable?(@config_file)
       begin
         @conf = YAML::load_file(@config_file)
+
         @conf.transform_keys!{|k| k.to_sym}
         @keys = @conf.keys
         clevel = @conf[:LOG_LEVEL]

data/lib/flnews_post_proc.rb

@@ -29,11 +29,10 @@ $LN = "\r\n"
 # The main application class.
 #  Does it.
 class PostProcessor
-  # class-level configuration object
-  @@config = Configuration.instance
   include BasicLogging  
 
   def initialize(article_text)
+    @config = Configuration.instance
     # for simplicity.
     # separate the headers and the body.
     debug ' initializing headers'

data/lib/headers.rb

@@ -20,13 +20,12 @@ require_relative 'newsgroups'
 # an object of this class represents the headers of a news-article
 
 class Headers
-  # class-level configuration object
-  @@config = Configuration.instance
   include BasicLogging
 
   # read the headers from the article
   def initialize(article_text)
     
+    @config = Configuration.instance
     line = nil
     # transform the article to an array.
     debug('before split, article_text is : ' << article_text)
@@ -105,10 +104,10 @@ class Headers
       @headers["X-No-Archive".to_sym] = no_archive
       @headers["Archive".to_sym] = 'no'
     end
-    if @@config.CUSTOM_HEADERS    
-      ch = @@config.CUSTOM_HEADERS
+    if @config.CUSTOM_HEADERS    
+      ch = @config.CUSTOM_HEADERS
       debug('setting custom headers : ' << ch.inspect)
-      @@config.CUSTOM_HEADERS.each do |pair| 
+      @config.CUSTOM_HEADERS.each do |pair| 
         ch = pair.split(':')
         hn = ch[0].strip
         hv = ch[1].strip

data/lib/newsgroups.rb

@@ -20,11 +20,10 @@ require_relative 'configuration'
 require_relative 'basic_logging'
 
 class Newsgroups
-  # class-level configuration object
-  @@config = Configuration.instance
-  include BasicLogging  
 
+  include BasicLogging  
   def initialize(groups)
+    @config = Configuration.instance
     @groups = groups.split(',')
     debug('set signature, intro, no_archive')
     # set details for this post
@@ -50,7 +49,7 @@ class Newsgroups
     # only one group.
     group = @groups[0]
     # all configured intro-lines.
-    gintros = @@config.GROUP_INTROS
+    gintros = @config.GROUP_INTROS
 
     if gintros && gintros.respond_to?(:to_hash)
       # find the intro for the group.
@@ -93,7 +92,7 @@ class Newsgroups
     @signature = nil
     # 1 group
     group = @groups[0]
-    gsigs = @@config.GROUP_SIGS
+    gsigs = @config.GROUP_SIGS
 
     if gsigs && gsigs.respond_to?(:to_hash)
       # find the signature for the group
@@ -124,7 +123,7 @@ class Newsgroups
   # define the no_archive header.
   def set_no_archive
     @no_archive = nil
-    xgs = @@config.NO_ARCHIVE_GROUPS
+    xgs = @config.NO_ARCHIVE_GROUPS
     if xgs && !xgs.empty? && xgs.detect {|g| @groups[0].match(g) }
       debug("setting no_archive")
       @no_archive = 'yes' 

data/lib/version.rb

@@ -14,8 +14,8 @@
 =end
 
 PROGNAME = 'flnews_post_proc'
-PROGVERSION = "1.45"
+PROGVERSION = "1.47"
 AUTHORS = "Michael Uplawski"
 EMAIL = "michael.uplawski@uplawski.eu"
 YEARS = "2023 - 2024"
-SUMMARY = "Bugfix: URLs exclude punctuation and others at the end."
+SUMMARY = "superfluous output in Headers eliminated"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flnews_post_proc
 version: !ruby/object:Gem::Version
-  version: '1.45'
+  version: '1.47'
 platform: ruby
 authors:
 - Michael Uplawski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-11 00:00:00.000000000 Z
+date: 2024-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -82,8 +82,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
-summary: 'Bugfix: URLs exclude punctuation and others at the end.'
+summary: superfluous output in Headers eliminated
 test_files: []