fixes #2

README.md

@@ -65,8 +65,8 @@ This project reads its configuration from the file backend/configuration.json or
 ```yaml
   database: 
       location: "http://127.0.0.1"
-      port: 	5984
-      name: 	"duck"
+      port: 5984
+      name: "duck"
 	  username: ""
 	  password: ""
   jwtkey: "secret"

backend/ducklib/database.go

@@ -137,12 +137,12 @@ func (database *Database) PostDocument(doc structs.Document) (ID string, err err
 }
 
 /*
-Ruleset DB operations
+Rulebase DB operations
 */
 /*
-func (database *Database) GetRuleset(id string) (User, error) {
+func (database *Database) GetRulebase(id string) (User, error) {
 	var u User
-	mp, err := db.GetRuleset(id)
+	mp, err := db.GetRulebase(id)
 	if err != nil {
 		return u, err
 	}
@@ -152,15 +152,15 @@ func (database *Database) GetRuleset(id string) (User, error) {
 	return u, err
 }
 
-func (database *Database) DeleteRuleset(id string) error {
+func (database *Database) DeleteRulebase(id string) error {
 
-	doc, err := db.GetRuleset(id)
+	doc, err := db.GetRulebase(id)
 	if err != nil {
 
 		return err
 	}
 	if rev, prs := doc["_rev"]; prs {
-		err := db.DeleteRuleset(id, rev.(string))
+		err := db.DeleteRulebase(id, rev.(string))
 		if err != nil {
 			return err
 		}
@@ -171,17 +171,17 @@ func (database *Database) DeleteRuleset(id string) error {
 
 }
 
-func (database *Database) PutRuleset(id string, content []byte) error {
+func (database *Database) PutRulebase(id string, content []byte) error {
 
-	return db.UpdateRuleset(id, string(content))
+	return db.UpdateRulebase(id, string(content))
 
 }
 
-func (database *Database) PostRuleset(content []byte) (string, error) {
+func (database *Database) PostRulebase(content []byte) (string, error) {
 	u := uuid.NewV4()
 	uuid := uuid.Formatter(u, uuid.Clean)
 
-	return uuid, db.NewRuleset(uuid, string(content))
+	return uuid, db.NewRulebase(uuid, string(content))
 
 }
 */

backend/ducklib/handlers.go

@@ -223,13 +223,13 @@ func postUserHandler(c echo.Context) error {
 }
 
 /*
-Ruleset handlers
+Rulebase handlers
 */
 
-//DB rulesethandlers are not used
+//DB Rulebasehandlers are not used
 /*
 func deleteRsHandler(c echo.Context) error {
-	err := datab.DeleteRuleset(c.Param("id"))
+	err := datab.DeleteRulebase(c.Param("id"))
 	if err != nil {
 		e := err.Error()
 		return c.JSON(http.StatusNotFound, Response{Ok: false, Reason: &e})
@@ -246,13 +246,13 @@ func putRsHandler(c echo.Context) error {
 		return c.JSON(http.StatusNotFound, Response{Ok: false, Reason: &e})
 	}
 	id := c.Param("id")
-	err = datab.PutRuleset(id, resp)
+	err = datab.PutRulebase(id, resp)
 	if err != nil {
 		e := err.Error()
 		return c.JSON(http.StatusNotFound, Response{Ok: false, Reason: &e})
 	}
 
-	doc, err := datab.GetRuleset(id)
+	doc, err := datab.GetRulebase(id)
 	if err != nil {
 		e := err.Error()
 		return c.JSON(http.StatusNotFound, Response{Ok: false, Reason: &e})
@@ -269,12 +269,12 @@ func postRsHandler(c echo.Context) error {
 		return c.JSON(http.StatusNotFound, Response{Ok: false, Reason: &e})
 	}
 
-	id, err := datab.PostRuleset(req)
+	id, err := datab.PostRulebase(req)
 	if err != nil {
 		e := err.Error()
 		return c.JSON(http.StatusNotFound, Response{Ok: false, Reason: &e})
 	}
-	doc, err := datab.GetRuleset(id)
+	doc, err := datab.GetRulebase(id)
 	if err != nil {
 		e := err.Error()
 		return c.JSON(http.StatusNotFound, Response{Ok: false, Reason: &e})

backend/ducklib/server.go

@@ -77,13 +77,13 @@ func GetServer(conf structs.Configuration, gopath string) *echo.Echo {
 	documents.GET("/:docid", getDocHandler)             //return document
 	documents.POST("/copy/:docid", copyDocHandler)      //copy document
 
-	//ruleset resources
+	//rulebase resources
 	rulebases := api.Group("/rulebases", jwtMiddleware) //base URI
-	//rulesets.POST("/", postRsHandler)                                //create a ruleset
-	//rulesets.DELETE("/:id", deleteRsHandler)                         //delete a ruleset
-	//rulesets.PUT("/:setid", putRsHandler)                            //update a ruleset
-	rulebases.PUT("/:baseid/documents", checkDocHandler)               //process provided document against ruleset
-	rulebases.PUT("/:baseid/documents/:documentid", checkDocIDHandler) //process document against ruleset
+	//rulebases.POST("/", postRsHandler)                                //create a rulebase
+	//rulebases.DELETE("/:id", deleteRsHandler)                         //delete a rulebase
+	//rulebases.PUT("/:setid", putRsHandler)                            //update a rulebase
+	rulebases.PUT("/:baseid/documents", checkDocHandler)               //process provided document against rulebase
+	rulebases.PUT("/:baseid/documents/:documentid", checkDocIDHandler) //process document against rulebase
 
 	// serves the static files
 	wbd := conf.WebDir

backend/main.go

@@ -17,7 +17,7 @@ var (
 	jwtKey      string
 	ruleBaseDir string
 	goPath      = os.Getenv("GOPATH")
-	startDir    = "/src/github.com/Microsoft/DUCK/RuleBases"
+	startDir    = "/src/github.com/Microsoft/DUCK/Rulebases"
 )
 
 func main() {

backend/pluginregistry/pluginregistry.go

@@ -19,10 +19,10 @@ type DBPlugin interface {
 	UpdateDocument(doc structs.Document) error
 	DeleteDocument(id string) error
 
-	//	GetRuleset(id string) (document map[string]interface{}, err error)
-	//	NewRuleset(id string, entry string) error
-	//	UpdateRuleset(id string, entry string) error
-	//	DeleteRuleset(id string, rev string) error
+	//	GetRulebase(id string) (document map[string]interface{}, err error)
+	//	NewRulebase(id string, entry string) error
+	//	UpdateRulebase(id string, entry string) error
+	//	DeleteRulebase(id string, rev string) error
 
 	//	GetStatement(id string) (document map[string]interface{}, err error)
 }

backend/plugins/couchdb/couchdb.go

@@ -17,10 +17,10 @@ update document		✓
 delete document		✓
 Document overview	✓
 
-create RuleSet		✓
-get RuleSet			✓
-update RuleSet		✓
-delete RuleSet		✓
+create Rulebase		✓
+get Rulebase		✓
+update Rulebase		✓
+delete Rulebase		✓
 
 
 */
@@ -152,8 +152,8 @@ func (cb *Couchbase) GetDocument(id string) (structs.Document, error) {
 }
 
 /*
-//GetRuleset returns a ruleset with the sppecified ID from the Couchbase Database
-func (cb *Couchbase) GetRuleset(id string) (document map[string]interface{}, err error) {
+//GetRulebase returns a Rulebase with the sppecified ID from the Couchbase Database
+func (cb *Couchbase) GetRulebase(id string) (document map[string]interface{}, err error) {
 
 	return cb.getCouchbaseDocument(id)
 }*/
@@ -288,8 +288,8 @@ func (cb *Couchbase) DeleteUser(id string) error {
 }
 
 /*
-// DeleteRuleset deletes a User from the Couchbase Database
-func (cb *Couchbase) DeleteRuleset(id string, rev string) error {
+// DeleteRulebase deletes a User from the Couchbase Database
+func (cb *Couchbase) DeleteRulebase(id string, rev string) error {
 	return cb.deleteCbDocument(id, rev)
 }*/
 
@@ -336,9 +336,9 @@ func (cb *Couchbase) NewDocument(doc structs.Document) error {
 }
 
 /*
-//NewRuleset creates a new Ruleset in the couchbase Database
-func (cb *Couchbase) NewRuleset(id string, entry string) error {
-	return cb.putEntry(id, entry, "ruleset")
+//NewRulebase creates a new Rulebase in the couchbase Database
+func (cb *Couchbase) NewRulebase(id string, entry string) error {
+	return cb.putEntry(id, entry, "rulebase")
 }*/
 
 //UpdateUser replaces an existing User in the Couchbase database
@@ -403,7 +403,7 @@ func (cb *Couchbase) putDocument(d structs.Document) error {
 }
 
 func (cb *Couchbase) putEntry(entry map[string]interface{}, designfile bool) error {
-	//check type of entry (document/user/ruleset)
+	//check type of entry (document/user/rulebase)
 	var entryReader *strings.Reader
 	var url string
 	if !designfile {