RUBYAPI-40 add #reso_api

Author: codygustafson

lib/spark_api.rb

@@ -39,6 +39,14 @@ def self.client(opts={})
     Thread.current[:spark_api_client] ||= SparkApi::Client.new(opts)
   end
 
+  def self.reso_client(opts={})
+    opts = opts.dup
+    opts[:version] = "Reso/OData"
+    opts[:middleware] = :reso_api
+
+    Thread.current[:reso_api_client] ||= SparkApi::Client.new(opts)
+  end
+
   def self.method_missing(method, *args, &block)
     return super unless (client.respond_to?(method))
     client.send(method, *args, &block)
@@ -47,6 +55,7 @@ def self.method_missing(method, *args, &block)
   def self.reset
     reset_configuration
     Thread.current[:spark_api_client] = nil
+    Thread.current[:reso_api_client] = nil
   end
 
 end

lib/spark_api/authentication/api_auth.rb

@@ -19,7 +19,7 @@ def authenticate
         sig = sign("#{@client.api_secret}ApiKey#{@client.api_key}")
         SparkApi.logger.debug { "Authenticating to #{@client.endpoint}" }
         start_time = Time.now
-        request_path = "/#{@client.version}/session?ApiKey=#{@client.api_key}&ApiSig=#{sig}"
+        request_path = "#{SparkApi::Configuration::DEFAULT_SESSION_PATH}?ApiKey=#{@client.api_key}&ApiSig=#{sig}"
         resp = @client.connection(true).post request_path, ""
         request_time = Time.now - start_time
         SparkApi.logger.info { "[#{(request_time * 1000).to_i}ms] Api: POST #{request_path}" }

lib/spark_api/configuration.rb

@@ -11,7 +11,7 @@ module Configuration
     # valid configuration options
     VALID_OPTION_KEYS = [:api_key, :api_secret, :api_user, :endpoint, 
       :user_agent, :version, :ssl, :ssl_verify, :oauth2_provider, :authentication_mode, 
-      :auth_endpoint, :callback, :compress, :timeout].freeze
+      :auth_endpoint, :callback, :compress, :timeout, :middleware].freeze
     OAUTH2_KEYS = [:authorization_uri, :access_uri, :client_id, :client_secret,
       # Requirements for authorization_code grant type
       :redirect_uri,  
@@ -36,12 +36,14 @@ module Configuration
     DEFAULT_AUTHORIZATION_URI = 'https://sparkplatform.com/oauth2'
     DEFAULT_VERSION = 'v1'
     DEFAULT_ACCESS_URI = "#{DEFAULT_ENDPOINT}/#{DEFAULT_VERSION}/oauth2/grant"
+    DEFAULT_SESSION_PATH = "/#{DEFAULT_VERSION}/session"
     DEFAULT_USER_AGENT = "Spark API Ruby Gem #{VERSION}"
     DEFAULT_SSL = true
     DEFAULT_SSL_VERIFY = true
     DEFAULT_OAUTH2 = nil
     DEFAULT_COMPRESS = false
     DEFAULT_TIMEOUT = 5 # seconds
+    DEFAULT_MIDDLEWARE = :spark_api
 
     X_SPARK_API_USER_AGENT = "X-SparkApi-User-Agent"
 
@@ -75,6 +77,7 @@ def reset_configuration
       self.version     = DEFAULT_VERSION
       self.compress    = DEFAULT_COMPRESS
       self.timeout     = DEFAULT_TIMEOUT
+      self.middleware  = DEFAULT_MIDDLEWARE
       self
     end
   end

lib/spark_api/connection.rb

@@ -23,7 +23,7 @@ def connection(force_ssl = false)
       end
 
       conn = Faraday.new(opts) do |conn|
-        conn.response :spark_api
+        conn.response self.middleware
         conn.options[:timeout] = self.timeout
         conn.adapter Faraday.default_adapter
       end

lib/spark_api/faraday_middleware.rb

@@ -86,6 +86,24 @@ def decompress_body(env)
     end
 
   end
-  Faraday::Response.register_middleware :spark_api => FaradayMiddleware
 
+  class ResoFaradayMiddleware < FaradayMiddleware
+
+    def on_complete(env)
+
+      body = decompress_body(env)
+      body = MultiJson.decode(body)
+
+      if body["D"]
+        super(env)
+        return
+      end
+
+      env[:body] = body
+    end
+
+  end
+
+  Faraday::Response.register_middleware :spark_api => FaradayMiddleware
+  Faraday::Response.register_middleware :reso_api => ResoFaradayMiddleware
 end