Merge pull request #165 from nkovacs/vendored

Fix generator when kallax is vendored

Author: Miguel Molina

generator/processor.go

@@ -506,7 +506,12 @@ func removeGoPath(path string) string {
 	for _, p := range parseutil.DefaultGoPath {
 		p = toSlash(p + "/src/")
 		if strings.HasPrefix(path, p) {
-			return prefix + strings.Replace(path, p, "", -1)
+			// Directories named "vendor" are only vendor directories
+			// if they're under $GOPATH/src.
+			if idx := strings.LastIndex(path, "/vendor/"); idx >= len(p)-1 {
+				return prefix + path[idx+8:]
+			}
+			return prefix + path[len(p):]
 		}
 	}
 	return prefix + path

generator/processor_test.go

@@ -356,7 +356,7 @@ func (s *ProcessorSuite) TestIsModel() {
 		Ptr *Bar
 		NoPtr Bar
 		Struct Struct
-	}	
+	}
 	`
 	pkg := s.processFixture(src)
 	m := findModel(pkg, "Foo")
@@ -401,7 +401,7 @@ func (s *ProcessorSuite) TestIsEmbedded() {
 		C struct {
 			D int
 		}
-	}	
+	}
 	`
 	pkg := s.processFixture(src)
 	m := findModel(pkg, "Foo")
@@ -457,6 +457,41 @@ func TestRemoveGoPath(t *testing.T) {
 			},
 			'/',
 		},
+		{
+			"/go/src/foo/go/src/fixtures.AliasString",
+			"foo/go/src/fixtures.AliasString",
+			[]string{
+				"/go",
+			},
+			'/',
+		},
+		{
+			"/home/workspace/gopath/src/foo/bar/vendor/gopkg.in/src-d/go-kallax.v1/tests/fixtures.AliasString",
+			"gopkg.in/src-d/go-kallax.v1/tests/fixtures.AliasString",
+			[]string{
+				"/home/foo/go",
+				"/home/workspace/gopath",
+			},
+			'/',
+		},
+		{
+			"/home/vendor/workspace/gopath/src/gopkg.in/src-d/go-kallax.v1/tests/fixtures.AliasString",
+			"gopkg.in/src-d/go-kallax.v1/tests/fixtures.AliasString",
+			[]string{
+				"/home/foo/go",
+				"/home/vendor/workspace/gopath",
+			},
+			'/',
+		},
+		{
+			"/home/vendor/workspace/gopath/src/vendor/gopkg.in/src-d/go-kallax.v1/tests/fixtures.AliasString",
+			"gopkg.in/src-d/go-kallax.v1/tests/fixtures.AliasString",
+			[]string{
+				"/home/foo/go",
+				"/home/vendor/workspace/gopath",
+			},
+			'/',
+		},
 	}
 
 	for _, c := range cases {