rename Parser methods

Author: buglloc

pkg/handlers/loop/handler.go

@@ -34,12 +34,12 @@ func (h *Handler) Name() string {
 
 func (h *Handler) Init(p handlers.Parser) error {
 	var err error
-	h.Nested[0], err = p.Next()
+	h.Nested[0], err = p.NextHandler()
 	if err != nil {
 		return err
 	}
 
-	h.Nested[1], err = p.Next()
+	h.Nested[1], err = p.NextHandler()
 	if err != nil {
 		return err
 	}

pkg/handlers/notify/handler.go

@@ -39,7 +39,7 @@ func (h *Handler) Init(p handlers.Parser) error {
 			return err
 		}
 
-		h.Nested, err = p.Next()
+		h.Nested, err = p.NextHandler()
 		if err != nil {
 			return err
 		}

pkg/handlers/parser.go

@@ -1,8 +1,9 @@
 package handlers
 
 type Parser interface {
-	All() ([]Handler, error)
-	Next() (Handler, error)
+	RestHandlers() ([]Handler, error)
+	NextHandler() (Handler, error)
+	NextValue() (string, error)
 	RestValues() ([]string, error)
 	NextRaw() (string, error)
 	FQDN() string

pkg/handlers/parser/parser.go

@@ -51,7 +51,7 @@ func (p *Parser) FQDN() string {
 	return p.fqdn
 }
 
-func (p *Parser) Next() (handlers.Handler, error) {
+func (p *Parser) NextHandler() (handlers.Handler, error) {
 	if p.cur >= p.maxLabel {
 		return nil, handlers.ErrEOF
 	}
@@ -103,10 +103,10 @@ func (p *Parser) RestValues() ([]string, error) {
 	}
 }
 
-func (p *Parser) All() ([]handlers.Handler, error) {
+func (p *Parser) RestHandlers() ([]handlers.Handler, error) {
 	var out []handlers.Handler
 	for {
-		h, err := p.Next()
+		h, err := p.NextHandler()
 		if h == nil {
 			return out, nil
 		}

pkg/handlers/parser/parser_test.go

@@ -223,7 +223,7 @@ func TestParser(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.in, func(t *testing.T) {
-			hndlrs, err := parser.NewParser(tc.in, "").All()
+			hndlrs, err := parser.NewParser(tc.in, "").RestHandlers()
 			require.NoError(t, err)
 			require.EqualValues(t, tc.handlers, hndlrs)
 		})

pkg/handlers/random/handler.go

@@ -35,12 +35,12 @@ func (h *Handler) Name() string {
 
 func (h *Handler) Init(p handlers.Parser) error {
 	var err error
-	h.Nested[0], err = p.Next()
+	h.Nested[0], err = p.NextHandler()
 	if err != nil {
 		return err
 	}
 
-	h.Nested[1], err = p.Next()
+	h.Nested[1], err = p.NextHandler()
 	if err != nil {
 		return err
 	}

pkg/handlers/sticky/handler.go

@@ -34,12 +34,12 @@ func (h *Handler) Name() string {
 
 func (h *Handler) Init(p handlers.Parser) error {
 	var err error
-	h.Nested[0], err = p.Next()
+	h.Nested[0], err = p.NextHandler()
 	if err != nil {
 		return err
 	}
 
-	h.Nested[1], err = p.Next()
+	h.Nested[1], err = p.NextHandler()
 	if err != nil {
 		return err
 	}

pkg/nssrv/handler.go

@@ -48,7 +48,7 @@ func (s *NSSrv) handleRequest(zone string, req *dns.Msg, logger *log.Logger) *dn
 			return item.Value().(*cachedHandler), nil
 		}
 
-		h, err := parser.NewParser(question.Name, zone).Next()
+		h, err := parser.NewParser(question.Name, zone).NextHandler()
 		if err != nil {
 			if err != handlers.ErrEOF {
 				return nil, err