libdolt 0.33.7 → 0.33.8

data/lib/libdolt/repository_lookup.rb

@@ -29,8 +29,14 @@ module Dolt
 
     def blob(repo, ref, path)
       repository = resolve_repository(repo)
+      blob = repository.rev_parse(ref)
+
+      if !blob.is_a?(Rugged::Blob)
+        blob = repository.rev_parse("#{ref}:#{path}")
+      end
+
       tpl_data(repository, ref, path, {
-          :blob => repository.rev_parse("#{ref}:#{path}"),
+          :blob => blob,
           :filemode => filemode(repository, ref, path)
         })
     end
@@ -131,6 +137,8 @@ module Dolt
       refspec = "#{ref}:#{File.dirname(path).sub(/^\.$/, '')}"
       entry = repo.rev_parse(refspec).find { |e| e[:name] == file }
       entry.nil? ? nil : entry[:filemode].to_s(8)
+    rescue Rugged::InvalidError
+      "100644" # Pretty much a guess :/
     end
   end
 

data/lib/libdolt/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Dolt
-  VERSION = "0.33.7"
+  VERSION = "0.33.8"
 end

data/test/libdolt/repository_lookup_test.rb

@@ -55,6 +55,14 @@ describe Dolt::RepositoryLookup do
       assert Rugged::Blob === data[:blob]
       assert_equal "100644", data[:filemode]
     end
+
+    it "looks up blob by sha1" do
+      data = @lookup.blob("gitorious", "c035ba24bb3bed31589bc6736ca9b116175eb723", "README.org")
+      assert_equal "gitorious", data[:repository_slug]
+      assert_equal "c035ba24bb3bed31589bc6736ca9b116175eb723", data[:ref]
+      assert Rugged::Blob === data[:blob]
+      assert_equal "100644", data[:filemode]
+    end
   end
 
   describe "#tree" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libdolt
 version: !ruby/object:Gem::Version
-  version: 0.33.7
+  version: 0.33.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -357,7 +357,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: libdolt
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Dolt API for serving git trees and syntax highlighted blobs