hermeneutics 1.13 → 1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d06afea9e09641e4c0c05bc3fca3590c3b4002047092034a379ab9a096867a57
-  data.tar.gz: 21944a76c2279a66b7de8ea9d32ad6db9328898c7ff944a2b736e0c3500dd61c
+  metadata.gz: aabd1ffa167d6b9e0add90086e915603207b905d49f2d86052956296976ce52c
+  data.tar.gz: 3b457fc4face001a9fddba09eac732aab2374851d59b8f1b72577761ba36f4cb
 SHA512:
-  metadata.gz: 399dd807c48582880089a94580b1c939ad57fc5da148b9987dff1f77729e731b62863f2f44a8a7540aefc4edc9dd211ab8dfe5a759d654ab6f9de682c968f9e7
-  data.tar.gz: 61514f34f392828df42f4123e49c6d7af7aecaf0dd3a503241ee60d5ee811e5e8fecb957cebee7bca4a407afab656ce96922f5ebf7d6c683e584acc3c56bf70f
+  metadata.gz: 19b8ab9cd48b49b96ec3a646178f31474de04cd1f92205477b2a67126191d7d88ae74c30fabbc87fbb0c8622f122911d3a46051ecf2bac567769c648a1f6e9e4
+  data.tar.gz: 59f9a3642bb013efb659bf32de2dac725193d6861ec7e9cd404a7cb87dc32357ceb4f623901b71757956b554ac689d86d0d0c2d7ca38d05c61fd72a18f5df3a8

data/lib/hermeneutics/message.rb

@@ -23,12 +23,13 @@ module Hermeneutics
       def parse input, **parameters
         b = parameters[ :boundary]
         b or raise ParseError, "Missing boundary parameter."
+        input.encode! input.encoding, universal_newline: true
         list = input.split /^--#{Regexp.quote b}/
         prolog = list.shift
         epilog = list.pop
         epilog and epilog.slice! /\A--\n/ or raise "Missing last separator."
         list.each { |p|
-          p.slice! /\A\n/ or raise "Malformed separator."
+          p.slice! /\A\n/ or raise "Malformed separator: #{b + p[/.*/]}."
         }
         list.map! { |t| Message.parse t }
         new b, prolog, list, epilog

data/lib/hermeneutics/types.rb

@@ -17,45 +17,52 @@ end
 
 module Hermeneutics
 
-  class PlainText < String
+  class PlainText
     class <<self
       def parse str
         t = HeaderExt.decode str
         new t
       end
     end
-    def initialize text
-      super
-      gsub! /\s+/, " "
-      strip!
+    attr_reader :value
+    def initialize value
+      self.value = value
     end
-    def quote
-      to_s
+    def value= value
+      @value = value
+      @value.gsub! /\s+/, " "
+      @value.strip!
+      @value.freeze
     end
+    def to_s ; @value ; end
+    alias quote to_s
     def encode
-      (HeaderExt.encode self).split
+      HeaderExt.encode @value
     end
   end
 
-  class Timestamp < Time
-    class <<self
-      def new time = nil
-        case time
-          when nil  then now
-          when Time then mktime *time.to_a
-          else           parse time.to_s
-        end
+  class Timestamp
+    attr_reader :value
+    def initialize value = nil
+      self.value = value
+    end
+    def value= value
+      @value = case value
+        when nil  then Time.now
+        when Time then value
+        else           Time.parse value.to_s
       end
     end
+    def to_s ; @value.to_s ; end
     def quote
       to_s
     end
     def encode
-      rfc822
+      @value.rfc822
     end
   end
 
-  class Id < String
+  class Id
     @host = nil
     class <<self
       attr_writer :host
@@ -69,10 +76,15 @@ module Hermeneutics
         $1
       end
     end
-    attr_reader :id
-    def initialize id = nil
-      super id || generate
+    attr_reader :value
+    def initialize value = nil
+      self.value = value
+    end
+    def value= value
+      @value = value ? value.new_string : generate
+      @value.freeze
     end
+    def to_s ; @value ; end
     alias quote to_s
     def encode
       "<#{self}>"
@@ -89,7 +101,7 @@ module Hermeneutics
     end
   end
 
-  class IdList < Array
+  class IdList
     class <<self
       def parse str
         i = new
@@ -101,17 +113,23 @@ module Hermeneutics
         i
       end
     end
-    def initialize
-      super
+    attr_reader :value
+    def initialize *ids
+      ids.flatten!
+      self.value = ids
     end
-    def add id
-      id = Id.new id.to_s unless Id === id
-      puts id
+    def value= ids
+      @list = []
+      ids.each { |id|
+        id = Id.new id unless Id === id
+        @list.push id
+      }
+      @list.freeze
     end
-    def quote
+    def to_s
       map { |i| i.quote }.join " "
     end
-    alias to_s quote
+    alias quote to_s
     def encode
       map { |i| i.encode }.join " "
     end
@@ -124,11 +142,12 @@ module Hermeneutics
         new i
       end
     end
+    attr_reader :value
     def initialize num
-      @i = num.to_i
+      @value = num.to_i
     end
-    def method_missing sym, *args, **kwargs, &block
-      @i.send sym, *args, **kwargs, &block
+    def value= value
+      @value = value
     end
     alias quote to_s
     alias encode to_s

data/lib/hermeneutics/version.rb

@@ -13,7 +13,7 @@
 module Hermeneutics
 
   NAME        = "hermeneutics"
-  VERSION     = "1.13".freeze
+  VERSION     = "1.15".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.13'
+  version: '1.15'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-28 00:00:00.000000000 Z
+date: 2023-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: supplement
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Ruby, at least 3.0
-rubygems_version: 3.0.8
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: CGI and mail handling