Merge pull request #3 from securityfirst/develop

Binary display

Author: Coccodrillo

feed_cadata.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"strings"
 	"time"
+
 	"github.com/securityfirst/umbrella-api/country"
 	"github.com/securityfirst/umbrella-api/models"
 )
@@ -18,13 +19,12 @@ func (g *CadataFetcher) Fetch() ([]models.FeedItem, error) {
 		"https://cadatacatalog.state.gov/storage/f/2013-11-24T21%3A00%3A30.424Z/tas.xml",
 		"https://cadatacatalog.state.gov/storage/f/2013-11-24T21%3A00%3A58.223Z/tws.xml",
 	} {
-		resp, err := http.Get(src)
+		body, err := makeRequest(src, http.MethodGet, nil)
 		if err != nil {
 			return nil, err
 		}
-		defer resp.Body.Close()
 		var v CadataResp
-		if err := xml.NewDecoder(resp.Body).Decode(&v); err != nil {
+		if err := xml.Unmarshal(body, &v); err != nil {
 			return nil, err
 		}
 		for i := range v.Title {

feed_gdasc.go

@@ -6,20 +6,20 @@ import (
 	"net/http"
 	"strings"
 	"time"
+
 	"github.com/securityfirst/umbrella-api/country"
 	"github.com/securityfirst/umbrella-api/models"
 )
 
 type GdascFetcher struct{}
 
 func (g *GdascFetcher) Fetch() ([]models.FeedItem, error) {
-	resp, err := http.Get("http://www.gdacs.org/xml/rss.xml")
+	body, err := makeRequest("http://www.gdacs.org/xml/rss.xml", http.MethodGet, nil)
 	if err != nil {
 		return nil, err
 	}
-	defer resp.Body.Close()
 	var v GdascResp
-	if err := xml.NewDecoder(resp.Body).Decode(&v); err != nil {
+	if err := xml.Unmarshal(body, &v); err != nil {
 		return nil, err
 	}
 	var feeds = make([]models.FeedItem, 0, len(v.Title))

feed_refiweb.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"net/http"
 	"strings"
 	"time"
 
@@ -19,7 +20,7 @@ type RefiWebFetcher struct {
 }
 
 func (r *RefiWebFetcher) Fetch() ([]models.FeedItem, error) {
-	body, err := makeRequest(fmt.Sprintf("https://api.reliefweb.int/v1/countries/%v", r.Country.ReliefWeb), "get", nil)
+	body, err := makeRequest(fmt.Sprintf("https://api.reliefweb.int/v1/countries/%v", r.Country.ReliefWeb), http.MethodGet, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -65,8 +66,8 @@ func (r *RefiWebFetcher) parseItem(t *goquery.Selection) (*models.FeedItem, erro
 	if len(segments) == 0 || to.Int64(segments[len(segments)-1]) == 0 {
 		return &item, nil
 	}
-	nodeUrl := fmt.Sprintf("http://api.rwlabs.org/v0/report/%v", segments[len(segments)-1])
-	body, err := makeRequest(nodeUrl, "get", nil)
+	nodeURL := fmt.Sprintf("http://api.rwlabs.org/v0/report/%v", segments[len(segments)-1])
+	body, err := makeRequest(nodeURL, "get", nil)
 	if err != nil {
 		return nil, err
 	}
@@ -83,31 +84,6 @@ func (r *RefiWebFetcher) parseItem(t *goquery.Selection) (*models.FeedItem, erro
 	return &item, nil
 }
 
-// type RWResponse struct {
-// 	Version string `json:"version"`
-// 	Status  int    `json:"status"`
-// 	Time    int    `json:"time"`
-// 	Data    struct {
-// 		Type string `json:"type"`
-// 		ID   int    `json:"id"`
-// 		Item struct {
-// 			ID              int    `json:"id"`
-// 			Name            string `json:"name"`
-// 			Description     string `json:"description"`
-// 			Status          string `json:"status"`
-// 			Iso3            string `json:"iso3"`
-// 			Featured        bool   `json:"featured"`
-// 			URL             string `json:"url"`
-// 			DescriptionHTML string `json:"description-html"`
-// 			Current         bool   `json:"current"`
-// 			Location        struct {
-// 				Lat  float64 `json:"lat"`
-// 				Long float64 `json:"long"`
-// 			} `json:"location"`
-// 		} `json:"item"`
-// 	} `json:"data"`
-// }
-
 type RWResponse struct {
 	Href  string `json:"href"`
 	Time  int    `json:"time"`

glide.lock

@@ -18,5 +18,5 @@ import:
 - package: golang.org/x/crypto
   subpackages:
   - bcrypt
-- package: github.com/securityfirst/tent
-- package: github.com/gin-gonic/gin
+- package: github.com/gin-gonic/gin   
+- package: gopkg.in/securityfirst/tent.v2