Merge branch 'feature/rework-mail-handling' into develop

1 files changed, 60 insertions, 0 deletions

diff --git a/lib/mail_handler/backends/mail_extensions.rb b/lib/mail_handler/backends/mail_extensions.rb
index cbe0491ed..f756abd1a 100644
--- a/lib/mail_handler/backends/mail_extensions.rb
+++ b/lib/mail_handler/backends/mail_extensions.rb
@@ -1,7 +1,67 @@
+require 'mail/message'
+require 'mail/fields/common/parameter_hash'
 module Mail
     class Message
         attr_accessor :url_part_number
         attr_accessor :rfc822_attachment # when a whole email message is attached as text
         attr_accessor :within_rfc822_attachment # for parts within a message attached as text (for getting subject mainly)
+        attr_accessor :count_parts_count
+        attr_accessor :count_first_uudecode_count
+
+        # A patched version of the message initializer to work around a bug where stripping the original
+        # input removes meaningful spaces - e.g. in the case of uuencoded bodies.
+        def initialize(*args, &block)
+            @body = nil
+            @body_raw = nil
+            @separate_parts = false
+            @text_part = nil
+            @html_part = nil
+            @errors = nil
+            @header = nil
+            @charset = 'UTF-8'
+            @defaulted_charset = true
+
+            @perform_deliveries = true
+            @raise_delivery_errors = true
+
+            @delivery_handler = nil
+
+            @delivery_method = Mail.delivery_method.dup
+
+            @transport_encoding = Mail::Encodings.get_encoding('7bit')
+
+            @mark_for_delete = false
+
+            if args.flatten.first.respond_to?(:each_pair)
+                init_with_hash(args.flatten.first)
+            else
+                # The replacement of this commented out line is the change.
+                # init_with_string(args.flatten[0].to_s.strip)
+                init_with_string(args.flatten[0].to_s)
+            end
+
+            if block_given?
+                instance_eval(&block)
+            end
+
+            self
+        end
+    end
+
+    # A patched version of the parameter hash that handles nil values without throwing
+    # an error.
+    class ParameterHash < IndifferentHash
+
+        def encoded
+          map.sort { |a,b| a.first.to_s <=> b.first.to_s }.map do |key_name, value|
+            # The replacement of this commented out line is the change
+            # unless value.ascii_only?
+            unless value.nil? || value.ascii_only?
+              value = Mail::Encodings.param_encode(value)
+              key_name = "#{key_name}*"
+            end
+            %Q{#{key_name}=#{quote_token(value)}}
+          end.join(";\r\n\s")
+        end
     end
 end
\ No newline at end of file