2 files changed, 39 insertions, 14 deletions
diff --git a/modules/ratelimit/ratelimit.go b/modules/ratelimit/ratelimit.go
index be622f6..9588db3 100644
--- a/modules/ratelimit/ratelimit.go
+++ b/modules/ratelimit/ratelimit.go
@@ -11,7 +11,7 @@ import (
 )
 
 func init() {
-	flyscrape.RegisterModule(new(Module))
+	flyscrape.RegisterModule(Module{})
 }
 
 type Module struct {
@@ -21,7 +21,18 @@ type Module struct {
 	semaphore chan struct{}
 }
 
-func (m *Module) OnLoad(v flyscrape.Visitor) {
+func (Module) ModuleInfo() flyscrape.ModuleInfo {
+	return flyscrape.ModuleInfo{
+		ID:  "ratelimit",
+		New: func() flyscrape.Module { return new(Module) },
+	}
+}
+
+func (m *Module) Provision(v flyscrape.Context) {
+	if m.disabled() {
+		return
+	}
+
 	rate := time.Duration(float64(time.Second) / m.Rate)
 
 	m.ticker = time.NewTicker(rate)
@@ -34,16 +45,26 @@ func (m *Module) OnLoad(v flyscrape.Visitor) {
 	}()
 }
 
-func (m *Module) OnRequest(_ *flyscrape.Request) {
+func (m *Module) BuildRequest(_ *flyscrape.Request) {
+	if m.disabled() {
+		return
+	}
 	<-m.semaphore
 }
 
-func (m *Module) OnComplete() {
+func (m *Module) Finalize() {
+	if m.disabled() {
+		return
+	}
 	m.ticker.Stop()
 }
 
+func (m *Module) disabled() bool {
+	return m.Rate == 0
+}
+
 var (
-	_ flyscrape.OnRequest  = (*Module)(nil)
-	_ flyscrape.OnLoad     = (*Module)(nil)
-	_ flyscrape.OnComplete = (*Module)(nil)
+	_ flyscrape.RequestBuilder = (*Module)(nil)
+	_ flyscrape.Provisioner    = (*Module)(nil)
+	_ flyscrape.Finalizer      = (*Module)(nil)
 )
diff --git a/modules/ratelimit/ratelimit_test.go b/modules/ratelimit/ratelimit_test.go
index 5e91f8f..ffd061c 100644
--- a/modules/ratelimit/ratelimit_test.go
+++ b/modules/ratelimit/ratelimit_test.go
@@ -5,33 +5,37 @@
 package ratelimit_test
 
 import (
+	"net/http"
 	"testing"
 	"time"
 
 	"github.com/philippta/flyscrape"
 	"github.com/philippta/flyscrape/modules/followlinks"
+	"github.com/philippta/flyscrape/modules/hook"
 	"github.com/philippta/flyscrape/modules/ratelimit"
 	"github.com/philippta/flyscrape/modules/starturl"
 	"github.com/stretchr/testify/require"
 )
 
 func TestRatelimit(t *testing.T) {
+	var times []time.Time
+
 	scraper := flyscrape.NewScraper()
 	scraper.LoadModule(&starturl.Module{URL: "http://www.example.com"})
 	scraper.LoadModule(&followlinks.Module{})
 	scraper.LoadModule(&ratelimit.Module{
 		Rate: 100,
 	})
-
-	scraper.SetTransport(flyscrape.MockTransport(200, `<a href="foo">foo</a>`))
-
-	var times []time.Time
-	scraper.OnRequest(func(req *flyscrape.Request) {
-		times = append(times, time.Now())
+	scraper.LoadModule(hook.Module{
+		AdaptTransportFn: func(rt http.RoundTripper) http.RoundTripper {
+			return flyscrape.MockTransport(200, `<a href="foo">foo</a>`)
+		},
+		BuildRequestFn: func(r *flyscrape.Request) {
+			times = append(times, time.Now())
+		},
 	})
 
 	start := time.Now()
-
 	scraper.Run()
 
 	first := times[0].Add(-10 * time.Millisecond)