libdolt 0.30.0 → 0.31.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    libdolt (0.30.0)
+    libdolt (0.31.0)
       htmlentities (~> 4.3)
       json (~> 1.7)
       makeup (~> 0.4)
@@ -17,7 +17,7 @@ GEM
     ci_reporter (1.9.0)
       builder (>= 2.1.2)
     escape_utils (0.3.2)
-    github-linguist (2.8.8)
+    github-linguist (2.9.4)
       charlock_holmes (~> 0.6.6)
       escape_utils (~> 0.3.1)
       mime-types (~> 1.19)
@@ -31,7 +31,7 @@ GEM
       htmlentities (~> 4.3)
       pygments.rb (~> 0.4)
     metaclass (0.0.1)
-    mime-types (1.23)
+    mime-types (1.24)
     minitest (2.12.1)
     mocha (0.14.0)
       metaclass (~> 0.0.1)

data/lib/libdolt/git/repository.rb

@@ -15,6 +15,7 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
+require "pathname"
 require "rugged"
 require "libdolt/git"
 require "libdolt/git/blame"
@@ -86,6 +87,29 @@ module Dolt
         []
       end
 
+      # Returns the blob, or if the blob is a symlink, returns the
+      # blob it's pointing to. If the link is defunct, returns nil.
+      def actual_blob(ref, path)
+        path = Pathname.new(path)
+        tree_path = path.dirname.sub(/^\.$/, "")
+        blob_path = path.basename
+        blob_entry = rev_parse("#{ref}:#{tree_path}").entries.find do |e|
+          e[:name] == blob_path.to_s
+        end
+
+        return if blob_entry.nil?
+        blob = blob(ref, path.to_s)
+
+        # Filemode 120000 is a symlink
+        if blob_entry[:filemode] == "120000".to_i(8)
+          return actual_blob(ref, tree_path + blob.content)
+        end
+
+        blob
+      rescue Rugged::TreeError => err
+        nil
+      end
+
       private
       def entry_history(ref, entry, limit)
         process = Dolt::Git.git(path, "log -n #{limit} #{ref} -- #{entry}")

data/lib/libdolt/repository_lookup.rb

@@ -117,11 +117,12 @@ module Dolt
     def readme(repo_name, ref, path)
       repository = resolve_repository(repo_name)
       readmes = repository.readmes(ref, path)
-      readme = readmes.detect {|blob| Makeup::Markup.can_render?(blob[:name])}
+      readme = readmes.detect { |blob| Makeup::Markup.can_render?(blob[:name]) }
       return unless readme
       blob_path = File.join(*[path, readme[:name]].reject { |p| p == "" })
-      blob = repository.blob(ref, blob_path)
-      {:blob => blob, :path => blob_path}
+      blob = repository.actual_blob(ref, blob_path)
+      return nil if blob.nil?
+      { :blob => blob, :path => blob_path }
     end
 
     def filemode(repo, ref, path)

data/lib/libdolt/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Dolt
-  VERSION = "0.30.0"
+  VERSION = "0.31.0"
 end

data/test/fixtures/dolt-test-repo.git/objects/19/a9bccbaadfa2e25f74584c3f13caebd600d23f

@@ -0,0 +1,2 @@
+x
��Aj1@Ѯ}
+�A��؅P��-dY�L��ˌ����=A�o����u�^�f�5� FH,C�X��{��"Fєܷl����G/^S�:ES�**��)�I����7���e�4��Y�n

data/test/fixtures/dolt-test-repo.git/objects/38/3216e07edec271936c7fd87b69c346511aedb2

@@ -0,0 +1,2 @@
+x
��Aj�0@Ѯu��ʌlK���]n1���X.���Bz�l���e�����G[U�:L)�$%�c�\HH�SP��f&�C$�˫�������g\���j��,V9ct",��ڴ�p�ֲ��N��u�
+;����_�U��Nj���>�"y�6}3c)A�W���m���c���S�

data/test/fixtures/dolt-test-repo.git/objects/64/bb41b95d4f696fc9e22ef9718fc2eaf0b6ccac

@@ -0,0 +1,2 @@
+x
��A
+�0@Q�9��I�I&
ŝ�H&SZ���q����}���y��i�H�I�w���L��ِ��Gd��H����I|́���w�T��->�ѹ#0��lü�yXƵ���eR]�žv��wu>@g������h��3��ό:��k�����7��P

data/test/fixtures/dolt-test-repo.git/refs/heads/master

@@ -1 +1 @@
-e8d33ae69b8c4d3df1e8fad4733d69720b176849
+383216e07edec271936c7fd87b69c346511aedb2

data/test/libdolt/git/repository_test.rb

@@ -228,7 +228,34 @@ describe Dolt::Git::Repository do
       end
 
       assert_equal 0, @repository.readmes("master").length
-      assert_equal 1, @repository.readmes("master","lib").length
+      assert_equal 1, @repository.readmes("master", "lib").length
+    end
+  end
+
+  describe "actual_blob" do
+    it "returns regular blob" do
+      blob = @repository.actual_blob("master", "lib/foo.rb").content
+      assert_equal "module Foo\nend\n", blob
+    end
+
+    it "resolves symlink" do
+      blob = @repository.actual_blob("master", "lib/symlink.rb").content
+      assert_equal "module Foo\nend\n", blob
+    end
+
+    it "resolves double symlink" do
+      blob = @repository.actual_blob("master", "lib/double-symlink.rb").content
+      assert_equal "module Foo\nend\n", blob
+    end
+
+    it "returns nil for out of bounds symlink" do
+      blob = @repository.actual_blob("master", "lib/oob-symlink.rb")
+      assert_equal nil, blob
+    end
+
+    it "returns nil for invalid symlink" do
+      blob = @repository.actual_blob("master", "lib/invalid-symlink.rb")
+      assert_equal nil, blob
     end
   end
 end

metadata

@@ -1,201 +1,199 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: libdolt
-version: !ruby/object:Gem::Version 
-  hash: 103
+version: !ruby/object:Gem::Version
+  version: 0.31.0
   prerelease: 
-  segments: 
-  - 0
-  - 30
-  - 0
-  version: 0.30.0
 platform: ruby
-authors: 
+authors:
 - Christian Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-08-19 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rugged
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7687057653
-        segments: 
-        - 0
-        - 18
-        - 0
-        - gh
-        - de
-        - 28323
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.18.0.gh.de28323
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: tzinfo
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.18.0.gh.de28323
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
-        version: "0.3"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: makeup
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
-        version: "0.4"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: makeup
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: htmlentities
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 4
-        - 3
-        version: "4.3"
+      - !ruby/object:Gem::Version
+        version: '4.3'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.3'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 7
-        version: "1.7"
+      - !ruby/object:Gem::Version
+        version: '1.7'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: mime-types
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 1
-        - 19
-        version: "1.19"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.19'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '1.19'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: redcarpet
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        version: "2.2"
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: tiltout
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: tiltout
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Dolt API for serving git trees and syntax highlighted blobs
-email: 
+email:
 - christian@gitorious.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -237,15 +235,40 @@ files:
 - test/fixtures/dolt-test-repo.git/config
 - test/fixtures/dolt-test-repo.git/description
 - test/fixtures/dolt-test-repo.git/info/exclude
+- test/fixtures/dolt-test-repo.git/objects/04/76d88d4c60823927c52f872ff09e7f84fb3549
+- test/fixtures/dolt-test-repo.git/objects/07/4e4c198421bfc8a1bf9a9c0fc117c4569ba0bd
 - test/fixtures/dolt-test-repo.git/objects/12/67a0fbd3ec606c20f3f1dca1f53bb9505ba9b5
+- test/fixtures/dolt-test-repo.git/objects/13/0ddb17c01e1c283669d012ad9e7e92fa1af5b1
+- test/fixtures/dolt-test-repo.git/objects/19/344f9121eb8871e814efd9534de9a0891631da
+- test/fixtures/dolt-test-repo.git/objects/19/a9bccbaadfa2e25f74584c3f13caebd600d23f
+- test/fixtures/dolt-test-repo.git/objects/1a/f9b62325e53f0e9aff8ed80d919b73a6fd18e2
+- test/fixtures/dolt-test-repo.git/objects/1e/cafd67fb977dee90345f0503b0ecc2e62e01d1
+- test/fixtures/dolt-test-repo.git/objects/1f/5508d7182176fa7584096d24d3b5f288a101ab
 - test/fixtures/dolt-test-repo.git/objects/26/4c348a80906538018616fa16fc35d04bdf38b0
+- test/fixtures/dolt-test-repo.git/objects/28/5f85e1dae8796d8780106b3986ba47cf989bca
+- test/fixtures/dolt-test-repo.git/objects/2b/f4bb63d412e8f5730c0fe6da5c6e5e913f26fa
+- test/fixtures/dolt-test-repo.git/objects/36/855d2d2899aa1044c4ea8eba229d7460cc083a
+- test/fixtures/dolt-test-repo.git/objects/38/3216e07edec271936c7fd87b69c346511aedb2
+- test/fixtures/dolt-test-repo.git/objects/3d/2cf127812ba38c74a69ea9f691768d68769df4
+- test/fixtures/dolt-test-repo.git/objects/4f/3b300a2d261163a8b0753aacdd378e3b73b917
+- test/fixtures/dolt-test-repo.git/objects/55/b0879bb70392b5754af3fe2b9ca2b98d22f3fb
 - test/fixtures/dolt-test-repo.git/objects/60/eebb9021a6ce7d582c2f2d4aa5bfb3672150ae
+- test/fixtures/dolt-test-repo.git/objects/64/bb41b95d4f696fc9e22ef9718fc2eaf0b6ccac
+- test/fixtures/dolt-test-repo.git/objects/75/937fa642851b518ccab55f7880d02e854e67f7
 - test/fixtures/dolt-test-repo.git/objects/85/026eda8302b98fa54cc24445a118028865a2e2
 - test/fixtures/dolt-test-repo.git/objects/89/cd7e9d4564928de6b803b36c6e3d081c8d9ca1
+- test/fixtures/dolt-test-repo.git/objects/96/68141a1c781cf4ec352cca52d0cebf8a04fc50
+- test/fixtures/dolt-test-repo.git/objects/a1/2abf5b47584c947cc7f09b27e5895644c5524d
 - test/fixtures/dolt-test-repo.git/objects/b4/0c249db94476cac7fa91a9d6491c0faf21ec21
 - test/fixtures/dolt-test-repo.git/objects/c0/35ba24bb3bed31589bc6736ca9b116175eb723
 - test/fixtures/dolt-test-repo.git/objects/c8/cc83f1a1fc3640fce14ab73d4fa4b22b6211d8
+- test/fixtures/dolt-test-repo.git/objects/ca/d2309100006f94967cdafe678356b96bb098a5
+- test/fixtures/dolt-test-repo.git/objects/cd/888aef50e3742885630ea4aa8c05f12b5518f4
+- test/fixtures/dolt-test-repo.git/objects/da/dd1e7ec0c822ba96fcee5d064bea66a7be3d5a
 - test/fixtures/dolt-test-repo.git/objects/de/dbf2faa4f522716ab727e4325a3d75772e137b
+- test/fixtures/dolt-test-repo.git/objects/df/d46204a2c44405a2591c2dbc7e73d1a81b5334
+- test/fixtures/dolt-test-repo.git/objects/e5/d842ae3035a402d34b531ae5117bc03b50ac77
+- test/fixtures/dolt-test-repo.git/objects/e7/271e0e558b55397698b8c73acf13bd7429ebb3
 - test/fixtures/dolt-test-repo.git/objects/e8/d33ae69b8c4d3df1e8fad4733d69720b176849
 - test/fixtures/dolt-test-repo.git/objects/e9/0021f89616ddf86855d05337c188408d3b417e
 - test/fixtures/dolt-test-repo.git/objects/fc/5f5fb50b435e183925b341909610aace90a413
@@ -294,39 +317,29 @@ files:
 - views/refs.erb
 - views/tree.erb
 - views/tree_history.erb
-has_rdoc: true
 homepage: http://gitorious.org/gitorious/libdolt
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: libdolt
-rubygems_version: 1.4.2
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Dolt API for serving git trees and syntax highlighted blobs
 test_files: []
-
+has_rdoc: