flnews_post_proc 2.05 → 2.09

data/lib/basic_logging.rb

@@ -26,7 +26,7 @@ module BasicLogging
   ERROR = 3
   FATAL = 4
   UNKNOWN = nil
-  
+
   # this is mainly for the translation of method calls into log levels
   Levels = {:debug => DEBUG, :info => INFO, :warn => WARN, :error => ERROR,
             :fatal => FATAL, :unknown => UNKNOWN}
@@ -34,7 +34,7 @@ module BasicLogging
   @@log_level = UNKNOWN
   @@target = STDOUT
   @@muted = []
-  
+
   # do not log, if caller is obj (class or instance)
   def self.mute(obj)
     name = obj.class == Class ? obj.name.dup : obj.class.name
@@ -72,7 +72,11 @@ module BasicLogging
     elsif !tg || tg.respond_to?(:to_str) && tg.strip.empty?
       @@target = nil
     elsif(!File::exist?(tg) || ( File.file?(tg) && File.writable?(tg) ) )
-      @@target = File.open(tg, 'w+')  
+      begin
+        @@target = File.open(tg, 'w+')  
+      rescue Exception => ex
+        $stderr.puts 'Cannot open log target ' << tg << ': ' << ex.message
+      end
     else
       STDERR.puts calling_method << ': ERROR : target ' << tg.to_str << ' cannot be set'
       STDERR.puts "Keeping old target " << @@target.inspect
@@ -157,7 +161,7 @@ module BasicLogging
       return 'from main'
     end
   end
-  
+
   # could be useful
   def lock_target(&block)
     begin

data/lib/body.rb

@@ -209,8 +209,15 @@ class Body
     ref_delim = @@config.REFERENCES_DELIMITER
     debug('references delimiter is ' << ref_delim)
     references = Array.new
-    # avoids a lot of trouble
-    body = @lines.join($LN).force_encoding('utf-8')
+    # avoids a lot of trouble.
+    # The encoding must be set before calling join().
+    # New in Ruby 4.1.0
+    #   Should be unneeded, as the encoding is enforced
+    #   after reading from STDIN.
+    @lines.each {|l| l.force_encoding('UTF-8')}
+    #   ... but still is.
+    # -----------------
+    body = @lines.join($LN)
     if ref_delim && !ref_delim.strip.empty? 
       unless ref_delim == ref_delim.reverse
         ref_delim.strip!

data/lib/configuration.rb

@@ -28,7 +28,7 @@ class Configuration
 
   def initialize() 
     debug 'Configuration::initialize()'
-    confname = PROGNAME << '.conf' 
+    confname = PROGNAME.dup << '.conf' 
     # try to open user-configuration
     @config_file = ENV['HOME'].dup << File::Separator << '.' << confname
     # if user-configuration does not exist, copy installed version.

data/lib/flnews_post_proc.conf

@@ -82,9 +82,16 @@ GROUP_SIGS:
 # DEFAULT: undefined
 # EXAMPLE (two headers):
 # - 'X-My-Header: nothing fancy'
-# - 'X-Post-Processor: flnews_post_proc'
+# - 'X-My-Dog: Labcoat Retriever'
 CUSTOM_HEADERS:
-- "X-Post-Processor: flnews_post_proc"
+
+# NAME_POSTPROCESSOR
+# If set, creates a custom header with the name of the post processor and its
+# current version. This setting is independent of CUSTOM_HEADERS, above.
+#
+# DEFAULT: no, false or unset
+# EXAMPLE: true
+NAME_POSTPROCESSOR: 
 
 # NO_ARCHIVE_GROUPS:
 # The newsgroups, where a header X-No-Archive: YES shall be set.

data/lib/headers.rb

@@ -17,6 +17,7 @@ require 'rfc_2047'
 require_relative 'basic_logging'
 require_relative 'configuration'
 require_relative 'newsgroups'
+require_relative 'version'
 
 # an object of this class represents the headers of a news-article
 
@@ -139,7 +140,7 @@ class Headers
         # Ensure header is ascii only
         if hv.ascii_only? && hn.ascii_only?
           # <---------- special treatment Post-Processor ---------->
-          hv << ' ' << PROGVERSION.to_s if hn == 'X-Post-Processor' && hv == 'flnews_post_proc'
+          # hv << ' ' << PROGVERSION.to_s if hn == 'X-Post-Processor' && hv == 'flnews_post_proc'
           #  >----------<
           @headers[hn.to_sym] = hv
         else
@@ -149,8 +150,11 @@ class Headers
         end
         @headers[hn.to_sym] = hv
       end
-      @headers.compact!
     end
+    if @config.NAME_POSTPROCESSOR
+      @headers["X-Post-Processor".to_sym] = PROGNAME.dup << ' ' << PROGVERSION.to_s
+    end
+    @headers.compact!
     debug('updated headers are ' << @headers.inspect)
   end
 

data/lib/newsgroups.rb

@@ -120,6 +120,7 @@ class Newsgroups
         end # gsigs.each
       end # gsigs for group?
       if tsig && tsig.rstrip.start_with?('/')
+        debug 'trying to pick a random signature'
         tsig = pick_sig(tsig.strip)
       end
       @signature = correct_linebreaks(tsig) if tsig
@@ -147,6 +148,7 @@ class Newsgroups
         if(psrc ) 
           psrc = psrc[1]
           if File.exist?(psrc) && File.readable?(psrc) 
+            debug 'reading signature file'
             ssigs = File.read(psrc).split(delim)
           else
             warn 'cannot find or read sourced signature file: ' << psrc
@@ -165,7 +167,10 @@ class Newsgroups
 
       # srand(Time.now.nsec)
       srand()
-      return all_sigs[rand(numSigs)]
+      psig = all_sigs[rand(numSigs)]
+      debug "HAVE a signature: \n\t" << (psig ? psig : ' N I L ')
+      rearrange_sigs(sigfile, all_sigs)
+      return psig
     else
       warn 'cannot find or read signature file: ' << sigfile
     end
@@ -174,7 +179,6 @@ class Newsgroups
 
   # write a new rearranged version of the signature file for 
   # better hazard.
-  # UNUSED
   def rearrange_sigs(sigfile, all_sigs)
     if File.writable?(sigfile) 
       new_sigs = Array.new(all_sigs.length)

data/lib/version.rb

@@ -14,7 +14,7 @@
 =end
 
 PROGNAME = 'flnews_post_proc'
-PROGVERSION = "2.05"
+PROGVERSION = "2.09"
 AUTHORS = "Michael Uplawski"
 EMAIL = "michael.uplawski@uplawski.eu"
 YEARS = "2023 - 2026"