gitlab-grit 2.6.6 → 2.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93e755061312f6d086b8189ea09986eba8f6d7f7
-  data.tar.gz: 26694a810ea758fd7290fc7404480a01e79ec8f4
+  metadata.gz: 3fd54799935ea1d520a6aaa11a63a48cdddedc58
+  data.tar.gz: 1b998b5f0d09a223808563ebcabcd93f2a25b8c7
 SHA512:
-  metadata.gz: 3581bae92ece861513f96844c466958e9addbeb76875d15a8ecc21b7e1d31d17a70172a0996eadce9648c62fc9c0b9c804e45b6f0865281d2a524334d8a161f3
-  data.tar.gz: d845087cf2ee106636d5055777f412ae39d71098b8319dfe5410427a2e50c5321216a6426a88934bd943527406df361c6221bea78dd0311d5aaf9592b02c64e8
+  metadata.gz: 07eeae942b4f325c3ef4032505f96a82164ef142cc746bcf670ae88fa20a6d56a97bb3599fde37a0a33025f943bb5e9f1127dbee851d9e5cde4e680701429727
+  data.tar.gz: 7898894a8aa10a0e0265424dc928ef50d192319ab6141dc7a510909feedf608aa6f0e2da08af6df219079292547e80c9d0cd4a99aad2b8dfd70f0cadaae075d4

data/VERSION

@@ -1 +1 @@
-2.6.6
+2.6.7

data/lib/grit_ext.rb

@@ -14,11 +14,11 @@ module GritExt
 
     # if message is utf-8 encoding, just return it
     message.force_encoding("UTF-8")
-    return ensure_encoding(message) if message.valid_encoding?
+    return message if message.valid_encoding?
 
     # return message if message type is binary
     detect = CharlockHolmes::EncodingDetector.detect(message)
-    return ensure_encoding(message.force_encoding("BINARY")) if detect && detect[:type] == :binary
+    return message.force_encoding("BINARY") if detect && detect[:type] == :binary
 
     # encoding message to detect encoding
     if detect && detect[:encoding]
@@ -26,22 +26,15 @@ module GritExt
     end
 
     # encode and clean the bad chars
-    message = message.replace clean(message)
-    ensure_encoding(message)
+    message.replace clean(message)
   rescue
     encoding = detect ? detect[:encoding] : "unknown"
     "--broken encoding: #{encoding}"
   end
 
-  private
-
   def clean(message)
     message.encode("UTF-16BE", :undef => :replace, :invalid => :replace, :replace => "")
            .encode("UTF-8")
            .gsub("\0".encode("UTF-8"), "")
   end
-
-  def ensure_encoding(message)
-    message.encode('UTF-8', :invalid => :replace, :undef => :replace, :replace => "")
-  end
 end

data/lib/grit_ext/diff.rb

@@ -16,7 +16,11 @@ module Grit
         lines = @diff.lines.to_a
         path = GritExt.encode! lines.shift(2).join
         body = GritExt.encode! lines.join
-        @diff = path + body
+        begin
+          @diff = path + body
+        rescue Encoding::CompatibilityError
+          @diff = GritExt.clean(path) + GritExt.clean(body)
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-grit
 version: !ruby/object:Gem::Version
-  version: 2.6.6
+  version: 2.6.7
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charlock_holmes