Merge pull request #20 from martinjlowm/feature/api-version

[Feature] Adds support for specifying API version

Author: Caitlin Bales (MSFT)

README.md

@@ -46,10 +46,10 @@ tokens        = context.acquire_token_for_user(resource, client_cred, user_cred)
 # add the access token to the request header
 callback = Proc.new { |r| r.headers["Authorization"] = "Bearer #{tokens.access_token}" }
 
-graph = MicrosoftGraph.new(
-                            base_url: "https://graph.microsoft.com/v1.0",
-                            cached_metadata_file: File.join(MicrosoftGraph::CACHED_METADATA_DIRECTORY, "metadata_v1.0.xml"),
-                            &callback
+graph = MicrosoftGraph.new(base_url: "https://graph.microsoft.com/v1.0",
+                           cached_metadata_file: File.join(MicrosoftGraph::CACHED_METADATA_DIRECTORY, "metadata_v1.0.xml"),
+                           api_version: '1.6', # Optional
+                           &callback
 )
 
 me = graph.me # get the current user

lib/microsoft_graph.rb

@@ -14,9 +14,10 @@ class MicrosoftGraph
 
   def initialize(options = {}, &auth_callback)
     @service = OData::Service.new(
+      api_version: options[:api_version],
+      auth_callback: auth_callback,
       base_url: BASE_URL,
-      metadata_file: options[:cached_metadata_file],
-      auth_callback: auth_callback
+      metadata_file: options[:cached_metadata_file]
     )
     @association_collections = {}
     unless MicrosoftGraph::ClassBuilder.loaded?

lib/microsoft_graph/collection_association.rb

@@ -191,21 +191,24 @@ def last?
 
     def fetch_next_page
       @next_link ||= query_path
-      result = begin
-        @graph.service.get(@next_link)
-      rescue OData::ClientError => e
-        if matches = /Unsupported sort property '([^']*)'/.match(e.message)
-          raise MicrosoftGraph::TypeError.new("Cannot sort by #{matches[1]}")
-        elsif /OrderBy not supported/.match(e.message)
-          if @order_by.length == 1
-            raise MicrosoftGraph::TypeError.new("Cannot sort by #{@order_by.first}")
+
+      result =
+        begin
+          @graph.service.get(@next_link)
+        rescue OData::ClientError => e
+          if matches = /Unsupported sort property '([^']*)'/.match(e.message)
+            raise MicrosoftGraph::TypeError.new("Cannot sort by #{matches[1]}")
+          elsif /OrderBy not supported/.match(e.message)
+            if @order_by.length == 1
+              raise MicrosoftGraph::TypeError.new("Cannot sort by #{@order_by.first}")
+            else
+              raise MicrosoftGraph::TypeError.new("Cannot sort by at least one field requested")
+            end
           else
-            raise MicrosoftGraph::TypeError.new("Cannot sort by at least one field requested")
+            raise e
           end
-        else
-          raise e
         end
-      end
+
       @next_link = result[:attributes]['@odata.next_link']
       @next_link.sub!(MicrosoftGraph::BASE_URL, "") if @next_link
 

lib/odata/service.rb

@@ -4,6 +4,9 @@ class Service
     attr_reader :metadata
 
     def initialize(options = {}, &block)
+      @api_version   = {
+        'api-version': options[:api_version]
+      } if options[:api_version]
       @auth_callback = options[:auth_callback] || block
       @base_url      = options[:base_url]
       @metadata_file = options[:metadata_file]
@@ -64,7 +67,17 @@ def patch(path, data)
     end
 
     def request(options = {})
-      req = Request.new(options[:method], options[:uri], options[:data])
+      uri = options[:uri]
+
+      if @api_version then
+        parsed_uri = URI(uri)
+        params = URI.decode_www_form(parsed_uri.query || '')
+                    .concat(@api_version.to_a)
+        parsed_uri.query = URI.encode_www_form params
+        uri = parsed_uri.to_s
+      end
+
+      req = Request.new(options[:method], uri, options[:data])
       @auth_callback.call(req) if @auth_callback
       req.perform
     end