mail 2.1.3 → 2.1.5

data/lib/mail/part.rb

@@ -32,27 +32,34 @@ module Mail
     end
     
     def bounced?
-      !!(action =~ /failed/i)
+      if action.is_a?(Array)
+        !!(action.first =~ /failed/i)
+      else
+        !!(action =~ /failed/i)
+      end
     end
     
+    
+    # Either returns the action if the message has just a single report, or an
+    # array of all the actions, one for each report
     def action
-      delivery_status_data['action'].value
+      get_return_values('action')
     end
     
     def final_recipient
-      delivery_status_data['final-recipient'].value
+      get_return_values('final-recipient')
     end
     
     def error_status
-      delivery_status_data['status'].value
+      get_return_values('status')
     end
 
     def diagnostic_code
-      delivery_status_data['diagnostic-code'].value
+      get_return_values('diagnostic-code')
     end
     
     def remote_mta
-      delivery_status_data['remote-mta'].value
+      get_return_values('remote-mta')
     end
     
     def retryable?
@@ -61,6 +68,14 @@ module Mail
 
     private
     
+    def get_return_values(key)
+      if delivery_status_data[key].is_a?(Array)
+        delivery_status_data[key].map { |a| a.value }
+      else
+        delivery_status_data[key].value
+      end
+    end
+    
     # A part may not have a header.... so, just init a body if no header
     def parse_message
       header_part, body_part = raw_source.split(/#{CRLF}#{WSP}*#{CRLF}/m, 2)

data/lib/mail/patterns.rb

@@ -6,8 +6,8 @@ module Mail
     field_name  = %Q|\x21-\x39\x3b-\x7e|
     field_body  = text
     
-    aspecial     = %Q|()<>[]:;.\\,"|
-    tspecial     = %Q|()<>[];:\\,"/?=|
+    aspecial     = %Q|()<>[]:;@\\,."| # RFC5322
+    tspecial     = %Q|()<>@,;:\\"/[]?=| # RFC2045
     lwsp         = %Q| \t\r\n|
     control      = %Q|\x00-\x1f\x7f-\xff|
     
@@ -40,4 +40,4 @@ module Mail
     end
     
   end
-end
+end

data/lib/mail/utilities.rb

@@ -137,12 +137,12 @@ module Mail
       # Example:
       # 
       #  string = :resent_from_field
-      #  dasherize ( string ) #=> 'resent_from_field'
+      #  dasherize ( string ) #=> 'resent-from-field'
       def dasherize( str )
-        str.to_s.downcase.gsub('_', '-')
+        str.to_s.gsub('_', '-')
       end
 
-      # Swaps out all underscores (_) for hyphens (-) good for stringing from symbols
+      # Swaps out all hyphens (-) for underscores (_) good for stringing to symbols
       # a field name.
       # 
       # Example:
@@ -160,4 +160,4 @@ module Mail
       receiver.send :include, InstanceMethods
     end
   end
-end
+end

data/lib/mail/vendor/treetop-1.4.3/Rakefile

@@ -1,23 +1,28 @@
-dir = File.dirname(__FILE__)
 require 'rubygems'
 require 'rake'
-$LOAD_PATH.unshift(File.join(dir, 'vendor', 'rspec', 'lib'))
-require 'spec/rake/spectask'
-
 require 'rake/gempackagetask'
+require 'spec/rake/spectask'
 
 task :default => :spec
-
 Spec::Rake::SpecTask.new do |t|
   t.pattern = 'spec/**/*spec.rb'
+  t.libs << 'spec'
 end
 
 load "./treetop.gemspec"
-
 Rake::GemPackageTask.new($gemspec) do |pkg|
   pkg.need_tar = true
 end
 
+task :spec => 'lib/treetop/compiler/metagrammar.treetop'
+file 'lib/treetop/compiler/metagrammar.treetop' do |t|
+  unless $bootstrapped_gen_1_metagrammar
+    load File.expand_path('../lib/treetop/bootstrap_gen_1_metagrammar.rb', __FILE__)
+  end
+
+  Treetop::Compiler::GrammarCompiler.new.compile(METAGRAMMAR_PATH)
+end
+
 task :version do
   puts RUBY_VERSION
 end

data/lib/mail/vendor/treetop-1.4.3/Treetop.tmbundle/Preferences/Comments.tmPreferences

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>name</key>
+	<string>Comments</string>
+	<key>settings</key>
+	<dict>
+		<key>shellVariables</key>
+		<array>
+			<dict>
+				<key>name</key>
+				<string>TM_COMMENT_START</string>
+				<key>value</key>
+				<string># </string>
+			</dict>
+		</array>
+	</dict>
+	<key>uuid</key>
+	<string>1BC307B6-CE08-449E-9074-1AEAA5CE99F4</string>
+</dict>
+</plist>

data/lib/mail/vendor/treetop-1.4.3/Treetop.tmbundle/Syntaxes/Treetop Grammar.tmLanguage

@@ -16,6 +16,10 @@
 	<string>Treetop Grammar</string>
 	<key>patterns</key>
 	<array>
+		<dict>
+			<key>include</key>
+			<string>#comment</string>
+		</dict>
 		<dict>
 			<key>begin</key>
 			<string>^(grammar) ([A-Z]\w+)</string>
@@ -46,9 +50,13 @@
 			<string>meta.grammar.treetop</string>
 			<key>patterns</key>
 			<array>
+				<dict>
+					<key>include</key>
+					<string>#comment</string>
+				</dict>
 				<dict>
 					<key>begin</key>
-					<string>\b(rule)\b (.+)$</string>
+					<string>\b(rule)\b (\w+)</string>
 					<key>beginCaptures</key>
 					<dict>
 						<key>1</key>
@@ -76,6 +84,10 @@
 					<string>meta.rule.treetop</string>
 					<key>patterns</key>
 					<array>
+						<dict>
+							<key>include</key>
+							<string>#comment</string>
+						</dict>
 						<dict>
 							<key>include</key>
 							<string>#strings</string>
@@ -203,6 +215,21 @@
 				</dict>
 			</array>
 		</dict>
+		<key>comment</key>
+		<dict>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.comment.treetop</string>
+				</dict>
+			</dict>
+			<key>match</key>
+			<string>(#).*$\n?</string>
+			<key>name</key>
+			<string>comment.line.number-sign.treetop</string>
+		</dict>
 		<key>strings</key>
 		<dict>
 			<key>patterns</key>

data/lib/mail/vendor/treetop-1.4.3/bin/tt

@@ -1,15 +1,15 @@
 #!/usr/bin/env ruby
 require 'optparse'
 require 'rubygems'
-require 'treetop'
 
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'treetop'
 require 'treetop/version'
+require 'treetop/polyglot'
 
 options = {}
 parser = OptionParser.new do |opts|
-  exts = Treetop::VALID_GRAMMAR_EXT.collect { |i| '.' + i }
+  exts = Treetop::Polyglot::VALID_GRAMMAR_EXT.collect { |i| '.' + i }
 
   opts.banner = "Treetop Parsing Expression Grammar (PEG) Comand Line Compiler"
   opts.define_head "Usage: tt [options] grammar_file[#{exts.join('|')}] ..."
@@ -58,7 +58,7 @@ end
 
 def grammar_exist?(filename)
   if File.extname(filename).empty?
-    Treetop::VALID_GRAMMAR_EXT.each do |ext|
+    Treetop::Polyglot::VALID_GRAMMAR_EXT.each do |ext|
       fn_ext = "#{filename}.#{ext}"
       return true if File.exist?(fn_ext) && !File.zero?(fn_ext)
     end
@@ -68,7 +68,7 @@ end
 
 def full_grammar_filename(filename)
   return filename if !File.extname(filename).empty?
-  Treetop::VALID_GRAMMAR_EXT.each do |ext|
+  Treetop::Polyglot::VALID_GRAMMAR_EXT.each do |ext|
     fn_ext = "#{filename}.#{ext}"
     return fn_ext if File.exist?(fn_ext) && !File.zero?(fn_ext)
   end
@@ -97,7 +97,7 @@ while !file_list.empty?
 
   # try to compile
   treetop_file = full_grammar_filename(treetop_file)
-  std_output_file = treetop_file.gsub(Treetop::VALID_GRAMMAR_EXT_REGEXP, '.rb')
+  std_output_file = treetop_file.gsub(Treetop::Polyglot::VALID_GRAMMAR_EXT_REGEXP, '.rb')
 
   if options[:out_file]
     # explicit output file name option; never overwrite unless forced

data/lib/mail/vendor/treetop-1.4.3/lib/treetop.rb

@@ -1,19 +1,3 @@
-require 'rubygems'
-
-module Treetop
-  VALID_GRAMMAR_EXT = ['treetop', 'tt']
-  VALID_GRAMMAR_EXT_REGEXP = /\.(#{VALID_GRAMMAR_EXT.join('|')})\Z/o
-end
-
-dir = File.dirname(__FILE__)
-
-TREETOP_ROOT = File.join(dir, 'treetop')
-require File.join(TREETOP_ROOT, "ruby_extensions")
-require File.join(TREETOP_ROOT, "runtime")
-require File.join(TREETOP_ROOT, "compiler")
-
-# To have Polyglot extensions loaded, you need to require 'polyglot'
-# before you require 'treetop'
-if defined?(Polyglot)
-  Polyglot.register(Treetop::VALID_GRAMMAR_EXT, Treetop)
-end
+require 'treetop/runtime'
+require 'treetop/compiler'
+# require 'treetop/polyglot'

data/lib/mail/vendor/treetop-1.4.3/lib/treetop/bootstrap_gen_1_metagrammar.rb

@@ -2,28 +2,25 @@
 # into the environment by compiling the current metagrammar.treetop using a trusted version of Treetop.
 
 require 'rubygems'
-dir = File.dirname(__FILE__)
 
 TREETOP_VERSION_REQUIRED_TO_BOOTSTRAP = '>= 1.1.5'
 
 # Loading trusted version of Treetop to compile the compiler
 gem_spec = Gem.source_index.find_name('treetop', TREETOP_VERSION_REQUIRED_TO_BOOTSTRAP).last
 raise "Install a Treetop Gem version #{TREETOP_VERSION_REQUIRED_TO_BOOTSTRAP} to bootstrap." unless gem_spec
-trusted_treetop_path = gem_spec.full_gem_path
-require File.join(trusted_treetop_path, 'lib', 'treetop')
+require "#{gem_spec.full_gem_path}/lib/treetop"
 
 # Relocating trusted version of Treetop to Trusted::Treetop
 Trusted = Module.new
 Trusted::Treetop = Treetop
 Object.send(:remove_const, :Treetop)
-Object.send(:remove_const, :TREETOP_ROOT)
 
 # Requiring version of Treetop that is under test
 $exclude_metagrammar = true
-require File.expand_path(File.join(dir, '..', 'treetop'))
+require File.expand_path('../treetop')
 
 # Compile and evaluate freshly generated metagrammar source
-METAGRAMMAR_PATH = File.join(TREETOP_ROOT, 'compiler', 'metagrammar.treetop')
+METAGRAMMAR_PATH = File.expand_path('../compiler/metagrammar.treetop', __FILE__)
 compiled_metagrammar_source = Trusted::Treetop::Compiler::GrammarCompiler.new.ruby_source(METAGRAMMAR_PATH)
 Object.class_eval(compiled_metagrammar_source)
 
@@ -42,4 +39,4 @@ Object.class_eval(compiled_metagrammar_source)
 #   include Trusted::Treetop::Runtime
 # end
 
-$bootstrapped_gen_1_metagrammar = true
+$bootstrapped_gen_1_metagrammar = true

data/lib/mail/vendor/treetop-1.4.3/lib/treetop/compiler.rb

@@ -1,6 +1,7 @@
-dir = File.dirname(__FILE__)
-require File.join(dir, *%w[compiler lexical_address_space])
-require File.join(dir, *%w[compiler ruby_builder])
-require File.join(dir, *%w[compiler node_classes])
-require File.join(dir, *%w[compiler metagrammar]) unless defined?($exclude_metagrammar)
-require File.join(dir, *%w[compiler grammar_compiler])
+require 'treetop/ruby_extensions'
+
+require 'treetop/compiler/lexical_address_space'
+require 'treetop/compiler/ruby_builder'
+require 'treetop/compiler/node_classes'
+require 'treetop/compiler/metagrammar' unless defined?($exclude_metagrammar)
+require 'treetop/compiler/grammar_compiler'

data/lib/mail/vendor/treetop-1.4.3/lib/treetop/compiler/metagrammar.rb

@@ -7,7 +7,7 @@ module Treetop
       include Treetop::Runtime
 
       def root
-        @root || :treetop_file
+        @root ||= :treetop_file
       end
 
       module TreetopFile0

data/lib/mail/vendor/treetop-1.4.3/lib/treetop/compiler/node_classes.rb

@@ -1,20 +1,19 @@
-dir = File.dirname(__FILE__)
-require File.join(dir, *%w[node_classes parsing_expression])
-require File.join(dir, *%w[node_classes atomic_expression])
-require File.join(dir, *%w[node_classes inline_module])
-require File.join(dir, *%w[node_classes predicate_block])
-require File.join(dir, *%w[node_classes treetop_file])
-require File.join(dir, *%w[node_classes grammar])
-require File.join(dir, *%w[node_classes declaration_sequence])
-require File.join(dir, *%w[node_classes parsing_rule])
-require File.join(dir, *%w[node_classes parenthesized_expression])
-require File.join(dir, *%w[node_classes nonterminal])
-require File.join(dir, *%w[node_classes terminal])
-require File.join(dir, *%w[node_classes anything_symbol])
-require File.join(dir, *%w[node_classes character_class])
-require File.join(dir, *%w[node_classes sequence])
-require File.join(dir, *%w[node_classes choice])
-require File.join(dir, *%w[node_classes repetition])
-require File.join(dir, *%w[node_classes optional])
-require File.join(dir, *%w[node_classes predicate])
-require File.join(dir, *%w[node_classes transient_prefix])
+require 'treetop/compiler/node_classes/parsing_expression'
+require 'treetop/compiler/node_classes/atomic_expression'
+require 'treetop/compiler/node_classes/inline_module'
+require 'treetop/compiler/node_classes/predicate_block'
+require 'treetop/compiler/node_classes/treetop_file'
+require 'treetop/compiler/node_classes/grammar'
+require 'treetop/compiler/node_classes/declaration_sequence'
+require 'treetop/compiler/node_classes/parsing_rule'
+require 'treetop/compiler/node_classes/parenthesized_expression'
+require 'treetop/compiler/node_classes/nonterminal'
+require 'treetop/compiler/node_classes/terminal'
+require 'treetop/compiler/node_classes/anything_symbol'
+require 'treetop/compiler/node_classes/character_class'
+require 'treetop/compiler/node_classes/sequence'
+require 'treetop/compiler/node_classes/choice'
+require 'treetop/compiler/node_classes/repetition'
+require 'treetop/compiler/node_classes/optional'
+require 'treetop/compiler/node_classes/predicate'
+require 'treetop/compiler/node_classes/transient_prefix'

data/lib/mail/vendor/treetop-1.4.3/lib/treetop/polyglot.rb

@@ -0,0 +1,9 @@
+module Treetop
+  module Polyglot
+    VALID_GRAMMAR_EXT = ['treetop', 'tt']
+    VALID_GRAMMAR_EXT_REGEXP = /\.(#{VALID_GRAMMAR_EXT.join('|')})\Z/o
+  end
+end
+
+require 'polyglot'
+Polyglot.register(Treetop::Polyglot::VALID_GRAMMAR_EXT, Treetop)

data/lib/mail/vendor/treetop-1.4.3/lib/treetop/ruby_extensions.rb

@@ -1,2 +1 @@
-dir = File.dirname(__FILE__)
-require "#{dir}/ruby_extensions/string"
+require 'treetop/ruby_extensions/string'

data/lib/mail/vendor/treetop-1.4.3/lib/treetop/runtime.rb

@@ -1,5 +1,6 @@
-dir = File.dirname(__FILE__)
-require "#{dir}/runtime/compiled_parser"
-require "#{dir}/runtime/syntax_node"
-require "#{dir}/runtime/terminal_parse_failure"
-require "#{dir}/runtime/interval_skip_list"
+require 'treetop/ruby_extensions'
+
+require 'treetop/runtime/compiled_parser'
+require 'treetop/runtime/syntax_node'
+require 'treetop/runtime/terminal_parse_failure'
+require 'treetop/runtime/interval_skip_list'

data/lib/mail/vendor/treetop-1.4.3/lib/treetop/runtime/interval_skip_list.rb

@@ -1,4 +1,3 @@
-dir = File.dirname(__FILE__)
-require "#{dir}/interval_skip_list/interval_skip_list.rb"
-require "#{dir}/interval_skip_list/head_node.rb"
-require "#{dir}/interval_skip_list/node.rb"
+require 'treetop/runtime/interval_skip_list/interval_skip_list'
+require 'treetop/runtime/interval_skip_list/head_node'
+require 'treetop/runtime/interval_skip_list/node'

data/lib/mail/vendor/treetop-1.4.3/lib/treetop/runtime/syntax_node.rb

@@ -3,9 +3,6 @@ module Treetop
     class SyntaxNode
       attr_reader :input, :interval
       attr_accessor :parent
-      attr_reader :dot_id
-
-      @@dot_id_counter = 0
 
       def initialize(input, interval, elements = nil)
         @input = input
@@ -26,9 +23,6 @@ module Treetop
           last_element = element
         end
 
-        @dot_id = @@dot_id_counter
-        @@dot_id_counter += 1
-
         @comprehensive_elements
       end
 
@@ -90,8 +84,14 @@ module Treetop
           )
       end
 
+      @@dot_id_counter = 0
+
+      def dot_id
+        @dot_id ||= @@dot_id_counter += 1
+      end
+
       def write_dot(io)
-        io.puts "node#{dot_id} [label=\"#{text_value}\"];"
+        io.puts "node#{dot_id} [label=\"'#{text_value}'\"];"
         if nonterminal? then
           elements.each do
             |x|