Progress on implementing the schema ontology.
- can process name - can process url - properties can have examples - id no longer requires a thing to be set on (may need to be revisited)
このコミットが含まれているのは:
コミット
0530121039
|
@ -108,20 +108,26 @@ func (v *VocabularyType) SetNotes(s string) {
|
|||
v.Notes = s
|
||||
}
|
||||
|
||||
func (v *VocabularyType) AddExample(e *VocabularyExample) {
|
||||
v.Examples = append(v.Examples, *e)
|
||||
}
|
||||
|
||||
var (
|
||||
_ NameSetter = &VocabularyType{}
|
||||
_ URISetter = &VocabularyType{}
|
||||
_ NotesSetter = &VocabularyType{}
|
||||
_ NameSetter = &VocabularyType{}
|
||||
_ URISetter = &VocabularyType{}
|
||||
_ NotesSetter = &VocabularyType{}
|
||||
_ ExampleAdder = &VocabularyType{}
|
||||
)
|
||||
|
||||
// VocabularyProperty represents a single ActivityStream property type in a
|
||||
// vocabulary.
|
||||
type VocabularyProperty struct {
|
||||
Name string
|
||||
URI *url.URL
|
||||
Notes string
|
||||
Domain []VocabularyReference
|
||||
Range []VocabularyReference
|
||||
Name string
|
||||
URI *url.URL
|
||||
Notes string
|
||||
Domain []VocabularyReference
|
||||
Range []VocabularyReference
|
||||
Examples []VocabularyExample
|
||||
// SubpropertyOf is ignorable as long as data is set up correctly TODO: Is this still correct?
|
||||
SubpropertyOf VocabularyReference // Must be a VocabularyProperty
|
||||
Functional bool
|
||||
|
@ -142,10 +148,15 @@ func (v *VocabularyProperty) SetNotes(s string) {
|
|||
v.Notes = s
|
||||
}
|
||||
|
||||
func (v *VocabularyProperty) AddExample(e *VocabularyExample) {
|
||||
v.Examples = append(v.Examples, *e)
|
||||
}
|
||||
|
||||
var (
|
||||
_ NameSetter = &VocabularyProperty{}
|
||||
_ URISetter = &VocabularyProperty{}
|
||||
_ NotesSetter = &VocabularyProperty{}
|
||||
_ NameSetter = &VocabularyProperty{}
|
||||
_ URISetter = &VocabularyProperty{}
|
||||
_ NotesSetter = &VocabularyProperty{}
|
||||
_ ExampleAdder = &VocabularyProperty{}
|
||||
)
|
||||
|
||||
// VocabularyExample documents an Example for an ActivityStream type or property
|
||||
|
@ -153,7 +164,7 @@ var (
|
|||
type VocabularyExample struct {
|
||||
Name string
|
||||
URI *url.URL
|
||||
Example map[string]interface{}
|
||||
Example interface{}
|
||||
}
|
||||
|
||||
func (v *VocabularyExample) SetName(s string) {
|
||||
|
|
|
@ -75,7 +75,7 @@ func (i *idLD) Exit(key string, ctx *ParsingContext) (bool, error) {
|
|||
|
||||
func (i *idLD) Apply(key string, value interface{}, ctx *ParsingContext) (bool, error) {
|
||||
if ctx.Current == nil {
|
||||
return true, fmt.Errorf("id apply called with nil Current")
|
||||
return true, nil
|
||||
} else if ider, ok := ctx.Current.(URISetter); !ok {
|
||||
return true, fmt.Errorf("id apply called with non-URISetter")
|
||||
} else if str, ok := value.(string); !ok {
|
||||
|
|
|
@ -10,6 +10,7 @@ const (
|
|||
exampleSpec = "workExample"
|
||||
mainEntitySpec = "mainEntity"
|
||||
urlSpec = "URL"
|
||||
nameSpec = "name"
|
||||
)
|
||||
|
||||
type SchemaOntology struct{}
|
||||
|
@ -40,13 +41,19 @@ func (o *SchemaOntology) LoadAsAlias(s string) ([]rdf.RDFNode, error) {
|
|||
Spec: schemaSpec,
|
||||
Alias: s,
|
||||
Name: urlSpec,
|
||||
Delegate: &URL{},
|
||||
Delegate: &url{},
|
||||
},
|
||||
&rdf.AliasedDelegate{
|
||||
Spec: schemaSpec,
|
||||
Alias: s,
|
||||
Name: nameSpec,
|
||||
Delegate: &name{},
|
||||
},
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (o *SchemaOntology) LoadSpecificAsAlias(alias, name string) ([]rdf.RDFNode, error) {
|
||||
switch name {
|
||||
func (o *SchemaOntology) LoadSpecificAsAlias(alias, n string) ([]rdf.RDFNode, error) {
|
||||
switch n {
|
||||
case exampleSpec:
|
||||
return []rdf.RDFNode{
|
||||
&rdf.AliasedDelegate{
|
||||
|
@ -71,11 +78,20 @@ func (o *SchemaOntology) LoadSpecificAsAlias(alias, name string) ([]rdf.RDFNode,
|
|||
Spec: "",
|
||||
Alias: "",
|
||||
Name: alias,
|
||||
Delegate: &URL{},
|
||||
Delegate: &url{},
|
||||
},
|
||||
}, nil
|
||||
case nameSpec:
|
||||
return []rdf.RDFNode{
|
||||
&rdf.AliasedDelegate{
|
||||
Spec: "",
|
||||
Alias: "",
|
||||
Name: alias,
|
||||
Delegate: &name{},
|
||||
},
|
||||
}, nil
|
||||
}
|
||||
return nil, fmt.Errorf("schema ontology cannot find %q to alias to %q", name, alias)
|
||||
return nil, fmt.Errorf("schema ontology cannot find %q to alias to %q", n, alias)
|
||||
}
|
||||
|
||||
func (o *SchemaOntology) LoadElement(name string, payload map[string]interface{}) ([]rdf.RDFNode, error) {
|
||||
|
@ -87,18 +103,26 @@ var _ rdf.RDFNode = &example{}
|
|||
type example struct{}
|
||||
|
||||
func (e *example) Enter(key string, ctx *rdf.ParsingContext) (bool, error) {
|
||||
// TODO
|
||||
ctx.Push()
|
||||
ctx.Current = &rdf.VocabularyExample{}
|
||||
return true, nil
|
||||
}
|
||||
|
||||
func (e *example) Exit(key string, ctx *rdf.ParsingContext) (bool, error) {
|
||||
// TODO
|
||||
ei := ctx.Current
|
||||
ctx.Pop()
|
||||
if ve, ok := ei.(*rdf.VocabularyExample); !ok {
|
||||
return true, fmt.Errorf("schema example did not pop a *VocabularyExample")
|
||||
} else if ea, ok := ctx.Current.(rdf.ExampleAdder); !ok {
|
||||
return true, fmt.Errorf("schema example not given an ExampleAdder")
|
||||
} else {
|
||||
ea.AddExample(ve)
|
||||
}
|
||||
return true, nil
|
||||
}
|
||||
|
||||
func (e *example) Apply(key string, value interface{}, ctx *rdf.ParsingContext) (bool, error) {
|
||||
// TODO
|
||||
return true, nil
|
||||
return true, fmt.Errorf("schema example cannot be applied")
|
||||
}
|
||||
|
||||
var _ rdf.RDFNode = &mainEntity{}
|
||||
|
@ -106,35 +130,72 @@ var _ rdf.RDFNode = &mainEntity{}
|
|||
type mainEntity struct{}
|
||||
|
||||
func (m *mainEntity) Enter(key string, ctx *rdf.ParsingContext) (bool, error) {
|
||||
// TODO
|
||||
ctx.Push()
|
||||
ctx.SetOnlyApplyThisNode(m)
|
||||
return true, nil
|
||||
}
|
||||
|
||||
func (m *mainEntity) Exit(key string, ctx *rdf.ParsingContext) (bool, error) {
|
||||
// TODO
|
||||
// Save the example
|
||||
example := ctx.Current
|
||||
// Undo the Enter operations
|
||||
ctx.ResetOnlyApplyThisNode()
|
||||
ctx.Pop()
|
||||
// Set the example data
|
||||
if vEx, ok := ctx.Current.(*rdf.VocabularyExample); !ok {
|
||||
return true, fmt.Errorf("mainEntity exit not given a *VocabularyExample")
|
||||
} else {
|
||||
vEx.Example = example
|
||||
}
|
||||
return true, nil
|
||||
}
|
||||
|
||||
func (m *mainEntity) Apply(key string, value interface{}, ctx *rdf.ParsingContext) (bool, error) {
|
||||
// TODO
|
||||
ctx.Current = value
|
||||
return true, nil
|
||||
}
|
||||
|
||||
var _ rdf.RDFNode = &URL{}
|
||||
var _ rdf.RDFNode = &url{}
|
||||
|
||||
type URL struct{}
|
||||
type url struct{}
|
||||
|
||||
func (u *URL) Enter(key string, ctx *rdf.ParsingContext) (bool, error) {
|
||||
// TODO
|
||||
return true, nil
|
||||
func (u *url) Enter(key string, ctx *rdf.ParsingContext) (bool, error) {
|
||||
return true, fmt.Errorf("schema url cannot be entered")
|
||||
}
|
||||
|
||||
func (u *URL) Exit(key string, ctx *rdf.ParsingContext) (bool, error) {
|
||||
// TODO
|
||||
return true, nil
|
||||
func (u *url) Exit(key string, ctx *rdf.ParsingContext) (bool, error) {
|
||||
return true, fmt.Errorf("schema url cannot be exited")
|
||||
}
|
||||
|
||||
func (u *URL) Apply(key string, value interface{}, ctx *rdf.ParsingContext) (bool, error) {
|
||||
// TODO
|
||||
return true, nil
|
||||
func (u *url) Apply(key string, value interface{}, ctx *rdf.ParsingContext) (bool, error) {
|
||||
if urlString, ok := value.(string); !ok {
|
||||
return true, fmt.Errorf("schema url not given a string")
|
||||
} else if uriSetter, ok := ctx.Current.(rdf.URISetter); !ok {
|
||||
return true, fmt.Errorf("schema url not given a URISetter in context")
|
||||
} else {
|
||||
return true, uriSetter.SetURI(urlString)
|
||||
}
|
||||
}
|
||||
|
||||
var _ rdf.RDFNode = &name{}
|
||||
|
||||
type name struct{}
|
||||
|
||||
func (n *name) Enter(key string, ctx *rdf.ParsingContext) (bool, error) {
|
||||
return true, fmt.Errorf("schema name cannot be entered")
|
||||
}
|
||||
|
||||
func (n *name) Exit(key string, ctx *rdf.ParsingContext) (bool, error) {
|
||||
return true, fmt.Errorf("schema name cannot be exited")
|
||||
}
|
||||
|
||||
func (n *name) Apply(key string, value interface{}, ctx *rdf.ParsingContext) (bool, error) {
|
||||
if s, ok := value.(string); !ok {
|
||||
return true, fmt.Errorf("schema name not given string")
|
||||
} else if ns, ok := ctx.Current.(rdf.NameSetter); !ok {
|
||||
return true, fmt.Errorf("schema name not given NameSetter in context")
|
||||
} else {
|
||||
ns.SetName(s)
|
||||
return true, nil
|
||||
}
|
||||
}
|
||||
|
|
読み込み中…
新しいイシューから参照