mail 2.2.1 → 2.2.2

data/CHANGELOG.rdoc

@@ -1,20 +1,18 @@
-== Thu May 13 02:49:47 UTC 2010 Mikel Lindsaar <raasdnil@gmail.com>
-
-* Fixed Ruby 1.8.6 and 1.9.x incompatibilities because we were using each_with_index and each_line
-* Redid the folding to make it much much faster for long strings (the old one really crumbled with headers longer than 100,000 characters (Lars Pind <lars@pinds.com>)
-* Mail now only returns one encoded-word per line (Lars Pind <lars@pinds.com>)
-* Fixed all the previous issues with extra white-space and an extra = at the end of the encoded-words. (Lars Pind <lars@pinds.com>)
-* Make sure we can handle decoding of very long strings efficiently (Lars Pind <lars@pinds.com>)
-* Handle setting of charset through []= method, so we don't get the warning (Lars Pind <lars@pinds.com>)
-* Remove the trailing =\n that pack('M') adds (Lars Pind <lars@pinds.com>)
-* Handle multiple quoted words in Encodings.unquote_and_convert_to (Eric Kidd <git@randomhacks.net>)
-* Ruby 1.9: mark source encoding so it's usable with -Ks, -Ke, etc (Jeremy Kemper <jeremy@bitsweat.net>)
-* Add #include? to mail body for convenience (Maxim Chernyak <max@bitsonnet.com>)
-* Use Mail::TestMailer.deliveries in README example (John Trupiano <jtrupiano@gmail.com>)
-* Allow bundler to automatically build a gem directly from git (Eric Kidd <git@randomhacks.net>)
-* Added recursive parsing of attachments inside message/rfc822 parts (Ubiratan Pires Alberton <u.alberton@gmail.com>)
-* Adding #inline_content_id for attachments and parts (mikel)
-* Updating readme (mikel)
+== Mon Jun  7 18:00:39 UTC 2010 Mikel Lindsaar <mikel@rubyx.com>
+
+* Updating versioning so we only have one source, VERSION.yml (mikel)
+* Changed activesupport dependency to 2.3.6 to fix #53, #64, and def #67. (Artem Titoulenko)
+* Fixing typo in break_down_to.rb. (mikel)
+
+== Mon Jun  7 18:07:16 UTC 2010 Mikel Lindsaar <mikel@rubyx.com>
+
+* fixing a typo when generating docs. (Andrew Bloom)
+* Changing \r\n\t to \r\n\s throughout mail (mikel)
+* Handle multiple quoted words in Encodings.unquote_and_convert_to (Eric Kidd)
+* Ruby 1.9: mark source encoding so it's usable with -Ks, -Ke, etc (Jeremy Kemper)
+* Add #include? to mail body for convenience (Maxim Chernyak)
+* Use Mail::TestMailer.deliveries in README example (John Trupiano)
+* Allow bundler to automatically build a gem directly from git (Eric Kidd)
 
 == Sun Apr 11 07:49:15 UTC 2010 Mikel Lindsaar <raasdnil@gmail.com>
 

data/Rakefile

@@ -33,7 +33,7 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Mail'
   rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 

data/VERSION.yml

@@ -0,0 +1,5 @@
+--- 
+:patch: 2
+:major: 2
+:build: 
+:minor: 2

data/lib/mail/core_extensions/string.rb

@@ -24,16 +24,4 @@ class String #:nodoc:
   unless method_defined?(:bytesize)
     alias :bytesize :length
   end
-
-  unless ''.respond_to?(:lines)
-    require "enumerator"
-
-    def lines
-      to_a.enum_for(:each)
-    end
-    
-  end
-
 end
-
-

data/lib/mail/encodings.rb

@@ -7,7 +7,6 @@ module Mail
 
   module Encodings
     
-    require "enumerator"
     include Mail::Patterns
     extend  Mail::Utilities
 
@@ -114,34 +113,24 @@ module Mail
     # 
     # String has to be of the format =?<encoding>?[QB]?<string>?=
     def Encodings.value_decode(str)
-      # Optimization: If there's no encoded-words in the string, just return it
-      return str unless str.index("=?")
-      
       str = str.gsub(/\?=(\s*)=\?/, '?==?') # Remove whitespaces between 'encoded-word's
 
-      # Split on white-space boundaries with capture, so we capture the white-space as well
-      str.split(/([ \t])/).map do |text|
-        if text.index('=?') != 0
-          text
-        else
-          # Join QP encoded-words that are adjacent to avoid decoding partial chars
-          text.gsub!(/\?\=\=\?.+?\?[Qq]\?/m, '') if text =~ /\?==\?/
-        
-          # Separate encoded-words with a space, so we can treat them one by one
-          text.gsub!(/\?\=\=\?/, '?= =?')
+      # Join QP encoded-words that are adjacent to avoid decoding partial chars
+      str.gsub!( /=\?==\?.+?\?[Qq]\?/m, '' ) if str =~ /\?==\?/
+      
+      str.gsub(/(.*?)(=\?.*?\?.\?.*?\?=)|$/m) do # Grab the insides of each encoded-word
+        before = $1.to_s
+        text = $2.to_s
 
-          text.split(/ /).map do |word|
-            case 
-            when word.to_str =~ /=\?.+\?[Bb]\?/m
-              b_value_decode(word)
-            when text.to_str =~ /=\?.+\?[Qq]\?/m
-              q_value_decode(word)
-            else
-              word.to_str
-            end
-          end
+        case
+        when text.to_str =~ /=\?.+\?[Bb]\?/m
+          before + b_value_decode(text)
+        when text.to_str =~ /=\?.+\?[Qq]\?/m
+          before + q_value_decode(text)
+        else
+          before + text
         end
-      end.join("")
+      end
     end
     
     # Takes an encoded string of the format =?<encoding>?[QB]?<string>?=
@@ -187,8 +176,7 @@ module Mail
       address.gsub!(/(".*?[^#{us_ascii}].+?")/) { |s| Encodings.b_value_encode(unquote(s), charset) }
       # Then loop through all remaining items and encode as needed
       tokens = address.split(/\s/)
-      # Need to use enum_for to stay 1.8.6 compatible
-      tokens.enum_for(:each_with_index).map do |word, i|
+      tokens.each_with_index.map do |word, i|
         if word.ascii_only?
           word
         else
@@ -211,7 +199,7 @@ module Mail
     def Encodings.b_value_encode(str, encoding = nil)
       return str if str.to_s.ascii_only?
       string, encoding = RubyVer.b_value_encode(str, encoding)
-      string.lines.map do |str|
+      string.each_line.map do |str|
         "=?#{encoding}?B?#{str.chomp}?="
       end.join(" ")
     end
@@ -226,8 +214,8 @@ module Mail
     def Encodings.q_value_encode(str, encoding = nil)
       return str if str.to_s.ascii_only?
       string, encoding = RubyVer.q_value_encode(str, encoding)
-      string.gsub!("=\r\n", '') # We already have limited the string to the length we want
-      string.lines.map do |str|
+      string.gsub!("=\r\n=", '=') # We already have limited the string to the length we want
+      string.each_line.map do |str|
         "=?#{encoding}?Q?#{str.chomp.gsub(/ /, '_')}?="
       end.join(" ")
     end

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

@@ -90,11 +90,11 @@ module Mail
     def do_encode(field_name)
       return '' if value.blank?
       address_array = tree.addresses.reject { |a| group_addresses.include?(a.encoded) }.compact.map { |a| a.encoded }
-      address_text  = address_array.join(", \r\n\t")
-      group_array = groups.map { |k,v| "#{k}: #{v.map { |a| a.encoded }.join(", \r\n\t")};" }
-      group_text  = group_array.join(" \r\n\t")
+      address_text  = address_array.join(", \r\n\s")
+      group_array = groups.map { |k,v| "#{k}: #{v.map { |a| a.encoded }.join(", \r\n\s")};" }
+      group_text  = group_array.join(" \r\n\s")
       return_array = [address_text, group_text].reject { |a| a.blank? }
-      "#{field_name}: #{return_array.join(", \r\n\t")}\r\n"
+      "#{field_name}: #{return_array.join(", \r\n\s")}\r\n"
     end
 
     def do_decode

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

@@ -36,7 +36,7 @@ module Mail
           key_name = "#{key_name}*"
         end
         %Q{#{key_name}=#{quote_token(value)}}
-      end.join(";\r\n\t")
+      end.join(";\r\n\s")
     end
 
     def decoded

data/lib/mail/fields/content_disposition_field.rb

@@ -49,7 +49,7 @@ module Mail
     # TODO: Fix this up
     def encoded
       if parameters.length > 0
-        p = ";\r\n\t#{parameters.encoded}\r\n"
+        p = ";\r\n\s#{parameters.encoded}\r\n"
       else
         p = ""
       end

data/lib/mail/fields/content_type_field.rb

@@ -109,7 +109,7 @@ module Mail
     # TODO: Fix this up
     def encoded
       if parameters.length > 0
-        p = ";\r\n\t#{parameters.encoded}\r\n"
+        p = ";\r\n\s#{parameters.encoded}\r\n"
       else
         p = ""
       end
@@ -160,7 +160,7 @@ module Mail
         type = $1
         # Handles misquoted param values
         # e.g: application/octet-stream; name=archiveshelp1[1].htm
-        # and: audio/x-midi;\r\n\tname=Part .exe
+        # and: audio/x-midi;\r\n\sname=Part .exe
         params = $2.to_s.split(/\s+/)
         params = params.map { |i| i.to_s.chomp.strip }
         params = params.map { |i| i.split(/\s*\=\s*/) }

data/lib/mail/fields/unstructured_field.rb

@@ -102,77 +102,64 @@ module Mail
     #  it is allowed elsewhere.
     def wrapped_value # :nodoc:
       @folded_line = []
-      @unfolded_line = decoded.to_s.split(/[ \t]/)
+      @unfolded_line = decoded.to_s.clone
       fold("#{name}: ".length)
       wrap_lines(name, @folded_line)
     end
-   
-    # 6.2. Display of 'encoded-word's
-    # 
-    #  When displaying a particular header field that contains multiple
-    #  'encoded-word's, any 'linear-white-space' that separates a pair of
-    #  adjacent 'encoded-word's is ignored.  (This is to allow the use of
-    #  multiple 'encoded-word's to represent long strings of unencoded text,
-    #  without having to separate 'encoded-word's where spaces occur in the
-    #  unencoded text.)
+
     def wrap_lines(name, folded_lines)
       result = []
       index = 0
       result[index] = "#{name}: #{folded_lines.shift}"
-      result.concat(folded_lines)
-      result.join("\r\n\t")
+      folded_lines.each do |line|
+        if (result[index] + line).length < 77
+          result[index] << " " + line
+        else
+          result[index] << "\r\n\s"
+          index += 1
+          result[index] = line
+        end
+      end
+      result.join
     end
 
     def fold(prepend = 0) # :nodoc:
-      encoding = @charset.to_s.upcase.gsub('_', '-')
-      while !@unfolded_line.empty?
-        encoded = false
-        limit = 78 - prepend
-        line = ""
-        while !@unfolded_line.empty?          
-          break unless word = @unfolded_line.first.dup
-          # Remember whether it was non-ascii before we encode it ('cause then we can't tell anymore)
-          non_ascii = word.not_ascii_only?
-          encoded_word = encode(word)
-          # Skip to next line if we're going to go past the limit
-          # Unless this is the first word, in which case we're going to add it anyway
-          # Note: This means that a word that's longer than 998 characters is going to break the spec. Please fix if this is a problem for you.
-          # (The fix, it seems, would be to use encoded-word encoding on it, because that way you can break it across multiple lines and 
-          # the linebreak will be ignored)
-          break if !line.empty? && (line.length + encoded_word.length + 1 > limit)
-          # If word was the first non-ascii word, we're going to make the entire line encoded and we're going to reduce the limit accordingly
-          if non_ascii && !encoded
-            encoded = true
-            encoded_word_safify!(line)
-            limit = limit - 8 - encoding.length  # minus the =?...?Q?...?= part, the possible leading white-space, and the name of the encoding
-          end
-          # Remove the word from the queue ...
-          @unfolded_line.shift
-          # ... add it in encoded form to the current line
-          line << " " unless line.empty?
-          encoded_word_safify!(encoded_word) if encoded
-          line << encoded_word          
-        end
-        # Add leading whitespace if both this and the last line were encoded, because whitespace between two encoded-words is ignored when decoding
-        line = " " + line if encoded && @folded_line.last && @folded_line.last.index('=?') == 0
-        # Encode the line if necessary
-        line = "=?#{encoding}?Q?#{line.gsub(/ /, '_')}?=" if encoded
-        # Add the line to the output and reset the prepend
-        @folded_line << line
-        prepend = 0
+      # Get the last whitespace character, OR we'll just choose 
+      # 78 if there is no whitespace, or 23 for non ascii:
+      # Each QP byte is 6 chars (=0A)
+      # Plus 18 for the =?encoding?Q?= ... ?=
+      # Plus 2 for the \r\n and 1 for the \s
+      # 80 - 2 - 1 - 18 = 59 / 6 ~= 10
+      @unfolded_line.ascii_only? ? (limit = 78 - prepend) : (limit = 10 - prepend)
+      # find the last white space character within the limit
+      if wspp = @unfolded_line.mb_chars.slice(0..limit) =~ /[ \t][^ \t]*$/
+        wrap = true
+        wspp = limit if wspp == 0
+        @folded_line << encode(@unfolded_line.mb_chars.slice!(0...wspp).strip.to_str)
+        @folded_line.flatten!
+      # if no last whitespace before the limit, find the first
+      elsif wspp = @unfolded_line.mb_chars =~ /[ \t][^ \t]/
+        wrap = true
+        wspp = limit if wspp == 0
+        @folded_line << encode(@unfolded_line.mb_chars.slice!(0...wspp).strip.to_str)
+        @folded_line.flatten!
+      # if no whitespace, don't wrap
+      else
+        wrap = false
+      end
+
+      if wrap && @unfolded_line.length > limit
+        fold
+      else
+        @folded_line << encode(@unfolded_line)
+        @folded_line.flatten!
       end
     end
-        
+
     def encode(value)
-      (value.not_ascii_only? ? [value].pack("M").gsub("=\n", '') : value).gsub("\r", "=0D").gsub("\n", "=0A")
-    end
-    
-    def encoded_word_safify!(value)
-      value.gsub!(/"/,  '=22')
-      value.gsub!(/\(/, '=28')
-      value.gsub!(/\)/, '=29')
-      value.gsub!(/\?/, '=3F')
-      value.gsub!(/_/,  '=5F')
+      value.gsub!("\r", "=0D")
+      value.gsub!("\n", "=0A")
+      Encodings.q_value_encode(value, @charset).split(" ")
     end
 
   end

data/lib/mail/message.rb

@@ -1180,8 +1180,6 @@ module Mail
         self.body = value
       elsif name.to_s =~ /content[-_]type/i
         header[name] = value
-      elsif name.to_s == 'charset'
-        self.charset = value
       else
         header[name] = value
       end

data/lib/mail/version.rb

@@ -1,10 +1,16 @@
 # encoding: utf-8
 module Mail
   module VERSION
-    MAJOR = 2
-    MINOR = 2
-    TINY  = 1
+    
+    def self.version
+      YAML.load_file(File.join(File.dirname(__FILE__), '../../', 'VERSION.yml'))
+    end
+    
+    MAJOR = version[:major]
+    MINOR = version[:minor]
+    PATCH = version[:patch]
+    BUILD = version[:build]
 
-    STRING = [MAJOR, MINOR, TINY].join('.')
+    STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 2
-  - 1
-  version: 2.2.1
+  - 2
+  version: 2.2.2
 platform: ruby
 authors: 
 - Mikel Lindsaar
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 +10:00
+date: 2010-06-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 2
         - 3
-        - 4
-        version: 2.3.4
+        - 6
+        version: 2.3.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,7 @@ files:
 - README.rdoc
 - Rakefile
 - TODO.rdoc
+- VERSION.yml
 - lib/mail/attachments_list.rb
 - lib/mail/body.rb
 - lib/mail/configuration.rb