hermeneutics 1.9 → 1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c88fb0c48f5ce9d5130e858d86c155c7b2bb42dbb747b9fb5ed66abfad388ad5
-  data.tar.gz: aae1bc88540bb33b77a4f4b6daea02155dac144932965cc8bb60e2da9f084444
+  metadata.gz: 721abdbe281ba643a27fefdcb8016c0f1a0202ed65e6c9741b5a90c3320c121e
+  data.tar.gz: c78e80af37ced64e8ab89d19b729da96f3b6d0e888f0bf0c5de96274bbdf30c3
 SHA512:
-  metadata.gz: e42c54fb360a488b13031c430611a561415114b420538303edb23264116e7da2c905b8f4bebea560bbebf16341c3a73dd928b82346d2bcf4c5d7f2be80591079
-  data.tar.gz: f2af0cc6d5352dcd191d6620f359c7e0f6b94624a8bbd863ef44a4a2aded797105899df102c4f14c8111548d6a76258b9213acddda63d16770dce123869368e1
+  metadata.gz: 30f6297db18bab61106428eee10338bfe4907dae30fa12bfbff8dc3e94a931b349befc4f5fa65bd21c9b053d9c9e8904d8c7d9920fc2f63f51d393167dc13a0b
+  data.tar.gz: 9f96a1b60536b83254252029fa36fa3e7ed739f270799bd8ccd155e068407a4b31de0073bb7049c5306b7096f5c9b54dca7ba53f8564966f7e82e6830cc644f4

data/lib/hermeneutics/cgi.rb

@@ -70,11 +70,11 @@ module Hermeneutics
       document Html
     end
 
-    def parameters inp = nil, &block
+    def parameters &block
       if block_given? then
         case request_method
           when "GET", "HEAD" then parse_query query_string, &block
-          when "POST"        then parse_posted inp||$stdin, &block
+          when "POST"        then parse_posted &block
           else                    parse_input &block
         end
       else
@@ -107,8 +107,8 @@ module Hermeneutics
       URLText.decode_hash data, &block
     end
 
-    def parse_posted inp, &block
-      data = inp.read
+    def parse_posted &block
+      data = $stdin.read.force_encoding Encoding::ASCII_8BIT
       data.bytesize == content_length.to_i or
         @warn = "Content length #{content_length} is wrong (#{data.bytesize})."
       ct = ContentType.parse content_type
@@ -116,7 +116,7 @@ module Hermeneutics
         when "application/x-www-form-urlencoded" then
           parse_query data, &block
         when "multipart/form-data" then
-          mp = Multipart.parse data, ct.hash
+          mp = Multipart.parse data, **ct.hash
           parse_multipart mp, &block
         when "text/plain" then
           # Suppose this is for testing purposes only.
@@ -130,7 +130,7 @@ module Hermeneutics
       mp.each { |part|
         cd = part.headers.content_disposition
         if cd.caption == "form-data" then
-          yield cd.name, part.body, **cd.hash
+          yield cd.name, part.body_decoded, **cd.hash
         end
       }
     end

data/lib/hermeneutics/contents.rb

@@ -327,7 +327,7 @@ module Hermeneutics
 
     def parse_mime input
       m = Mime.find @caption
-      m and m.parse input, @hash
+      m and m.parse input, **@hash
     end
 
   end

data/lib/hermeneutics/css.rb

@@ -242,8 +242,8 @@ module Hermeneutics
     def single hash
       if block_given? then
         hash.map { |k,v|
-          if Symbol === k then k = k.new_string ; k.gsub! /_/, "-" end
-          if Array  === v then v = v.join " "                      end
+          if Symbol === k then k = k.to_s ; k.gsub! /_/, "-" end
+          if Array  === v then v = v.join " "                end
           yield "#{k}: #{v};"
         }
       else

data/lib/hermeneutics/html.rb

@@ -52,9 +52,9 @@ module Hermeneutics
           yield i
         end
       end
-      def document *args, &block
+      def document *args, **kwargs, &block
         open do |i|
-          i.document *args, &block
+          i.document *args, **kwargs, &block
         end
       end
       def write_file name = nil
@@ -81,9 +81,9 @@ module Hermeneutics
       end
     end
 
-    def document *args, &block
+    def document *args, **kwargs, &block
       doctype_header
-      build *args, &block
+      build *args, **kwargs, &block
     end
 
     def doctype_header
@@ -270,7 +270,7 @@ module Hermeneutics
       def mkattrs attrs
         attrs or return
         attrs.each { |k,v|
-          if Symbol === k then k = k.new_string ; k.gsub! /_/, "-" end
+          if Symbol === k then k = k.to_s ; k.gsub! /_/, "-" end
           v = case v
             when Array      then v.compact.join " "
             when true       then k.to_s if @assign_attributes

data/lib/hermeneutics/message.rb

@@ -65,7 +65,7 @@ module Hermeneutics
     MIME = /^multipart\//
 
     class IllegalBoundary < StandardError ; end
-    class ParseError < StandardError ; end
+    class ParseError      < StandardError ; end
 
     # :stopdoc:
     class PartFile
@@ -130,7 +130,7 @@ module Hermeneutics
 
     class <<self
 
-      def parse input, parameters
+      def parse input, **parameters
         b = parameters[ :boundary]
         b or raise ParseError, "Missing boundary parameter."
         PartFile.open input, b do |partfile|
@@ -493,7 +493,7 @@ module Hermeneutics
 
       private :new
 
-      def parse input, parameters = nil
+      def parse input
         parse_hb input do |h,b|
           new h, b
         end
@@ -596,11 +596,10 @@ module Hermeneutics
         when "base64" then
           (@body.unpack "m").join
         else
-          @body.new_string
-      end
-      if (c = @headers.content_type) and (s = c[ :charset]) then
-        r.force_encoding s
+          @body
       end
+      c = @headers.content_type
+      r.force_encoding c&&c[ :charset] || Encoding::ASCII_8BIT
       r
     end
 

data/lib/hermeneutics/version.rb

@@ -14,7 +14,7 @@
 module Hermeneutics
 
   NAME        = "hermeneutics"
-  VERSION     = "1.9".freeze
+  VERSION     = "1.10".freeze
   SUMMARY     = "CGI and mail handling"
 
   DESCRIPTION = <<~EOT

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hermeneutics
 version: !ruby/object:Gem::Version
-  version: '1.9'
+  version: '1.10'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: supplement