Handle case when filter query is whitespace

Fixes #35

Author: rgburke

cmd/grv/commit_filter.go

@@ -7,7 +7,7 @@ import (
 // CreateCommitFilter constructs a commit filter from the provided query
 func CreateCommitFilter(query string) (commitFilter *CommitFilter, errors []error) {
 	filter, errors := CreateFilter(query, &CommitFieldDescriptor{})
-	if len(errors) > 0 {
+	if len(errors) > 0 || filter == nil {
 		return
 	}
 

cmd/grv/commit_filter_test.go

@@ -208,3 +208,14 @@ func TestCommitFieldValuesAreExtracted(t *testing.T) {
 		}
 	}
 }
+
+func TestNilCommitFilterIsReturnedIfQueryDoesNotDefineFilter(t *testing.T) {
+	query := " \t\v\r\n"
+	commitFilter, errors := CreateCommitFilter(query)
+
+	if len(errors) > 0 {
+		t.Errorf("CreateCommitFilter failed with errors %v", errors)
+	} else if commitFilter != nil {
+		t.Errorf("Expected returned filter to be nil but found: %[1]v of type %[1]T", commitFilter)
+	}
+}

cmd/grv/commit_view.go

@@ -766,6 +766,9 @@ func addCommitFilter(commitView *CommitView, action Action) (err error) {
 	if len(errors) > 0 {
 		commitView.channels.ReportErrors(errors)
 		return
+	} else if commitFilter == nil {
+		log.Debugf("Query string does not define commit filter: \"%v\"", query)
+		return
 	}
 
 	if err = commitView.repoData.AddCommitFilter(commitView.activeRef, commitFilter); err != nil {

cmd/grv/filter_generator.go

@@ -23,11 +23,13 @@ type FieldDescriptor interface {
 func CreateFilter(query string, fieldDescriptor FieldDescriptor) (filter Filter, errors []error) {
 	queryParser := NewQueryParser(strings.NewReader(query))
 
-	expression, _, err := queryParser.Parse()
+	expression, eof, err := queryParser.Parse()
 	if err != nil {
 		log.Debugf("Errors encountered when parsing query")
 		errors = append(errors, err)
 		return
+	} else if eof {
+		return
 	}
 
 	log.Debugf("Received query: %v", expression)

cmd/grv/filter_generator_test.go

@@ -466,3 +466,14 @@ func TestFieldValuesAreRetrievedFromInput(t *testing.T) {
 		}
 	}
 }
+
+func TestNilFilterIsReturnedIfQueryDoesNotDefineFilter(t *testing.T) {
+	query := " "
+	filter, errors := CreateFilter(query, &TestRecordFieldDescriptor{})
+
+	if len(errors) > 0 {
+		t.Errorf("CreateFilter failed with errors %v", errors)
+	} else if filter != nil {
+		t.Errorf("Expected returned filter to be nil but found: %[1]v of type %[1]T", filter)
+	}
+}

cmd/grv/ref_filter.go

@@ -7,7 +7,7 @@ import (
 // CreateRefFilter creates a ref filter from the provided query
 func CreateRefFilter(query string) (refFilter *RefFilter, errors []error) {
 	filter, errors := CreateFilter(query, &refFieldDescriptor{})
-	if len(errors) > 0 {
+	if len(errors) > 0 || filter == nil {
 		return
 	}
 

cmd/grv/ref_filter_test.go

@@ -168,3 +168,14 @@ func TestCertainRenderedRefTypesAlwaysMatchFilter(t *testing.T) {
 		}
 	}
 }
+
+func TestNilRefFilterIsReturnedIfQueryDoesNotDefineFilter(t *testing.T) {
+	query := "         "
+	refFilter, errors := CreateRefFilter(query)
+
+	if len(errors) > 0 {
+		t.Errorf("CreateRefFilter failed with errors %v", errors)
+	} else if refFilter != nil {
+		t.Errorf("Expected returned filter to be nil but found: %[1]v of type %[1]T", refFilter)
+	}
+}

cmd/grv/ref_view.go

@@ -958,6 +958,9 @@ func addRefFilter(refView *RefView, action Action) (err error) {
 	if len(errors) > 0 {
 		refView.channels.ReportErrors(errors)
 		return
+	} else if refFilter == nil {
+		log.Debugf("Query string does not define ref filter: \"%v\"", query)
+		return
 	}
 
 	beforeRenderedRefNum := len(refView.renderedRefs.RenderedRefs())