rims-rfc822 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0825e7fac6f422946c68301c42abcce200e31d32a96ed83d6b1879a5a2b7c6cf'
-  data.tar.gz: '091affd6b8394475774ea160b56eb870f01785f72c1b737ea41fe4a5c6698d82'
+  metadata.gz: 6d5fb16811b51a21112bde75cf3afb370097c69205b0351847382a19debeaac9
+  data.tar.gz: c7a0b7ee568f34e324f2fe3cef2db7908346a09ab7c9131fc6ae96bdd39c06e0
 SHA512:
-  metadata.gz: 210d959c67edec519382dfcb24e7aa1069a93e8da0b001badff3c8e643b2aaf83c5a0f84e54f0354fe1740e86b4a2467f5c5f503420fd6e2b2e89b15c0585dc7
-  data.tar.gz: ad09d49a4f5caab505893a90e5c309d3d2878178aa73dcec2784fbbf38ad24ac5028710c3f62ece160bc7ccbbbdbf1969fe70c38ae13d1a322f0a99cad5e1cd3
+  metadata.gz: 0f4e32a989c3f2d49a304133eba4109d6f058eca263bcf4c593ee81aafce43ef54aae91bd74f8e0cba9dd571c5c4892a0dcfe2b31b4d96cedd4adfe6574509ca
+  data.tar.gz: 67c9fccdca18ccb61c91f5c416e650a7525de89827654173fd9cc09f403190a5cd586d2eac7934be73080956499be2bdf373f8251a7b79504e513a641d263d50

data/README.md

@@ -37,8 +37,13 @@ p msg.body
 p msg.header[name]
 p msg.header.fetch_upcase(name)
 p msg.header.field_value_list(name)
+p msg.header.empty?
 p msg.header.key? name
-msg.header.each do |name, value|
+p msg.header.keys
+msg.header.each_key do |name|
+  p name
+end
+msg.header.each_pair do |name, value|
   p [ name, value ]
 end
 

data/lib/rims/rfc822.rb

@@ -10,7 +10,7 @@ module RIMS
       def split_message(msg_txt)
         header_txt, body_txt = msg_txt.lstrip.split(/\r?\n\r?\n/, 2)
         if ($&) then
-          header_txt << $& if $&
+          header_txt << $&
         else
           body_txt = header_txt
           header_txt = nil
@@ -57,7 +57,10 @@ module RIMS
             when '('
               state = :comment
             when "\\"
-              src_txt.sub!(/\A./, '') and dst_txt << $&
+              unless (src_txt.empty?) then
+                dst_txt << src_txt[0]
+                src_txt[0] = ''
+              end
             else
               dst_txt << match_txt
             end
@@ -66,7 +69,10 @@ module RIMS
             when '"'
               state = :raw
             when "\\"
-              src_txt.sub!(/\A./, '') && dst_txt << $&
+              unless (src_txt.empty?) then
+                dst_txt << src_txt[0]
+                src_txt[0] = ''
+              end
             else
               dst_txt << match_txt
             end
@@ -75,7 +81,7 @@ module RIMS
             when ')'
               state = :raw
             when "\\"
-              src_txt.sub!(/\A./, '')
+              src_txt[0] = ''
             else
               # ignore comment text.
             end
@@ -90,7 +96,16 @@ module RIMS
 
       def parse_parameters(parameters_txt)
         params = {}
-        parameters_txt.scan(%r'(?<name>\S+?) \s* = \s* (?: (?<quoted_string>".*?") | (?<token>\S+?) ) \s* (?:;|\Z)'x) do
+        parameters_txt.scan(%r{
+          (?<name> \S+? )
+          \s* = \s*
+          (?:
+            (?<quoted_string> ".*?" ) |
+            (?<token> \S+? )
+          )
+          \s*
+          (?: ; | \Z )
+        }x) do
           name = $~[:name]
           if ($~[:quoted_string]) then
             quoted_value = $~[:quoted_string]
@@ -139,9 +154,18 @@ module RIMS
           end
         end
 
-        [ 'application'.dup.force_encoding(type_txt.encoding).freeze,
-          'octet-stream'.dup.force_encoding(type_txt.encoding).freeze,
-          params
+        # See RFC2045 / 5.2. Content-Type Defaults
+        # <https://tools.ietf.org/html/rfc2045#section-5.2>
+        #
+        #     Default RFC 822 messages without a MIME Content-Type header are taken
+        #     by this protocol to be plain text in the US-ASCII character set,
+        #     which can be explicitly specified as:
+        #
+        #       Content-type: text/plain; charset=us-ascii
+        #
+        [ 'text'.dup.force_encoding(type_txt.encoding).freeze,
+          'plain'.dup.force_encoding(type_txt.encoding).freeze,
+          params                # default is no charset, it will be `ASCII-8BIT'.
         ].freeze
       end
       module_function :parse_content_type
@@ -201,20 +225,22 @@ module RIMS
           if (src_txt.sub!(%r{
                 \A
                 \s*
-                (?<display_name>\S.*?) \s* : (?<group_list>.*?) ;
+                (?<display_name> \S.*? ) \s* : (?<group_list> .*? ) ;
                 \s*
                 ,?
               }x, ''))
           then
             display_name = $~[:display_name]
             group_list = $~[:group_list]
-            addr_list << Address.new( nil, nil, unquote_phrase(display_name), nil).freeze
+            addr_list << Address.new(nil, nil, unquote_phrase(display_name), nil).freeze
             addr_list.concat(parse_mail_address_list(group_list))
             addr_list << Address.new(nil, nil, nil, nil).freeze
           elsif (src_txt.sub!(%r{
                    \A
                    \s*
-                   (?<local_part>[^<>@",\s]+) \s* @ \s* (?<domain>[^<>@",\s]+)
+                   (?<local_part> [^<>@",\s]+ )
+                   \s* @ \s*
+                   (?<domain> [^<>@",\s]+ )
                    \s*
                    ,?
                  }x, ''))
@@ -223,17 +249,25 @@ module RIMS
           elsif (src_txt.sub!(%r{
                    \A
                    \s*
-                   (?<display_name>\S.*?)
+                   (?<display_name> \S.*? )
                    \s*
                    <
                      \s*
                      (?:
-                       (?<route>@[^<>@",]* (?:, \s* @[^<>@",]*)*)
+                       (?<route>
+                         @[^<>@",]*
+                         (?:
+                           , \s*
+                           @[^<>@",]*
+                         )*
+                       )
                        \s*
                        :
                      )?
                      \s*
-                     (?<local_part>[^<>@",\s]+) \s* @ \s* (?<domain>[^<>@",\s]+)
+                     (?<local_part> [^<>@",\s]+ )
+                     \s* @ \s*
+                     (?<domain> [^<>@",\s]+ )
                      \s*
                    >
                    \s*
@@ -402,7 +436,7 @@ module RIMS
               # run the slow `String#encode' only when really needed
               # because of a premise that the strings other than
               # encoded words are ASCII only.
-              foreword.encode!(decode_charset_encoding, charset_convert_options)
+              foreword.encode!(dst.encoding, charset_convert_options)
             end
             dst << foreword
           end
@@ -449,8 +483,6 @@ module RIMS
     end
 
     class Header
-      include Enumerable
-
       def initialize(header_txt)
         @raw_source = header_txt
         @field_list = nil
@@ -464,7 +496,7 @@ module RIMS
           @field_list = Parse.parse_header(@raw_source)
           @field_table = {}
           for name, value in @field_list
-            key = name.downcase
+            key = name.downcase.freeze
             @field_table[key] = [] unless (@field_table.key? key)
             @field_table[key] << value
           end
@@ -478,13 +510,34 @@ module RIMS
       end
       private :setup_header
 
-      def each
+      # API methods
+
+      def [](name)
         setup_header
-        return enum_for(:each) unless block_given?
-        for name, value in @field_list
-          yield(name, value)
+        if (value_list = @field_table[name.downcase]) then
+          value_list[0]
         end
-        self
+      end
+
+      def fetch_upcase(name)
+        setup_header
+        if (value_list = @field_table[name.downcase]) then
+          value_list[0].upcase
+        end
+      end
+
+      def field_value_list(name)
+        setup_header
+        @field_table[name.downcase]
+      end
+
+      # minimal methods like `Hash'
+
+      include Enumerable
+
+      def empty?
+        setup_header
+        @field_list.empty?
       end
 
       def key?(name)
@@ -497,26 +550,30 @@ module RIMS
       alias include? key?
       alias member? key?
 
-      def [](name)
+      def keys
         setup_header
-        if (value_list = @field_table[name.downcase]) then
-          value_list[0]
-        end
+        @field_table.keys
       end
 
-      def fetch_upcase(name)
+      def each_key
         setup_header
-        if (value_list = @field_table[name.downcase]) then
-          if (value = value_list[0]) then
-            value.upcase
-          end
+        return enum_for(:each_key) unless block_given?
+        @field_table.each_key do |key|
+          yield(key)
         end
+        self
       end
 
-      def field_value_list(name)
+      def each_pair
         setup_header
-        @field_table[name.downcase]
+        return enum_for(:each_pair) unless block_given?
+        for name, value in @field_list
+          yield(name, value)
+        end
+        self
       end
+
+      alias each each_pair
     end
 
     class Body
@@ -609,6 +666,7 @@ module RIMS
       alias media_subtype_upcase media_sub_type_upcase
 
       def content_type_upcase
+        # not return `nil'
         content_type.upcase
       end
 
@@ -635,8 +693,10 @@ module RIMS
       end
 
       def setup_content_disposition
-        if (header.key? 'Content-Disposition') then
-          @content_disposition ||= Parse.parse_content_disposition(header['Content-Disposition'])
+        if (@content_disposition.nil?) then
+          if (header.key? 'Content-Disposition') then
+            @content_disposition = Parse.parse_content_disposition(header['Content-Disposition'])
+          end
         end
 
         nil
@@ -649,9 +709,7 @@ module RIMS
       end
 
       def content_disposition_upcase
-        if (type = content_disposition) then
-          type.upcase
-        end
+        content_disposition&.upcase
       end
 
       def content_disposition_parameter(name)
@@ -671,8 +729,8 @@ module RIMS
       alias content_disposition_parameters content_disposition_parameter_list
 
       def setup_content_language
-        if (header.key? 'Content-Language') then
-          if (@content_language.nil?) then
+        if (@content_language.nil?) then
+          if (header.key? 'Content-Language') then
             @content_language = header.field_value_list('Content-Language').map{|tags_txt| Parse.parse_content_language(tags_txt) }
             @content_language.flatten!
             @content_language.freeze
@@ -689,9 +747,7 @@ module RIMS
       end
 
       def content_language_upcase
-        if (tag_list = content_language) then
-          tag_list.map{|tag| tag.upcase }
-        end
+        content_language&.map{|tag| tag.upcase }
       end
 
       def text?
@@ -703,8 +759,8 @@ module RIMS
       end
 
       def parts
-        if (multipart?) then
-          if (@parts.nil?) then
+        if (@parts.nil?) then
+          if (multipart?) then
             if (boundary = self.boundary) then
               part_list = Parse.parse_multipart_body(boundary, body.raw_source)
               @parts = part_list.map{|msg_txt| Message.new(msg_txt) }
@@ -713,9 +769,9 @@ module RIMS
             end
             @parts.freeze
           end
-
-          @parts
         end
+
+        @parts
       end
 
       def message?
@@ -723,14 +779,18 @@ module RIMS
       end
 
       def message
-        if (message?) then
-          @message ||= Message.new(body.raw_source)
+        if (@message.nil?) then
+          if (message?) then
+            @message = Message.new(body.raw_source)
+          end
         end
+
+        @message
       end
 
       def date
-        if (header.key? 'Date') then
-          if (@date.nil?) then
+        if (@date.nil?) then
+          if (header.key? 'Date') then
             begin
               @date = Time.parse(header['Date'])
             rescue ArgumentError
@@ -738,14 +798,14 @@ module RIMS
             end
             @date.freeze
           end
-
-          @date
         end
+
+        @date
       end
 
       def mail_address_header_field(field_name)
         if (header.key? field_name) then
-          ivar_name = '@' + field_name.downcase.gsub('-', '_')
+          ivar_name = '@' + field_name.downcase.tr('-', '_')
           addr_list = instance_variable_get(ivar_name)
           if (addr_list.nil?) then
             addr_list = header.field_value_list(field_name).map{|addr_list_txt| Parse.parse_mail_address_list(addr_list_txt) }

data/lib/rims/rfc822/version.rb

@@ -2,7 +2,7 @@
 
 module RIMS
   module RFC822
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rims-rfc822
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - TOKI Yoshinori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-14 00:00:00.000000000 Z
+date: 2019-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler