tmail 1.2.7 → 1.2.7.1

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

@@ -31,21 +31,19 @@ module CharDet
   class SBCSGroupProber < CharSetGroupProber
     def initialize
       super
-      @_mProbers = [ 
-	SingleByteCharSetProber.new(Win1251CyrillicModel),
-	SingleByteCharSetProber.new(Koi8rModel),
-	SingleByteCharSetProber.new(Latin5CyrillicModel),
-	SingleByteCharSetProber.new(MacCyrillicModel),
-	SingleByteCharSetProber.new(Ibm866Model),
-	SingleByteCharSetProber.new(Ibm855Model),
-	SingleByteCharSetProber.new(Latin7GreekModel),
-	SingleByteCharSetProber.new(Win1253GreekModel),
-	SingleByteCharSetProber.new(Latin5BulgarianModel),
-	SingleByteCharSetProber.new(Win1251BulgarianModel),
-	SingleByteCharSetProber.new(Latin2HungarianModel),
-	SingleByteCharSetProber.new(Win1250HungarianModel),
-	SingleByteCharSetProber.new(TIS620ThaiModel),
-      ]
+      @_mProbers = [ SingleByteCharSetProber.new(Win1251CyrillicModel),
+                     SingleByteCharSetProber.new(Koi8rModel),
+                     SingleByteCharSetProber.new(Latin5CyrillicModel),
+                     SingleByteCharSetProber.new(MacCyrillicModel),
+                     SingleByteCharSetProber.new(Ibm866Model),
+                     SingleByteCharSetProber.new(Ibm855Model),
+                     SingleByteCharSetProber.new(Latin7GreekModel),
+                     SingleByteCharSetProber.new(Win1253GreekModel),
+                     SingleByteCharSetProber.new(Latin5BulgarianModel),
+                     SingleByteCharSetProber.new(Win1251BulgarianModel),
+                     SingleByteCharSetProber.new(Latin2HungarianModel),
+                     SingleByteCharSetProber.new(Win1250HungarianModel),
+                     SingleByteCharSetProber.new(TIS620ThaiModel) ]
       hebrewProber = HebrewProber.new()
       logicalHebrewProber = SingleByteCharSetProber.new(Win1255HebrewModel, false, hebrewProber)
       visualHebrewProber = SingleByteCharSetProber.new(Win1255HebrewModel, true, hebrewProber)

data/lib/tmail/vendor/rchardet-1.3/lib/rchardet/sjisprober.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[2 - charLen..-1], charLen)
-	    @_mDistributionAnalyzer.feed(@_mLastChar, charLen)
-	  else
-	    @_mContextAnalyzer.feed(aBuf[i + 1 - charLen ... i + 3 - charLen], 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[2 - charLen..-1], charLen)
+            @_mDistributionAnalyzer.feed(@_mLastChar, charLen)
+          else
+            @_mContextAnalyzer.feed(aBuf[i + 1 - charLen ... i + 3 - charLen], 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 get_state() == EDetecting
+        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/universaldetector.rb

@@ -51,10 +51,10 @@ module CharDet
       @_mInputState = EPureAscii
       @_mLastChar = ''
       if @_mEscCharSetProber
-	@_mEscCharSetProber.reset()
+        @_mEscCharSetProber.reset()
       end
       for prober in @_mCharSetProbers
-	prober.reset()
+        prober.reset()
       end
     end
 
@@ -65,101 +65,102 @@ module CharDet
       return if not aLen
 
       if not @_mGotData
-	# If the data starts with BOM, we know it is UTF
-	if aBuf[0...3] == "\xEF\xBB\xBF"
-	  # EF BB BF  UTF-8 with BOM
-	  @result = {'encoding' => "UTF-8", 'confidence' => 1.0}
-	elsif aBuf[0...4] == "\xFF\xFE\x00\x00"
-	  # FF FE 00 00  UTF-32, little-endian BOM
-	  @result = {'encoding' => "UTF-32LE", 'confidence' => 1.0}
-	elsif aBuf[0...4] == "\x00\x00\xFE\xFF"
-	  # 00 00 FE FF  UTF-32, big-endian BOM
-	  @result = {'encoding' => "UTF-32BE", 'confidence' => 1.0}
-	elsif aBuf[0...4] == "\xFE\xFF\x00\x00"
-	  # FE FF 00 00  UCS-4, unusual octet order BOM (3412)
-	  @result = {'encoding' => "X-ISO-10646-UCS-4-3412", 'confidence' => 1.0}
-	elsif aBuf[0...4] == "\x00\x00\xFF\xFE"
-	  # 00 00 FF FE  UCS-4, unusual octet order BOM (2143)
-	  @result = {'encoding' =>  "X-ISO-10646-UCS-4-2143", 'confidence' =>  1.0}
-	elsif aBuf[0...2] == "\xFF\xFE"
-	  # FF FE  UTF-16, little endian BOM
-	  @result = {'encoding' =>  "UTF-16LE", 'confidence' =>  1.0}
-	elsif aBuf[0...2] == "\xFE\xFF"
-	  # FE FF  UTF-16, big endian BOM
-	  @result = {'encoding' =>  "UTF-16BE", 'confidence' =>  1.0}
-	end
+        # If the data starts with BOM, we know it is UTF
+        if aBuf[0...3] == "\xEF\xBB\xBF"
+          # EF BB BF  UTF-8 with BOM
+          @result = {'encoding' => "UTF-8", 'confidence' => 1.0}
+        elsif aBuf[0...4] == "\xFF\xFE\x00\x00"
+          # FF FE 00 00  UTF-32, little-endian BOM
+          @result = {'encoding' => "UTF-32LE", 'confidence' => 1.0}
+        elsif aBuf[0...4] == "\x00\x00\xFE\xFF"
+          # 00 00 FE FF  UTF-32, big-endian BOM
+          @result = {'encoding' => "UTF-32BE", 'confidence' => 1.0}
+        elsif aBuf[0...4] == "\xFE\xFF\x00\x00"
+          # FE FF 00 00  UCS-4, unusual octet order BOM (3412)
+          @result = {'encoding' => "X-ISO-10646-UCS-4-3412", 'confidence' => 1.0}
+        elsif aBuf[0...4] == "\x00\x00\xFF\xFE"
+          # 00 00 FF FE  UCS-4, unusual octet order BOM (2143)
+          @result = {'encoding' =>  "X-ISO-10646-UCS-4-2143", 'confidence' =>  1.0}
+        elsif aBuf[0...2] == "\xFF\xFE"
+          # FF FE  UTF-16, little endian BOM
+          @result = {'encoding' =>  "UTF-16LE", 'confidence' =>  1.0}
+        elsif aBuf[0...2] == "\xFE\xFF"
+          # FE FF  UTF-16, big endian BOM
+          @result = {'encoding' =>  "UTF-16BE", 'confidence' =>  1.0}
+        end
       end
-
+         
       @_mGotData = true
-      if @result['encoding'] and (@result['confidence'] > 0.0):
-	@done = true
-	return
+      if @result['encoding'] and (@result['confidence'] > 0.0)  
+        @done = true
+        return
       end
-      if @_mInputState == EPureAscii:
-	if @_highBitDetector =~ (aBuf)
-	  @_mInputState = EHighbyte
-	elsif (@_mInputState == EPureAscii) and @_escDetector =~ (@_mLastChar + aBuf)
-	  @_mInputState = EEscAscii
-	end
+      
+      if @_mInputState == EPureAscii
+        if @_highBitDetector =~ (aBuf)
+          @_mInputState = EHighbyte
+        elsif (@_mInputState == EPureAscii) and @_escDetector =~ (@_mLastChar + aBuf)
+          @_mInputState = EEscAscii
+        end
       end
-
+        
       @_mLastChar = aBuf[-1..-1]
       if @_mInputState == EEscAscii
-	if not @_mEscCharSetProber
-	  @_mEscCharSetProber = EscCharSetProber.new()
-	end
-	if @_mEscCharSetProber.feed(aBuf) == EFoundIt
-	  @result = {'encoding' =>  self._mEscCharSetProber.get_charset_name(),
-			       'confidence' =>  @_mEscCharSetProber.get_confidence()
-	  }
-	  @done = true
-	end
+        if not @_mEscCharSetProber
+          @_mEscCharSetProber = EscCharSetProber.new()
+        end
+        if @_mEscCharSetProber.feed(aBuf) == EFoundIt
+          @result = {'encoding' =>  self._mEscCharSetProber.get_charset_name(),
+                     'confidence' =>  @_mEscCharSetProber.get_confidence()
+          }
+          @done = true
+        end
       elsif @_mInputState == EHighbyte
-	if not @_mCharSetProbers or @_mCharSetProbers.empty?
-	  @_mCharSetProbers = [MBCSGroupProber.new(), SBCSGroupProber.new(), Latin1Prober.new()]
-	end
-	for prober in @_mCharSetProbers
-	  if prober.feed(aBuf) == EFoundIt
-	    @result = {'encoding' =>  prober.get_charset_name(),
-				   'confidence' =>  prober.get_confidence()}
-	    @done = true
-	    break
-	  end
-	end
+        if not @_mCharSetProbers or @_mCharSetProbers.empty?
+          @_mCharSetProbers = [MBCSGroupProber.new(), SBCSGroupProber.new(), Latin1Prober.new()]
+        end
+        for prober in @_mCharSetProbers
+          if prober.feed(aBuf) == EFoundIt
+            @result = {'encoding' =>  prober.get_charset_name(),
+                       'confidence' =>  prober.get_confidence()}
+            @done = true
+            break
+          end
+        end
       end
-
+        
     end
-
+        
     def close
       return if @done
       if not @_mGotData
-	$stderr << "no data received!\n" if $debug
-	return
+        $stderr << "no data received!\n" if $debug
+        return
       end
       @done = true
-
-      if @_mInputState == EPureAscii:
-	@result = {'encoding' => 'ascii', 'confidence' => 1.0}
-	return @result
+        
+      if @_mInputState == EPureAscii  
+        @result = {'encoding' => 'ascii', 'confidence' => 1.0}
+        return @result
       end
-
-      if @_mInputState == EHighbyte:
-	confidences = {}
+        
+      if @_mInputState == EHighbyte
+        confidences = {}
         @_mCharSetProbers.each{ |prober| confidences[prober] = prober.get_confidence }
-	maxProber = @_mCharSetProbers.max{ |a,b| confidences[a] <=> confidences[b] }
-	if maxProber and maxProber.get_confidence > MINIMUM_THRESHOLD
-	  @result = {'encoding' =>  maxProber.get_charset_name(),
-			       'confidence' =>  maxProber.get_confidence()}
-	  return @result
-	end
+        maxProber = @_mCharSetProbers.max{ |a,b| confidences[a] <=> confidences[b] }
+        if maxProber and maxProber.get_confidence > MINIMUM_THRESHOLD
+          @result = {'encoding' =>  maxProber.get_charset_name(),
+                     'confidence' =>  maxProber.get_confidence()}
+          return @result
+        end
       end
 
       if $debug
-	$stderr << "no probers hit minimum threshhold\n" if $debug
-	for prober in @_mCharSetProbers[0]._mProbers
-	  next if not prober
-	  $stderr << "#{prober.get_charset_name} confidence = #{prober.get_confidence}\n" if $debug
-	end
+        $stderr << "no probers hit minimum threshhold\n" if $debug
+        for prober in @_mCharSetProbers[0]._mProbers
+          next if not prober
+          $stderr << "#{prober.get_charset_name} confidence = #{prober.get_confidence}\n" if $debug
+        end
       end
     end
   end

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

@@ -48,25 +48,25 @@ module CharDet
 
     def feed(aBuf)
       aBuf.each_byte do |b|
-	c = b.chr
-	codingState = @_mCodingSM.next_state(c)
-	if codingState == EError
-	  @_mState = ENotMe
-	  break
-	elsif codingState == EItsMe
-	  @_mState = EFoundIt
-	  break
-	elsif codingState == EStart
-	  if @_mCodingSM.get_current_charlen() >= 2
-	    @_mNumOfMBChar += 1
-	  end
-	end
+        c = b.chr
+        codingState = @_mCodingSM.next_state(c)
+        if codingState == EError
+          @_mState = ENotMe
+          break
+        elsif codingState == EItsMe
+          @_mState = EFoundIt
+          break
+        elsif codingState == EStart
+          if @_mCodingSM.get_current_charlen() >= 2
+            @_mNumOfMBChar += 1
+          end
+        end
       end
 
-      if get_state() == EDetecting:
-	if get_confidence() > SHORTCUT_THRESHOLD
-	  @_mState = EFoundIt
-	end
+      if get_state() == EDetecting
+        if get_confidence() > SHORTCUT_THRESHOLD
+          @_mState = EFoundIt
+        end
       end
 
       return get_state()
@@ -75,12 +75,12 @@ module CharDet
     def get_confidence
       unlike = 0.99
       if @_mNumOfMBChar < 6
-	for i in (0...@_mNumOfMBChar)
-	  unlike = unlike * ONE_CHAR_PROB
-	end
-	return 1.0 - unlike
+        for i in (0...@_mNumOfMBChar)
+          unlike = unlike * ONE_CHAR_PROB
+        end
+        return 1.0 - unlike
       else
-	return unlike
+        return unlike
       end
     end
   end

data/lib/tmail/version.rb

@@ -33,7 +33,8 @@ module TMail
     MAJOR = 1
     MINOR = 2
     TINY  = 7
+    MICRO = 1
 
-    STRING = [MAJOR, MINOR, TINY].join('.')
+    STRING = [MAJOR, MINOR, TINY, MICRO].join('.')
   end
 end

data/tmail.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tmail}
-  s.version = "1.2.7"
+  s.version = "1.2.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mikel Lindsaar <raasdnil AT gmail.com>"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tmail
 version: !ruby/object:Gem::Version 
-  version: 1.2.7
+  version: 1.2.7.1
 platform: ruby
 authors: 
 - Mikel Lindsaar <raasdnil AT gmail.com>