Modified ItemMatches method fo match changed ItemMatcher interface

Changes

6 changed files (+47/-16)

• collection.go
  • @@ -302,9 +302,14 @@ func FollowingNew() *Following {
    return &i } - // ItemMatches - func (c Collection) ItemMatches(it Item) bool { - return c.Items.Contains(it) + // ItemsMatch + func (c Collection) ItemsMatch(col ...Item) bool { + for _, it := range col { + if match := c.Items.Contains(it); !match { + return false + } + } + return true } // Equals
• collection_page.go
  • @@ -296,9 +296,14 @@ func ToCollectionPage(it Item) (*CollectionPage, error) {
    return nil, errors.New("unable to convert to collection page") } - // ItemMatches - func (c CollectionPage) ItemMatches(it Item) bool { - return c.Items.Contains(it) + // ItemsMatch + func (c CollectionPage) ItemsMatch(col ...Item) bool { + for _, it := range col { + if match := c.Items.Contains(it); !match { + return false + } + } + return true } // Equals
• iri.go
  • @@ -235,6 +235,11 @@ func (i IRI) Contains(what IRI, checkScheme bool) bool {
    return strings.Contains(p, pw) } - func (i IRI) ItemMatches(it Item) bool { - return it.GetLink().Contains(i, false) + func (i IRI) ItemsMatch(col ...Item) bool { + for _, it := range col { + if match := it.GetLink().Contains(i, false); !match { + return false + } + } + return true }
• item_collection.go
  • @@ -186,8 +186,14 @@ func ToItemCollection(it Item) (*ItemCollection, error) {
    return nil, errors.New("unable to convert to item collection") } - func (i ItemCollection) ItemMatches(it Item) bool { - return i.Contains(it) + // ItemsMatch + func (i ItemCollection) ItemsMatch(col ...Item) bool { + for _, it := range col { + if match := i.Contains(it); !match { + return false + } + } + return true } // Equals
• ordered_collection.go
  • @@ -397,9 +397,14 @@ func SharesNew() *Shares {
    return &i } - // ItemMatches - func (o OrderedCollection) ItemMatches(it Item) bool { - return o.OrderedItems.Contains(it) + // ItemsMatch + func (o OrderedCollection) ItemsMatch(col ...Item) bool { + for _, it := range col { + if match := o.OrderedItems.Contains(it); !match { + return false + } + } + return true } // Equals
• ordered_collection_page.go
  • @@ -251,9 +251,14 @@ func ToOrderedCollectionPage(it Item) (*OrderedCollectionPage, error) {
    return nil, errors.New("unable to convert to ordered collection page") } - // ItemMatches - func (o OrderedCollectionPage) ItemMatches(it Item) bool { - return o.OrderedItems.Contains(it) + // ItemsMatch + func (o OrderedCollectionPage) ItemsMatch(col ...Item) bool { + for _, it := range col { + if match := o.OrderedItems.Contains(it); !match { + return false + } + } + return true } // Equals