gitlab_git 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f27529cfedcde0463fd58df616dd0ccfc0f8d747
-  data.tar.gz: d9b76853f6e0ab13439e56fd8cc4c67c8d3b75ee
+  metadata.gz: 68bd2b8cece23ce9a6c60c5303bb084ffc2bdeb4
+  data.tar.gz: dd31b1e48b9bcb854c3405025299f0799185d309
 SHA512:
-  metadata.gz: bce2de00ee1416fd9fe88d3d8987df62f046ef0c4443df8e3c1a64a24d93ca194706bb4795635ff86e4d01ab5b3087954ee00ac480b0613e33099c92ab8f10b5
-  data.tar.gz: b0c00d55181cb8bd403322bae01bd5f73d73578a9cac7a1b110b81997ff85d81f95f5ed4ea3932519a07ad3f35510118a3b089608e559873a4337ea41e85137e
+  metadata.gz: 068c5c67a558a81f61af31b35e2a9534c633a9b28c2ff2d60e9823909ed2a2fe176d298c5a1bf23969345410a1f20b2b23c388d659c3f197677533974da786a1
+  data.tar.gz: fc020e342e8df55bb3ca3458b92e6f7a56b332862e17f6600b9a5ec82fa93d1afbf491a8fec7f38867218981c3ea18709d110c109e4ed78ad69fce6d1466fa0d

data/VERSION

@@ -1 +1 @@
-5.1.0
+5.2.0

data/lib/gitlab_git.rb

@@ -7,6 +7,7 @@ require 'active_support/core_ext/hash/keys'
 require 'grit'
 require 'grit_ext'
 require 'rugged'
+require "charlock_holmes"
 
 Grit::Blob.class_eval do
   include Linguist::BlobHelper
@@ -14,6 +15,7 @@ end
 
 # Gitlab::Git
 require_relative "gitlab_git/popen"
+require_relative "gitlab_git/encoding_herlper"
 require_relative "gitlab_git/blame"
 require_relative "gitlab_git/blob"
 require_relative "gitlab_git/commit"

data/lib/gitlab_git/blob.rb

@@ -2,6 +2,7 @@ module Gitlab
   module Git
     class Blob
       include Linguist::BlobHelper
+      include EncodingHelper
 
       attr_accessor :name, :path, :size, :data, :mode, :id, :commit_id
 
@@ -84,6 +85,14 @@ module Gitlab
       def empty?
         !data || data == ''
       end
+
+      def data
+        encode! @data
+      end
+
+      def name
+        encode! @name
+      end
     end
   end
 end

data/lib/gitlab_git/encoding_herlper.rb

@@ -0,0 +1,34 @@
+module EncodingHelper
+  extend self
+
+  def encode!(message)
+    return nil unless message.respond_to? :force_encoding
+
+    # if message is utf-8 encoding, just return it
+    message.force_encoding("UTF-8")
+    return message if message.valid_encoding?
+
+    # return message if message type is binary
+    detect = CharlockHolmes::EncodingDetector.detect(message)
+    return message.force_encoding("BINARY") if detect && detect[:type] == :binary
+
+    # encoding message to detect encoding
+    if detect && detect[:encoding]
+      message.force_encoding(detect[:encoding])
+    end
+
+    # encode and clean the bad chars
+    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
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-linguist
@@ -66,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.19.0
+- !ruby/object:Gem::Dependency
+  name: charlock_holmes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.9
 description: GitLab wrapper around git objects
 email: dmitriy.zaporozhets@gmail.com
 executables: []
@@ -80,6 +94,7 @@ files:
 - lib/gitlab_git/commit.rb
 - lib/gitlab_git/compare.rb
 - lib/gitlab_git/diff.rb
+- lib/gitlab_git/encoding_herlper.rb
 - lib/gitlab_git/git_stats.rb
 - lib/gitlab_git/log_parser.rb
 - lib/gitlab_git/popen.rb