hermeneutics 1.23 → 1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81d01a3292ca2c19c8a0a7f285262c44584bb7d91d658dc5650774f9828bcd92
-  data.tar.gz: 92bf5d6e7c81f27da58666bba8e5df0716bafcefef2daec6b0dca1f716f2b20d
+  metadata.gz: df19436c205dec9d79e7ea6329b0039f73c0df18785684b3497a5beacba86de0
+  data.tar.gz: 71249e9f95d7d3b7a5cc4c69de6dcdf8d50312db07d6b4e06e75df798e24a7f6
 SHA512:
-  metadata.gz: b97a17139583cd4955b413e09affd7349544d36ff0228d9c4238879567e9ed83c922f5f0d2a5cb41009afc7ebe94330ff7187d8d75c0452dc7e17b5e3bb23757
-  data.tar.gz: 198822fd194ff176303b2d05ab599d662458e6e9100ee0d1c711ce819ddb7da324c6b86377a148fce0ff0a1e16492e8947eed8e894d88512a73fef9d2cf120b4
+  metadata.gz: 53de39c130f7134771b2ae8a03047ddd58ddf8daed8bf1b62e32f3627fe0125324e89a33aec4072cd38e4c5194261322e32d6069533fed8845c352982ca714fc
+  data.tar.gz: f3b02d37c1397fa5ddc2bf76247d85b1eef0d99a74d0c3afda583e97d1938ab1a7542c3ea557eec95c0deef199ddd1dfa5e73f3618598af009b8848f7def97d9

data/lib/hermeneutics/addrs.rb

@@ -6,7 +6,7 @@
 
 =begin rdoc
 
-:section: Classes definied here
+:section: Classes defined here
 
 Hermeneutics::Addr      is a single address
 Hermeneutics::AddrList  is a list of addresses in mail header fields.
@@ -306,22 +306,6 @@ module Hermeneutics
           end
         end
 
-        def lexer_decode str, &block
-          if block_given? then
-            HeaderExt.lexer str do |k,s|
-              case k
-                when :decoded then yield Token[ :char, s, true]
-                when :plain   then lexer s, &block
-                when :space   then yield Token[ :space]
-              end
-            end
-          else
-            r = []
-            lexer_decode str do |t| r.push t end
-            r
-          end
-        end
-
         private
 
         def escaped h, c
@@ -432,7 +416,7 @@ module Hermeneutics
       #   #   "Möller, Fritz" <fmoeller@example.com>
       #
       def parse_decode str, &block
-        l = Token.lexer_decode str
+        l = Token.lexer str
         compile l, &block
       end
 
@@ -577,7 +561,8 @@ module Hermeneutics
 
     class <<self
       def parse cont
-        new.add_encoded cont
+        str = HeaderExt.decode cont
+        new.add_quoted str
       end
     end
 
@@ -596,7 +581,7 @@ module Hermeneutics
     def push addrs
       case addrs
         when nil    then
-        when String then add_encoded addrs
+        when String then add_quoted addrs
         when Addr   then @list.push addrs
         else             addrs.each { |a| push a }
       end
@@ -681,13 +666,6 @@ module Hermeneutics
       self
     end
 
-    def add_encoded cont
-      Addr.parse_decode cont.to_s do |a,|
-        @list.push a
-      end
-      self
-    end
-
   end
 
 end

data/lib/hermeneutics/cgi.rb

@@ -129,7 +129,7 @@ module Hermeneutics
 
     def parameters nl: false, sym: false, strip: false
       if block_given? then
-        data.parse do |k,v,**kw|
+        parameter_data.parse do |k,v,**kw|
           k = k.to_sym if sym
           if v then
             v.strip! if strip
@@ -146,33 +146,28 @@ module Hermeneutics
       end
     end
 
-    def data
+    def parameter_data
       case request_method
         when "GET", "HEAD" then
-          Data::UrlEnc.new query_string
+          dc, d = Data::UrlEnc, query_string
         when "POST"        then
-          data = $stdin.binmode.read
-          data.bytesize == content_length.to_i or
-            warn "Content length #{content_length} is wrong (#{data.bytesize})."
+          d = $stdin.binmode.read
+          d.bytesize == content_length.to_i or
+            warn "Content length #{content_length} is wrong (#{d.bytesize})."
           ct = ContentType.parse content_type
-          data.force_encoding ct[ :charset]||Encoding::ASCII_8BIT
-          case ct.fulltype
-            when "application/x-www-form-urlencoded" then
-              Data::UrlEnc.new data
-            when "multipart/form-data" then
-              Data::Multiparted.new data, ct.hash
-            when "text/plain" then
-              Data::Plain.new data
-            when "application/json" then
-              Data::Json.new data
-            when "application/x-yaml", "application/yaml" then
-              Data::Yaml.new data
-            else
-              Data::UrlEnc.new data
+          d.force_encoding ct[ :charset]||Encoding::ASCII_8BIT
+          dc = case ct.fulltype
+            when "application/x-www-form-urlencoded"      then Data::UrlEnc
+            when "multipart/form-data"                    then a = [ ct.hash] ; Data::Multiparted
+            when "text/plain"                             then Data::Plain
+            when "application/json"                       then Data::Json
+            when "application/x-yaml", "application/yaml" then Data::Yaml
+            else                                               Data::UrlEnc
           end
         else
-          Data::Lines.new read_interactive
+          dc, d = Data::Lines, read_interactive
       end
+      dc.new d, *a
     end
 
 
@@ -208,8 +203,9 @@ module Hermeneutics
       class Lines < Plain
         def initialize lines
           @lines = lines
+          super nil
         end
-        def data ; @lines.join "\n" ; end
+        def data ; @data ||= @lines.join "\n" ; end
         def parse
           @lines.each { |s|
             k, v = s.split %r/=/

data/lib/hermeneutics/color.rb

@@ -4,7 +4,7 @@
 
 =begin rdoc
 
-:section: Classes definied here
+:section: Classes defined here
 
 Hermeneutics::Color handles 24-bit colors.
 

data/lib/hermeneutics/contents.rb

@@ -4,7 +4,7 @@
 
 =begin rdoc
 
-:section: Classes definied here
+:section: Classes defined here
 
 Hermeneutics::Contents is a content field parser.
 
@@ -44,9 +44,9 @@ module Hermeneutics
       #   ds[ "a"]  #=> "0123456"
       #
       def parse line
-        rest = line.strip
-        hash = parse_hash rest
-        new hash
+        rest = HeaderExt.decode line
+        rest.strip!
+        new *(build_args rest)
       end
 
       def urltext
@@ -55,7 +55,7 @@ module Hermeneutics
 
       private
 
-      def parse_hash rest
+      def build_args rest
         hash = Hash.new { |h,k| h[ k] = [] }
         asts = {}
         while rest.notempty? do
@@ -66,6 +66,7 @@ module Hermeneutics
           else
             [ rest.dup, ""]
           end
+          rest.lstrip!
           key.downcase!
           key = key.to_sym
           asts[ key] = ast
@@ -91,7 +92,7 @@ module Hermeneutics
           end
           r[ k] = v
         }
-        r
+        [ r]
       end
 
     end
@@ -236,11 +237,9 @@ module Hermeneutics
       #   c.caption         #=> "text/html"
       #   c[ :boundary]     #=> "0123456"
       #
-      def parse line
-        rest = line.strip
+      def build_args rest
         caption, rest = rest.split Dictionary::RES, 2
-        hash = parse_hash rest
-        new caption, hash
+        [ caption, *(super rest)]
       end
 
     end

data/lib/hermeneutics/escape.rb

@@ -9,7 +9,7 @@ require "supplement"
 
 =begin rdoc
 
-:section: Classes definied here
+:section: Classes defined here
 
 Hermeneutics::Entities encodes to and decodes from HTML-Entities
 (+&+ etc.)
@@ -401,11 +401,12 @@ module Hermeneutics
     #
     def mkurl path, hash = nil, anchor = nil
       unless Hash === hash then
-        hash, anchor = anchor, hash
+        hash, anchor = anchor, nil
       end
-      r = "#{path}"
-      r << "?#{encode_hash hash}" if hash
-      r << "##{anchor}" if anchor
+      r = ""
+      r << path.to_s
+      r << "?" << (encode_hash hash) if hash
+      r << "#" << anchor.to_s        if anchor
       r
     end
 
@@ -726,28 +727,18 @@ module Hermeneutics
       #
       def decode str
         r, e = [], []
-        v, l = nil, nil
-        lexer str do |type,piece|
-          case type
-            when :decoded then
-              e.push piece.encoding
-              if l == :space and (v == :decoded or not v) then
-                r.pop
-              elsif l == :plain then
-                r.push SPACE
-              end
-            when :space then
-              nil
-            when :plain then
-              if l == :decoded then
-                r.push SPACE
-              end
+        loop do
+          if str =~ /=\?([a-z0-9_-]+?)\?([QB])\?([!-~]+?)\?=/i then
+            p = $`
+            d = unmask $1, $2, $3
+            str = $'
+          else
+            p = str
           end
-          r.push piece
-          v, l = l, type
-        end
-        if l == :space and v == :decoded then
-          r.pop
+          r.push p if p =~ /\S/
+          d or break
+          r.push d
+          e.push d.encoding
         end
         e.uniq!
         begin
@@ -760,23 +751,6 @@ module Hermeneutics
         end
       end
 
-      def lexer str
-        while str do
-          str =~ /(\s+)|\B=\?(\S*?)\?([QB])\?(\S*?)\?=\B/i
-          if $1 then
-            yield :plain, $` unless $`.empty?
-            yield :space, $&
-          elsif $2 then
-            yield :plain, $` unless $`.empty?
-            d = unmask $2, $3, $4
-            yield :decoded, d
-          else
-            yield :plain, str
-          end
-          str = $'.notempty?
-        end
-      end
-
       private
 
       def unmask cs, tp, txt

data/lib/hermeneutics/message.rb

@@ -146,11 +146,7 @@ module Hermeneutics
 
       def contents type = nil
         if type then
-          if @contents then
-            if not @contents.is_a? type then
-              @contents = type.parse @data
-            end
-          else
+          unless @contents and (@contents.is_a? type) then
             @contents = type.parse @data
           end
         else

data/lib/hermeneutics/tags.rb

@@ -4,7 +4,7 @@
 
 =begin rdoc
 
-:section: Classes definied here
+:section: Classes defined here
 
 Hermeneutics::Parser Parses HTML source and builds a tree
 

data/lib/hermeneutics/types.rb

@@ -42,6 +42,12 @@ module Hermeneutics
   end
 
   class Timestamp
+    class <<self
+      def parse str
+        t = DateTime.parse str
+        new t
+      end
+    end
     attr_reader :value
     def initialize value = nil
       self.value = value

data/lib/hermeneutics/version.rb

@@ -13,7 +13,7 @@
 module Hermeneutics
 
   NAME        = "hermeneutics"
-  VERSION     = "1.23".freeze
+  VERSION     = "1.24".freeze
   SUMMARY     = "CGI and mail handling"
 
   DESCRIPTION = <<~EOT

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: hermeneutics
 version: !ruby/object:Gem::Version
-  version: '1.23'
+  version: '1.24'
 platform: ruby
 authors:
 - Bertram Scharpf
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: supplement
@@ -78,7 +77,6 @@ homepage: http://www.bertram-scharpf.de
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--charset"
 - utf-8
@@ -98,8 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Ruby, at least 3.0
-rubygems_version: 3.5.21
-signing_key:
+rubygems_version: 3.7.1
 specification_version: 4
 summary: CGI and mail handling
 test_files: []