Rename documents parsing/rendering functions

astrada · May 13, 2012 · 999ce90 · 999ce90
1 parent 5746e80
commit 999ce90
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 25 deletions.
diff --git a/src/gdata/gdataDocumentsV3Model.ml b/src/gdata/gdataDocumentsV3Model.ml
@@ -110,7 +110,15 @@ struct
   module Feed =
     GdataAtom.MakeFeed(Entry)(GdataAtom.Link)(GdataAtom.GenericExtensions)
 
-  let revisions_feed_to_data_model =
+  let parse_entry =
+    GdataAtom.data_model_to_entry Entry.of_xml_data_model Entry.empty
+
+  let parse_feed = Feed.parse_feed
+
+  let entry_to_data_model =
+    GdataAtom.element_to_data_model get_documents_prefix Entry.to_xml_data_model
+
+  let feed_to_data_model =
     GdataAtom.element_to_data_model get_documents_prefix Feed.to_xml_data_model
 
 end
@@ -472,13 +480,15 @@ struct
   let largestChangestamp =
     Feed.extensions |-- DocumentFeedExtensions.largestChangestamp
 
-  let parse_document_entry =
+  let parse_entry =
     GdataAtom.data_model_to_entry Entry.of_xml_data_model Entry.empty
 
-  let document_entry_to_data_model =
+  let parse_feed = Feed.parse_feed
+
+  let entry_to_data_model =
     GdataAtom.element_to_data_model get_documents_prefix Entry.to_xml_data_model
 
-  let document_feed_to_data_model =
+  let feed_to_data_model =
     GdataAtom.element_to_data_model get_documents_prefix Feed.to_xml_data_model
 
 end
@@ -939,10 +949,10 @@ struct
 
   end
 
-  let parse_metadata_entry =
+  let parse_entry =
     GdataAtom.data_model_to_entry Entry.of_xml_data_model Entry.empty
 
-  let metadata_entry_to_data_model =
+  let entry_to_data_model =
     GdataAtom.element_to_data_model get_documents_prefix Entry.to_xml_data_model
 
 end
@@ -1134,7 +1144,7 @@ struct
   let parse_entry =
     GdataAtom.data_model_to_entry Entry.of_xml_data_model Entry.empty
 
-  let archive_entry_to_data_model =
+  let entry_to_data_model =
     GdataAtom.element_to_data_model get_documents_prefix Entry.to_xml_data_model
 
 end

diff --git a/src/gdata/gdataDocumentsV3Model.mli b/src/gdata/gdataDocumentsV3Model.mli
@@ -37,7 +37,13 @@ sig
       and type link_t = GdataAtom.Link.t
       and type extensions_t = GdataAtom.GenericExtensions.t
 
-  val revisions_feed_to_data_model : Feed.t -> GdataCore.xml_data_model
+  val parse_entry : GdataCore.xml_data_model -> Entry.t
+
+  val parse_feed : GdataCore.xml_data_model -> Feed.t
+
+  val entry_to_data_model : Entry.t -> GdataCore.xml_data_model
+
+  val feed_to_data_model : Feed.t -> GdataCore.xml_data_model
 
 end
 
@@ -124,11 +130,13 @@ sig
 
   val largestChangestamp : (Feed.t, int) GapiLens.t
 
-  val parse_document_entry : GdataCore.xml_data_model -> Entry.t
+  val parse_entry : GdataCore.xml_data_model -> Entry.t
+
+  val parse_feed : GdataCore.xml_data_model -> Feed.t
 
-  val document_entry_to_data_model : Entry.t -> GdataCore.xml_data_model
+  val entry_to_data_model : Entry.t -> GdataCore.xml_data_model
 
-  val document_feed_to_data_model : Feed.t -> GdataCore.xml_data_model
+  val feed_to_data_model : Feed.t -> GdataCore.xml_data_model
 
 end
 
@@ -247,9 +255,9 @@ sig
 
   end
 
-  val parse_metadata_entry : GdataCore.xml_data_model -> Entry.t
+  val parse_entry : GdataCore.xml_data_model -> Entry.t
 
-  val metadata_entry_to_data_model : Entry.t -> GdataCore.xml_data_model
+  val entry_to_data_model : Entry.t -> GdataCore.xml_data_model
 
 end
 
@@ -293,7 +301,7 @@ sig
 
   val parse_entry : GdataCore.xml_data_model -> Entry.t
 
-  val archive_entry_to_data_model : Entry.t -> GdataCore.xml_data_model
+  val entry_to_data_model : Entry.t -> GdataCore.xml_data_model
 
 end
 

diff --git a/src/test/testDocumentsV3Model.ml b/src/test/testDocumentsV3Model.ml
@@ -7,8 +7,8 @@ let test_parse_documents_feed () =
   let ch = open_in "test_data/test_documents_feed.xml" in
   let feed = GdataUtils.parse_xml
                (fun () -> input_byte ch)
-               Document.Feed.parse_feed in
-  let tree = Document.document_feed_to_data_model feed in
+               Document.parse_feed in
+  let tree = Document.feed_to_data_model feed in
     TestHelper.assert_equal_file
       "test_data/test_parse_documents_feed.xml"
       (GdataUtils.data_to_xml_string tree)
@@ -17,8 +17,8 @@ let test_parse_user_metadata_entry () =
   let ch = open_in "test_data/test_documents_user_metadata.xml" in
   let entry = GdataUtils.parse_xml
                 (fun () -> input_byte ch)
-                Metadata.parse_metadata_entry in
-  let tree = Metadata.metadata_entry_to_data_model entry in
+                Metadata.parse_entry in
+  let tree = Metadata.entry_to_data_model entry in
     TestHelper.assert_equal_file
       "test_data/test_parse_user_metadata_entry.xml"
       (GdataUtils.data_to_xml_string tree)
@@ -27,8 +27,8 @@ let test_parse_changes_feed () =
   let ch = open_in "test_data/test_documents_changes_feed.xml" in
   let feed = GdataUtils.parse_xml
                 (fun () -> input_byte ch)
-                Document.Feed.parse_feed in
-  let tree = Document.document_feed_to_data_model feed in
+                Document.parse_feed in
+  let tree = Document.feed_to_data_model feed in
     TestHelper.assert_equal_file
       "test_data/test_parse_changes_feed.xml"
       (GdataUtils.data_to_xml_string tree);
@@ -40,8 +40,8 @@ let test_parse_revisions_feed () =
   let ch = open_in "test_data/test_documents_revisions_feed.xml" in
   let feed = GdataUtils.parse_xml
                 (fun () -> input_byte ch)
-                Revision.Feed.parse_feed in
-  let tree = Revision.revisions_feed_to_data_model feed in
+                Revision.parse_feed in
+  let tree = Revision.feed_to_data_model feed in
     TestHelper.assert_equal_file
       "test_data/test_parse_revisions_feed.xml"
       (GdataUtils.data_to_xml_string tree)
@@ -50,8 +50,8 @@ let test_parse_acl_feed () =
   let ch = open_in "test_data/test_documents_acl_feed.xml" in
   let feed = GdataUtils.parse_xml
                 (fun () -> input_byte ch)
-                GdataACL.Feed.parse_feed in
-  let tree = GdataACL.acl_feed_to_data_model feed in
+                GdataACL.parse_feed in
+  let tree = GdataACL.feed_to_data_model feed in
     TestHelper.assert_equal_file
       "test_data/test_parse_acl_feed.xml"
       (GdataUtils.data_to_xml_string tree)
@@ -61,7 +61,7 @@ let test_parse_archive_entry () =
   let feed = GdataUtils.parse_xml
                 (fun () -> input_byte ch)
                 Archive.parse_entry in
-  let tree = Archive.archive_entry_to_data_model feed in
+  let tree = Archive.entry_to_data_model feed in
     TestHelper.assert_equal_file
       "test_data/test_parse_archive_entry.xml"
       (GdataUtils.data_to_xml_string tree)