Merge pull request #37 from skv-headless/submodule-method

submodules in diff

Author: dzaporozhets

lib/gitlab_git/blob.rb

@@ -15,18 +15,22 @@ def find(repository, sha, path)
 
           return nil unless blob_entry
 
-          blob = repository.lookup(blob_entry[:oid])
-
-          if blob
-            Blob.new(
-              id: blob.oid,
-              name: blob_entry[:name],
-              size: blob.size,
-              data: blob.content,
-              mode: blob_entry[:mode],
-              path: path,
-              commit_id: sha,
-            )
+          if blob_entry[:type] == :commit
+            submodule_blob(blob_entry, path, sha)
+          else
+            blob = repository.lookup(blob_entry[:oid])
+
+            if blob
+              Blob.new(
+                id: blob.oid,
+                name: blob_entry[:name],
+                size: blob.size,
+                data: blob.content,
+                mode: blob_entry[:mode],
+                path: path,
+                commit_id: sha,
+              )
+            end
           end
         end
 
@@ -63,17 +67,22 @@ def find_entry_by_path(repository, root_id, path)
 
           if path_arr.size > 1
             return nil unless entry[:type] == :tree
-          else
-            return nil unless entry[:type] == :blob
-          end
-
-          if path_arr.size > 1
             path_arr.shift
             find_entry_by_path(repository, entry[:oid], path_arr.join('/'))
           else
-            entry
+            [:blob, :commit].include?(entry[:type]) ? entry : nil
           end
         end
+
+        def submodule_blob(blob_entry, path, sha)
+          Blob.new(
+            id: blob_entry[:oid],
+            name: blob_entry[:name],
+            data: '',
+            path: path,
+            commit_id: sha,
+          )
+        end
       end
 
       def initialize(options)

lib/gitlab_git/diff.rb

@@ -52,6 +52,10 @@ def to_hash
         hash
       end
 
+      def submodule?
+        a_mode == '160000' || b_mode == '160000'
+      end
+
       private
 
       def init_from_rugged(rugged)

spec/blob_spec.rb

@@ -33,6 +33,13 @@
 
       it { blob.should be_nil }
     end
+
+    context 'six submodule' do
+      let(:blob) { Gitlab::Git::Blob.find(repository, SeedRepo::Commit::ID, 'six') }
+
+      it { blob.id.should == '409f37c4f05865e4fb208c771485f211a22c4c2d' }
+      it { blob.data.should == '' }
+    end
   end
 
   describe :raw do

spec/diff_spec.rb

@@ -62,4 +62,14 @@
       its(:diff) { should include '+class Feature' }
     end
   end
+
+  describe :submodule? do
+    before do
+      commit = repository.lookup('5937ac0a7beb003549fc5fd26fc247adbce4a52e')
+      @diffs = commit.parents[0].diff(commit).patches
+    end
+
+    it { Gitlab::Git::Diff.new(@diffs[0]).submodule?.should == false }
+    it { Gitlab::Git::Diff.new(@diffs[1]).submodule?.should == true }
+  end
 end