grit_ext 0.1.0 → 0.5.0

data/README.md

@@ -39,11 +39,11 @@ Or install it yourself as:
 => "ISO-8859-1"
 [7] pry(main)> blob.data
 => "source 'https://rubygems.org'\n\n# Specify your gem's dependencies in grit_ext.gemspec\ngemspec\n"
-[7] pry(main)> blob.text?
+[8] pry(main)> blob.text?
 => true
-[7] pry(main)> blob.image?
+[9] pry(main)> blob.image?
 => false
-[7] pry(main)> blob.binary?
+[10] pry(main)> blob.binary?
 => false
 ```
 

data/grit_ext.gemspec

@@ -13,8 +13,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "grit_ext"
   gem.require_paths = ["lib"]
-  gem.version       = GritExt::VERSION
+  gem.version       = GritExt.version
 
-  gem.add_dependency("charlock_holmes", "~> 0.6.8")
-  gem.add_dependency("language_sniffer", "~> 1.0.1")
+  gem.add_dependency("charlock_holmes", "~> 0.6.9")
 end

data/lib/grit_ext/actor.rb

@@ -0,0 +1,10 @@
+module Grit
+  class Actor
+
+    alias_method :old_name, :name
+
+    def name
+      GritExt.transcode old_name
+    end
+  end
+end

data/lib/grit_ext/blob.rb

@@ -1,28 +1,26 @@
 module Grit
   class Blob
-    def text?
-      !!(mime_type =~ /application|text/ && !binary?)
-    end
 
-    def image?
-      !!(mime_type =~ /image/)
-    end
+    alias_method :old_name, :name
+    alias_method :old_data, :data
 
-    def binary?
-      data[0..1024].include?("\000")
+    def name
+      GritExt.transcode old_name
     end
 
-    def encoding
-      if detection = CharlockHolmes::EncodingDetector.detect(data)
-        detection[:encoding]
-      end
+    def data
+      GritExt.transcode old_data
     end
 
-    def language
-      if lang = LanguageSniffer.detect(basename, :content => data).language
-        lang.name
+    class << self
+      alias_method :old_blame, :blame
+
+      def blame(repo, commit, file)
+        old_blame(repo, commit, file).map do |b,lines|
+          [b, GritExt.transcode(lines.join('\n')).split('\n')]
+        end
       end
     end
+
   end
 end
-

data/lib/grit_ext/commit.rb

@@ -0,0 +1,15 @@
+module Grit
+  class Commit
+
+    alias_method :old_message, :message
+    alias_method :old_short_message, :short_message
+
+    def message
+      GritExt.transcode old_message
+    end
+
+    def short_message
+      GritExt.transcode old_short_message
+    end
+  end
+end

data/lib/grit_ext/diff.rb

@@ -0,0 +1,16 @@
+module Grit
+  class Diff
+
+    def old_path
+      GritExt.transcode @a_path
+    end
+
+    def new_path
+      GritExt.transcode @b_path
+    end
+
+    def diff
+      GritExt.transcode @diff
+    end
+  end
+end

data/lib/grit_ext/tag.rb

@@ -0,0 +1,10 @@
+module Grit
+  class Tag
+
+    alias_method :old_message, :message
+
+    def message
+      GritExt.transcode old_message
+    end
+  end
+end

data/lib/grit_ext/tree.rb

@@ -0,0 +1,10 @@
+module Grit
+  class Tree
+
+    alias_method :old_name, :name
+
+    def name
+      GritExt.transcode old_name
+    end
+  end
+end

data/lib/grit_ext/version.rb

@@ -1,3 +1,7 @@
 module GritExt
-  VERSION = "0.1.0"
+  extend self
+
+  def version
+    "0.5.0"
+  end
 end

data/lib/grit_ext.rb

@@ -1,18 +1,37 @@
-require "rubygems"
 require "charlock_holmes"
-require "language_sniffer"
+require "grit_ext/actor"
 require "grit_ext/blob"
+require "grit_ext/commit"
+require "grit_ext/tree"
+require "grit_ext/diff"
 require "grit_ext/version"
-require "grit_ext/raw_object"
 
 module GritExt
-  private
-  def transcode(content)
-    detection = CharlockHolmes::EncodingDetector.detect(content)
-    if hash = detection
-     content = CharlockHolmes::Converter.convert(content, hash[:encoding], 'UTF-8') if hash[:encoding]
+  extend self
+
+  def transcode(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 if detect[:type] == :binary
+
+    # if message is not utf-8 encoding, convert it
+    if detect[:encoding]
+      message.force_encoding(detect[:encoding])
+      message.encode!("UTF-8", detect[:encoding], undef: :replace, replace: "", invalid: :replace)
     end
-    content
+
+    # ensure message encoding is utf8
+    message.valid_encoding? ? message : raise
+
+    # Prevent app from crash cause of encoding errors
+  rescue
+    encoding = detect ? detect[:encoding] : "unknown"
+    "--broken encoding: #{encoding}"
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grit_ext
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,30 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
-  requirement: &70258896872560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.6.9
   type: :runtime
   prerelease: false
-  version_requirements: *70258896872560
-- !ruby/object:Gem::Dependency
-  name: language_sniffer
-  requirement: &70258891864420 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *70258891864420
+        version: 0.6.9
 description: the grit's extension
 email:
 - saitowu@gmail.com
@@ -47,8 +41,12 @@ files:
 - Rakefile
 - grit_ext.gemspec
 - lib/grit_ext.rb
+- lib/grit_ext/actor.rb
 - lib/grit_ext/blob.rb
-- lib/grit_ext/raw_object.rb
+- lib/grit_ext/commit.rb
+- lib/grit_ext/diff.rb
+- lib/grit_ext/tag.rb
+- lib/grit_ext/tree.rb
 - lib/grit_ext/version.rb
 homepage: http://saito.im
 licenses: []
@@ -70,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: gives grit utf-8 support and some misc enhancement

data/lib/grit_ext/raw_object.rb

@@ -1,13 +0,0 @@
-module Grit
-  module GitRuby
-    module Internal
-      class RawObject
-        include GritExt
-
-        def content
-          transcode(@content)
-        end
-      end
-    end
-  end
-end