Update docs for change to query builder

Author: RogerSelwyn

docs/source/usage/addressbook.rst

@@ -64,15 +64,16 @@ Without admin consent you can only access a few properties of each user such as
 To search the Global Address List (Users API):
 
 .. code-block:: python
-
+    
     global_address_list = account.directory()
 
     # for backwards compatibility only this also works and returns a Directory object:
     # global_address_list = account.address_book(address_book='gal')
 
     # start a new query:
-    q = global_address_list.new_query('display_name')
-    q.startswith('George Best')
+    builder = global_address_list.new_query()
+    query = builder.select('display_name')
+    query = query & builder.startswith('subject', 'George Best')
 
     for user in global_address_list.get_users(query=q):
         print(user)

docs/source/usage/calendar.rst

@@ -46,12 +46,13 @@ Working with Calendar instances:
 
     calendar = schedule.get_calendar(calendar_name='Birthdays')
 
+    builder = calendar.new_query()
     calendar.name = 'Football players birthdays'
     calendar.update()
 
     
-    start_q = calendar.new_query('start').greater_equal(dt.datetime(2018, 5, 20))
-    end_q = calendar.new_query('start').less_equal(dt.datetime(2018, 5, 24))
+    start_q = builder.greater_equal('start', dt.datetime(2018, 5, 20))
+    end_q = builder.greater_equal('start', dt.datetime(2018, 5, 24))
 
     birthdays = calendar.get_events(
         include_recurring=True, # include_recurring=True will include repeated events on the result set.

docs/source/usage/mailbox.rst

@@ -87,7 +87,8 @@ MailboxSettings.ReadWrite  mailbox_settings                         To read and
 .. .. code-block:: python
 
 ..     # All child folders whose name startswith 'Top'
-..     mail_folders = mailbox.get_folders(query=mailbox.new_query('displayName').startswith('Top'))
+..     builder = mailbox.new_query()
+..     mail_folders = mailbox.get_folders(query=builder.startswith('displayName', 'Top'))
 
 Mailbox and Messages
 """"""""""""""""""""
@@ -152,8 +153,9 @@ Creating a draft message is as easy as this:
 **Working with saved emails is also easy**
 
 .. code-block:: python
-
-    query = mailbox.new_query().on_attribute('subject').contains('george best')  # see Query object in Utils
+    
+    builder = mailbox.new_query()
+    query = builder.chain_or(builder.contains('subject', 'george best'), builder.startswith('subject', 'quotes')  # see Query object in Utils
     messages = mailbox.get_messages(limit=25, query=query)
 
     message = messages[0]  # get the first one

docs/source/usage/utils/query.rst

@@ -12,8 +12,7 @@ For example:
 
 .. code-block:: python
 
-    from O365.utils import QueryBuilder
-    builder = QueryBuilder(protocol=account.protocol)
+    builder = mailbox.new_query()
 
     query = builder.chain_or(builder.contains('subject', 'george best'), builder.startswith('subject', 'quotes')
 
@@ -27,7 +26,7 @@ For example:
     # contains(subject, 'george best') or startswith(subject, 'quotes') and createdDateTime gt '2018-03-21T00:00:00Z'
     # note you can pass naive datetimes and those will be converted to you local timezone and then send to the api as UTC in iso8601 format
 
-    # To use Query objetcs just pass it to the query parameter:
+    # To use Query objects just pass it to the query parameter:
     filtered_messages = mailbox.get_messages(query=query)
 
 You can also specify specific data to be retrieved with "select":

docs/source/usage/utils/utils.rst

@@ -49,14 +49,14 @@ For example:
 
 .. code-block:: python
 
-    query = mailbox.new_query()  # you can use the shorthand: mailbox.q()
+    builder = mailbox.new_query()  # you can use the shorthand: mailbox.q()
 
-    query = query.on_attribute('subject').contains('george best').chain('or').startswith('quotes')
+    query = builder.chain_or(builder.contains('subject', 'george best'), builder.startswith('subject', 'quotes')
 
     # 'created_date_time' will automatically be converted to the protocol casing.
     # For example when using MS Graph this will become 'createdDateTime'.
 
-    query = query.chain('and').on_attribute('created_date_time').greater(datetime(2018, 3, 21))
+    query = query & builder.greater('created_date_time', datetime(2018, 3, 21))
 
     print(query)