git-object-browser 0.0.2 → 0.0.3

data/Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'rake'
 gem 'json'
 
 # Specify your gem's dependencies in git-object-browser.gemspec

data/htdocs/js/main.js

@@ -201,6 +201,9 @@ function GitCtrl($scope, $location, $routeParams, GitResource, PackedObjectResou
         }
       });
       $scope.object.entries = entries;
+    } else if (json.type == "packed_object") {
+      template = json.type;
+      $scope.unpacked = json.unpacked;
     } else {
       template = json.type;
     }

data/htdocs/templates/object.html

@@ -1,54 +1,83 @@
 <article>
-<h1 style="font-size:1.8em;"><i data-entry-icon="'object'"></i> {{path}} <small>Object</small></h1>
+  <h1 style="font-size:1.8em;"><i data-entry-icon="'object'"></i> {{path}} <small>Object</small></h1>
 
-<table class="table">
-
-<tbody>
-<tr><th>type</th><td>
-<i data-entry-icon="object.type"></i> {{object.type}}
-</td>
-</tr>
-<tr><th>sha1</th><td>{{object.sha1}}</td></tr>
-<tr><th>size</th><td>{{object.size}}</td></tr>
-
-<tr data-ng-repeat="prop in object.properties">
-<th>{{prop.key}}</th>
-<td data-ng-switch="prop.type">
-<span data-ng-switch-when="sha1"><a href="#/.git/{{prop.path}}">{{prop.value}}</a></span>
-<span data-ng-switch-when="user">{{prop.value}} <small style="color:#aaa">{{prop.date}}</small></span>
-<span data-ng-switch-default>{{prop.value}}</span>
-</td>
-</tr>
-</tbody>
+  <div class="tabbable">
+    <ul class="nav nav-tabs">
+      <li class="active"><a href="#parsed" data-toggle="tab">Parsed</a></li>
+      <li><a href="#plain" data-toggle="tab">Plain</a></li>
+    </ul>
+    <div class="tab-content">
+      <div class="tab-pane active" id="parsed">
 
-<tbody data-ng-switch="object.type">
-<tr data-ng-switch-when="blob"><th>content</th><td><pre>{{object.content}}</pre></td></tr>
-<tr data-ng-switch-when="commit"><th>message</th><td>{{object.message}}</td></tr>
-<tr data-ng-switch-when="tag"><th>message</th><td>{{object.message}}</td></tr>
-<tr data-ng-switch-when="tree"><th>entries</th><td>
+<table class="table">
+  <tbody>
+    <tr>
+      <th>sha1</th>
+      <td>{{object.sha1}}</td>
+    </tr>
+    <tr>
+      <th>type</th>
+      <td><i data-entry-icon="object.type"></i> {{object.type}}</td>
+    </tr>
+    <tr>
+      <th>size</th>
+      <td>{{object.size}}</td>
+    </tr>
+    <tr data-ng-repeat="prop in object.properties">
+      <th>{{prop.key}}</th>
+      <td data-ng-switch="prop.type">
+        <span data-ng-switch-when="sha1"><a href="#/.git/{{prop.path}}">{{prop.value}}</a></span>
+        <span data-ng-switch-when="user">{{prop.value}} <small style="color:#aaa">{{prop.date}}</small></span>
+        <span data-ng-switch-default>{{prop.value}}</span>
+      </td>
+    </tr>
+  </tbody>
 
-<table class="table table-striped table-condensed">
-<thead>
-<tr>
-<th>mode</th>
-<th>filename</th>
-<th>sha1</th>
-</tr>
-</thead>
-<tbody>
-<tr data-ng-repeat="entry in object.entries">
-<td><i data-mode-icon="entry.mode"></i> {{entry.mode}}</td>
-<td>{{entry.filename}}</td>
-<td><a href="#" data-ref-href="entry">{{entry.sha1}}</a></td>
-</tr>
-</tbody>
+  <tbody data-ng-switch="object.type">
+    <tr data-ng-switch-when="blob">
+      <th>content</th>
+      <td><pre>{{object.content}}</pre></td>
+    </tr>
+    <tr data-ng-switch-when="commit">
+      <th>message</th>
+      <td>{{object.message}}</td>
+    </tr>
+    <tr data-ng-switch-when="tag">
+      <th>message</th>
+      <td>{{object.message}}</td>
+    </tr>
+    <tr data-ng-switch-when="tree">
+      <th>entries</th>
+      <td>
+        <table class="table table-striped table-condensed">
+          <thead>
+            <tr>
+              <th>mode</th>
+              <th>filename</th>
+              <th>sha1</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr data-ng-repeat="entry in object.entries">
+              <td><i data-mode-icon="entry.mode"></i> {{entry.mode}}</td>
+              <td>{{entry.filename}}</td>
+              <td><a href="#" data-ref-href="entry">{{entry.sha1}}</a></td>
+            </tr>
+          </tbody>
+        </table>
+      </td>
+    </tr>
+  </tbody>
 
 </table>
-</td></tr>
-
-</tbody>
 
-</table>
+      </div>
+      <div class="tab-pane" id="plain">
 
+<pre>{{object.type}} {{object.size}}\0
+{{object.content}}</pre>
 
+      </div>
+    </div>
+  </div>
 </article>

data/htdocs/templates/pack_index.html

@@ -9,8 +9,8 @@
 <th>sha1</th>
 <th>crc32</th>
 <th><a href="" data-ng-click="orderByOffset()">offset</a></th>
-<th>type *</th>
-<th>size *</th>
+<th>type</th>
+<th>size</th>
 </tr>
 </thead>
 <tbody>
@@ -26,13 +26,12 @@
 <td><a href="#/{{packUrl}}?offset={{entry.offset}}">{{entry.offset}}</a></td>
 <td><i data-entry-icon="entry.type"></i> {{entry.type}}
 <span data-ng-show="entry.base_offset"><a href="#/{{packUrl}}?offset={{entry.base_offset}}">{{entry.base_offset}}</a></span>
-<span data-ng-show="entry.base_sha1"><a href="#/{{packUrl}}?sha1={{entry.base_sha1}}">{{entry.base_sha1.substr(0,6)}}</a></span>
+<span data-ng-show="entry.base_sha1"><a data-ref-href="entry.base_sha1">{{entry.base_sha1.substr(0,6)}}</a></span>
 </td>
 <td>{{entry.size}}</td>
 </tr>
 </tbody>
 </table>
 
-<a href="#/.git/packed-refs" data-ng-show="limited">Show All</a>
 </article>
 

data/htdocs/templates/packed_object.html

@@ -1,111 +1,120 @@
 <article>
 <h1 style="font-size:1.8em;"><i data-entry-icon="'object'"></i> {{path}} <small>Packed Object</small></h1>
 
+  <div class="tabbable">
+    <ul class="nav nav-tabs">
+      <li class="active"><a href="#parsed" data-toggle="tab">Parsed</a></li>
+      <li data-ng-show="object.object.content"><a href="#plain" data-toggle="tab">Plain</a></li>
+      <li data-ng-show="object.delta_commands"><a href="#deltas" data-toggle="tab">Deltas</a></li>
+      <li><a href="#/{{path.replace('.pack', '.idx')}}"><i class="icon-list"></i> Index</a></li>
+    </ul>
+
+    <div class="tab-content">
+      <div class="tab-pane active" id="parsed">
 <table class="table">
-<tbody>
-
-<tr>
-<th>offset</th>
-<td>{{object.offset}}</td>
-</tr>
-
-<tr data-ng-show="object.base_offset">
-<th>base offset</th>
-<td><a href="#/{{path}}?offset={{object.base_offset}}">{{object.base_offset}}</a></td>
-</tr>
-
-<tr data-ng-show="object.base_offset">
-<th>delta type</th>
-<td><i data-entry-icon="object.type"></i> {{object.type}}</td>
-</tr>
-
-<tr>
-<th>type</th>
-<td><i data-entry-icon="object.object.type"></i> {{object.object.type}}</td>
-</tr>
-
-<tr data-ng-show="object.base_offset">
-<th>base size</th>
-<td>{{object.base_size}}</td>
-</tr>
-
-<tr data-ng-show="object.base_offset">
-<th>delta size</th>
-<td>{{object.size}}</td>
-</tr>
-
-<tr><th>size</th><td>{{object.object.size}}</td></tr>
-
-<tr><th>sha1</th><td>{{object.object.sha1}}</td></tr>
-
-<tr data-ng-repeat="prop in object.object.properties">
-<th>{{prop.key}}</th>
-<td data-ng-switch="prop.type">
-<span data-ng-switch-when="sha1"><a href="#/.git/{{prop.path}}">{{prop.value}}</a></span>
-<span data-ng-switch-when="user">{{prop.value}} <small style="color:#aaa">{{prop.date}}</small></span>
-<span data-ng-switch-default>{{prop.value}}</span>
-</td>
-</tr>
-</tbody>
-
-<tbody data-ng-switch="object.object.type">
-<tr data-ng-switch-when="blob"><th>content</th><td><pre>{{object.object.content}}</pre></td></tr>
-<tr data-ng-switch-when="commit"><th>message</th><td>{{object.object.message}}</td></tr>
-<tr data-ng-switch-when="tag"><th>message</th><td>{{object.object.message}}</td></tr>
-<tr data-ng-switch-when="tree"><th>entries</th><td>
-
-<table class="table table-striped table-condensed">
-<thead>
-<tr>
-<th>mode</th>
-<th>filename</th>
-<th>sha1</th>
-</tr>
-</thead>
-<tbody>
-<tr data-ng-repeat="entry in object.object.entries">
-<td><i data-mode-icon="entry.mode"></i> {{entry.mode}}</td>
-<td>{{entry.filename}}</td>
-<td><a href="#" data-ref-href="entry">{{entry.sha1}}</a></td>
-</tr>
-</tbody>
+  <tbody>
+    <tr>
+      <!-- Object could be unpacked. -->
+      <th>sha1</th>
+      <td>{{object.object.sha1}} <a data-ref-href="object.object" data-ng-show="unpacked"><i class="icon-arrow-right"></i> unpacked</a></td>
+    </tr>
+    <tr>
+      <th>offset</th>
+      <td><a href="#/{{path}}?offset={{object.offset}}">{{object.offset}}</a></td>
+    </tr>
+    <tr data-ng-show="object.base_offset">
+      <th>base offset</th>
+      <td><a href="#/{{path}}?offset={{object.base_offset}}">{{object.base_offset}}</a></td>
+    </tr>
+    <tr data-ng-show="object.base_offset">
+      <th>delta type</th>
+      <td><i data-entry-icon="object.type"></i> {{object.type}}</td>
+    </tr>
+    <tr>
+      <th>type</th>
+      <td><i data-entry-icon="object.object.type"></i> {{object.object.type}}</td>
+    </tr>
+    <tr data-ng-show="object.base_offset">
+      <th>base size</th>
+      <td>{{object.base_size}}</td>
+    </tr>
+    <tr data-ng-show="object.base_offset">
+      <th>delta size</th>
+      <td>{{object.size}}</td>
+    </tr>
+    <tr><th>size</th><td>{{object.object.size}}</td></tr>
+
+    <tr data-ng-repeat="prop in object.object.properties">
+      <th>{{prop.key}}</th>
+      <td data-ng-switch="prop.type">
+        <span data-ng-switch-when="sha1"><a href="#/.git/{{prop.path}}">{{prop.value}}</a></span>
+        <span data-ng-switch-when="user">{{prop.value}} <small style="color:#aaa">{{prop.date}}</small></span>
+        <span data-ng-switch-default>{{prop.value}}</span>
+      </td>
+    </tr>
+  </tbody>
+<table>
 
+<table class="table">
+  <tbody data-ng-switch="object.object.type">
+    <tr data-ng-switch-when="blob"><th>content</th><td><pre>{{object.object.content}}</pre></td></tr>
+    <tr data-ng-switch-when="commit"><th>message</th><td>{{object.object.message}}</td></tr>
+    <tr data-ng-switch-when="tag"><th>message</th><td>{{object.object.message}}</td></tr>
+    <tr data-ng-switch-when="tree">
+      <th>entries</th>
+      <td>
+        <table class="table table-striped table-condensed">
+          <thead>
+            <tr>
+              <th>mode</th>
+              <th>filename</th>
+              <th>sha1</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr data-ng-repeat="entry in object.object.entries">
+              <td><i data-mode-icon="entry.mode"></i> {{entry.mode}}</td>
+              <td>{{entry.filename}}</td>
+              <td><a href="#" data-ref-href="entry">{{entry.sha1}}</a></td>
+            </tr>
+          </tbody>
+        </table>
+      </td>
+    </tr>
+  </tbody>
 </table>
-</td></tr>
-</tbody>
 
-<tbody>
+      </div>
+      <div class="tab-pane" id="deltas">
 
-<tr>
-<th>commands</th>
-<td>
+        <table class="table table-striped">
+          <thead>
+            <th>source</th>
+            <th>offset</th>
+            <th>size</th>
+            <th>data</th>
+          </thead>
+          <tbody>
+            <tr data-ng-repeat="command in object.delta_commands">
+              <td>{{command.source}}</td>
+              <td>{{command.offset}}</td>
+              <td>{{command.size}}</td>
+              <td><pre data-ng-show="command.data">{{command.data}}</pre></td>
+            </tr>
+          </tbody>
+        </table>
 
-<table class="table table-striped">
-<thead>
-<th>source</th>
-<th>offset</th>
-<th>size</th>
-<th>data</th>
-</thead>
-<tbody>
-<tr data-ng-repeat="command in object.delta_commands">
-<td>{{command.source}}</td>
-<td>{{command.offset}}</td>
-<td>{{command.size}}</td>
-<td><pre data-ng-show="command.data">{{command.data}}</pre></td>
-</tr>
-</tbody>
+      </div>
+      <div class="tab-pane" id="plain">
 
-</table>
+<pre>{{object.object.type}} {{object.object.size}}\0
+{{object.object.content}}</pre>
 
-</td>
-</tr>
+      </div>
+    </div>
+  </div>
 
 
 
-</tbody>
-</table>
 
-<a href="#/.git/packed-refs" data-ng-show="limited">Show All</a>
 </article>
-

data/htdocs/templates/packed_refs.html

@@ -1,27 +1,43 @@
 <article>
-<h1><i data-entry-icon="'ref'"></i> {{path}} <small>Packed References</small></h1>
+  <h1><i data-entry-icon="'ref'"></i> {{path}} <small>Packed References</small></h1>
+
+  <div class="tabbable">
+    <ul class="nav nav-tabs">
+      <li class="active"><a href="#parsed" data-toggle="tab">Parsed</a></li>
+      <li><a href="#plain" data-toggle="tab">Plain</a></li>
+    </ul>
+    <div class="tab-content">
+      <div class="tab-pane active" id="parsed">
 
 <table class="table table-striped">
-<thead>
-<tr>
-<th>sha1</th>
-<th>ref</th>
-</tr>
-</thead>
-<tbody>
-<tr data-ng-repeat="entry in object.entries">
-<td>
-<i data-entry-icon="'commit'" data-ng-hide="entry.tag_sha1"></i>
-<i data-entry-icon="'tag'" data-ng-show="entry.tag_sha1"></i>
- <a data-ref-href="entry">{{entry.sha1}}</a>
-<span data-ng-show="entry.tag_sha1"><br>
-<i data-entry-icon="'commit'"></i> <a data-ref-href="entry.tag_sha1">{{entry.tag_sha1}}</a>
-</span>
-</td>
-<td><a href="#/.git/packed-refs?ref={{entry.ref}}">{{entry.ref}}</a></td>
-</tr>
-</tbody>
+  <thead>
+    <tr>
+      <th>sha1</th>
+      <th>ref</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr data-ng-repeat="entry in object.entries">
+      <td>
+        <i data-entry-icon="'commit'" data-ng-hide="entry.tag_sha1"></i>
+        <i data-entry-icon="'tag'" data-ng-show="entry.tag_sha1"></i>
+        <a data-ref-href="entry">{{entry.sha1}}</a>
+        <span data-ng-show="entry.tag_sha1"><br>
+          <i data-entry-icon="'commit'"></i> <a data-ref-href="entry.tag_sha1">{{entry.tag_sha1}}</a>
+        </span>
+      </td>
+      <td><a href="#/.git/packed-refs?ref={{entry.ref}}">{{entry.ref}}</a></td>
+    </tr>
+  </tbody>
 </table>
-
 <a href="#/.git/packed-refs" data-ng-show="limited">Show All</a>
+
+      </div>
+      <div class="tab-pane" id="plain">
+        <pre>{{object.content}}</pre>
+      </div>
+    </div>
+  </div>
+</article>
+
 </article>

data/htdocs/templates/ref.html

@@ -1,6 +1,14 @@
 <article>
 <h1><i data-entry-icon="'ref'"></i> {{path}} <small>Reference</small></h1>
 
+<div class="tabbable">
+  <ul class="nav nav-tabs">
+    <li class="active"><a href="#parsed" data-toggle="tab">Parsed</a></li>
+    <li><a href="#plain" data-toggle="tab">Plain</a></li>
+  </ul>
+  <div class="tab-content">
+    <div class="tab-pane active" id="parsed">
+
 <table class="table">
 <tr data-ng-show="object.sha1">
 <th>sha1</th><td><a data-ref-href="object">{{object.sha1}}</a></td>
@@ -9,4 +17,15 @@
 <th>ref</th><td><a  data-ref-href="object">{{object.ref}}</a></td>
 </tr>
 </table>
+
+    </div>
+    <div class="tab-pane" id="plain">
+
+<pre>{{object.content}}</pre>
+
+    </div>
+  </div>
+</div>
+
+
 </article>

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

@@ -49,9 +49,9 @@ module GitObjectBrowser
 
       def to_hash
         return {
-          "type" => "directory",
-          "path" => @path,
-          "entries" => @entries
+          :type    => "directory",
+          :path    => @path,
+          :entries => @entries
         }
       end
 

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

@@ -47,13 +47,13 @@ module GitObjectBrowser
 
       def to_hash
         return {
-          'type' => @type,
-          'sha1' => @sha1,
-          'size' => @size,
-          'entries' => @entries,
-          'content' => @content,
-          'properties' => @properties,
-          'message' => @message,
+          :type       => @type,
+          :sha1       => @sha1,
+          :size       => @size,
+          :entries    => @entries,
+          :content    => @content,
+          :properties => @properties,
+          :message    => @message
         }
       end
 
@@ -65,6 +65,7 @@ module GitObjectBrowser
       private
 
       def parse_tree_entries
+        @content = ''
         entries = []
         loop do
           entry = {}
@@ -72,6 +73,7 @@ module GitObjectBrowser
           break if entry[:mode].empty?
           entry[:filename] = find_char "\0"
           entry[:sha1]     = hex(20)
+          @content += "#{entry[:mode]} #{entry[:filename]}\\0\\#{entry[:sha1]}\n"
           entries << entry
         end
         return entries
@@ -86,23 +88,23 @@ module GitObjectBrowser
           line = lines.shift
           break if line.empty?
           prop = {}
-          (prop['key'], prop['value']) = line.split(/ /, 2)
-          if prop['value'] =~ /\A([0-9a-f]{2})([0-9a-f]{38})\z/
-            prop['type'] = 'sha1'
-            prop['path'] = "objects/#{ $1 }/#{ $2 }"
-          elsif %w{author committer tagger}.include?(prop['key']) &&
+          (prop[:key], prop[:value]) = line.split(/ /, 2)
+          if prop[:value] =~ /\A([0-9a-f]{2})([0-9a-f]{38})\z/
+            prop[:type] = 'sha1'
+            prop[:path] = "objects/#{ $1 }/#{ $2 }"
+          elsif %w{author committer tagger}.include?(prop[:key]) &&
               # couldn't find the spec...
-              prop['value'].to_s =~ /\A(.*) <(.*)> (\d+)(?: ((?:(?:\+|-)(?:\d{4}|\d{2}:\d{2}))|Z))?\z/
-            prop['type']  = 'user'
-            prop['name']  = $1.force_encoding("UTF-8")
-            prop['name']  = '(not UTF-8)' unless prop['name'].valid_encoding?
-            prop['email'] = $2.force_encoding("UTF-8")
-            prop['email'] = '(not UTF-8)' unless prop['email'].valid_encoding?
-            prop['unixtime'] = $3
-            prop['timezone'] = $4
-            prop['date'] = epoch($3.to_i, $4).iso8601
+              prop[:value].to_s =~ /\A(.*) <(.*)> (\d+)(?: ((?:(?:\+|-)(?:\d{4}|\d{2}:\d{2}))|Z))?\z/
+            prop[:type]  = 'user'
+            prop[:name]  = $1.force_encoding("UTF-8")
+            prop[:name]  = '(not UTF-8)' unless prop[:name].valid_encoding?
+            prop[:email] = $2.force_encoding("UTF-8")
+            prop[:email] = '(not UTF-8)' unless prop[:email].valid_encoding?
+            prop[:unixtime] = $3
+            prop[:timezone] = $4
+            prop[:date] = epoch($3.to_i, $4).iso8601
           else
-            prop['type'] = 'text'
+            prop[:type] = 'text'
           end
           properties << prop
         end

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

@@ -60,11 +60,11 @@ module GitObjectBrowser
         end
 
         return {
-          "version"      => @version,
-          "entry_count"  => @entry_count,
-          "entries"      => entries,
-          "extensions"   => extensions,
-          "sha1"         => @sha1,
+          :version       => @version,
+          :entry_count   => @entry_count,
+          :entries       => entries,
+          :extensions    => extensions,
+          :sha1          => @sha1,
         }
       end
 

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

@@ -66,27 +66,27 @@ module GitObjectBrowser
 
       def to_hash
         return {
-          "ctime" => @ctime,
-          "cnano" => @cnano,
-          "mtime" => @mtime,
-          "mnano" => @mnano,
-          "dev"   => @dev,
-          "ino"   => @ino,
-          "object_type"       => @object_type,
-          "unix_permission"   => @unix_permission,
+          :ctime  => @ctime,
+          :cnano  => @cnano,
+          :mtime  => @mtime,
+          :mnano  => @mnano,
+          :dev    => @dev,
+          :ino    => @ino,
+          :object_type        => @object_type,
+          :unix_permission    => @unix_permission,
 
-          "uid"   => @uid,
-          "gid"   => @gid,
-          "size"  => @size,
-          "sha1"  => @sha1,
-          "path"  => @path,
+          :uid    => @uid,
+          :gid    => @gid,
+          :size   => @size,
+          :sha1   => @sha1,
+          :path   => @path,
 
-          "assume_valid_flag" => @assume_valid_flag,
-          "extended_flag"     => @extended_flag,
-          "stage"             => @stage,
-          "skip_worktree"     => @skip_worktree,
-          "intent_to_add"     => @intent_to_add,
-          "name_length"       => @name_length,
+          :assume_valid_flag  => @assume_valid_flag,
+          :extended_flag      => @extended_flag,
+          :stage              => @stage,
+          :skip_worktree      => @skip_worktree,
+          :intent_to_add      => @intent_to_add,
+          :name_length        => @name_length,
         }
       end
 

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

@@ -21,8 +21,8 @@ module GitObjectBrowser
 
       def to_hash
         return {
-          "signature" => @signature,
-          "total_length" => @total_length,
+          :signature     => @signature,
+          :total_length  => @total_length,
         }
       end
 

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

@@ -18,19 +18,19 @@ module GitObjectBrowser
         length = 0
         while (length < @total_length)
           entry = {}
-          entry['path_component'] = find_char "\0"
-          entry['entry_count']    = find_char " "
-          entry['subtree_count']  = find_char "\n"
+          entry[:path_component] = find_char "\0"
+          entry[:entry_count]    = find_char " "
+          entry[:subtree_count]  = find_char "\n"
 
-          length += entry['path_component'].bytesize + 1
-          length += entry['entry_count'].bytesize + 1
-          length += entry['subtree_count'].bytesize + 1
+          length += entry[:path_component].bytesize + 1
+          length += entry[:entry_count].bytesize + 1
+          length += entry[:subtree_count].bytesize + 1
 
-          entry['entry_count']    = entry['entry_count'].to_i
-          entry['subtree_count']  = entry['subtree_count'].to_i
+          entry[:entry_count]    = entry[:entry_count].to_i
+          entry[:subtree_count]  = entry[:subtree_count].to_i
 
-          if 0 <= entry['entry_count']
-            entry['sha1'] = hex(20)
+          if 0 <= entry[:entry_count]
+            entry[:sha1] = hex(20)
             length += 20
           end
           @entries << entry
@@ -41,9 +41,9 @@ module GitObjectBrowser
 
       def to_hash
         return {
-          "signature" => @signature,
-          "total_length" => @total_length,
-          "entries" => @entries
+          :signature     => @signature,
+          :total_length  => @total_length,
+          :entries       => @entries
         }
       end
 

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

@@ -121,10 +121,10 @@ module GitObjectBrowser
 
       def to_hash
         return {
-          :fanout => @fanout,
-          :entries => @entries,
+          :fanout        => @fanout,
+          :entries       => @entries,
           :packfile_sha1 => @packfile_sha1,
-          :index_sha1 => @index_sha1,
+          :index_sha1    => @index_sha1,
         }
       end
 

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

@@ -5,6 +5,8 @@ module GitObjectBrowser
 
     class PackedRefs
       def initialize(input)
+        @content = input.read(nil)
+        input.seek(0)
         @entries = []
         while (line = input.gets) do
           next if line =~ /\A\s*#/
@@ -25,7 +27,8 @@ module GitObjectBrowser
 
       def to_hash
         return {
-          :entries => @entries
+          :entries => @entries,
+          :content => @content
         }
       end
 

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

@@ -17,7 +17,7 @@ module GitObjectBrowser
       end
 
       def to_hash
-        return { 'content' => @content }
+        return { :content => @content }
       end
     end
   end

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

@@ -5,19 +5,20 @@ module GitObjectBrowser
 
     class Ref
       def initialize(input)
-        line = input.gets.to_s
+        @content = input.read(nil)
 
-        if line =~ %r{\Aref:\s*(.+)}
+        if @content =~ %r{\Aref:\s*(.+)}
           @ref = $1
-        elsif line =~ %r{\A([0-9a-f]{40})}
+        elsif @content =~ %r{\A([0-9a-f]{40})}
           @sha1 = $1
         end
       end
 
       def to_hash
         return {
-          "ref"  => @ref,
-          "sha1" => @sha1
+          :ref     => @ref,
+          :sha1    => @sha1,
+          :content => @content
         }
       end
 

data/lib/git-object-browser/server/git_servlet.rb

@@ -65,11 +65,16 @@ module GitObjectBrowser
       def response_wrapped_object(response, type, obj)
         ok(response)
         hash = {}
-        hash["type"] = type
-        hash["object"] = obj.to_hash
-        hash["root"] = @target
-        hash["path"] = @relpath
-        hash["wroking_dir"] = File.basename(File.dirname(@target))
+        hash[:type] = type
+        hash[:object] = obj.to_hash
+        hash[:root] = @target
+        hash[:path] = @relpath
+        hash[:wroking_dir] = File.basename(File.dirname(@target))
+
+        if type == 'packed_object'
+          sha1 = hash[:object][:object][:sha1]
+          hash[:unpacked] = File.exist?(File.join(@target, 'objects', sha1[0..1], sha1[2..-1]).to_s)
+        end
 
         response.body = ::JSON.generate(hash)
       end

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

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

data/spec/fixtures/json/tree.json

@@ -14,7 +14,7 @@
       "sha1": "d234c5e057fe32c676ea67e8cb38f4625ddaeb54"
     }
   ],
-  "content": null,
+  "content": "100644 sample-a.txt\\0\\1d3dc60b5a117054e43741d51e599ff31bb15f9f\n100644 sample.txt\\0\\d234c5e057fe32c676ea67e8cb38f4625ddaeb54\n",
   "properties": null,
   "message": null
 }

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

@@ -11,30 +11,30 @@ module GitObjectBrowser::Models
 
     it 'should parse header' do
       index = subject.parse.to_hash
-      index['version'].should eq 2
-      index['entry_count'].should eq index['entries'].length
+      index[:version].should eq 2
+      index[:entry_count].should eq index[:entries].length
     end
 
     it 'should parse entries' do
       index = subject.parse.to_hash
-      entries = index['entries']
+      entries = index[:entries]
       entries.length.should eq 2
-      entries[0]['path'].should eq 'sample-a.txt'
-      entries[0]['sha1'].should eq '1d3dc60b5a117054e43741d51e599ff31bb15f9f'
-      entries[0]['object_type'].should eq '1000'
-      entries[0]['unix_permission'].should eq '644'
-      entries[0]['size'].should eq 9
+      entries[0][:path].should eq 'sample-a.txt'
+      entries[0][:sha1].should eq '1d3dc60b5a117054e43741d51e599ff31bb15f9f'
+      entries[0][:object_type].should eq '1000'
+      entries[0][:unix_permission].should eq '644'
+      entries[0][:size].should eq 9
 
-      entries[1]['path'].should eq 'sample.txt'
-      entries[1]['sha1'].should eq 'd234c5e057fe32c676ea67e8cb38f4625ddaeb54'
-      entries[1]['object_type'].should eq '1000'
-      entries[1]['unix_permission'].should eq '644'
-      entries[0]['size'].should eq 9
+      entries[1][:path].should eq 'sample.txt'
+      entries[1][:sha1].should eq 'd234c5e057fe32c676ea67e8cb38f4625ddaeb54'
+      entries[1][:object_type].should eq '1000'
+      entries[1][:unix_permission].should eq '644'
+      entries[0][:size].should eq 9
     end
 
     it 'should parse extensions (index_tree_extension_spec.rb tests the content)' do
       index = subject.parse.to_hash
-      extensions = index['extensions']
+      extensions = index[:extensions]
       extensions.length.should eq 1
     end
 

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

@@ -14,18 +14,18 @@ module GitObjectBrowser::Models
 
       it 'should parse extension signature and length' do
         data = subject.parse.to_hash
-        tree = data['extensions'][0]
-        tree['signature'].should eq 'TREE'
-        tree['total_length'].should eq 25
+        tree = data[:extensions][0]
+        tree[:signature].should eq 'TREE'
+        tree[:total_length].should eq 25
       end
 
       it 'should parse entries' do
-        entries = subject.parse.to_hash['extensions'][0]['entries']
+        entries = subject.parse.to_hash[:extensions][0][:entries]
         entries.length.should eq 1
         entry = entries.first
-        entry['sha1'].should eq 'c36491256978d26c08cd7aa97eee0f5631f96659'
-        entry['entry_count'].should eq 2
-        entry['subtree_count'].should eq 0
+        entry[:sha1].should eq 'c36491256978d26c08cd7aa97eee0f5631f96659'
+        entry[:entry_count].should eq 2
+        entry[:subtree_count].should eq 0
       end
     end
 
@@ -34,24 +34,24 @@ module GitObjectBrowser::Models
 
       it 'should parse extension signature and length' do
         data = subject.parse.to_hash
-        tree = data['extensions'][0]
-        tree['signature'].should eq 'TREE'
-        tree['total_length'].should eq 6
+        tree = data[:extensions][0]
+        tree[:signature].should eq 'TREE'
+        tree[:total_length].should eq 6
       end
 
       it 'should return -1 entry_count' do
-        entries = subject.parse.to_hash['extensions'][0]['entries']
+        entries = subject.parse.to_hash[:extensions][0][:entries]
         entries.length.should eq 1
         entry = entries.first
-        entry['entry_count'].should eq -1
-        entry['subtree_count'].should eq 0
-        entry['path_component'].should eq ''
-        entry['sha1'].should be_nil
+        entry[:entry_count].should eq -1
+        entry[:subtree_count].should eq 0
+        entry[:path_component].should eq ''
+        entry[:sha1].should be_nil
       end
 
       it 'return correct hash' do
         data = subject.parse.to_hash
-        data['sha1'].should eq 'ad7408a5d4e6050d3b95c21d260ae568b24e4d19'
+        data[:sha1].should eq 'ad7408a5d4e6050d3b95c21d260ae568b24e4d19'
       end
     end
   end

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

@@ -5,7 +5,7 @@ module GitObjectBrowser::Models
     it 'should read content' do
       input = File.open(File.join(FIXTURES_DIR, 'git/plain_file'))
       data = PlainFile.new(input).parse.to_hash
-      data.should eq({ 'content' => 'sample' })
+      data.should eq({ :content => 'sample' })
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-object-browser
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-02-10 00:00:00.000000000 Z
 dependencies: []
 description: Browse git raw objects.
 email:
@@ -182,6 +182,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -211213857821396965
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24