mail 1.3.4 → 1.3.5

data/CHANGELOG.rdoc

@@ -1,3 +1,16 @@
+== Sun Dec 27 07:30:02 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
+
+* Changed fields to default to :decoded on :to_s, all container objects retain :encoded as the default for :to_s
+
+== Thu Dec 17 06:35:05 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
+
+* Fixed parsing error 'Subject: =?ISO-8859-1?Q?Re=3A_ol=E1?=' (has a new line embedded)
+
+== Thu Dec 17 02:14:23 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
+
+* Version 1.3.4
+* Vendor'd treetop
+
 == Thu Dec 17 01:32:00 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
 
 * Version 1.3.3

data/README.rdoc

@@ -110,8 +110,12 @@ I have tried to simplify it some:
    return the object's "value" only as a string.  This means it will not include
    the header fields (like 'To:' or 'Subject:').
    
-3. By default, calling :to_s on an object will call it's encoded method, that is, make
-   it ready to send in an email.
+3. By default, calling :to_s on a container object will call it's encoded method, while
+   :to_s on a field object will call it's decoded method.  So calling :to_s on a Mail
+   object will return the mail, all encoded ready to send, while calling :to_s on the
+   From field will return the decoded value of the field.  The body and headers of Mail
+   objects are considered containers.  If you are in doubt, call :encoded, or :decoded
+   explicitly, this is safer if you are not sure.
    
 4. Structured fields that have parameter values that can be encoded (e.g. Content-Type) will
    provide decoded parameter values when you call the parameter names as methods against

data/Rakefile

@@ -12,7 +12,7 @@ require 'bundler'
 
 spec = Gem::Specification.new do |s|
   s.name        = "mail"
-  s.version     = "1.3.4"
+  s.version     = "1.3.5"
   s.author      = "Mike Lindsaar"
   s.email       = "raasdnil@gmail.com"
   s.homepage    = "http://github.com/mikel/mail"

data/lib/mail/elements/content_disposition_element.rb

@@ -22,10 +22,6 @@ module Mail
       @parameters
     end
     
-    def to_s(*args)
-
-    end
-    
     def cleaned(string)
       string =~ /(.+);\s*$/ ? $1 : string
     end

data/lib/mail/elements/content_type_element.rb

@@ -27,10 +27,6 @@ module Mail
       @parameters
     end
     
-    def to_s(*args)
-
-    end
-    
     def cleaned(string)
       string =~ /(.+);\s*$/ ? $1 : string
     end

data/lib/mail/encodings/encodings.rb

@@ -91,14 +91,14 @@ module Mail
     # String has to be of the format =?<encoding>?[QB]?<string>?=
     def Encodings.value_decode(str)
       str.gsub!(/\?=(\s*)=\?/, '?==?') # Remove whitespaces between 'encoded-word's
-      str.gsub(/(.*?)(=\?.*?\?.\?.*?\?=)|$/) do
+      str.gsub(/(.*?)(=\?.*?\?.\?.*?\?=)|$/m) do
         before = $1.to_s
         text = $2.to_s
         
         case
-        when text =~ /=\?.+\?[Bb]\?/
+        when text =~ /=\?.+\?[Bb]\?/m
           before + b_value_decode(text)
-        when text =~ /=\?.+\?[Qq]\?/
+        when text =~ /=\?.+\?[Qq]\?/m
           before + q_value_decode(text)
         else
           before + text
@@ -181,7 +181,7 @@ module Mail
     end
     
     def Encodings.split_encoding_from_string( str )
-      match = str.match(/\=\?(.+)?\?[QB]\?(.+)?\?\=/i)
+      match = str.match(/\=\?(.+)?\?[QB]\?(.+)?\?\=/mi)
       if match
         [match[1], match[2]]
       else

data/lib/mail/fields/common/common_field.rb

@@ -28,7 +28,7 @@ module Mail
       end
       
       def to_s
-        encoded
+        decoded
       end
       
       def field_length

data/lib/mail/version.rb

@@ -3,7 +3,7 @@ module Mail
   module VERSION
     MAJOR = 1
     MINOR = 3
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/mail/version_specific/ruby_1_8.rb

@@ -45,7 +45,7 @@ module Mail
     end
     
     def Ruby18.b_value_decode(str)
-      match = str.match(/\=\?(.+)?\?[Bb]\?(.+)?\?\=/)
+      match = str.match(/\=\?(.+)?\?[Bb]\?(.+)?\?\=/m)
       if match
         encoding = match[1]
         str = Ruby18.decode_base64(match[2])
@@ -61,7 +61,7 @@ module Mail
     end
     
     def Ruby18.q_value_decode(str)
-      match = str.match(/\=\?(.+)?\?[Qq]\?(.+)?\?\=/)
+      match = str.match(/\=\?(.+)?\?[Qq]\?(.+)?\?\=/m)
       if match
         encoding = match[1]
         str = Encodings::QuotedPrintable.decode(match[2])

data/lib/mail/version_specific/ruby_1_9.rb

@@ -37,7 +37,7 @@ module Mail
     end
     
     def Ruby19.b_value_decode(str)
-      match = str.match(/\=\?(.+)?\?[Bb]\?(.+)?\?\=/)
+      match = str.match(/\=\?(.+)?\?[Bb]\?(.+)?\?\=/m)
       if match
         encoding = match[1]
         str = Ruby19.decode_base64(match[2])
@@ -52,7 +52,7 @@ module Mail
     end
 
     def Ruby19.q_value_decode(str)
-      match = str.match(/\=\?(.+)?\?[Qq]\?(.+)?\?\=/)
+      match = str.match(/\=\?(.+)?\?[Qq]\?(.+)?\?\=/m)
       if match
         encoding = match[1]
         str = Encodings::QuotedPrintable.decode(match[2])

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

@@ -11,7 +11,6 @@ require File.join(TREETOP_ROOT, "ruby_extensions")
 require File.join(TREETOP_ROOT, "runtime")
 require File.join(TREETOP_ROOT, "compiler")
 
-unless defined?(::TREETOP_DISABLE_POLYGLOT)
-  require 'polyglot'
+if defined?(Polyglot)
   Polyglot.register(Treetop::VALID_GRAMMAR_EXT, Treetop)
-end
+end

data/lib/vendor/treetop.rb

@@ -1,5 +1,4 @@
 # Have to vendor treetop to avoid loading polyglot
 
 $:.unshift "#{File.dirname(__FILE__)}/treetop-1.4.3/lib"
-::TREETOP_DISABLE_POLYGLOT = true
 require 'treetop'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mail
 version: !ruby/object:Gem::Version 
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors: 
 - Mike Lindsaar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-17 00:00:00 +11:00
+date: 2009-12-27 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency