Move the extractors.LinkTransformer interface to the models package

Author: thewizardplusplus

extractors/default_extractor.go

@@ -7,27 +7,17 @@ import (
 	"net/http"
 
 	"github.com/pkg/errors"
+	"github.com/thewizardplusplus/go-crawler/models"
 	htmlselector "github.com/thewizardplusplus/go-html-selector"
 	"github.com/thewizardplusplus/go-html-selector/builders"
 	httputils "github.com/thewizardplusplus/go-http-utils"
 )
 
-//go:generate mockery --name=LinkTransformer --inpackage --case=underscore --testonly
-
-// LinkTransformer ...
-type LinkTransformer interface {
-	TransformLinks(
-		links []string,
-		response *http.Response,
-		responseContent []byte,
-	) ([]string, error)
-}
-
 // DefaultExtractor ...
 type DefaultExtractor struct {
 	HTTPClient      httputils.HTTPClient
 	Filters         htmlselector.OptimizedFilterGroup
-	LinkTransformer LinkTransformer
+	LinkTransformer models.LinkTransformer
 }
 
 // ExtractLinks ...

extractors/default_extractor_test.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
+	"github.com/thewizardplusplus/go-crawler/models"
 	htmlselector "github.com/thewizardplusplus/go-html-selector"
 	httputils "github.com/thewizardplusplus/go-http-utils"
 )
@@ -20,7 +21,7 @@ func TestDefaultExtractor_ExtractLinks(test *testing.T) {
 	type fields struct {
 		HTTPClient      httputils.HTTPClient
 		Filters         htmlselector.OptimizedFilterGroup
-		LinkTransformer LinkTransformer
+		LinkTransformer models.LinkTransformer
 	}
 	type args struct {
 		ctx      context.Context
@@ -95,7 +96,7 @@ func TestDefaultExtractor_ExtractLinks(test *testing.T) {
 				Filters: htmlselector.OptimizeFilters(htmlselector.FilterGroup{
 					"a": {"href"},
 				}),
-				LinkTransformer: func() LinkTransformer {
+				LinkTransformer: func() models.LinkTransformer {
 					links := []string{"http://example.com/1", "http://example.com/2"}
 					transformedLinks := []string{
 						"http://example.com/transformed/1",
@@ -175,7 +176,7 @@ func TestDefaultExtractor_ExtractLinks(test *testing.T) {
 				Filters: htmlselector.OptimizeFilters(htmlselector.FilterGroup{
 					"a": {"href"},
 				}),
-				LinkTransformer: func() LinkTransformer {
+				LinkTransformer: func() models.LinkTransformer {
 					links := []string{"http://example.com/1", "http://example.com/2"}
 
 					responseContent := `

extractors/mock_gen.go

@@ -28,6 +28,16 @@ type LinkExtractor interface {
 	models.LinkExtractor
 }
 
+//go:generate mockery --name=LinkTransformer --inpackage --case=underscore --testonly
+
+// LinkTransformer ...
+//
+// It's used only for mock generating.
+//
+type LinkTransformer interface {
+	models.LinkTransformer
+}
+
 //go:generate mockery --name=Logger --inpackage --case=underscore --testonly
 
 // Logger ...

extractors/transformers/mock_gen.go

@@ -1,7 +1,7 @@
 package transformers
 
 import (
-	"github.com/thewizardplusplus/go-crawler/extractors"
+	"github.com/thewizardplusplus/go-crawler/models"
 )
 
 //go:generate mockery --name=LinkTransformer --inpackage --case=underscore --testonly
@@ -11,5 +11,5 @@ import (
 // It's used only for mock generating.
 //
 type LinkTransformer interface {
-	extractors.LinkTransformer
+	models.LinkTransformer
 }

extractors/transformers/transformer_group.go

@@ -4,11 +4,11 @@ import (
 	"net/http"
 
 	"github.com/pkg/errors"
-	"github.com/thewizardplusplus/go-crawler/extractors"
+	"github.com/thewizardplusplus/go-crawler/models"
 )
 
 // TransformerGroup ...
-type TransformerGroup []extractors.LinkTransformer
+type TransformerGroup []models.LinkTransformer
 
 // TransformLinks ...
 func (transformers TransformerGroup) TransformLinks(

extractors/transformers/transformer_group_test.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
-	"github.com/thewizardplusplus/go-crawler/extractors"
+	"github.com/thewizardplusplus/go-crawler/models"
 )
 
 func TestTransformerGroup_TransformLinks(test *testing.T) {
@@ -54,7 +54,7 @@ func TestTransformerGroup_TransformLinks(test *testing.T) {
 		{
 			name: "success with transformers",
 			transformers: TransformerGroup{
-				func() extractors.LinkTransformer {
+				func() models.LinkTransformer {
 					links := []string{"http://example.com/1", "http://example.com/2"}
 					transformedLinks := []string{
 						"http://example.com/1/transformed/1",
@@ -79,7 +79,7 @@ func TestTransformerGroup_TransformLinks(test *testing.T) {
 
 					return transformer
 				}(),
-				func() extractors.LinkTransformer {
+				func() models.LinkTransformer {
 					links := []string{
 						"http://example.com/1/transformed/1",
 						"http://example.com/2/transformed/1",
@@ -137,7 +137,7 @@ func TestTransformerGroup_TransformLinks(test *testing.T) {
 		{
 			name: "error",
 			transformers: TransformerGroup{
-				func() extractors.LinkTransformer {
+				func() models.LinkTransformer {
 					links := []string{"http://example.com/1", "http://example.com/2"}
 
 					responseContent := `

models/interfaces.go

@@ -2,13 +2,23 @@ package models
 
 import (
 	"context"
+	"net/http"
 )
 
 // LinkExtractor ...
 type LinkExtractor interface {
 	ExtractLinks(ctx context.Context, threadID int, link string) ([]string, error)
 }
 
+// LinkTransformer ...
+type LinkTransformer interface {
+	TransformLinks(
+		links []string,
+		response *http.Response,
+		responseContent []byte,
+	) ([]string, error)
+}
+
 // LinkChecker ...
 type LinkChecker interface {
 	CheckLink(ctx context.Context, link SourcedLink) bool