From ed9c46fc7bf1ee85d3d79ce5c2d80dc37fba17ba Mon Sep 17 00:00:00 2001 From: Marius Orcsik Date: Sat, 11 May 2019 11:53:32 +0200 Subject: [PATCH] Renamed the Fold* functions to Flatten* --- activity.go | 34 +++++++++++++++++----------------- activity_test.go | 4 ++-- collections.go | 6 +++--- collections_test.go | 2 +- iri.go | 4 ++-- iri_test.go | 2 +- object.go | 28 ++++++++++++++-------------- object_test.go | 4 ++-- 8 files changed, 42 insertions(+), 42 deletions(-) diff --git a/activity.go b/activity.go index 603892c..900b8d9 100644 --- a/activity.go +++ b/activity.go @@ -1765,25 +1765,25 @@ func ToActivity(it Item) (*Activity, error) { return nil, errors.New("unable to convert activity") } -// FoldIntransitiveActivityProperties -func FoldIntransitiveActivityProperties(act IntransitiveActivity) IntransitiveActivity{ - act.Actor = FoldToIRI(act.Actor) - act.Target = FoldToIRI(act.Target) - act.Result = FoldToIRI(act.Result) - act.Origin = FoldToIRI(act.Origin) - act.Result = FoldToIRI(act.Result) - act.Instrument = FoldToIRI(act.Instrument) +// FlattenIntransitiveActivityProperties flattens the IntransitiveActivity's properties from Object type to IRI +func FlattenIntransitiveActivityProperties(act IntransitiveActivity) IntransitiveActivity{ + act.Actor = FlattenToIRI(act.Actor) + act.Target = FlattenToIRI(act.Target) + act.Result = FlattenToIRI(act.Result) + act.Origin = FlattenToIRI(act.Origin) + act.Result = FlattenToIRI(act.Result) + act.Instrument = FlattenToIRI(act.Instrument) return act } -// FoldActivityProperties -func FoldActivityProperties(act Activity) Activity { - act.Object = FoldToIRI(act.Object) - act.Actor = FoldToIRI(act.Actor) - act.Target = FoldToIRI(act.Target) - act.Result = FoldToIRI(act.Result) - act.Origin = FoldToIRI(act.Origin) - act.Result = FoldToIRI(act.Result) - act.Instrument = FoldToIRI(act.Instrument) +// FlattenActivityProperties flattens the Activity's properties from Object type to IRI +func FlattenActivityProperties(act Activity) Activity { + act.Object = FlattenToIRI(act.Object) + act.Actor = FlattenToIRI(act.Actor) + act.Target = FlattenToIRI(act.Target) + act.Result = FlattenToIRI(act.Result) + act.Origin = FlattenToIRI(act.Origin) + act.Result = FlattenToIRI(act.Result) + act.Instrument = FlattenToIRI(act.Instrument) return act } diff --git a/activity_test.go b/activity_test.go index d0da82a..c188bb0 100644 --- a/activity_test.go +++ b/activity_test.go @@ -2357,10 +2357,10 @@ func TestToActivity(t *testing.T) { t.Skipf("TODO") } -func TestFoldActivityProperties(t *testing.T) { +func TestFlattenActivityProperties(t *testing.T) { t.Skipf("TODO") } -func TestFoldIntransitiveActivityProperties(t *testing.T) { +func TestFlattenIntransitiveActivityProperties(t *testing.T) { t.Skipf("TODO") } diff --git a/collections.go b/collections.go index f52ef58..a2e6fcf 100644 --- a/collections.go +++ b/collections.go @@ -294,11 +294,11 @@ func (o *OrderedCollectionPage) Collection() CollectionInterface { return o } -// FoldItemCollection -func FoldItemCollection(c ItemCollection) ItemCollection { +// FlattenItemCollection flattens the Collection's properties from Object type to IRI +func FlattenItemCollection(c ItemCollection) ItemCollection { if c != nil && len(c) > 0 { for i, it := range c { - c[i] = FoldToIRI(it) + c[i] = FlattenToIRI(it) } } return c diff --git a/collections_test.go b/collections_test.go index 61242a7..5cff5ca 100644 --- a/collections_test.go +++ b/collections_test.go @@ -494,6 +494,6 @@ func TestOrderedCollectionPage_Collection(t *testing.T) { t.Skipf("TODO") } -func TestFoldItemCollection(t *testing.T) { +func TestFlattenItemCollection(t *testing.T) { t.Skipf("TODO") } diff --git a/iri.go b/iri.go index 8891b6c..be93b21 100644 --- a/iri.go +++ b/iri.go @@ -46,8 +46,8 @@ func (i IRI) IsObject() bool { return false } -// FoldToIRI -func FoldToIRI(it Item) Item { +// FlattenToIRI checks if Item can be flatten to an IRI and returns it if so +func FlattenToIRI(it Item) Item { if it!= nil && it.IsObject() && len(it.GetLink()) > 0 { return it.GetLink() } diff --git a/iri_test.go b/iri_test.go index 8b077b2..b32c464 100644 --- a/iri_test.go +++ b/iri_test.go @@ -59,6 +59,6 @@ func TestIRI_UnmarshalJSON(t *testing.T) { } } -func TestFoldToIRI(t *testing.T) { +func TestFlattenToIRI(t *testing.T) { t.Skipf("TODO") } diff --git a/object.go b/object.go index ba4f252..6fd9850 100644 --- a/object.go +++ b/object.go @@ -630,8 +630,8 @@ func ToObject(it Item) (*Object, error) { return nil, errors.New("unable to convert object") } -// FoldObjectProperties -func FoldObjectProperties(o Object) Object { +// FlattenObjectProperties flattens the Object's properties from Object types to IRI +func FlattenObjectProperties(o Object) Object { if o.Replies != nil && o.Replies.IsObject() { if len(o.Replies.GetLink()) > 0 { o.Replies = o.Replies.GetLink() @@ -639,32 +639,32 @@ func FoldObjectProperties(o Object) Object { o.Replies = IRI(fmt.Sprintf("%s/replies", o.GetLink())) } } - o.AttributedTo = FoldToIRI(o.AttributedTo) - o.InReplyTo = FoldToIRI(o.InReplyTo) + o.AttributedTo = FlattenToIRI(o.AttributedTo) + o.InReplyTo = FlattenToIRI(o.InReplyTo) - o.To = FoldItemCollection(o.To) - o.Bto = FoldItemCollection(o.Bto) - o.CC = FoldItemCollection(o.CC) - o.BCC = FoldItemCollection(o.BCC) - o.Audience = FoldItemCollection(o.Audience) + o.To = FlattenItemCollection(o.To) + o.Bto = FlattenItemCollection(o.Bto) + o.CC = FlattenItemCollection(o.CC) + o.BCC = FlattenItemCollection(o.BCC) + o.Audience = FlattenItemCollection(o.Audience) - o.Tag = FoldItemCollection(o.Tag) + o.Tag = FlattenItemCollection(o.Tag) return o } -// FoldProperties -func FoldProperties(it Item) Item { +// FlattenProperties flattens the Item's properties from Object types to IRI +func FlattenProperties(it Item) Item { if ValidActivityType(it.GetType()) { act, err := ToActivity(it) if err == nil { - return FoldActivityProperties(*act) + return FlattenActivityProperties(*act) } } if ValidActorType(it.GetType()) || ValidObjectType(it.GetType()) { ob, err := ToObject(it) if err == nil { - return FoldObjectProperties(*ob) + return FlattenObjectProperties(*ob) } } return it diff --git a/object_test.go b/object_test.go index a1c634e..307320a 100644 --- a/object_test.go +++ b/object_test.go @@ -509,10 +509,10 @@ func TestToObject(t *testing.T) { t.Skipf("TODO") } -func TestFoldObjectProperties(t *testing.T) { +func TestFlattenObjectProperties(t *testing.T) { t.Skipf("TODO") } -func TestFoldProperties(t *testing.T) { +func TestFlattenProperties(t *testing.T) { t.Skipf("TODO") }