libdolt 0.9.0 → 0.10.0

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    libdolt (0.8.0)
+    libdolt (0.9.0)
       em_pessimistic (~> 0.1)
       em_rugged (~> 0.3)
       eventmachine (~> 1.0)
       htmlentities (~> 4.3)
       json (~> 1.7)
-      makeup (~> 0)
+      makeup (~> 0.2)
       mime-types (~> 1.19)
       tzinfo (~> 0.3)
       when (~> 0)
@@ -26,7 +26,7 @@ GEM
     github-markup (0.7.4)
     htmlentities (4.3.1)
     json (1.7.5)
-    makeup (0.1.1)
+    makeup (0.2.0)
       github-markup (~> 0.7)
       htmlentities (~> 4.3)
       pygments.rb (~> 0.2)

data/lib/libdolt/repo_actions.rb

@@ -61,8 +61,8 @@ module Dolt
         names = refs.map(&:name)
         block.call(nil, {
                      :repository_slug => repo,
-                     :tags => stripped_ref_names(names, :tags),
-                     :heads => stripped_ref_names(names, :heads)
+                     :tags => expand_refs(repository, names, :tags),
+                     :heads => expand_refs(repository, names, :heads)
                    })
       end
       d.errback { |err| block.call(err, nil) }
@@ -96,9 +96,9 @@ module Dolt
       }.merge(locals)
     end
 
-    def stripped_ref_names(names, type)
+    def expand_refs(repository, names, type)
       names.select { |n| n =~ /#{type}/ }.map do |n|
-        n.sub(/^refs\/#{type}\//, "")
+        [n.sub(/^refs\/#{type}\//, ""), repository.rev_parse_oid_sync(n)]
       end
     end
   end

data/lib/libdolt/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Dolt
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

data/test/libdolt/repo_actions_test.rb

@@ -22,10 +22,15 @@ require "ostruct"
 
 class Repository
   attr_reader :name
-  def initialize(name); @name = name; end
+  def initialize(name)
+    @name = name
+    @refs = {}
+  end
+
   def tree(ref, path); stub; end
   def tree_entry(ref, path); stub; end
   def rev_parse(rev); stub; end
+  def rev_parse_oid_sync(ref); @refs[ref] || nil; end
   def blame(ref, path); stub; end
   def log(ref, path, limit); stub; end
   def refs; stub; end
@@ -35,6 +40,10 @@ class Repository
     @deferred.resolve(blob)
   end
 
+  def stub_ref(name, ref)
+    @refs[name] = ref
+  end
+
   private
   def stub
     @deferred = When.defer
@@ -213,12 +222,16 @@ describe Dolt::RepoActions do
       @actions.refs("gitorious") { |err, d| data = d }
 
       repo = @resolver.resolved.last
+      repo.stub_ref("refs/tags/v0.2.0", "a" * 40)
+      repo.stub_ref("refs/tags/v0.2.1", "b" * 40)
+      repo.stub_ref("refs/heads/libgit2", "c" * 40)
+      repo.stub_ref("refs/heads/master", "d" * 40)
       repo.resolve_promise(@refs)
 
       expected = {
         :repository_slug => "gitorious",
-        :heads => ["libgit2", "master"],
-        :tags => ["v0.2.1", "v0.2.0"]
+        :heads => [["libgit2", "c" * 40], ["master", "d" * 40]],
+        :tags => [["v0.2.1", "b" * 40], ["v0.2.0", "a" * 40]]
       }
       assert_equal expected, data
     end

data/test/libdolt/templates/refs_test.rb

@@ -28,7 +28,10 @@ describe "refs template" do
   end
 
   it "renders JSON" do
-    data = { "heads" => ["libgit2", "master"], "tags" => ["v2.1.0"] }
+    data = {
+      "heads" => [["libgit2", "0123456"], ["master", "1234567"]],
+      "tags" => [["v2.1.0", "2345678"]]
+    }
     html = @renderer.render(:refs, data)
 
     assert_equal data, JSON.parse(html)

data/views/refs.erb

@@ -17,6 +17,6 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
 %>{
-    "heads": [<%= heads.map { |n| "\"#{n}\"" }.join(",") %>],
-    "tags": [<%= tags.map { |n| "\"#{n}\"" }.join(",") %>]
+    "heads": [<%= heads.map { |head| "[\"#{head.first}\", \"#{head.last}\"]" }.join(",") %>],
+    "tags": [<%= tags.map { |tag| "[\"#{tag.first}\", \"#{tag.last}\"]" }.join(",") %>]
 }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libdolt
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 55
   prerelease: 
   segments: 
   - 0
-  - 9
+  - 10
   - 0
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Christian Johansen