Move to a filters directory

clipperhouse · Apr 8, 2020 · 701df22 · 701df22
1 parent c81c389
commit 701df22
Show file tree

Hide file tree

Showing 36 changed files with 28 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ import (
 	"strings"
 
 	"github.com/clipperhouse/jargon"
-	"github.com/clipperhouse/jargon/stackoverflow"
+	"github.com/clipperhouse/jargon/filters/stackoverflow"
 )
 
 text := `Let’s talk about Ruby on Rails and ASPNET MVC.`
@@ -72,17 +72,17 @@ if err := stream.Err(); err != nil {
 
 Canonical terms (lemmas) are looked up in token filters. Several are available:
 
-[Stack Overflow technology tags](https://pkg.go.dev/github.com/clipperhouse/jargon/stackoverflow)
+[Stack Overflow technology tags](https://pkg.go.dev/github.com/clipperhouse/jargon/filters/stackoverflow)
   - `Ruby on Rails → ruby-on-rails`
   - `ObjC → objective-c`
 
-[Contractions](https://pkg.go.dev/github.com/clipperhouse/jargon/contractions)
+[Contractions](https://pkg.go.dev/github.com/clipperhouse/jargon/filters/contractions)
   - `Couldn’t → Could not`
 
-[ASCII fold](https://pkg.go.dev/github.com/clipperhouse/jargon/ascii)
+[ASCII fold](https://pkg.go.dev/github.com/clipperhouse/jargon/filters/ascii)
   - `café → cafe`
 
-[Stem](https://pkg.go.dev/github.com/clipperhouse/jargon/stemmer)
+[Stem](https://pkg.go.dev/github.com/clipperhouse/jargon/filters/stemmer)
   - `Manager|management|manages → manag`
 
 To implement your own, see the [Filter type](https://godoc.org/github.com/clipperhouse/jargon/#Filter).

diff --git a/cmd/jargon/main.go b/cmd/jargon/main.go
@@ -9,10 +9,10 @@ import (
 	"strings"
 
 	"github.com/clipperhouse/jargon"
-	"github.com/clipperhouse/jargon/ascii"
-	"github.com/clipperhouse/jargon/contractions"
-	"github.com/clipperhouse/jargon/stackoverflow"
-	"github.com/clipperhouse/jargon/stemmer"
+	"github.com/clipperhouse/jargon/filters/ascii"
+	"github.com/clipperhouse/jargon/filters/contractions"
+	"github.com/clipperhouse/jargon/filters/stackoverflow"
+	"github.com/clipperhouse/jargon/filters/stemmer"
 	"github.com/spf13/afero"
 )
 
@@ -136,7 +136,7 @@ func setInput(c *config, mode os.FileMode, filein string) error {
 		c.Filein = file
 	}
 
-	c.Pipedin = (mode & os.ModeCharDevice) == 0 // https://stackoverflow.com/a/43947435/70613
+	c.Pipedin = (mode & os.ModeCharDevice) == 0 // https://filters/stackoverflow.com/a/43947435/70613
 
 	// If no input, display usage
 	input := c.Pipedin || c.Filein != nil

diff --git a/cmd/jargon/main_test.go b/cmd/jargon/main_test.go
@@ -7,10 +7,10 @@ import (
 	"testing"
 
 	"github.com/clipperhouse/jargon"
-	"github.com/clipperhouse/jargon/ascii"
-	"github.com/clipperhouse/jargon/contractions"
-	"github.com/clipperhouse/jargon/stackoverflow"
-	"github.com/clipperhouse/jargon/stemmer"
+	"github.com/clipperhouse/jargon/filters/ascii"
+	"github.com/clipperhouse/jargon/filters/contractions"
+	"github.com/clipperhouse/jargon/filters/stackoverflow"
+	"github.com/clipperhouse/jargon/filters/stemmer"
 	"github.com/spf13/afero"
 )
 
@@ -172,7 +172,7 @@ func TestFilters(t *testing.T) {
 		}
 		if len(c.Filters) == len(test.filters) {
 			for i := range test.filters {
-				// https://stackoverflow.com/a/9644797
+				// https://filters/stackoverflow.com/a/9644797
 				// This is not a good test, but perhaps better than nothing
 				// E.g. the pointers to different stemmers are all the same
 				expected := reflect.ValueOf(test.filters[i]).Pointer()

diff --git a/example_test.go b/example_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/clipperhouse/jargon"
-	"github.com/clipperhouse/jargon/stackoverflow"
+	"github.com/clipperhouse/jargon/filters/stackoverflow"
 )
 
 func ExampleTokenize() {

diff --git a/ascii/ASCIIFoldingFilter.java → filters/ascii/ASCIIFoldingFilter.java b/ascii/ASCIIFoldingFilter.java → filters/ascii/ASCIIFoldingFilter.java
diff --git a/ascii/TestASCIIFoldingFilter.java → filters/ascii/TestASCIIFoldingFilter.java b/ascii/TestASCIIFoldingFilter.java → filters/ascii/TestASCIIFoldingFilter.java
diff --git a/ascii/filter.go → filters/ascii/filter.go b/ascii/filter.go → filters/ascii/filter.go
diff --git a/ascii/fold.go → filters/ascii/fold.go b/ascii/fold.go → filters/ascii/fold.go
diff --git a/ascii/fold_test.go → filters/ascii/fold_test.go b/ascii/fold_test.go → filters/ascii/fold_test.go
diff --git a/contractions/README.md → filters/contractions/README.md b/contractions/README.md → filters/contractions/README.md
@@ -27,7 +27,7 @@ import (
     "fmt"
 
     "github.com/clipperhouse/jargon"
-    "github.com/clipperhouse/jargon/contractions"
+    "github.com/clipperhouse/jargon/filters/contractions"
 )
 
 var lem = jargon.NewLemmatizer(contractions.Expander)
@@ -52,6 +52,6 @@ func main() {
 
 ### Implementation
 
-The [Lookup method](https://github.com/clipperhouse/jargon/blob/master/contractions/filter.go#L7) satisfies the [jargon.TokenFilter interface](https://github.com/clipperhouse/jargon/blob/master/filter.go).
+The [Lookup method](https://github.com/clipperhouse/jargon/blob/master/filters/contractions/filter.go#L7) satisfies the [jargon.TokenFilter interface](https://github.com/clipperhouse/jargon/blob/master/filter.go).
 
-Here is the [base list of contractions](https://github.com/clipperhouse/jargon/blob/master/contractions/generator.go#L101). Variations (case, apostrophes) are code-generated.
+Here is the [base list of contractions](https://github.com/clipperhouse/jargon/blob/master/filters/contractions/generator.go#L101). Variations (case, apostrophes) are code-generated.
diff --git a/contractions/filter.go → filters/contractions/filter.go b/contractions/filter.go → filters/contractions/filter.go
diff --git a/contractions/filter_test.go → filters/contractions/filter_test.go b/contractions/filter_test.go → filters/contractions/filter_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/clipperhouse/jargon"
-	"github.com/clipperhouse/jargon/contractions"
+	"github.com/clipperhouse/jargon/filters/contractions"
 )
 
 func TestContractions(t *testing.T) {

diff --git a/contractions/generate/main.go → filters/contractions/generate/main.go b/contractions/generate/main.go → filters/contractions/generate/main.go
diff --git a/contractions/generate/main_test.go → filters/contractions/generate/main_test.go b/contractions/generate/main_test.go → filters/contractions/generate/main_test.go
diff --git a/contractions/generated.go → filters/contractions/generated.go b/contractions/generated.go → filters/contractions/generated.go
diff --git a/nba/filter.go → filters/nba/filter.go b/nba/filter.go → filters/nba/filter.go
@@ -1,6 +1,6 @@
 package nba
 
-import "github.com/clipperhouse/jargon/synonyms"
+import "github.com/clipperhouse/jargon/filters/synonyms"
 
 //go:generate go run generate/main.go
 

diff --git a/nba/filter_test.go → filters/nba/filter_test.go b/nba/filter_test.go → filters/nba/filter_test.go
diff --git a/nba/generate/main.go → filters/nba/generate/main.go b/nba/generate/main.go → filters/nba/generate/main.go
@@ -10,7 +10,7 @@ import (
 	"text/template"
 
 	"github.com/PuerkitoBio/goquery"
-	"github.com/clipperhouse/jargon/ascii"
+	"github.com/clipperhouse/jargon/filters/ascii"
 )
 
 func main() {

diff --git a/nba/generated.go → filters/nba/generated.go b/nba/generated.go → filters/nba/generated.go
diff --git a/sigil/filter.go → filters/sigil/filter.go b/sigil/filter.go → filters/sigil/filter.go
diff --git a/sigil/filter_test.go → filters/sigil/filter_test.go b/sigil/filter_test.go → filters/sigil/filter_test.go
diff --git a/stackoverflow/filter.go → filters/stackoverflow/filter.go b/stackoverflow/filter.go → filters/stackoverflow/filter.go
@@ -2,7 +2,7 @@
 package stackoverflow
 
 import (
-	"github.com/clipperhouse/jargon/synonyms"
+	"github.com/clipperhouse/jargon/filters/synonyms"
 )
 
 //go:generate go run generate/main.go

diff --git a/stackoverflow/filter_test.go → filters/stackoverflow/filter_test.go b/stackoverflow/filter_test.go → filters/stackoverflow/filter_test.go
diff --git a/stackoverflow/generate/main.go → filters/stackoverflow/generate/main.go b/stackoverflow/generate/main.go → filters/stackoverflow/generate/main.go
diff --git a/stackoverflow/generated.go → filters/stackoverflow/generated.go b/stackoverflow/generated.go → filters/stackoverflow/generated.go
diff --git a/stemmer/filter.go → filters/stemmer/filter.go b/stemmer/filter.go → filters/stemmer/filter.go
diff --git a/stemmer/filter_test.go → filters/stemmer/filter_test.go b/stemmer/filter_test.go → filters/stemmer/filter_test.go
diff --git a/stopwords/filter.go → filters/stopwords/filter.go b/stopwords/filter.go → filters/stopwords/filter.go
diff --git a/stopwords/filter_test.go → filters/stopwords/filter_test.go b/stopwords/filter_test.go → filters/stopwords/filter_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/clipperhouse/jargon"
-	"github.com/clipperhouse/jargon/stopwords"
+	"github.com/clipperhouse/jargon/filters/stopwords"
 )
 
 func TestCaseSensitive(t *testing.T) {

diff --git a/synonyms/filter.go → filters/synonyms/filter.go b/synonyms/filter.go → filters/synonyms/filter.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 
 	"github.com/clipperhouse/jargon"
-	"github.com/clipperhouse/jargon/synonyms/trie"
+	"github.com/clipperhouse/jargon/filters/synonyms/trie"
 )
 
 // Filter is the data structure of a synonyms filter. Use NewFilter to create.

diff --git a/synonyms/filter_test.go → filters/synonyms/filter_test.go b/synonyms/filter_test.go → filters/synonyms/filter_test.go
diff --git a/synonyms/trie/trie.go → filters/synonyms/trie/trie.go b/synonyms/trie/trie.go → filters/synonyms/trie/trie.go
diff --git a/twitter/filter.go → filters/twitter/filter.go b/twitter/filter.go → filters/twitter/filter.go
@@ -5,7 +5,7 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/clipperhouse/jargon/sigil"
+	"github.com/clipperhouse/jargon/filters/sigil"
 )
 
 // Handles will identify Twitter-style handles, combining the @ and name into a single token

diff --git a/twitter/filter_test.go → filters/twitter/filter_test.go b/twitter/filter_test.go → filters/twitter/filter_test.go
diff --git a/tokenstream_test.go b/tokenstream_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/clipperhouse/jargon"
-	"github.com/clipperhouse/jargon/stackoverflow"
+	"github.com/clipperhouse/jargon/filters/stackoverflow"
 )
 
 func ExampleTokenStream_Scan() {

diff --git a/web/main.go b/web/main.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"github.com/clipperhouse/jargon"
-	"github.com/clipperhouse/jargon/stackoverflow"
+	"github.com/clipperhouse/jargon/filters/stackoverflow"
 )
 
 func main() {