mail 2.1.5.3 → 2.2.0

data/lib/mail/parsers/rfc2822.treetop

@@ -31,6 +31,14 @@ module Mail
       [\x09\x20]
     end
   
+    rule FWS    # Folding white space
+      (WSP* CRLF WSP+) / (CRLF WSP+) / obs_FWS
+    end
+
+    rule CFWS
+      (FWS* comment)* FWS?
+    end
+
     rule NO_WS_CTL
       [\x01-\x08]   /         # US-ASCII control characters
       [\x0B-\x0C]   /         #  that do not include the
@@ -48,14 +56,6 @@ module Mail
       DQUOTE
     end
 
-    rule FWS    # Folding white space
-      (WSP* CRLF WSP+) / (CRLF WSP+) / obs_FWS
-    end
-
-    rule CFWS
-      (FWS* comment)* FWS?
-    end
-
     rule ctext
       NO_WS_CTL   /    # Non white space controls
       [\x21-\x27] /    # The rest of the US-ASCII
@@ -128,6 +128,10 @@ module Mail
       [\x47-\x5b] /   # or the "." or the 
       [\x5d-\x7e]     # double quote character
     end
+
+    rule phrase
+      obs_phrase / word+
+    end
     
     rule word
       atom / quoted_string
@@ -136,10 +140,6 @@ module Mail
     rule phrase_list
       first_phrase:phrase other_phrases:("," FWS* phrase_value:phrase)*
     end
-  
-    rule phrase
-      obs_phrase / word+
-    end
 
     rule domain_literal
       CFWS? "[" (FWS? dcontent)* FWS? "]" CFWS?

data/lib/mail/patterns.rb

@@ -3,7 +3,7 @@ module Mail
     white_space = %Q|\x9\x20|
     text        = %Q|\x1-\x8\xB\xC\xE-\x7f|
     field_name  = %Q|\x21-\x39\x3b-\x7e|
-    field_body  = text
+    qp_safe     = %Q|\x20-\x3c\x3e-\x7e|
     
     aspecial     = %Q|()<>[]:;@\\,."| # RFC5322
     tspecial     = %Q|()<>@,;:\\"/[]?=| # RFC2045
@@ -15,10 +15,12 @@ module Mail
     FWS           = /#{CRLF}#{WSP}*/
     TEXT          = /[#{text}]/ # + obs-text
     FIELD_NAME    = /[#{field_name}]+/
-    FIELD_BODY    = /[#{field_body}]+/
-    FIELD_LINE    = /^[#{field_name}]+:\s*[#{field_body}]+$/
-    HEADER_LINE   = /^([#{field_name}]+:\s*[#{field_body}]+)/
+    FIELD_BODY    = /.+/
+    FIELD_LINE    = /^[#{field_name}]+:\s*.+$/
+    HEADER_LINE   = /^([#{field_name}]+:\s*.+)$/
 
+    QP_UNSAFE     = /[^#{qp_safe}]/
+    QP_SAFE       = /[#{qp_safe}]/
     CONTROL_CHAR  = /[#{control}]/n
     ATOM_UNSAFE   = /[#{Regexp.quote aspecial}#{control}#{lwsp}]/n
     PHRASE_UNSAFE = /[#{Regexp.quote aspecial}#{control}]/n

data/lib/mail/utilities.rb

@@ -11,7 +11,7 @@ module Mail
     # If the string supplied has ATOM unsafe characters in it, will return the string quoted 
     # in double quotes, otherwise returns the string unmodified
     def quote_atom( str )
-      (ATOM_UNSAFE === str) ? dquote(str) : str
+      atom_safe?( str ) ? str : dquote(str)
     end
 
     # If the string supplied has PHRASE unsafe characters in it, will return the string quoted 
@@ -38,7 +38,7 @@ module Mail
     # If the string supplied has TOKEN unsafe characters in it, will return the string quoted 
     # in double quotes, otherwise returns the string unmodified
     def quote_token( str )
-      (TOKEN_UNSAFE === str) ? dquote(str) : str
+      token_safe?( str ) ? str : dquote(str)
     end
 
     # Wraps supplied string in double quotes unless it is already wrapped.
@@ -46,7 +46,8 @@ module Mail
     # Additionally will escape any double quotation marks in the string with a single
     # backslash in front of the '"' character.
     def dquote( str )
-      str = $1 if str =~ /^"(.*)?"$/
+      match = str.match(/^"(.*)?"$/)
+      str = match[1] if match
       # First remove all escaped double quotes:
       str = str.gsub(/\\"/, '"')
       # Then wrap and re-escape all double quotes
@@ -60,7 +61,8 @@ module Mail
     #  string = '"This is a string"'
     #  unquote(string) #=> 'This is a string'
     def unquote( str )
-      str =~ /^"(.*?)"$/ ? $1 : str
+      match = str.match(/^"(.*?)"$/)
+      match ? match[1] : str
     end
     
     # Wraps a string in parenthesis and escapes any that are in the string itself.
@@ -79,7 +81,8 @@ module Mail
     #  str = '(This is a string)'
     #  unparen( str ) #=> 'This is a string'
     def unparen( str )
-      str =~ /^\((.*?)\)$/ ? $1 : str
+      match = str.match(/^\((.*?)\)$/)
+      match ? match[1] : str
     end
     
     # Escape parenthesies in a string

data/lib/mail/version.rb

@@ -2,10 +2,9 @@
 module Mail
   module VERSION
     MAJOR = 2
-    MINOR = 1
-    TINY  = 5
-    MICRO = 3
+    MINOR = 2
+    TINY  = 0
 
-    STRING = [MAJOR, MINOR, TINY, MICRO].join('.')
+    STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

metadata

@@ -4,10 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 1
-  - 5
-  - 3
-  version: 2.1.5.3
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Mike Lindsaar
@@ -15,13 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 +11:00
+date: 2010-04-11 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -30,24 +29,24 @@ dependencies:
         - 3
         - 4
         version: 2.3.4
-  type: :runtime
-  version_requirements: *id001
+  requirement: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: mime-types
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id002
+  requirement: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: treetop
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -56,8 +55,8 @@ dependencies:
         - 4
         - 5
         version: 1.4.5
-  type: :runtime
-  version_requirements: *id003
+  requirement: *id003
+  prerelease: false
 description: A really Ruby Mail handler.
 email: raasdnil@gmail.com
 executables: []