From 80f7c5ea03ce3fe84ff20d2a6a33a5c4d1eb9be2 Mon Sep 17 00:00:00 2001
From: Alessandro Strada <alessandro.strada@gmail.com>
Date: Mon, 19 Dec 2011 22:11:33 +0100
Subject: [PATCH] Refactor calendar settings service

---
 src/gapi/gapiCalendarService.ml   | 14 +++++++++++---
 src/gapi/gapiCalendarService.mli  | 17 ++++++-----------
 src/test/testCalendarServiceV3.ml |  2 +-
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/gapi/gapiCalendarService.ml b/src/gapi/gapiCalendarService.ml
index 155f0418..1c62d2c8 100644
--- a/src/gapi/gapiCalendarService.ml
+++ b/src/gapi/gapiCalendarService.ml
@@ -652,7 +652,15 @@ struct
 end
 
 module SettingsResource =
-  GapiService.Make
-    (SettingResourceConf)
-    (GapiService.StandardParameters)
+struct
+  module Service =
+    GapiService.Make(SettingResourceConf)(GapiService.StandardParameters)
+
+  let list ?url ?etag ?parameters session =
+    Service.list ?url ?etag ?parameters session
+
+  let get ?url ?parameters ~setting session =
+    Service.get ?url ?parameters setting session
+
+end
 
diff --git a/src/gapi/gapiCalendarService.mli b/src/gapi/gapiCalendarService.mli
index 503037be..63171dfa 100644
--- a/src/gapi/gapiCalendarService.mli
+++ b/src/gapi/gapiCalendarService.mli
@@ -564,9 +564,8 @@ module FreebusyResource :
 sig
   (** Returns free/busy information for a set of calendars.
 
-    Usage: [query ?url parameters session] where [parameters] specifies the request parameters (e.g.: target calendar IDs), and [session] is the current session.
-     
     @param url Service endpoint base URL (defaults to ["https://www.googleapis.com/calendar/v3/freeBusy"]).
+    @param parameters Optional standard parameters..
     *)
   val query :
     ?url:string ->
@@ -582,31 +581,27 @@ module SettingsResource :
 sig
   (** Returns all user settings for the authenticated user.
 
-    Usage: [list ?url ?etag ?parameters session] where [session] is the current session.
-     
     @param url Service endpoint base URL (defaults to ["https://www.googleapis.com/calendar/v3/users/me/settings"]).
-    @param etag optional ETag.
-    @param parameters standard parameters.
+    @param etag Optional ETag.
+    @param parameters Optional standard parameters..
     *)
   val list :
     ?url:string ->
     ?etag:string ->
     ?parameters:GapiService.StandardParameters.t ->
-    ?container_id:string ->
     GapiConversation.Session.t ->
     (GapiCalendar.Settings.t * GapiConversation.Session.t)
 
   (** Returns a single user setting.
 
-    Usage: [get ?url setting_id session] where [setting_id] is the name of the user setting, and [session] is the current session.
-     
     @param url Service endpoint base URL (defaults to ["https://www.googleapis.com/calendar/v3/users/me/settings"]).
+    @param parameters Optional standard parameters..
+    @param setting Name of the user setting.
     *)
   val get :
     ?url:string ->
     ?parameters:GapiService.StandardParameters.t ->
-    ?container_id:string ->
-    string ->
+    setting:string ->
     GapiConversation.Session.t ->
     (GapiCalendar.Setting.t * GapiConversation.Session.t)
 
diff --git a/src/test/testCalendarServiceV3.ml b/src/test/testCalendarServiceV3.ml
index 76b578ea..89a11d54 100644
--- a/src/test/testCalendarServiceV3.ml
+++ b/src/test/testCalendarServiceV3.ml
@@ -168,7 +168,7 @@ let test_settings_get () =
     (fun session ->
        let (setting, _) =
          GapiCalendarService.SettingsResource.get
-           "country"
+           ~setting:"country"
            session
        in
          assert_equal