rmail 1.0.0 → 1.1.4

data/lib/rmail/message.rb

@@ -46,6 +46,7 @@ module RMail
       @body = nil
       @epilogue = nil
       @preamble = nil
+      @delimiters = nil
     end
 
     # Test if this message is structured exactly the same as the other
@@ -130,14 +131,14 @@ module RMail
     # Access the epilogue string for this message.  The epilogue
     # string is relevant only for multipart messages.  It is the text
     # that occurs after all parts of the message and is generally nil.
-    attr :epilogue, true
+    attr_accessor :epilogue
 
     # Access the preamble string for this message.  The preamble
     # string is relevant only for multipart messages.  It is the text
     # that occurs just before the first part of the message, and is
     # generally nil or simple English text describing the nature of
     # the message.
-    attr :preamble, true
+    attr_accessor :preamble
 
     # Returns the entire message in a single string.  This uses the
     # RMail::Serialize class.

data/lib/rmail/parser.rb

@@ -202,7 +202,6 @@ module RMail
     def parse_header(input, depth)
       data = nil
       header = nil
-      pushback = nil
       boundary = nil
       while chunk = input.read
         data ||= ''
@@ -213,15 +212,17 @@ module RMail
           # headers.  The body part starts directly after this
           # newline.
           rest = data[1..-1]
+        elsif data[0] == ?\r && data[1] == ?\n
+          rest = data[2..-1]
         else
-          header, rest = data.split(/\n\n/, 2)
+          header, rest = data.split(/\r?\n\r?\n/, 2)
         end
         break if rest
       end
       input.pushback(rest)
       if header
         mime = false
-        fields = header.split(/\n(?!\s)/)
+        fields = header.split(/\r?\n(?!\s)/)
         if fields.first =~ /^From /
           @handler.mbox_from(fields.first)
           fields.shift

data/lib/rmail/parser/pushbackreader.rb

@@ -81,11 +81,11 @@ module RMail
             end
           end
           chunk
-        when Fixnum
+        when Integer
           read_chunk(size)
         else
           raise ArgumentError,
-            "Read size (#{size.inspect}) must be a Fixnum or nil."
+            "Read size (#{size.inspect}) must be an Integer or nil."
         end
       end
 
@@ -102,7 +102,7 @@ module RMail
       # convenient to call from derived classes when super() isn't
       # easy to use.
       def standard_read_chunk(size)
-        unless size.is_a?(Fixnum) && size > 0
+        unless size.is_a?(Integer) && size > 0
           raise ArgumentError,
             "Read size (#{size.inspect}) must be greater than 0."
         end
@@ -132,11 +132,11 @@ module RMail
 
       # Set the chunk size of this reader in bytes.  This is useful
       # mainly for testing, though perhaps some operations could be
-      # optimized by tweaking this value.  The chunk size must be a
-      # Fixnum greater than 0.
+      # optimized by tweaking this value.  The chunk size must be an
+      # Integer greater than 0.
       def chunk_size=(size)
-        unless size.is_a?(Fixnum)
-          raise ArgumentError, "chunk size must be a Fixnum"
+        unless size.is_a?(Integer)
+          raise ArgumentError, "chunk size must be an Integer"
         end
         unless size >= 1
           raise ArgumentError, "invalid size #{size.inspect} given"

data/lib/rmail/serialize.rb

@@ -74,7 +74,7 @@ module RMail
 
     def serialize_low(message, depth = 0)
       if message.multipart?
-        delimiters, delimiters_boundary = message.get_delimiters
+        delimiters, _delimiters_boundary = message.get_delimiters
         unless delimiters
           boundary = "\n--" + message.header.param('Content-Type', 'boundary')
           delimiters = Array.new(message.body.length + 1, boundary + "\n")

data/lib/rmail/version.rb

@@ -0,0 +1,3 @@
+module RMail
+  VERSION = '1.1.4'
+end

data/test/testaddress.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #--
-#   Copyright (C) 2001, 2002, 2003, 2007 Matt Armstrong.  All rights reserved.
+#   Copyright (C) 2001, 2002, 2003, 2007, 2008 Matt Armstrong.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -419,7 +419,7 @@ class TestRMailAddress < TestBase
           :format => '"Jason @ Tibbitts" <tibbs@uh.edu>' } ] ]
 
     # Majordomo II parses all of these with an error.  We have deleted
-    # some of the tests since when they are actually legal.
+    # some of the tests when they are actually legal.
     validate_case ['tibbs@uh.edu Jason Tibbitts', [] ]
     validate_case ['@uh.edu', [] ] # Can't start with @
     validate_case ['J <tibbs>', [] ] # Not FQDN
@@ -644,7 +644,6 @@ class TestRMailAddress < TestBase
   end
 
   def test_rfc_822
-
     validate_case\
     ['":sysmail"@ Some-Group. Some-Org, Muhammed.(I am the greatest) Ali @(the)Vegas.WBA',
       [ { :name => nil,
@@ -664,7 +663,6 @@ class TestRMailAddress < TestBase
   end
 
   def test_misc_addresses()
-
     # Make sure that parsing empty stuff works
     assert_equal([], RMail::Address.parse(nil))
     assert_equal([], RMail::Address.parse(""))
@@ -794,17 +792,31 @@ class TestRMailAddress < TestBase
 	} ] ]
   end
 
+  def test_bug_23043
+    # http://rubyforge.org/tracker/?func=detail&atid=1754&aid=23043&group_id=446
+    validate_case\
+    ['=?iso-8859-1?Q?acme@example.com?= <acme@example.com>',
+      [ { :name => '=?iso-8859-1?Q?acme@example.com?=',
+          :display_name => '=?iso-8859-1?Q?acme@example.com?=',
+          :address => 'acme@example.com',
+          :comments => nil,
+          :domain => 'example.com',
+          :local => 'acme',
+          :format => '"=?iso-8859-1?Q?acme@example.com?=" <acme@example.com>',
+        } ] ]
+  end
+
   def test_invalid_addresses()
     # The display name isn't encoded -- bad, but we parse it.
     validate_case\
-    ["\322\315\322 \312\353\363\341 <bar@foo.invalid>",
-      [ { :name => "\322\315\322 \312\353\363\341",
-	  :display_name => "\322\315\322 \312\353\363\341",
+    ["\322\315\322 \312\353\363\341 <bar@foo.invalid>".force_encoding('ASCII-8BIT'),
+      [ { :name => "\322\315\322 \312\353\363\341".force_encoding("ASCII-8BIT"),
+	  :display_name => "\322\315\322 \312\353\363\341".force_encoding("ASCII-8BIT"),
 	  :address => 'bar@foo.invalid',
 	  :comments => nil,
 	  :domain => 'foo.invalid',
 	  :local => 'bar',
-	  :format => "\"\322\315\322 \312\353\363\341\" <bar@foo.invalid>",
+	  :format => "\"\322\315\322 \312\353\363\341\" <bar@foo.invalid>".force_encoding("ASCII-8BIT"),
 	} ] ]
   end
 
@@ -1117,13 +1129,13 @@ class TestRMailAddress < TestBase
     assert_equal(nil, addr.domain)
     assert_equal(nil, addr.local)
 
-    e = assert_raise(ArgumentError) {
+    assert_raise(ArgumentError) {
       RMail::Address.new(["bob"])
     }
-    e = assert_raise(ArgumentError) {
+    assert_raise(ArgumentError) {
       RMail::Address.new(Object.new)
     }
-    e = assert_raise(ArgumentError) {
+    assert_raise(ArgumentError) {
       RMail::Address.new(Hash.new)
     }
   end

data/test/testbase.rb

@@ -27,6 +27,26 @@
 
 # Base for all the test cases, providing a default setup and teardown
 
+if ENV["COVERAGE"] || ENV["TRAVIS"]
+  require "simplecov"
+  SimpleCov.start do
+    add_filter "/test/"
+  end
+  top = File.expand_path("../..", __FILE__)
+  # track all ruby files under lib
+  SimpleCov.track_files("#{top}/lib/**/*.rb")
+
+  # use coveralls for on-line code coverage reporting at Travis CI
+  if ENV["TRAVIS"]
+    require "coveralls"
+    SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new [
+      SimpleCov::Formatter::HTMLFormatter,
+      Coveralls::SimpleCov::Formatter
+    ]
+  end
+  SimpleCov.start
+end
+
 require 'test/unit'
 require 'rbconfig.rb'
 require 'tempfile'
@@ -39,7 +59,7 @@ rescue LoadError
 end
 
 class TestBase < Test::Unit::TestCase
-  include Config
+  include RbConfig
 
   attr_reader :scratch_dir
 

data/test/testheader.rb

@@ -209,7 +209,12 @@ class TestRMailHeader < TestBase
     # Test the params argument
     h = RMail::Header.new
     h.add("name", "value", nil, 'param1' => 'value1', 'param2' => '+value2')
-    assert_equal('value; param1=value1; param2="+value2"', h['name'])
+    # Param order can not be guaranteed since they are given as dict to the
+    # function.
+    #assert_equal('value; param1=value1; param2="+value2"', h['name'])
+    header_check = (h['name'] == 'value; param1=value1; param2="+value2"' or
+                    h['name'] == 'value; param2="+value2"; param1=value1')
+    assert(header_check)
 
     h = RMail::Header.new
     h.add_raw("MIME-Version: 1.0")
@@ -776,6 +781,10 @@ EOF
     h.delete('content-type')
     h['content-type'] = ' foo/html   ; charset=ISO-8859-1'
     assert_equal("foo/html", h.content_type)
+
+    h = RMail::Header.new
+    h['content-type'] = ''
+    assert_equal(nil, h.content_type)
   end
 
   def test_media_type
@@ -1016,18 +1025,7 @@ EOF
     begin
       h = RMail::Header.new
       # This one is bogus and can't even be parsed.
-      h.add_raw("Date: 21/01/2002 09:29:33 Pacific Daylight Time")
-      t = assert_nothing_raised {
-        h.date
-      }
-      assert_nil(t)
-    end
-
-    begin
-      h = RMail::Header.new
-      # This time is out of the range that can be represented by a
-      # Time object.
-      h.add_raw("Date: Sun, 14 Jun 2065 05:51:55 +0200")
+      h.add_raw("Date: A long time ago")
       t = assert_nothing_raised {
         h.date
       }
@@ -1222,4 +1220,14 @@ EOF
     assert_equal(0, h.recipients.length)
   end
 
+  def test_invalid_encoding_utf8
+    _, value = RMail::Header::Field.parse('Subject: abgeändertes Angebot')
+    assert_equal 'abgeändertes Angebot', value
+  end
+
+  def test_invalid_encoding_iso_8859_1
+    _, value = RMail::Header::Field.parse('Subject: abgeändertes Angebot'.encode(Encoding::ISO_8859_1))
+    assert_equal 'abgeändertes Angebot'.encode(Encoding::ISO_8859_1), value
+  end
+
 end

data/test/testmessage.rb

@@ -141,7 +141,7 @@ Second body line
   def test_decode
     message = RMail::Message.new
 
-    all_bytes = ''
+    all_bytes = ''.force_encoding('ASCII-8BIT')
     0.upto(255) do |i|
       all_bytes << i
     end

metadata

@@ -1,38 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rmail
-version: !ruby/object:Gem::Version 
-  version: 1.0.0
+version: !ruby/object:Gem::Version
+  version: 1.1.4
 platform: ruby
-authors: 
+authors:
 - Matt Armstrong
+- Antonio Terceiro
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2008-01-05 00:00:00 -08:00
-default_executable: 
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies: []
-
-description: RMail is a lightweight mail library containing various utility classes and modules that allow ruby scripts to parse, modify, and generate MIME mail messages.
-email: matt@rfc20.org
+description: |2
+    RMail is a lightweight mail library containing various utility classes and
+    modules that allow ruby scripts to parse, modify, and generate MIME mail
+    messages.
+email: terceiro@softwarelivre.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README
-- NEWS
+extra_rdoc_files:
+- README.md
+- ChangeLog
+- THANKS
+- TODO
+- guide/Intro.txt
+- guide/MIME.txt
+- guide/TableOfContents.txt
+files:
+- ChangeLog
+- NOTES
+- README.md
+- Rakefile
 - THANKS
 - TODO
 - guide/Intro.txt
 - guide/MIME.txt
 - guide/TableOfContents.txt
-files: 
+- lib/rmail.rb
+- lib/rmail/address.rb
+- lib/rmail/header.rb
+- lib/rmail/mailbox.rb
+- lib/rmail/mailbox/mboxreader.rb
+- lib/rmail/message.rb
+- lib/rmail/parser.rb
+- lib/rmail/parser/multipart.rb
+- lib/rmail/parser/pushbackreader.rb
+- lib/rmail/serialize.rb
+- lib/rmail/utils.rb
+- lib/rmail/version.rb
 - test/addrgrammar.txt
-- test/data
 - test/data/mbox.odd
 - test/data/mbox.simple
-- test/data/multipart
 - test/data/multipart/data.1
 - test/data/multipart/data.10
 - test/data/multipart/data.11
@@ -50,7 +68,14 @@ files:
 - test/data/multipart/data.7
 - test/data/multipart/data.8
 - test/data/multipart/data.9
-- test/data/parser
+- test/data/parser.badmime1
+- test/data/parser.badmime2
+- test/data/parser.nested-multipart
+- test/data/parser.nested-simple
+- test/data/parser.nested-simple2
+- test/data/parser.nested-simple3
+- test/data/parser.rfc822
+- test/data/parser.simple-mime
 - test/data/parser/multipart.1
 - test/data/parser/multipart.10
 - test/data/parser/multipart.11
@@ -67,15 +92,6 @@ files:
 - test/data/parser/multipart.7
 - test/data/parser/multipart.8
 - test/data/parser/multipart.9
-- test/data/parser.badmime1
-- test/data/parser.badmime2
-- test/data/parser.nested-multipart
-- test/data/parser.nested-simple
-- test/data/parser.nested-simple2
-- test/data/parser.nested-simple3
-- test/data/parser.rfc822
-- test/data/parser.simple-mime
-- test/data/transparency
 - test/data/transparency/absolute.1
 - test/data/transparency/absolute.2
 - test/data/transparency/absolute.3
@@ -101,61 +117,32 @@ files:
 - test/testserialize.rb
 - test/testtestbase.rb
 - test/testtranspparency.rb
-- guide/Intro.txt
-- guide/MIME.txt
-- guide/TableOfContents.txt
-- lib/rmail
-- lib/rmail/address.rb
-- lib/rmail/header.rb
-- lib/rmail/mailbox
-- lib/rmail/mailbox/mboxreader.rb
-- lib/rmail/mailbox.rb
-- lib/rmail/message.rb
-- lib/rmail/parser
-- lib/rmail/parser/multipart.rb
-- lib/rmail/parser/pushbackreader.rb
-- lib/rmail/parser.rb
-- lib/rmail/serialize.rb
-- lib/rmail/utils.rb
-- lib/rmail.rb
-- install.rb
-- NEWS
-- NOTES
-- README
-- THANKS
-- TODO
-- Rakefile
-- version
-has_rdoc: true
-homepage: http://www.rfc20.org/rubymail
+homepage: https://github.com/terceiro/rmail
+licenses: []
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --title
-- RubyMail Documentation (version 1.0.0)
-- --main
+rdoc_options:
+- "--title"
+- RubyMail Documentation (version 1.1.4)
+- "--main"
 - README
-- --exclude
+- "--exclude"
 - SCCS
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
+    - !ruby/object:Gem::Version
       version: 1.8.1
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: rubymail
-rubygems_version: 1.0.1
+rubygems_version: 3.1.2
 signing_key: 
-specification_version: 2
+specification_version: 4
 summary: A MIME mail parsing and generation library.
 test_files: []
-