rmail 1.0.0 → 1.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 419bee362a39a953f99c8e6ff8adbbc1c921df6a4db9bb64f549ec6ed6a6ba3b
+  data.tar.gz: f93bce83b84092e1c05ef2472f1d1936b03ad7ff5ef398b2f85dd61eff5f726c
+SHA512:
+  metadata.gz: e3084bf084c2be23361db1cdc21321f623ab32e486ff3a101516d8f12999853c6650158b6082208320b79fd638bc51e7b06952bab9f41c2013b0675697e11e91
+  data.tar.gz: 4801d74331dfa38682cb4484f16f5cb9f07704bb8305fa5dcb2e3a42a10460e912327c63a00a7f02b92e1ffc2a7d653cfa33cf7c45bc4b055b3c6d4e29fcd95c

data/{NEWS → ChangeLog}

@@ -1,3 +1,45 @@
+= Changes in RubyMail 1.1.4 (released 2020-07-08)
+
+- Fix 'warning: constant ::Fixnum is deprecated' since Ruby 2.5 (Martin Vidner)
+- Fix 'warning: instance variable @delimiters not initialized' (Martin Vidner)
+- Fix 'warning: shadowing outer local variable - name, value' (Martin Vidner)
+- Fix 'warning: optional boolean argument is obsoleted' (Martin Vidner)
+- Fix 'warning: character class has duplicated range' (Martin Vidner)
+- Fix 'warning: assigned but unused variable' (Martin Vidner)
+- Enable code coverage analysis (Martin Vidner)
+- Test Ruby 2.5 and 2.6 on Travis (Martin Vidner)
+- Test Ruby 2.7 (Martin Vidner)
+- include license text in a separate file (Dan Callaghan)
+- Rakefile: drop usage of deprecated rubygems feature (Antonio Terceiro)
+
+= Changes in RubyMail 1.1.3 (released 2017-07-16)
+
+- Fix tests that suddenly started failing for no apparent reason
+
+= Changes in RubyMail 1.1.2 (released 2016-01-17)
+
+- Fix crash on invalid header encodings (Github issue #7)
+
+= Changes in RubyMail 1.1.1 (released 2015-11-30)
+
+- README.md updated (and renamed from README). Thanks to Aldric Giacomoni and
+  Zeger-Jan van de Weg
+- Fix crash against empty "Content-Type" header. Thanks to Matthew Bloch
+
+= 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/{README → README.md}

@@ -1,64 +1,41 @@
-= RubyMail
+# RubyMail
 
 This is RubyMail, a lightweight mail library containing various
 utility classes and modules that allow Ruby scripts to parse,
 modify, and generate MIME mail messages.
 
-= Requirements
+## Requirements
 
-Ruby 1.6.7 (or newer) or Ruby 1.8.*.  Only tested under Linux, should
-be fine under any Unix.
+Ruby 2.0 or newer is supported.
 
-= Documentation
+## Install
 
-The documentation is in RDoc format in the doc subdirectory.  Aside
-from the API reference, you will be interested in guide/Intro.txt and
-guide/TableOfContents.txt.
+```bash
+gem install rmail
+```
 
-= Install
+## Status
 
-Type the following while in the package directory:
+[![Build Status](https://travis-ci.org/terceiro/rmail.svg?branch=master)](https://travis-ci.org/terceiro/rmail)
 
-  ruby install.rb config
-  ruby install.rb setup
-  ruby install.rb install
 
-You may need special permissions to execute the last line.  If you
-want to just install RubyMail to a custom location, just copy the
-rmail subdirectory manually.
+## Tests
 
-= Status
+This package has a complete unit test suite. To run it, just run `rake` under
+the top-level directory. When submitting patches, please make sure all the
+tests pass with your changes applied.
 
-This package works well, but I consider all API subject to change.
+## Support
 
-I very much appreciate suggestions and comments, but please think
-twice about using this for production use just yet.
+If you found a bug, or even if you think you did but is not completely sure,
+open an issue on the [issue tracker](https://github.com/terceiro/rmail/issues).
 
-= Tests?
+## License
 
-This package has a complete unit test suite (requires RubyUnit to
-run).  Currently all of my e-mail is processed by this library.
+ Copyright (C) 2001, 2002, 2003, 2004 Matt Armstrong.
+ Copyright (C) 2015 Antonio Terceiro.
+ All rights reserved.
 
-= Why?
-
-It is fun.
-
-One use for RubyMail is the RubyFilter package, available at:
-
-    http://www.lickey.com/rubyfilter/
-
-= Alternatives
-
-You might check out TMail as well.
-
-= Support
-
-To reach the author of RubyMail, send mail to matt@lickey.com.
-
-= License
-
- Copyright (C) 2001, 2002, 2003, 2004 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:

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',
+                         'README.md',
                          '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.md", "ChangeLog", "THANKS",
                           "TODO", "guide/*.txt", "lib/**/*.rb")
   rdoc.rdoc_files.exclude(/\bSCCS\b/,
                           "lib/rubymail/parser/*")
@@ -136,51 +123,48 @@ 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.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
 
@@ -649,7 +661,7 @@ module RMail
             comment
           when /\A""/           # skip empty quoted text
             @string = $'
-          when /\A[\w!$%&\'*+\/=?^_\`{\}|~#-]+/m
+          when /\A[\w!$%&\'*+\/=?^\`{\}|~#-]+/m
             @string = $'
             @sym = SYM_ATOM
             break
@@ -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,10 @@ module RMail
 
     class Field                 # :nodoc:
       # fixme, document methadology for this (RFC2822)
-      EXTRACT_FIELD_NAME_RE = /\A([^\x00-\x1f\x7f-\xff :]+):\s*/o
+
+      # accoring to RFC2822 the header field name can consist of any
+      # ASCII char between and including 33 and 126.
+      EXTRACT_FIELD_NAME_RE = /\A(^\w[-\w]+):\s*/o
 
       class << self
         def parse(field)
@@ -133,10 +136,10 @@ module RMail
     end
 
     # Return the value of the first matching field of a field name, or
-    # nil if none found.  If passed a Fixnum, returns the header
+    # nil if none found.  If passed an Integer, returns the header
     # indexed by the number.
     def [](name_or_index)
-      if name_or_index.kind_of? Fixnum
+      if name_or_index.kind_of? Integer
         temp = @fields[name_or_index]
         temp = temp.value unless temp.nil?
       else
@@ -471,9 +474,9 @@ module RMail
     #
     # See also: #match
     def match?(name, value)
-      massage_match_args(name, value) { |name, value|
+      massage_match_args(name, value) { |mname, mvalue|
         match = detect {|n, v|
-          n =~ name && v =~ value
+          n =~ mname && v =~ mvalue
         }
         ! match.nil?
       }
@@ -504,10 +507,10 @@ module RMail
     #
     # See also: #match?
     def match(name, value)
-      massage_match_args(name, value) { |name, value|
+      massage_match_args(name, value) { |mname, mvalue|
         header = RMail::Header.new
-        found = each { |n, v|
-          if n.downcase =~ name  &&  value =~ v
+        each { |n, v|
+          if n.downcase =~ mname  &&  mvalue =~ v
             header[n] = v
           end
         }
@@ -533,8 +536,9 @@ module RMail
     # executed and its return value is returned.  If no block is passed,
     # the value of the +default+ argument is returned.
     def content_type(default = nil)
-      if value = self['content-type']
-	value.strip.split(/\s*;\s*/)[0].downcase
+      content_type = self['content-type']
+      if content_type && content_type.length > 0
+	content_type.strip.split(/\s*;\s*/)[0].downcase
       else
 	if block_given?
           yield
@@ -630,7 +634,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()
@@ -889,7 +893,7 @@ module RMail
 
     protected
 
-    attr :fields, true
+    attr_accessor :fields
 
     private