RUBYAPI-40 config based

Author: codygustafson

lib/spark_api.rb

@@ -13,6 +13,7 @@
 require 'spark_api/connection'
 require 'spark_api/client'
 require 'spark_api/faraday_middleware'
+require 'spark_api/reso_faraday_middleware'
 require 'spark_api/primary_array'
 require 'spark_api/options_hash'
 require 'spark_api/models'
@@ -39,14 +40,6 @@ 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)
@@ -55,7 +48,6 @@ 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/cli.rb

@@ -31,6 +31,7 @@ class ConsoleCLI
         :api_user => "API_USER",
         # OTHER
         :debug=> "DEBUG",
+        :middleware => "SPARK_MIDDLEWARE",
         :console => "SPARK_API_CONSOLE"  # not a public option, meant to distinguish bin/spark_api and script/console
       }
 
@@ -69,7 +70,8 @@ def self.setup_options(stdout,arguments)
           :api_secret => ENV[OPTIONS_ENV[:api_secret]],
           :api_user => ENV[OPTIONS_ENV[:api_user]],
           :ssl_verify => ENV.fetch(OPTIONS_ENV[:ssl_verify], true),
-          :console => ENV[OPTIONS_ENV[:console]]
+          :console => ENV[OPTIONS_ENV[:console]],
+          :middleware => ENV[OPTIONS_ENV[:middleware]]
         }
         cli_options = {}
         file_options = {}
@@ -128,7 +130,10 @@ def self.setup_options(stdout,arguments)
           opts.on("--api_user API_USER",
                   "ID of the Spark user to run the client as.",
                   "Default: ENV['#{OPTIONS_ENV[:api_user]}']") { |arg| cli_options[:api_user] = arg }
-          
+          opts.on("--middleware SPARK_MIDDLEWARE",
+                  "spark_api for accessing spark, reso_api for accessing reso adapter",
+                  "Default: spark_api") { |arg| cli_options[:middleware] = arg }
+
           # General           
           opts.on("-f", "--file FILE",
                   "Load configuration for yaml file.") { |arg| file_options = parse_file_options(arg) }

lib/spark_api/cli/api_auth.rb

@@ -6,4 +6,5 @@
   config.api_user = ENV["API_USER"] if ENV["API_USER"]
   config.endpoint = ENV["API_ENDPOINT"] if ENV["API_ENDPOINT"]
   config.ssl_verify = ENV["SSL_VERIFY"].downcase != 'false' if ENV["SSL_VERIFY"]
+  config.middleware = ENV["SPARK_MIDDLEWARE"]  if ENV["SPARK_MIDDLEWARE"]
 end

lib/spark_api/cli/oauth2.rb

@@ -19,6 +19,7 @@
   config.authentication_mode = SparkApi::Authentication::OAuth2
   config.endpoint = ENV["API_ENDPOINT"] if ENV["API_ENDPOINT"]
   config.ssl_verify = ENV["SSL_VERIFY"].downcase != 'false' if ENV["SSL_VERIFY"]
+  config.middleware = ENV["SPARK_MIDDLEWARE"]  if ENV["SPARK_MIDDLEWARE"]
 end
 
 # Enables saving and loading serialized oauth2 sessions for the system user. 

lib/spark_api/configuration.rb

@@ -43,7 +43,7 @@ module Configuration
     DEFAULT_OAUTH2 = nil
     DEFAULT_COMPRESS = false
     DEFAULT_TIMEOUT = 5 # seconds
-    DEFAULT_MIDDLEWARE = :spark_api
+    DEFAULT_MIDDLEWARE = 'spark_api'
 
     X_SPARK_API_USER_AGENT = "X-SparkApi-User-Agent"
 
@@ -77,7 +77,7 @@ def reset_configuration
       self.version     = DEFAULT_VERSION
       self.compress    = DEFAULT_COMPRESS
       self.timeout     = DEFAULT_TIMEOUT
-      self.middleware  = DEFAULT_MIDDLEWARE
+      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 self.middleware
+        conn.response self.middleware.to_sym
         conn.options[:timeout] = self.timeout
         conn.adapter Faraday.default_adapter
       end

lib/spark_api/faraday_middleware.rb

@@ -87,23 +87,7 @@ def decompress_body(env)
 
   end
 
-  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
+

lib/spark_api/request.rb

@@ -65,7 +65,11 @@ def request(method, path, body, options)
       begin
         request_opts = {}
         request_opts.merge!(options)
-        request_path = "/#{version}#{path}"
+        request_path = if middleware == :reso_api
+                         "/Reso/OData#{path}"
+                       else
+                         "/#{version}#{path}"
+                       end
         start_time = Time.now
         if [:get, :delete, :head].include?(method.to_sym)
           response = authenticator.request(method, request_path, nil, request_opts)

lib/spark_api/reso_faraday_middleware.rb

@@ -0,0 +1,23 @@
+
+module SparkApi
+
+  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
+      end
+
+      env[:body] = body
+    end
+
+  end
+
+  Faraday::Response.register_middleware :reso_api => ResoFaradayMiddleware
+end