Add ACL scope name and convenience lenses

astrada · May 15, 2012 · 3d31218 · 3d31218
1 parent 7efa26f
commit 3d31218
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/src/gdata/gdataACL.ml b/src/gdata/gdataACL.ml
@@ -54,7 +54,8 @@ module Scope =
 struct
   type t = {
     _type : string;
-    value : string
+    value : string;
+    name : string;
   }
 
 	let _type = {
@@ -65,16 +66,22 @@ struct
 		GapiLens.get = (fun x -> x.value);
 		GapiLens.set = (fun v x -> { x with value = v })
 	}
+	let name = {
+		GapiLens.get = (fun x -> x.name);
+		GapiLens.set = (fun v x -> { x with name = v })
+	}
 
   let empty = {
     _type = "";
-    value = ""
+    value = "";
+    name = "";
   }
 
   let to_xml_data_model scope =
     GdataAtom.render_element ns_gAcl "scope"
       [GdataAtom.render_attribute "" "type" scope._type;
-       GdataAtom.render_attribute "" "value" scope.value]
+       GdataAtom.render_attribute "" "value" scope.value;
+       GdataAtom.render_attribute "" "name" scope.name]
 
   let of_xml_data_model scope tree =
     match tree with
@@ -86,6 +93,10 @@ struct
           ([`Attribute; `Name "value"; `Namespace ""],
            v) ->
           { scope with value = v }
+      | GapiCore.AnnotatedTree.Leaf
+          ([`Attribute; `Name "name"; `Namespace ""],
+           v) ->
+          { scope with name = v }
       | GapiCore.AnnotatedTree.Leaf
           ([`Attribute; `Name _; `Namespace ns],
            _) when ns = Xmlm.ns_xmlns ->
@@ -134,6 +145,7 @@ struct
   let etag = common |-- GdataAtom.BasicEntry.etag
   let id = common |-- GdataAtom.BasicEntry.id
   let links = common |-- GdataAtom.BasicEntry.links
+  let categories = common |-- GdataAtom.BasicEntry.categories
 
   let empty = {
     common = GdataAtom.BasicEntry.empty;

diff --git a/src/gdata/gdataACL.mli b/src/gdata/gdataACL.mli
@@ -7,7 +7,7 @@ module RoleWithKey :
 sig
   type t = {
     key : string;
-    role : string
+    role : string;
   }
 
   val key : (t, string) GapiLens.t
@@ -21,11 +21,13 @@ module Scope :
 sig
   type t = {
     _type : string;
-    value : string
+    value : string;
+    name : string;
   }
 
   val _type : (t, string) GapiLens.t
   val value : (t, string) GapiLens.t
+  val name : (t, string) GapiLens.t
 
   include GdataAtom.AtomData with type t := t
 
@@ -52,6 +54,7 @@ sig
   val etag : (t, string) GapiLens.t
   val id : (t, GdataAtom.atom_id) GapiLens.t
   val links : (t, GdataAtom.Link.t list) GapiLens.t
+  val categories : (t, GdataAtom.Category.t list) GapiLens.t
 
   include GdataAtom.AtomData with type t := t