added core types; not yet all

Author: Vsevolod

module/move/gspread/src/gcore/client.rs

@@ -7,7 +7,7 @@ mod private
   use std::cell::RefCell;
   use former::Former;
 
-  use crate::{gcore::methods::{sheet::SpreadSheetMethod, values::SpreadSheetValuesMethod}, *};
+  use crate::{gcore::methods::{batch_update::SpreadSheetBatchUpdate, sheet::SpreadSheetMethod, values::SpreadSheetValuesMethod}, *};
   use gcore::Secret;
 
 
@@ -84,7 +84,7 @@ mod private
     pub endpoint : &'a str,
   }
 
-  impl< S : Secret > Client< '_, S >
+  impl< 'a, S : Secret > Client< 'a, S >
   {
     pub fn spreadsheet( &self ) -> SpreadSheetValuesMethod< S >
     {
@@ -101,6 +101,19 @@ mod private
         client : self
       }
     }
+
+    pub fn batch_update< 'b >( &'a self, spreadsheet_id : &'b str ) -> SpreadSheetBatchUpdate< 'a, 'b, S >
+    {
+      SpreadSheetBatchUpdate
+      {
+        client : self,
+        spreadsheet_id,
+        requests : Default::default(),
+        include_spreadsheet_in_response : Default::default(),
+        response_ranges : Default::default(),
+        response_include_grid_data : Default::default()
+      }
+    }
   }
 
 }

module/move/gspread/src/gcore/methods.rs

@@ -5,4 +5,5 @@ crate::mod_interface!
 {
   layer sheet;
   layer values;
+  layer batch_update;
 }

module/move/gspread/src/gcore/methods/batch_update.rs

@@ -0,0 +1,129 @@
+mod private 
+{
+  use crate::{gcore::{DeleteDimensionRequest, Error, Request, Response, Result}, *};
+  use gcore::{Secret, Client};
+
+  pub struct SpreadSheetBatchUpdate< 'a, 'b, S : Secret >
+  {
+    pub client : &'a Client< 'a, S >,
+    pub requests : Vec< Request >,
+    pub spreadsheet_id : &'b str,
+    pub include_spreadsheet_in_response : bool,
+    pub response_ranges : Vec< String >,
+    pub response_include_grid_data : bool
+  }
+
+  impl< 'a, 'b, S : Secret > SpreadSheetBatchUpdate< 'a, 'b, S >
+  {
+    pub fn delete_dimension
+    (
+      mut self,
+      req : DeleteDimensionRequest
+    ) -> SpreadSheetBatchUpdate< 'a, 'b, S >
+    {
+      self.requests.push( Request::DeleteDimension( req ) );
+      self
+    }
+
+    pub async fn doit( &self ) -> Result< Response >
+    {
+      let endpoint = format!
+      (
+        "{}/{}:batchUpdate",
+        self.client.endpoint,
+        self.spreadsheet_id
+      );
+
+      let body = BatchUpdateRequest
+      {
+        requests : self.requests.clone(),
+        include_spreadsheet_in_response : self.include_spreadsheet_in_response,
+        response_ranges : self.response_ranges.clone(),
+        response_include_grid_data : self.response_include_grid_data
+      };
+
+      let token = match &self.client.auth
+      {
+        Some( auth_data ) => 
+        {
+          let mut token_ref = auth_data.token.borrow_mut();
+
+          if let Some( token ) = &*token_ref 
+          {
+            token.clone()
+          } 
+          else 
+          {
+            let new_token = auth_data
+            .secret
+            .get_token()
+            .await
+            .map_err( | err | Error::ApiError( err.to_string() ) )?;
+
+            *token_ref = Some( new_token.clone() );
+
+            new_token
+          }
+        }
+        None => "".to_string()
+      };
+
+      let response = reqwest::Client::new()
+      .post( endpoint )
+      .json( &body )
+      .bearer_auth( token )
+      .send()
+      .await
+      .map_err( | err | Error::ApiError( err.to_string() ) )?;
+
+      if !response.status().is_success()
+      {
+        let response_text = response
+        .text()
+        .await
+        .map_err( | err | Error::ParseError( err.to_string() ) )?;
+        
+        return Err( Error::ApiError( response_text ) );
+      }
+
+      let response_parsed = response.json::< Response >()
+      .await
+      .map_err( | err | Error::ParseError( err.to_string() ) )?;
+
+      Ok( response_parsed )
+    }
+  }
+
+  #[ derive( Debug, ser::Serialize, ser::Deserialize ) ]
+  pub struct BatchUpdateRequest
+  {
+    /// A list of updates to apply to the spreadsheet. Requests will be applied in the order they are specified. If any request is not valid, no requests will be applied.
+    requests : Vec< Request >,
+    /// Determines if the update response should include the spreadsheet resource.
+    #[ serde( rename = "includeSpreadsheetInResponse" ) ]
+    include_spreadsheet_in_response : bool,
+    /// Limits the ranges included in the response spreadsheet. Meaningful only if includeSpreadsheetInResponse is 'true'.
+    #[ serde( rename = "resoponseRanges" ) ]
+    response_ranges : Vec< String >,
+    /// True if grid data should be returned. Meaningful only if includeSpreadsheetInResponse is 'true'. This parameter is ignored if a field mask was set in the request.
+    #[ serde( rename = "responseIncludeGridData" ) ]
+    response_include_grid_data : bool 
+  }
+
+  #[ derive( Debug, ser::Serialize, ser::Deserialize ) ]
+  pub struct BatchUpdateResponse
+  {
+    #[ serde( rename = "spreadsheetId" ) ]
+    spreadsheet_id : Option< String >,
+    replies : Option< Vec< Response > >,
+    updated_spreadsheet : Option<  >
+  }
+}
+
+crate::mod_interface!
+{
+  own use
+  {
+    SpreadSheetBatchUpdate
+  };
+}

module/move/gspread/src/gcore/methods/sheet.rs

@@ -66,21 +66,6 @@ mod private
         _dest : dest
       }
     }
-
-    pub fn delete_dimension< 'a >
-    (
-      &'a self,
-      spreadsheet_id : &'a str,
-      request : DeleteDimensionRequest
-    ) -> SheetDeleteDimensionMethod< 'a, S >
-    {
-      SheetDeleteDimensionMethod
-      {
-        client : self.client,
-        spreadsheet_id : spreadsheet_id,
-        request : request
-      }
-    }
   }
 
   /// # SheetCopyMethod
@@ -191,96 +176,13 @@ mod private
     }
   }
 
-  pub struct SheetDeleteDimensionMethod< 'a, S : Secret >
-  {
-    client : &'a Client< 'a, S >,
-    spreadsheet_id : &'a str,
-    request : DeleteDimensionRequest
-  }
-
-  impl< S : Secret > SheetDeleteDimensionMethod< '_, S >
-  {
-    pub async fn doit( &self ) -> Result< Response  >
-    {
-      let endpoint = format!
-      (
-        "{}/{}:batchUpdate",
-        self.client.endpoint,
-        self.spreadsheet_id
-      );
-
-      let token = match &self.client.auth
-      {
-        Some( auth_data ) => 
-        {
-          let mut token_ref = auth_data.token.borrow_mut();
-
-          if let Some( token ) = &*token_ref 
-          {
-            token.clone()
-          } 
-          else 
-          {
-            let new_token = auth_data
-            .secret
-            .get_token()
-            .await
-            .map_err( | err | Error::ApiError( err.to_string() ) )?;
-
-            *token_ref = Some( new_token.clone() );
-
-            new_token
-          }
-        }
-        None => "".to_string()
-      };
-
-      let response = reqwest::Client::new()
-      .post( endpoint )
-      .json( &self.request )
-      .bearer_auth( token )
-      .send()
-      .await
-      .map_err( | err | Error::ApiError( err.to_string() ) )?;
-
-      let response_parsed = response.json::< Response >()
-      .await
-      .map_err( | err | Error::ParseError( err.to_string() ) )?;
-
-      Ok( response_parsed )
-    }
-  }
-
   #[ derive( Debug, ser::Serialize, ser::Deserialize ) ]
   pub struct BatchUpdateResponse
   {
     #[ serde( rename = "spreadsheetId" ) ]
     spreadsheet_id : Option< String >,
   }
 
-  #[ derive( Debug, ser::Serialize, ser::Deserialize ) ]
-  pub enum Request
-  {
-    #[ serde( rename = "deleteDimension" ) ]
-    DeleteDimension( DeleteDimensionRequest )
-  }
-
-  #[ derive( Debug, ser::Serialize, ser::Deserialize ) ]
-  pub struct BatchUpdateRequest
-  {
-    /// A list of updates to apply to the spreadsheet. Requests will be applied in the order they are specified. If any request is not valid, no requests will be applied.
-    requests : Vec< Request >,
-    /// Determines if the update response should include the spreadsheet resource.
-    #[ serde( rename = "includeSpreadsheetInResponse" ) ]
-    include_spreadsheet_in_response : bool,
-    /// Limits the ranges included in the response spreadsheet. Meaningful only if includeSpreadsheetInResponse is 'true'.
-    #[ serde( rename = "resoponseRanges" ) ]
-    response_ranges : Vec< String >,
-    /// True if grid data should be returned. Meaningful only if includeSpreadsheetInResponse is 'true'. This parameter is ignored if a field mask was set in the request.
-    #[ serde( rename = "responseIncludeGridData" ) ]
-    response_include_grid_data : bool 
-  }
-
   #[ derive( Debug, ser::Serialize, ser::Deserialize ) ]
   pub struct SheetCopyRequest
   {