RUBYAPI-40 final touches

Author: codygustafson

lib/spark_api/connection.rb

@@ -33,13 +33,29 @@ def connection(force_ssl = false)
 
     # HTTP request headers for client requests
     def headers
+      if self.middleware.to_sym == :reso_api
+        reso_headers
+      else
+        spark_headers
+      end
+    end
+
+    def spark_headers
       {
         :accept => 'application/json',
         :content_type => 'application/json',
         :user_agent => Configuration::DEFAULT_USER_AGENT,
         Configuration::X_SPARK_API_USER_AGENT => user_agent
       }
     end
+
+    def reso_headers
+      {
+        :accept => 'application/json, application/xml',
+        :user_agent => Configuration::DEFAULT_USER_AGENT,
+        Configuration::X_SPARK_API_USER_AGENT => user_agent
+      }
+    end
 
   end
 end

lib/spark_api/request.rb

@@ -65,7 +65,7 @@ def request(method, path, body, options)
       begin
         request_opts = {}
         request_opts.merge!(options)
-        request_path = if middleware == :reso_api
+        request_path = if middleware.to_sym == :reso_api
                          "/Reso/OData#{path}"
                        else
                          "/#{version}#{path}"

lib/spark_api/reso_faraday_middleware.rb

@@ -6,15 +6,22 @@ class ResoFaradayMiddleware < FaradayMiddleware
     def on_complete(env)
 
       body = decompress_body(env)
-      body = MultiJson.decode(body)
 
-      if body["D"]
-        puts "D contains #{body['D'].inspect}"
-        super(env)
-        return
+      begin
+        body = MultiJson.decode(body)
+
+        if body["D"]
+          super(env)
+          return
+        end
+
+        env[:body] = body
+      rescue MultiJson::ParseError => e
+        # We will allow the client to choose their XML parser, but should do
+        # some minor format verification
+        raise e if body.strip[/\A<\?xml/].nil?
       end
 
-      env[:body] = body
     end
 
   end