tmail 1.2.7 → 1.2.7.1

data/CHANGES

@@ -1,3 +1,8 @@
+=== 1.2.7.1 / 2010-02-07
+
+* Fixed stray ruby-debug
+* Re indented RChardet, and handled old syntax
+
 === 1.2.3.1 / 2008-04-11
 
 * Closed #19429 - Installing TMail on Windows with the gem

data/lib/tmail/attachments.rb

@@ -41,7 +41,7 @@ module TMail
     end
   
     private
-    require 'ruby-debug'
+  
     def attachment(part)
       if part.multipart?
         part.attachments

data/lib/tmail/vendor/rchardet-1.3/lib/rchardet/chardistribution.rb

@@ -6,7 +6,8 @@
 # Portions created by the Initial Developer are Copyright (C) 1998
 # the Initial Developer. All Rights Reserved.
 # 
-# Contributor(s):
+# Contributor(s)
+
 #   Jeff Hodges
 #   Mark Pilgrim - port to Python
 #
@@ -49,19 +50,19 @@ module CharDet
     def feed(aStr, aCharLen)
       # # """feed a character with known length"""
       if aCharLen == 2
-	# we only care about 2-bytes character in our distribution analysis
-	order = get_order(aStr)
+        # we only care about 2-bytes character in our distribution analysis
+        order = get_order(aStr)
       else
-	order = -1
+        order = -1
       end
       if order >= 0
-	@_mTotalChars += 1
-	# order is valid
-	if order < @_mTableSize:
-	  if 512 > @_mCharToFreqOrder[order]:
-	    @_mFreqChars += 1
-	  end
-	end
+        @_mTotalChars += 1
+        # order is valid
+        if order < @_mTableSize
+          if 512 > @_mCharToFreqOrder[order]
+            @_mFreqChars += 1
+          end
+        end
       end
     end
 
@@ -69,14 +70,14 @@ module CharDet
       # """return confidence based on existing data"""
       # if we didn't receive any character in our consideration range, return negative answer
       if @_mTotalChars <= 0
-	return SURE_NO
+        return SURE_NO
       end
 
-      if @_mTotalChars != @_mFreqChars:
-	r = @_mFreqChars / ((@_mTotalChars - @_mFreqChars) * @_mTypicalDistributionRatio)
-	if r < SURE_YES
-	  return r
-	end
+      if @_mTotalChars != @_mFreqChars
+        r = @_mFreqChars / ((@_mTotalChars - @_mFreqChars) * @_mTypicalDistributionRatio)
+        if r < SURE_YES
+          return r
+        end
       end
 
       # normalize confidence (we don't want to be 100% sure)
@@ -111,9 +112,9 @@ module CharDet
       #   second byte range: 0xa1 -- 0xfe
       # no validation needed here. State machine has done that
       if aStr[0..0] >= "\xC4"
-	return 94 * (aStr[0] - 0xC4) + aStr[1] - 0xA1
+        return 94 * (aStr[0] - 0xC4) + aStr[1] - 0xA1
       else
-	return -1
+        return -1
       end
     end
   end
@@ -132,9 +133,9 @@ module CharDet
       #   second byte range: 0xa1 -- 0xfe
       # no validation needed here. State machine has done that
       if aStr[0..0] >= "\xB0"
-	return 94 * (aStr[0] - 0xB0) + aStr[1] - 0xA1
+        return 94 * (aStr[0] - 0xB0) + aStr[1] - 0xA1
       else
-	return -1
+        return -1
       end
     end
   end
@@ -153,9 +154,9 @@ module CharDet
       #  second byte range: 0xa1 -- 0xfe
       # no validation needed here. State machine has done that
       if (aStr[0..0] >= "\xB0") and (aStr[1..1] >= "\xA1")
-	return 94 * (aStr[0] - 0xB0) + aStr[1] - 0xA1
+        return 94 * (aStr[0] - 0xB0) + aStr[1] - 0xA1
       else
-	return -1
+        return -1
       end
     end
   end
@@ -174,13 +175,13 @@ module CharDet
       #   second byte range: 0x40 -- 0x7e , 0xa1 -- 0xfe
       # no validation needed here. State machine has done that
       if aStr[0..0] >= "\xA4"
-	if aStr[1..1] >= "\xA1"
-	  return 157 * (aStr[0] - 0xA4) + aStr[1] - 0xA1 + 63
-	else
-	  return 157 * (aStr[0] - 0xA4) + aStr[1] - 0x40
-	end
+        if aStr[1..1] >= "\xA1"
+          return 157 * (aStr[0] - 0xA4) + aStr[1] - 0xA1 + 63
+        else
+          return 157 * (aStr[0] - 0xA4) + aStr[1] - 0x40
+        end
       else
-	return -1
+        return -1
       end
     end
   end
@@ -200,15 +201,15 @@ module CharDet
       # no validation needed here. State machine has done that
       aStr = aStr[0..1].join if aStr.class == Array
       if (aStr[0..0] >= "\x81") and (aStr[0..0] <= "\x9F")
-	order = 188 * (aStr[0] - 0x81)
+        order = 188 * (aStr[0] - 0x81)
       elsif (aStr[0..0] >= "\xE0") and (aStr[0..0] <= "\xEF")
-	order = 188 * (aStr[0] - 0xE0 + 31)
+        order = 188 * (aStr[0] - 0xE0 + 31)
       else
-	return -1
+        return -1
       end
       order = order + aStr[1] - 0x40
       if aStr[1..1] > "\x7F"
-	order =- 1
+        order =- 1
       end
       return order
     end
@@ -227,10 +228,10 @@ module CharDet
       #   first  byte range: 0xa0 -- 0xfe
       #   second byte range: 0xa1 -- 0xfe
       # no validation needed here. State machine has done that
-      if aStr[0..0] >= "\xA0":
-	return 94 * (aStr[0] - 0xA1) + aStr[1] - 0xa1
+      if aStr[0..0] >= "\xA0"
+        return 94 * (aStr[0] - 0xA1) + aStr[1] - 0xa1
       else
-	return -1
+        return -1
       end
     end
   end

data/lib/tmail/vendor/rchardet-1.3/lib/rchardet/charsetgroupprober.rb

@@ -6,7 +6,7 @@
 # Portions created by the Initial Developer are Copyright (C) 1998
 # the Initial Developer. All Rights Reserved.
 # 
-# Contributor(s):
+# Contributor(s)
 #   Jeff Hodges - port to Ruby
 #   Mark Pilgrim - port to Python
 #
@@ -40,42 +40,42 @@ module CharDet
       super
       @_mActiveNum = 0
 
-      for prober in @_mProbers:
-	if prober
-	  prober.reset()
-	  prober.active = true
-	  @_mActiveNum += 1
-	end
+      for prober in @_mProbers
+        if prober
+          prober.reset()
+          prober.active = true
+          @_mActiveNum += 1
+        end
       end
       @_mBestGuessProber = nil
     end
 
     def get_charset_name
       if not @_mBestGuessProber
-	get_confidence()
-	return nil unless @_mBestGuessProber
-	#                self._mBestGuessProber = self._mProbers[0]
+        get_confidence()
+        return nil unless @_mBestGuessProber
+        #                self._mBestGuessProber = self._mProbers[0]
       end
       return @_mBestGuessProber.get_charset_name()
     end
 
     def feed(aBuf)
       for prober in @_mProbers
-	next unless prober
-	next unless prober.active
-	st = prober.feed(aBuf)
-	next unless st
-	if st == EFoundIt
-	  @_mBestGuessProber = prober
-	  return get_state()
-	elsif st == ENotMe
-	  prober.active = false
-	  @_mActiveNum -= 1
-	  if @_mActiveNum <= 0
-	    @_mState = ENotMe
-	    return get_state()
-	  end
-	end
+        next unless prober
+        next unless prober.active
+        st = prober.feed(aBuf)
+        next unless st
+        if st == EFoundIt
+          @_mBestGuessProber = prober
+          return get_state()
+        elsif st == ENotMe
+          prober.active = false
+          @_mActiveNum -= 1
+          if @_mActiveNum <= 0
+            @_mState = ENotMe
+            return get_state()
+          end
+        end
       end
       return get_state()
     end
@@ -83,28 +83,28 @@ module CharDet
     def get_confidence()
       st = get_state()
       if st == EFoundIt
-	return 0.99
+        return 0.99
       elsif st == ENotMe
-	return 0.01
+        return 0.01
       end
       bestConf = 0.0
       @_mBestGuessProber = nil
       for prober in @_mProbers
-	next unless prober
-	unless prober.active
-	  $stderr << "#{prober.get_charset_name()} not active\n" if $debug
-	  next
-	end
-	cf = prober.get_confidence()
-	$stderr << "#{prober.get_charset_name} confidence = #{cf}\n" if $debug
-	if bestConf < cf
-	  bestConf = cf
-	  @_mBestGuessProber = prober
-	end
+        next unless prober
+        unless prober.active
+          $stderr << "#{prober.get_charset_name()} not active\n" if $debug
+          next
+        end
+        cf = prober.get_confidence()
+        $stderr << "#{prober.get_charset_name} confidence = #{cf}\n" if $debug
+        if bestConf < cf
+          bestConf = cf
+          @_mBestGuessProber = prober
+        end
       end
       return 0.0 unless @_mBestGuessProber
       return bestConf
-      #        else:
+      #        else
       #            self._mBestGuessProber = self._mProbers[0]
       #            return self._mBestGuessProber.get_confidence()
     end

data/lib/tmail/vendor/rchardet-1.3/lib/rchardet/codingstatemachine.rb

@@ -44,8 +44,8 @@ module CharDet
       # if it is first byte, we also get byte length
       byteCls = @_mModel['classTable'][c[0]]
       if @_mCurrentState == EStart
-	@_mCurrentBytePos = 0
-	@_mCurrentCharLen = @_mModel['charLenTable'][byteCls]
+        @_mCurrentBytePos = 0
+        @_mCurrentCharLen = @_mModel['charLenTable'][byteCls]
       end
       # from byte's class and stateTable, we get its next state
       @_mCurrentState = @_mModel['stateTable'][@_mCurrentState * @_mModel['classFactor'] + byteCls]

data/lib/tmail/vendor/rchardet-1.3/lib/rchardet/escprober.rb

@@ -30,21 +30,19 @@ module CharDet
   class EscCharSetProber < CharSetProber
     def initialize
       super()
-      @_mCodingSM = [ 
-	CodingStateMachine.new(HZSMModel),
-	CodingStateMachine.new(ISO2022CNSMModel),
-	CodingStateMachine.new(ISO2022JPSMModel),
-	CodingStateMachine.new(ISO2022KRSMModel)
-      ]
+      @_mCodingSM = [ CodingStateMachine.new(HZSMModel),
+                      CodingStateMachine.new(ISO2022CNSMModel),
+                      CodingStateMachine.new(ISO2022JPSMModel),
+                      CodingStateMachine.new(ISO2022KRSMModel)  ]
       reset()
     end
 
     def reset
       super()
-      for codingSM in @_mCodingSM:
-	next if not codingSM
-	codingSM.active = true
-	codingSM.reset()
+      for codingSM in @_mCodingSM
+        next if not codingSM
+        codingSM.active = true
+        codingSM.reset()
       end
       @_mActiveSM = @_mCodingSM.length
       @_mDetectedCharset = nil
@@ -56,35 +54,36 @@ module CharDet
 
     def get_confidence
       if @_mDetectedCharset
-	return 0.99
+        return 0.99
       else
-	return 0.00
+        return 0.00
       end
     end
 
     def feed(aBuf)
       aBuf.each_byte do |b|
-	c = b.chr
-	for codingSM in @_mCodingSM
-	  next unless codingSM
-	  next unless codingSM.active
-	  codingState = codingSM.next_state(c)
-	  if codingState == EError
-	    codingSM.active = false
-	    @_mActiveSM -= 1
-	    if @_mActiveSM <= 0
-	      @_mState = ENotMe
-	      return get_state()
-	    end
-	  elsif codingState == EItsMe
-	    @_mState = EFoundIt
-	    @_mDetectedCharset = codingSM.get_coding_state_machine()
-	    return get_state()
-	  end
-	end
+        c = b.chr
+        for codingSM in @_mCodingSM
+          next unless codingSM
+          next unless codingSM.active
+          codingState = codingSM.next_state(c)
+          if codingState == EError
+            codingSM.active = false
+            @_mActiveSM -= 1
+            if @_mActiveSM <= 0
+              @_mState = ENotMe
+              return get_state()
+            end
+          elsif codingState == EItsMe
+            @_mState = EFoundIt
+            @_mDetectedCharset = codingSM.get_coding_state_machine()
+            return get_state()
+          end
+        end
       end
-
       return get_state()
+
     end
+
   end
 end

data/lib/tmail/vendor/rchardet-1.3/lib/rchardet/eucjpprober.rb

@@ -48,33 +48,33 @@ module CharDet
     def feed(aBuf)
       aLen = aBuf.length
       for i in (0...aLen)
-	codingState = @_mCodingSM.next_state(aBuf[i..i])
-	if codingState == EError
-	  $stderr << "#{get_charset_name} prober hit error at byte #{i}\n" if $debug
-	  @_mState = ENotMe
-	  break
-	elsif codingState == EItsMe
-	  @_mState = EFoundIt
-	  break
-	elsif codingState == EStart:
-	  charLen = @_mCodingSM.get_current_charlen()
-	  if i == 0
-	    @_mLastChar[1] = aBuf[0..0]
-	    @_mContextAnalyzer.feed(@_mLastChar, charLen)
-	    @_mDistributionAnalyzer.feed(@_mLastChar, charLen)
-	  else
-	    @_mContextAnalyzer.feed(aBuf[i-1...i+1], charLen)
-	    @_mDistributionAnalyzer.feed(aBuf[i-1...i+1], charLen)
-	  end
-	end
+        codingState = @_mCodingSM.next_state(aBuf[i..i])
+        if codingState == EError
+          $stderr << "#{get_charset_name} prober hit error at byte #{i}\n" if $debug
+          @_mState = ENotMe
+          break
+        elsif codingState == EItsMe
+          @_mState = EFoundIt
+          break
+        elsif codingState == EStart
+          charLen = @_mCodingSM.get_current_charlen()
+          if i == 0
+            @_mLastChar[1] = aBuf[0..0]
+            @_mContextAnalyzer.feed(@_mLastChar, charLen)
+            @_mDistributionAnalyzer.feed(@_mLastChar, charLen)
+          else
+            @_mContextAnalyzer.feed(aBuf[i-1...i+1], charLen)
+            @_mDistributionAnalyzer.feed(aBuf[i-1...i+1], charLen)
+          end
+        end
       end
 
       @_mLastChar[0] = aBuf[aLen-1..aLen-1]
 
       if get_state() == EDetecting
-	if @_mContextAnalyzer.got_enough_data() and (get_confidence() > SHORTCUT_THRESHOLD)
-	  @_mState = EFoundIt
-	end
+        if @_mContextAnalyzer.got_enough_data() and (get_confidence() > SHORTCUT_THRESHOLD)
+          @_mState = EFoundIt
+        end
       end
 
       return get_state()

data/lib/tmail/vendor/rchardet-1.3/lib/rchardet/hebrewprober.rb

@@ -215,34 +215,34 @@ module CharDet
       # so the word boundary detection works properly. [MAP]
 
       if get_state() == ENotMe
-	# Both model probers say it's not them. No reason to continue.
-	return ENotMe
+        # Both model probers say it's not them. No reason to continue.
+        return ENotMe
       end
 
       aBuf = filter_high_bit_only(aBuf)
 
       for cur in aBuf.split(' ')
-	if cur == ' '
-	  # We stand on a space - a word just ended
-	  if @_mBeforePrev != ' '
-	    # next-to-last char was not a space so self._mPrev is not a 1 letter word
-	    if is_final(@_mPrev)
-	      # case (1) [-2:not space][-1:final letter][cur:space]
-	      @_mFinalCharLogicalScore += 1
-	    elsif is_non_final(@_mPrev)
-	      # case (2) [-2:not space][-1:Non-Final letter][cur:space]
-	      @_mFinalCharVisualScore += 1
-	    end
-	  end
-	else
-	  # Not standing on a space
-	  if (@_mBeforePrev == ' ') and (is_final(@_mPrev)) and (cur != ' ')
-	    # case (3) [-2:space][-1:final letter][cur:not space]
-	    @_mFinalCharVisualScore += 1
-	  end
-	end
-	@_mBeforePrev = @_mPrev
-	@_mPrev = cur
+        if cur == ' '
+          # We stand on a space - a word just ended
+          if @_mBeforePrev != ' '
+            # next-to-last char was not a space so self._mPrev is not a 1 letter word
+            if is_final(@_mPrev)
+              # case (1) [-2:not space][-1:final letter][cur:space]
+              @_mFinalCharLogicalScore += 1
+            elsif is_non_final(@_mPrev)
+              # case (2) [-2:not space][-1:Non-Final letter][cur:space]
+              @_mFinalCharVisualScore += 1
+            end
+          end
+        else
+          # Not standing on a space
+          if (@_mBeforePrev == ' ') and (is_final(@_mPrev)) and (cur != ' ')
+            # case (3) [-2:space][-1:final letter][cur:not space]
+            @_mFinalCharVisualScore += 1
+          end
+        end
+        @_mBeforePrev = @_mPrev
+        @_mPrev = cur
       end
 
       # Forever detecting, till the end or until both model probers return eNotMe (handled above)
@@ -254,24 +254,24 @@ module CharDet
       # If the final letter score distance is dominant enough, rely on it.
       finalsub = @_mFinalCharLogicalScore - @_mFinalCharVisualScore
       if finalsub >= MIN_FINAL_CHAR_DISTANCE
-	return LOGICAL_HEBREW_NAME
+        return LOGICAL_HEBREW_NAME
       end
       if finalsub <= -MIN_FINAL_CHAR_DISTANCE
-	return VISUAL_HEBREW_NAME
+        return VISUAL_HEBREW_NAME
       end
 
       # It's not dominant enough, try to rely on the model scores instead.
       modelsub = @_mLogicalProber.get_confidence() - @_mVisualProber.get_confidence()
       if modelsub > MIN_MODEL_DISTANCE
-	return LOGICAL_HEBREW_NAME
+        return LOGICAL_HEBREW_NAME
       end
       if modelsub < -MIN_MODEL_DISTANCE
-	return VISUAL_HEBREW_NAME
+        return VISUAL_HEBREW_NAME
       end
 
       # Still no good, back to final letter distance, maybe it'll save the day.
       if finalsub < 0.0
-	return VISUAL_HEBREW_NAME
+        return VISUAL_HEBREW_NAME
       end
 
       # (finalsub > 0 - Logical) or (don't know what to do) default to Logical.
@@ -281,7 +281,7 @@ module CharDet
     def get_state
       # Remain active as long as any of the model probers are active.
       if (@_mLogicalProber.get_state() == ENotMe) and (@_mVisualProber.get_state() == ENotMe)
-	return ENotMe
+        return ENotMe
       end
       return EDetecting
     end