add Filter() function

Author: circa10a

Makefile

@@ -1,5 +1,5 @@
 GOCMD=go
-VERSION=v0.1.6
+VERSION=v0.2.0
 
 # First target for travis ci
 test:

README.md

@@ -113,32 +113,11 @@ fmt.Println(string(json))
 #### Get news about a specific product
 
 ```go
-package main
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/circa10a/go-aws-news"
-)
-
-func getEKSAnnouncements(n awsnews.Announcements) awsnews.Announcements {
-	var myEKSAnnouncements awsnews.Announcements
-	for _, v := range n {
-		if strings.Contains(v.Title, "EKS") {
-			myEKSAnnouncements = append(myEKSAnnouncements, v)
-		}
-	}
-	return myEKSAnnouncements
-}
-
-func main() {
-	news, err := awsnews.Fetch(2019, 12)
-	if err != nil {
-		fmt.Println(err)
-	} else {
-		getEKSAnnouncements(news).Print()
-	}
+news, err := awsnews.Fetch(2019, 12)
+if err != nil {
+	fmt.Println(err)
+} else {
+	news.Filter([]string{"EKS", "ECS"}).Print()
 }
 ```
 

announcements.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"regexp"
+	"strings"
 	"time"
 
 	"github.com/PuerkitoBio/goquery"
@@ -26,24 +27,27 @@ type newsDoc struct {
 	*goquery.Document
 }
 
-// Fetch Fetches all of the announcements for the specified year/month that was input.
-func Fetch(year int, month int) (Announcements, error) {
+func (n newsDoc) GetAnnouncements() (Announcements, error) {
 	// Create []Announcement
 	var announcements Announcements
-	doc, err := getNewsDoc(year, month)
-	if err != nil {
-		return announcements, err
-	}
-	news := newsDoc{doc}
-	news.getSelectionItems().Each(func(i int, s *goquery.Selection) {
-		title := news.getSelectionTitle(s)
-		link := fmt.Sprintf("https:%v", news.getSelectionItemLink(s))
-		date := parseDate(news.getSelectionItemDate(s))
+	n.getSelectionItems().Each(func(i int, s *goquery.Selection) {
+		title := n.getSelectionTitle(s)
+		link := fmt.Sprintf("https:%v", n.getSelectionItemLink(s))
+		date := parseDate(n.getSelectionItemDate(s))
 		announcements = append(announcements, Announcement{Title: title, Link: link, PostDate: date})
 	})
 	return announcements, nil
 }
 
+// Fetch Fetches all of the announcements for the specified year/month that was input.
+func Fetch(year int, month int) (Announcements, error) {
+	doc, err := getNewsDoc(year, month)
+	if err != nil {
+		return Announcements{}, err
+	}
+	return newsDoc{doc}.GetAnnouncements()
+}
+
 // Extract date from amazon's format
 // Input: Posted on: Jan 7, 2020
 // Output: Jan 7, 2020
@@ -122,3 +126,16 @@ func (a Announcements) JSON() ([]byte, error) {
 	}
 	return json, nil
 }
+
+// Filter accepts a slice of products/terms to only return announcments you care about
+func (a Announcements) Filter(p []string) Announcements {
+	var filteredAnnouncements Announcements
+	for _, v := range a {
+		for _, product := range p {
+			if strings.Contains(strings.ToLower(v.Title), strings.ToLower(product)) {
+				filteredAnnouncements = append(filteredAnnouncements, v)
+			}
+		}
+	}
+	return filteredAnnouncements
+}

announcements_test.go

@@ -52,10 +52,15 @@ func TestYesterday(t *testing.T) {
 	}
 }
 
-// Integration test
 func TestJSON(t *testing.T) {
-	news, err := Fetch(2019, 12)
+	news, err := newsDoc{testDoc}.GetAnnouncements()
 	assert.NoError(t, err)
 	_, jsonErr := news.JSON()
 	assert.NoError(t, jsonErr)
 }
+
+func TestFilter(t *testing.T) {
+	news, _ := newsDoc{testDoc}.GetAnnouncements()
+	filteredNews := news.Filter([]string{"EKS", "ECS"})
+	assert.Equal(t, len(filteredNews), 6)
+}