Refactor codebase into modules

1 files changed, 35 insertions, 20 deletions

diff --git a/modules/urlfilter/urlfilter_test.go b/modules/urlfilter/urlfilter_test.go
index e383a32..9ebb8a5 100644
--- a/modules/urlfilter/urlfilter_test.go
+++ b/modules/urlfilter/urlfilter_test.go
@@ -5,16 +5,22 @@
 package urlfilter_test
 
 import (
+	"net/http"
+	"sync"
 	"testing"
 
 	"github.com/philippta/flyscrape"
 	"github.com/philippta/flyscrape/modules/followlinks"
+	"github.com/philippta/flyscrape/modules/hook"
 	"github.com/philippta/flyscrape/modules/starturl"
 	"github.com/philippta/flyscrape/modules/urlfilter"
 	"github.com/stretchr/testify/require"
 )
 
 func TestURLFilterAllowed(t *testing.T) {
+	var urls []string
+	var mu sync.Mutex
+
 	scraper := flyscrape.NewScraper()
 	scraper.LoadModule(&starturl.Module{URL: "http://www.example.com/"})
 	scraper.LoadModule(&followlinks.Module{})
@@ -22,16 +28,19 @@ func TestURLFilterAllowed(t *testing.T) {
 		URL:         "http://www.example.com/",
 		AllowedURLs: []string{`/foo\?id=\d+`, `/bar$`},
 	})
-
-	scraper.SetTransport(flyscrape.MockTransport(200, `
-        <a href="foo?id=123">123</a>
-        <a href="foo?id=ABC">ABC</a>
-        <a href="/bar">bar</a>
-        <a href="/barz">barz</a>`))
-
-	var urls []string
-	scraper.OnRequest(func(req *flyscrape.Request) {
-		urls = append(urls, req.URL)
+	scraper.LoadModule(hook.Module{
+		AdaptTransportFn: func(rt http.RoundTripper) http.RoundTripper {
+			return flyscrape.MockTransport(200, `
+				<a href="foo?id=123">123</a>
+				<a href="foo?id=ABC">ABC</a>
+				<a href="/bar">bar</a>
+				<a href="/barz">barz</a>`)
+		},
+		ReceiveResponseFn: func(r *flyscrape.Response) {
+			mu.Lock()
+			urls = append(urls, r.Request.URL)
+			mu.Unlock()
+		},
 	})
 
 	scraper.Run()
@@ -43,6 +52,9 @@ func TestURLFilterAllowed(t *testing.T) {
 }
 
 func TestURLFilterBlocked(t *testing.T) {
+	var urls []string
+	var mu sync.Mutex
+
 	scraper := flyscrape.NewScraper()
 	scraper.LoadModule(&starturl.Module{URL: "http://www.example.com/"})
 	scraper.LoadModule(&followlinks.Module{})
@@ -50,16 +62,19 @@ func TestURLFilterBlocked(t *testing.T) {
 		URL:         "http://www.example.com/",
 		BlockedURLs: []string{`/foo\?id=\d+`, `/bar$`},
 	})
-
-	scraper.SetTransport(flyscrape.MockTransport(200, `
-        <a href="foo?id=123">123</a>
-        <a href="foo?id=ABC">ABC</a>
-        <a href="/bar">bar</a>
-        <a href="/barz">barz</a>`))
-
-	var urls []string
-	scraper.OnRequest(func(req *flyscrape.Request) {
-		urls = append(urls, req.URL)
+	scraper.LoadModule(hook.Module{
+		AdaptTransportFn: func(rt http.RoundTripper) http.RoundTripper {
+			return flyscrape.MockTransport(200, `
+				<a href="foo?id=123">123</a>
+				<a href="foo?id=ABC">ABC</a>
+				<a href="/bar">bar</a>
+				<a href="/barz">barz</a>`)
+		},
+		ReceiveResponseFn: func(r *flyscrape.Response) {
+			mu.Lock()
+			urls = append(urls, r.Request.URL)
+			mu.Unlock()
+		},
 	})
 
 	scraper.Run()