event: Export duration

It's annoying not to be able to create a Duration outside of this
package.

Author: daenney

event.go

@@ -9,15 +9,17 @@ import (
 	"github.com/anaskhan96/soup"
 )
 
-type duration struct {
+// Duration represents a interval of time
+type Duration struct {
 	time.Duration
 }
 
-func (d duration) MarshalJSON() (b []byte, err error) {
+// MarshalJSON marshals a Duration to JSON
+func (d Duration) MarshalJSON() (b []byte, err error) {
 	return json.Marshal(d.Duration)
 }
 
-func (d duration) String() string {
+func (d Duration) String() string {
 	dur := d.Round(time.Minute)
 	h := dur / time.Hour
 	m := (dur - (h * time.Hour)) / time.Minute
@@ -50,8 +52,8 @@ func (d duration) String() string {
 // Event represents a single event at a GDQ
 type Event struct {
 	Start    time.Time `json:"start"`
-	Setup    duration  `json:"setup"`
-	Estimate duration  `json:"estimate"`
+	Setup    Duration  `json:"setup"`
+	Estimate Duration  `json:"estimate"`
 	Runners  []string  `json:"runners"`
 	Hosts    []string  `json:"hosts"`
 	Title    string    `json:"title"`
@@ -114,18 +116,18 @@ func toDateTime(input string) time.Time {
 	return res
 }
 
-func toDuration(input string) duration {
+func toDuration(input string) Duration {
 	if strings.TrimSpace(input) == "" {
-		return duration{0}
+		return Duration{0}
 	}
 	elems := strings.Split(strings.TrimSpace(input), ":")
 	if len(elems) != 3 {
-		return duration{0}
+		return Duration{0}
 	}
 	entry := fmt.Sprintf("%sh%sm%ss", strings.TrimSpace(elems[0]), strings.TrimSpace(elems[1]), strings.TrimSpace(elems[2]))
 	res, err := time.ParseDuration(entry)
 	if err != nil {
-		return duration{0}
+		return Duration{0}
 	}
-	return duration{res}
+	return Duration{res}
 }

event_test.go

@@ -9,38 +9,38 @@ import (
 )
 
 func TestDurationMarshal(t *testing.T) {
-	d := duration{0}
+	d := Duration{0}
 	j, err := d.MarshalJSON()
 	assertEqual(t, err, nil)
 	assertEqual(t, string(j), "0")
 
-	dn := duration{1*time.Hour + 1*time.Minute + 1*time.Second}
+	dn := Duration{1*time.Hour + 1*time.Minute + 1*time.Second}
 	jn, err := dn.MarshalJSON()
 	assertEqual(t, err, nil)
 	assertEqual(t, string(jn), "3661000000000")
 }
 
 func TestDurationString(t *testing.T) {
 	t.Run("no hours, no minutes", func(t *testing.T) {
-		assertEqual(t, duration{0}.String(), "0 minutes")
+		assertEqual(t, Duration{0}.String(), "0 minutes")
 	})
 	t.Run("one hour, no minutes", func(t *testing.T) {
-		assertEqual(t, duration{1 * time.Hour}.String(), "1 hour")
+		assertEqual(t, Duration{1 * time.Hour}.String(), "1 hour")
 	})
 	t.Run("one hour, one minute", func(t *testing.T) {
-		assertEqual(t, duration{1*time.Hour + 1*time.Minute}.String(), "1 hour and 1 minute")
+		assertEqual(t, Duration{1*time.Hour + 1*time.Minute}.String(), "1 hour and 1 minute")
 	})
 	t.Run("one hour, two minutes", func(t *testing.T) {
-		assertEqual(t, duration{1*time.Hour + 2*time.Minute}.String(), "1 hour and 2 minutes")
+		assertEqual(t, Duration{1*time.Hour + 2*time.Minute}.String(), "1 hour and 2 minutes")
 	})
 	t.Run("two hours, two minutes", func(t *testing.T) {
-		assertEqual(t, duration{2*time.Hour + 2*time.Minute}.String(), "2 hours and 2 minutes")
+		assertEqual(t, Duration{2*time.Hour + 2*time.Minute}.String(), "2 hours and 2 minutes")
 	})
 	t.Run("one minute", func(t *testing.T) {
-		assertEqual(t, duration{1 * time.Minute}.String(), "1 minute")
+		assertEqual(t, Duration{1 * time.Minute}.String(), "1 minute")
 	})
 	t.Run(" two minutes", func(t *testing.T) {
-		assertEqual(t, duration{2 * time.Minute}.String(), "2 minutes")
+		assertEqual(t, Duration{2 * time.Minute}.String(), "2 minutes")
 	})
 }