rmail 1.0.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6b4a29f4260f329ca644299cc81203d2db1f7785
+  data.tar.gz: caa1c6f095e88be1d91c9c694b0a0debde71edb8
+SHA512:
+  metadata.gz: 432fb864d8aad5282d9e987870fa0996cf2e6d2f4e96c7a5cf865bc048900dcb0d77439c55c00e77694caaa64943ad486dcdf7fba97b6c2406e20f05de5b9360
+  data.tar.gz: 79f14439893e809897523cfa6cf7b39519b72ad67b0a885041d49ca3b4e7bc6d7f87b7bac84c72835d948cf956f01b590dbb6a0ba4f21ca15ae3ca570dc81cd3

data/{NEWS → ChangeLog}

@@ -1,3 +1,17 @@
+= Changes in RubyMail 1.1.0 (released 2015-02-10)
+
+- This version contains fixes for running on Ruby 2.0+ that were contributed by
+  Josef Stribny, plus 7 patches that have accumulated in the Debian package of
+  rmail over the years by Adeodato Simó, Per Andersson, and Antonio Terceiro.
+  There are also a few fixes by the original author Matt Armstrong that never
+  made it into a release.
+- This version is mostly compatible with 1.0.0, but since it wasn't explicitly
+  tested on older RUby releases we bumping the minor version as a warning to
+  users.
+- Rakefile was updated to actually run on modern Ruby versions
+- The tests were fixed for Ruby 2.0+ compatibility
+- The version number was moved to lib/rmail/version.rb
+
 = Changes in RubyMail 1.0.0 (released 2008-01-05)
 
 - This version differs *only* in the changes required for Ruby 1.9

data/Rakefile

@@ -4,12 +4,8 @@
 # This is a Ruby file, used by the "rake" make-like program.
 #
 
-begin
-  # First, we use a few ruby things...
-  require 'rubygems'
-  require 'rake/gempackagetask'
-end
-require 'rake/rdoctask'
+require 'rubygems/package_task'
+require 'rdoc/task'
 require 'rake/testtask'
 require 'shellwords'
 
@@ -23,7 +19,7 @@ task :default => :test
 # Test tasks
 #
 Rake::TestTask.new do |t|
-  t.libs << 'test'
+  t.libs << '.'
   t.pattern = 'test/test*.rb'
   t.verbose = true
 end
@@ -38,7 +34,7 @@ def can_release_package
   reasons = []
 
   unless news_is_current
-    reasons << 'the NEWS file is not current'
+    reasons << 'the ChangeLog file is not current'
   end
 
   unless defined?(Gem)
@@ -67,11 +63,11 @@ def can_release_package
   can_release_package
 end
 
-# Is the NEWS file current?
+# Is ChangeLog current?
 def news_is_current
   today = Time.now.strftime('%Y-%m-%d')
   version = Regexp.new(Regexp.quote(PKG_VERSION))
-  if IO.readlines('NEWS').first =~
+  if IO.readlines('ChangeLog').first =~
       /= Changes in RubyMail #{PKG_VERSION} \(released #{today}\)$/
     true
   else
@@ -83,34 +79,25 @@ end
 #
 # These PKG_ variables are used by Rake's package rule.
 #
-PKG_VERSION = begin
-                version= IO.readlines('version').first.chomp
-                if version =~ /^\d+\.\d+\.\d+$/
-                  version.untaint
-                else
-                  fail "package version is bogus"
-                end
-                version
-              end
+require './lib/rmail/version.rb'
+PKG_VERSION = RMail::VERSION
 
 PKG_FILES = FileList.new('test/**/*',
                          'guide/**/*',
                          'lib/**/*',
-                         'install.rb',
-                         'NEWS',
+                         'ChangeLog',
                          'NOTES',
                          'README',
                          'THANKS',
                          'TODO',
-                         'Rakefile',
-                         'version')
+                         'Rakefile')
 
 #
 # Teach Rake how to build the RDoc documentation for this package.
 #
 rdoc = Rake::RDocTask.new do |rdoc|
   rdoc.main = 'README'
-  rdoc.rdoc_files.include("README", "NEWS", "THANKS",
+  rdoc.rdoc_files.include("README", "ChangeLog", "THANKS",
                           "TODO", "guide/*.txt", "lib/**/*.rb")
   rdoc.rdoc_files.exclude(/\bSCCS\b/,
                           "lib/rubymail/parser/*")
@@ -136,51 +123,49 @@ end
 #
 # Create a Gem::Specification right in the Rakefile, using some of the
 # variables we have set up above.
-#
-if defined?(Gem)
-  spec = Gem::Specification.new do |s|
-    s.name = 'rmail'
-    s.version = PKG_VERSION + if can_release_package
-                                ''
-                              else
-                                '.666'
-                              end
-    s.summary = 'A MIME mail parsing and generation library.'
-    s.description = <<-EOF
-    RMail is a lightweight mail library containing various utility classes and
-    modules that allow ruby scripts to parse, modify, and generate MIME mail
-    messages.
-    EOF
-
-    s.files = PKG_FILES.to_a
-
-    s.required_ruby_version = Gem::Version::Requirement.new(">= 1.8.1")
-
-    s.has_rdoc = true
-    s.extra_rdoc_files = rdoc.rdoc_files.reject { |fn| fn =~ /\.rb$/ }.to_a
-    s.rdoc_options.concat([ '--title', rdoc.title, '--main', rdoc.main,
-                            rdoc.options ].flatten)
-
-    s.test_files = FileList['test/tc_*.rb'].to_a
-
-    s.author = "Matt Armstrong"
-    s.email = "matt@rfc20.org"
-    s.homepage = "http://www.rfc20.org/rubymail"
-
-    s.rubyforge_project = "rubymail"
-  end
+spec = Gem::Specification.new do |s|
+  s.name = 'rmail'
+  s.version = PKG_VERSION + if can_release_package
+                              ''
+                            else
+                              '.666'
+                            end
+  s.summary = 'A MIME mail parsing and generation library.'
+  s.description = <<-EOF
+  RMail is a lightweight mail library containing various utility classes and
+  modules that allow ruby scripts to parse, modify, and generate MIME mail
+  messages.
+  EOF
+
+  s.files = PKG_FILES.to_a
+
+  s.required_ruby_version = Gem::Version::Requirement.new(">= 1.8.1")
+
+  s.has_rdoc = true
+  s.extra_rdoc_files = rdoc.rdoc_files.reject { |fn| fn =~ /\.rb$/ }.to_a
+  s.rdoc_options.concat([ '--title', rdoc.title, '--main', rdoc.main,
+                          rdoc.options ].flatten)
+
+  s.test_files = FileList['test/tc_*.rb'].to_a
+
+  s.author = ["Matt Armstrong", "Antonio Terceiro"]
+  s.email = "terceiro@softwarelivre.org"
+  s.homepage = "https://github.com/terceiro/rmail"
+end
 
-  #
-  # Use our Gem::Specification to make some package tasks.
-  #
-  Rake::GemPackageTask.new(spec) do |pkg|
-    pkg.need_zip = true
-    pkg.need_tar = true
-  end
+#
+# Use our Gem::Specification to make some package tasks.
+#
+Gem::PackageTask.new(spec) do |pkg|
+  pkg.need_zip = true
+  pkg.need_tar = true
 end
 
-desc "Install RubyMail using the standard install.rb script"
-task :install do
-  ruby "install.rb"
+desc 'Makes a release'
+task :release => [:test, :package] do
+  sh 'git', 'tag', '-s', "v#{PKG_VERSION}"
+  sh 'git', 'push'
+  sh 'git', 'push', '--tags'
+  sh 'gem' 'push', 'pkg/#{rmail}-#{PKG_VERSION}.gem'
 end
 

data/lib/rmail/address.rb

@@ -1,5 +1,5 @@
 #--
-#   Copyright (C) 2001, 2002, 2003 Matt Armstrong.  All rights
+#   Copyright (C) 2001, 2002, 2003, 2008 Matt Armstrong.  All rights
 #   reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,6 @@ module RMail
     # is parsed for mail addresses and if one is found, it is used to
     # initialize this object.
     def initialize(string = nil)
-
       @local = @domain = @comments = @display_name = nil
 
       if string.kind_of?(String)
@@ -421,7 +420,6 @@ module RMail
         # local-part ':' -> it is a display-name of a group
         # display-name '<' -> it is a mailbox display name
         # display-name ':' -> it is a group display name
-        #
 
 	# set lookahead to '@' '<' or ':' (or another value for
 	# invalid input)
@@ -472,6 +470,20 @@ module RMail
 	  @addresses.last.local = get_text
           expect(SYM_AT_SIGN)
           domain
+
+          if @sym == SYM_LESS_THAN
+            # Workaround for invalid input.  Treat 'foo@bar <foo@bar>' as if it
+            # were '"foo@bar" <foo@bar>'.  The domain parser will eat
+            # 'bar' but stop at '<'.  At this point, we've been
+            # parsing the display name as if it were an address, so we
+            # throw the address into display_name and parse an
+            # angle_addr.
+            @addresses.last.display_name =
+              format("%s@%s", @addresses.last.local, @addresses.last.domain)
+            @addresses.last.local = nil
+            @addresses.last.domain = nil
+            angle_addr
+          end
         end
       end
 
@@ -691,7 +703,7 @@ module RMail
 	    @sym = SYM_DOMAIN_LITERAL
 	    @lexeme = $1.gsub(/(^|[^\\])[\r\n\t ]+/, '\1').gsub(/\\(.)/, '\1')
 	    break
-          when /\A[\200-\377\w!$%&\'*+\/=?^_\`{\}|~#-]+/m
+          when /\A[\200-\377\w!$%&\'*+\/=?^_\`{\}|~#-]+/nm
             # This is just like SYM_ATOM, but includes all characters
             # with high bits.  This is so we can allow such tokens in
             # the display name portion of an address even though it

data/lib/rmail/header.rb

@@ -73,7 +73,7 @@ module RMail
 
     class Field                 # :nodoc:
       # fixme, document methadology for this (RFC2822)
-      EXTRACT_FIELD_NAME_RE = /\A([^\x00-\x1f\x7f-\xff :]+):\s*/o
+      EXTRACT_FIELD_NAME_RE = /\A([^\x00-\x1f\x7f-\xff :]+):\s*/no
 
       class << self
         def parse(field)
@@ -630,7 +630,7 @@ module RMail
     # Set the boundary parameter of this message's Content-Type:
     # field.
     def set_boundary(boundary)
-      params = params_quoted('content-type')
+      params = params('content-type')
       params ||= {}
       params['boundary'] = boundary
       content_type = content_type()

data/lib/rmail/parser.rb

@@ -213,15 +213,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/version.rb

@@ -0,0 +1,3 @@
+module RMail
+  VERSION = '1.1.0'
+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
 

data/test/testbase.rb

@@ -39,7 +39,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")

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.0
 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: 2015-02-11 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: 
+extra_rdoc_files:
 - README
-- NEWS
+- ChangeLog
 - THANKS
 - TODO
 - guide/Intro.txt
 - guide/MIME.txt
 - guide/TableOfContents.txt
-files: 
+files:
+- ChangeLog
+- NOTES
+- README
+- Rakefile
+- THANKS
+- TODO
+- guide/Intro.txt
+- guide/MIME.txt
+- guide/TableOfContents.txt
+- 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,33 @@ 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.0)
+- "--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
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 2
+specification_version: 4
 summary: A MIME mail parsing and generation library.
 test_files: []
-