mailparser 0.4.22a → 0.5.0.beta1

data/lib/mailparser/rfc2047.rb

@@ -1,9 +1,8 @@
+# coding: ascii-8bit
 # Copyright (C) 2006-2010 TOMITA Masahiro
 # mailto:tommy@tmtm.org
 
 require "strscan"
-require "iconv"
-require "nkf"
 require "mailparser/conv_charset"
 
 module MailParser
@@ -11,26 +10,6 @@ end
 
 module MailParser::RFC2047
 
-  class String < ::String
-    @@charset_converter = Proc.new{|f,t,s| MailParser::ConvCharset.conv_charset(f,t,s)}
-    def initialize(str, charset=nil, raw=nil, charset_converter=nil)
-      super(str)
-      @charset = charset
-      @raw = raw || str
-      @charset_converter = charset_converter || @@charset_converter
-    end
-    attr_reader :charset
-    attr_reader :raw
-
-    def conv_charset(to_charset)
-      if @charset and to_charset
-        @charset_converter.call @charset, to_charset, self
-      else
-        self
-      end
-    end
-  end
-
   module_function
 
   def decode(str, opt=nil)
@@ -40,35 +19,45 @@ module MailParser::RFC2047
     else
       charset = opt
     end
+    charset_converter ||= MailParser::ConvCharset.method(:conv_charset)
     last_charset = nil
     ret = ""
-    split_decode(str, charset_converter).each do |s|
-      begin
-        s2 = charset && s.charset ? s.conv_charset(charset) : s
-        cs = s.charset
-      rescue Iconv::Failure
-        s2 = s.raw
-        cs = nil
+    ret.force_encoding(charset) if String.method_defined? :force_encoding and charset
+    split_decode(str) do |s, cs, raw|
+      if charset
+        begin
+          s = charset_converter.call(cs || charset, charset, s)
+        rescue
+          s = raw
+          cs = nil
+        end
       end
       ret << " " if last_charset.nil? or cs.nil?
-      ret << s2
+      ret << s
       last_charset = cs
     end
     return ret.strip
   end
 
-  def split_decode(str, charset_converter=nil)
-    ret = []
-    while str =~ /\=\?([^\(\)\<\>\@\,\;\:\"\/\[\]\?\.\=]+)\?([QB])\?([^\? ]+)\?\=/ni do
+  def split_decode(str)
+    while str =~ /\=\?([^\(\)\<\>\@\,\;\:\"\/\[\]\?\.\=]+)\?([QB])\?([^\? ]+)\?\=/i do
       raw = $&
       pre, charset, encoding, enc_text, after = $`, $1.downcase, $2.downcase, $3, $'
-      ret << String.new(pre.strip) unless pre.strip.empty?
+      s = pre.strip
+      yield s, nil, raw unless s.empty?
       s = encoding == "q" ? q_decode(enc_text) : b_decode(enc_text)
-      ret << String.new(s, charset, raw, charset_converter)
+      if String.method_defined? :force_encoding
+        begin
+          s.force_encoding(charset)
+        rescue
+          s.force_encoding('ascii-8bit')
+        end
+      end
+      yield s, charset, raw
       str = after
     end
-    ret << String.new(str.strip) unless str.empty?
-    return ret
+    s = str.strip
+    yield s, nil, raw unless s.empty?
   end
 
   def q_decode(str)

data/lib/mailparser/rfc2183/parser.rb

@@ -1,3 +1,4 @@
+# coding: ascii-8bit
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.7
@@ -26,7 +27,7 @@ def parse(header_type, value)
 end
 
 def parse_sub(&block)
-  yield @header_type, nil
+  yield [@header_type, nil]
   @scanner.scan(&block)
 end
 

data/lib/mailparser/rfc2183/scanner.rb

@@ -1,3 +1,4 @@
+# coding: ascii-8bit
 # Copyright (C) 2006-2010 TOMITA Masahiro
 # mailto:tommy@tmtm.org
 

data/lib/mailparser/rfc2183.rb

@@ -1,3 +1,4 @@
+# coding: ascii-8bit
 # Copyright (C) 2006-2010 TOMITA Masahiro
 # mailto:tommy@tmtm.org
 

data/lib/mailparser/rfc2231.rb

@@ -1,3 +1,4 @@
+# coding: ascii-8bit
 # Copyright (C) 2006-2010 TOMITA Masahiro
 # mailto:tommy@tmtm.org
 
@@ -12,7 +13,7 @@ module MailParser::RFC2231
     char_lang = {}
     params.each do |key, value|
       case key
-      when /^([^\*]+)(\*0)?\*$/no
+      when /^([^\*]+)(\*0)?\*$/
         name, ord = $1, $2
         char, lang, v = value.split(/\'/, 3)
         char_lang[name] = [char, lang]
@@ -20,17 +21,17 @@ module MailParser::RFC2231
           raise MailParser::ParseError, "#{key}=#{value}" if opt[:strict]
           v = lang || char
         end
-        v = v.gsub(/%([0-9A-F][0-9A-F])/ni){$1.hex.chr}
+        v = v.gsub(/%([0-9A-F][0-9A-F])/i){$1.hex.chr}
         if ord then
           h[name] << [0, v]
         else
           newparams[name] = v
         end
-      when /^([^\*]+)\*([1-9]\d*)\*$/no
+      when /^([^\*]+)\*([1-9]\d*)\*$/
         name, ord = $1, $2.to_i
-        v = value.gsub(/%([0-9A-F][0-9A-F])/ni){$1.hex.chr}
+        v = value.gsub(/%([0-9A-F][0-9A-F])/i){$1.hex.chr}
         h[name] << [ord, v]
-      when /^([^\*]+)\*([0-9]\d*)$/no
+      when /^([^\*]+)\*([0-9]\d*)$/
         name, ord = $1, $2.to_i
         h[name] << [ord, value]
       else