git-object-browser 0.0.3 → 0.0.4

data/htdocs/js/main.js

@@ -154,16 +154,13 @@ function GitCtrl($scope, $location, $routeParams, GitResource, PackedObjectResou
       'gid',
       'size',
       'sha1',
+      'assume_valid_flag',
+      'extended_flag',
+      'stage',
       'path'
     ]
 
-    if (version == 2) {
-      keys = keys.concat([
-        'assume_valid_flag',
-        'extended_flag',
-        'stage',
-      ]);
-    } else {
+    if (version == 3) {
       keys = keys.concat([
         'skip_worktree',
         'intent_to_add',

data/htdocs/templates/objects.html

@@ -7,7 +7,7 @@
 <tr data-ng-repeat="rows in objectTable">
 <td data-ng-repeat="cel in rows">
   <span data-ng-switch="cel.type">
-    <span data-ng-switch-when="empty">{{cel.basename}}</span>
+    <span data-ng-switch-when="empty"><span style="color:#eee">{{cel.basename}}</span></span>
     <span data-ng-switch-default><a href="/#/.git/objects/{{cel.basename}}">{{cel.basename}}</a></span>
   </span>
 </td>

data/lib/git-object-browser/models/index.rb

@@ -28,8 +28,10 @@ module GitObjectBrowser
 
       def parse_entries
         entries = []
+        last_path = nil
         @entry_count.times do |i|
-          entries << IndexEntry.new(@in, @version)
+          entries << IndexEntry.new(@in, @version, last_path)
+          last_path = entries.last.path
         end
         return entries
       end

data/lib/git-object-browser/models/index_entry.rb

@@ -11,58 +11,94 @@ module GitObjectBrowser
       attr_reader :skip_worktree, :intent_to_add
       attr_reader :name_length
 
-      def initialize(input, version)
+      def initialize(input, version, last_path = nil)
         super(input)
         @version = version
+        @last_path = last_path
         parse
       end
 
       def parse
-        @ctime = int
-        @cnano = int
-        @mtime = int
-        @mnano = int # 16 byte
-        @dev   = int
-        @ino   = int
+        @ctime = int       # 4
+        @cnano = int       # 8
+        @mtime = int       # 12
+        @mnano = int       # 16
+        @dev   = int       # 20
+        @ino   = int       # 24
+        parse_mode         # 28
+        @uid   = int       # 32
+        @gid   = int       # 36
+        @size  = int       # 40
+        @sha1  = hex(20)   # 60
+        parse_flags        # 62
+        parse_path
+      end
 
-        mode   = binstr(4)
+      def parse_mode
+        mode = binstr(4)
         @object_type     = mode[16..19]
         unused           = mode[20..22]
         @unix_permission = sprintf('%o', mode[23..31].to_i(2))
-
-        @uid   = int # 32 bytes
-        @gid   = int
-        @size  = int
-        @sha1  = hex(20)
-        parse_flags # 62 bytes
-        @path  = parse_path
       end
+      private :parse_mode
 
       def parse_flags
         flags  = binstr(2)
-        if @version == 2
-          @assume_valid_flag = flags[0..0]
-          @extended_flag     = flags[1..1]
-          @stage             = flags[2..3]
-        elsif @version == 3
-          reserved           = flags[0..0]
-          @skip_worktree     = flags[1..1]
-          @intent_to_add     = flags[2..2]
-        end
+        @assume_valid_flag = flags[0..0].to_i
+        @extended_flag     = flags[1..1].to_i
+        @stage             = flags[2..3]
         @name_length = ["0000" + flags[4..15]].pack("B*").unpack("n")[0]
+        if @version == 3 && @extended_flag == 1
+          exended          = binstr(2)
+          reserved         = extended[0..0]
+          @skip_worktree   = extended[1..1]
+          @intent_to_add   = extended[2..2]
+        end
       end
+      private :parse_flags
 
-      # path: 2 + 8 * n bytes (nul pannding)
       def parse_path
+        if @version == 2 || @version == 3
+          parse_path_v2
+        elsif @version == 4
+          parse_path_v4
+        end
+      end
+      private :parse_path
+
+      # path: 2 + 8 * n bytes (nul pannding)
+      def parse_path_v2
         token = raw(2) # 64 bytes
-        path = ""
+        @path = ""
         begin
-          path += token.unpack("Z*").first
+          @path += token.unpack("Z*").first
           break if token.unpack("C*").last == 0
         end while(token = raw(8))
-        return path
       end
+      private :parse_path_v2
 
+      def parse_path_v4
+        (chop_size, _) = parse_chop_size()
+        @path = find_char("\0")
+        if chop_size > 0
+          @path = @last_path[0 .. chop_size * -1 - 1] + @path
+        end
+      end
+      private :parse_path_v4
+
+      def parse_chop_size
+        value      = -1
+        value_size = 0
+        begin
+          b          = byte
+          value_size += 1
+          continue   = b & 0b10000000
+          low_value  = b & 0b01111111
+          value      = ((value + 1) << 7) | low_value
+        end while continue != 0
+        return [value, value_size]
+      end
+      private :parse_chop_size
 
       def to_hash
         return {

data/lib/git-object-browser/models/packed_object.rb

@@ -206,7 +206,9 @@ module GitObjectBrowser
       end
 
       # sha1_file.c get_delta_base
+      #   https://github.com/git/git/blob/master/sha1_file.c
       # unpack-objects.c unpack_delta_entry
+      #   https://github.com/git/git/blob/master/builtin/unpack-objects.c
       def parse_delta_offset
         offset   = -1
         hdr_size = 0

data/lib/git-object-browser/version.rb

@@ -1,3 +1,3 @@
 module GitObjectBrowser
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/git-object-browser/models/index_spec.rb

@@ -38,5 +38,21 @@ module GitObjectBrowser::Models
       extensions.length.should eq 1
     end
 
+    context 'when the index version is 4' do
+      let(:infile) { '003-version-4' }
+
+      it 'should parse header' do
+        index = subject.parse.to_hash
+        index[:version].should eq 4
+        index[:entry_count].should eq index[:entries].length
+      end
+
+      it 'should parse pathes' do
+        index = subject.parse.to_hash
+        entries = index[:entries]
+        expect = ['test.txt', 'test2.txt', 'test3.txt']
+        entries.map {|entry| entry[:path]}.should eq expect
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-object-browser
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-10 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies: []
 description: Browse git raw objects.
 email:
@@ -98,6 +98,7 @@ files:
 - spec/fixtures/generate_worktree.sh
 - spec/fixtures/git/indexes/001
 - spec/fixtures/git/indexes/002-empty-tree-extension
+- spec/fixtures/git/indexes/003-version-4
 - spec/fixtures/git/plain_file
 - spec/fixtures/json/blob.json
 - spec/fixtures/json/merge-a.json
@@ -184,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -211213857821396965
+      hash: 2893578660749395643
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -195,6 +196,7 @@ test_files:
 - spec/fixtures/generate_worktree.sh
 - spec/fixtures/git/indexes/001
 - spec/fixtures/git/indexes/002-empty-tree-extension
+- spec/fixtures/git/indexes/003-version-4
 - spec/fixtures/git/plain_file
 - spec/fixtures/json/blob.json
 - spec/fixtures/json/merge-a.json