flnews_post_proc 1.48 → 1.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a019c52dac602a5b00c71131e8b44a61769604a08035b7afad305a27c5d43a0
-  data.tar.gz: 7f5a69f62df2a18fefe9f0f5f499d7960d40b751b4bda67f26a88f91034ac941
+  metadata.gz: ce08a05f564e461547838e8be747b716bf319f0e873bdae49032bc11b27bad99
+  data.tar.gz: a7ecf3115645be839b9de3bcb20a503c51558107655c569c86a8e73b9179ce19
 SHA512:
-  metadata.gz: fe1d5fee2fffc214f8aa96b34e4886b3c2e7b16a71dd2ac99b8df214528d53c43df8b425fe4b21d4edf58e691e6cd5f497e09ed12a81129dd0f0e883fcf9ab76
-  data.tar.gz: 40f0b45424e01cc6b034aeeb4a7729bb0a499e231eb0001a60d762e4f1952964090dacda102fb87215ed66786e7e2887c471c95cc930018b469df669d16915b1
+  metadata.gz: 3031a8647b65d99a133f2064f839d19441f51babd4bed2df6e9c382fa0d3621584bb005b1b8335dbbb6c864c1714d76008b5698c5a38879ea409740f5f19e266
+  data.tar.gz: e7b68552b48ac5b475b220d5fdf6695e761e1443b0ce214676ca67122dc4ae32d84c6c22ca8a6e89e63ee606d3418dd0c1f2c62dde082fec3e189c6d580c9910

data/README.md

@@ -56,7 +56,7 @@ The flnews newsreader is sufficient for Usenet access, i.e. to receive and read
 articles from -, as well as to write and post articles to newsgroups.
 
 When you compare news-clients, you will always notice the differences and  
-choose the software that you prefer. Flnews however, has the charm that you can  
+choose the software that you prefer. flnews however, has the charm that you can  
 influence how the program itself works but also modify posts that flnews  
 produces, just before the program will transmit them to the chosen nntp-server.
 
@@ -93,13 +93,13 @@ 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. 
+* 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 
+  **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  
@@ -166,7 +166,7 @@ Ruby, noted as a String. Beware to mask a backslash '\\' by another one,
 ike in the example. A capture-group '()' serves to extract the name from the  
 match result.
 
-Leave this field empty to keep the default from the FLNews configuration  
+Leave this field empty to keep the default from the flnews configuration  
 intact.
 
  CONTENT: A String equivalent of a regular expression.
@@ -199,7 +199,7 @@ intact.
 
  CONTENT: A newsgroup or regexp per line, followed by a colon, a space and a String
 
- DEFAULT: As configured in FLNews
+ DEFAULT: As configured in flnews
  
  EXAMPLE: _alt.test: "Thus spoke #\{fup_name\} on that baleful #\{fup_date\}:"_
 
@@ -320,7 +320,7 @@ A dialog may be displayed which allows you to disable any of these
 four options, so that the defaults from flnews prevail.
 
 ATTN! Canceling the dialog or pushing the Esc-key does interrupt   
-the process. Flnews will not post the article.
+the process. flnews will not post the article.
 
 Set this option to no, NO or similar to disable the dialog.
 

data/lib/_quoting_style_regexp

@@ -1 +1,2 @@
+# UNUSED
 " > >> > testerei ei ei".strip.gsub( /^>+(\s+>+)*/) {|m| m.to_s.delete(" ")}

data/lib/body.rb

@@ -17,7 +17,12 @@
 require_relative 'basic_logging'
 require_relative 'configuration'
 
-# an object of this class represents the body of a news-article.
+# An object of this class represents the body of a news-article.
+# It processes the original text and changes some details:
+#    intro-lines
+#    signatures
+#    URI formats
+#    Footnotes (and/or a list of references) are created
 class Body
   # a class-level configuration instance.
   @@config = Configuration.instance
@@ -99,6 +104,13 @@ class Body
             # exchange original intro-line against the new one
             @lines[@lines.index(ointro)] = intro.strip 
             # looked complicated because it is.
+            
+            # keep this line for reference.
+            @intro = intro
+          else
+            wmsg = 'Text following the intro is not a citation!'
+            wmsg << "\n\tIntro will NOT be modified: \"#{ointro}\"!"
+            warn wmsg
           end
         end
       end # fn.strip.empty?
@@ -111,7 +123,7 @@ class Body
       # remove any signature(s) from 
       # the current article
       sigpos = @lines.index('-- ')
-      debug('found signature at position ' << sigpos) if sigpos
+      debug('found signature in line ' << sigpos.to_s) if sigpos
       @lines = @lines.slice(0, sigpos ) if sigpos
       debug('setting signature ' << signature) if signature
       @lines << "-- " << signature if signature
@@ -128,7 +140,7 @@ class Body
   
   # Verify and possibly correct links in the post.
   # Simple.
-  def handle_urls() 
+  def handle_uris() 
     # Determine here or elsewhere if URLs shall be verified.
     # Default is != no. nil or '' do qualify as default.
     if @@config.VFY_URLS
@@ -144,7 +156,8 @@ class Body
           #  <----------------------------
 
           # BUGFIX : Urls with @
-          new_line = handle_news(l)   
+          # BUGFIX : email address in the intro 
+          new_line = handle_news(l) if !@intro || l.strip != @intro.strip
           # http(s)
           if l.include?('http')
             new_line = handle_http(l)
@@ -172,9 +185,8 @@ class Body
         # to the whole body, over multiple lines, if need be.
         begin
           ref = body.match(ref_rx )
-          debug("found reference " << ref.to_s << " (length: " << (ref ? ref.to_s.size.to_s : '0') << ")")
+          debug("found reference " << ref.to_s << " (length: " << (ref ? ref.to_s.size.to_s : '0') << ")") if ref && ref.length > 0
           if ref 
-            debug('ref is ' << ref.to_s)
             #  ... This is some presentation thing and I think
             #  it works, too.
             r = ref[0].gsub(/[ \t]+/, ' ').strip
@@ -184,7 +196,7 @@ class Body
             body.gsub!(ref[0], format(@@config.REFERENCE_FORMAT, index.to_s ))
           end
         end until ref == nil
-        debug("all references found:\n" << references.join('\n'))
+        debug("all references found:\n" << references.join('\n')) if !references.empty?
       else
         msg = 'The References Delimiter is the same in its reversed form.'
         msg << "#{$LN}Cannot handle references or footnotes!"
@@ -198,6 +210,8 @@ class Body
           r = r.gsub(ref_delim, '').gsub(ref_delim.reverse,'')
           body << (i + 1 ).to_s << ") " << r.strip <<  $LN
         end
+      else
+        debug('no refences found')
       end
     end
     @lines = body.split($LN)
@@ -238,7 +252,8 @@ class Body
     url_strs = l_array.collect do |ele| 
       if ele.strip.include?('http') && ele.match(/https?:\S+/)
         ele.lstrip! 
-        while !ele.match(/([[:alnum:]]|>)$/) do 
+        # ensure last character is alphanumeric or '>' or '/'
+        until ele.match(/([[:alnum:]]|>|\/)$/) do 
           ele.chop!
         end
         ele

data/lib/configuration.rb

@@ -91,6 +91,7 @@ class Configuration
       end
       @conf[:CONFIG_VERSION] = PROGVERSION.to_f
       bak_conf = @config_file.dup << '_' << conf_version.to_s
+      bak_conf.gsub!('.' << PROGNAME,  'bak_' << PROGNAME)
       info('Old configuration is saved to ' << bak_conf ) 
       info('New configuration is saved to ' << @config_file ) 
       begin

data/lib/flnews_post_proc.rb

@@ -55,7 +55,7 @@ class PostProcessor
     body.set_signature(newsgroups.signature)
 
     # verify and eventually correct URLs
-    body.handle_urls
+    body.handle_uris
 
     # get the headers and the body as a string.
     # Assemble.

data/lib/version.rb

@@ -14,9 +14,8 @@
 =end
 
 PROGNAME = 'flnews_post_proc'
-PROGVERSION = "1.48"
+PROGVERSION = "1.52"
 AUTHORS = "Michael Uplawski"
 EMAIL = "michael.uplawski@uplawski.eu"
 YEARS = "2023 - 2024"
-SUMMARY = "\tConcurrent access to the log file\n\tLog cleared upon setting log target"
-SUMMARY << "\n\t\"STDOUT\" allowed as log target"
+SUMMARY = "Configuration backups are no longer hidden files."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flnews_post_proc
 version: !ruby/object:Gem::Version
-  version: '1.48'
+  version: '1.52'
 platform: ruby
 authors:
 - Michael Uplawski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-30 00:00:00.000000000 Z
+date: 2024-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -30,7 +30,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.2
-description: Post-processor for Usenet-articles created in FLNews
+description: Post-processor for Usenet-articles created in flnews
 email: michael.uplawski@uplawski.eu
 executables:
 - flnews_post_proc
@@ -85,6 +85,5 @@ requirements: []
 rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
-summary: Concurrent access to the log file Log cleared upon setting log target "STDOUT"
-  allowed as log target
+summary: Configuration backups are no longer hidden files.
 test_files: []