spark_api 1.4.26 → 1.4.27

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDczOTVmZGM0NzQ5MzIzOTIyOGEyMWM5ODViOTdiMmI3NDc0MjA5YQ==
+    ZDBhNjI3MmEwMWY5YTI4MzUwMzE1NDc0ZDI2NTQwNjBiNjUzNGJiNA==
   data.tar.gz: !binary |-
-    NmZmZjMwNGIzZjZmNzcwOGRlZWFlOWE2NTA1YzBlODAyODc1ZWQ1Yg==
+    ODAzOWQwMTFhYzM2ZTIwN2VmYTY4NmMyMTdhZjA1ZWRiN2JkOTg1MA==
 SHA512:
   metadata.gz: !binary |-
-    MmU0ZjdlM2Y4Nzg3ZmU4MTQ3YjRiYTMxMDMzNzYxMzBhMjYwYWJjNjZhNmRi
-    NjM3ZTBlNWZkMTJkYmM2ZDJkM2RmYjI3NjE3MDE0ZWZmNDYxYzAwMDI3NTE0
-    MWZkYjliYTE1Yjg5NmZmMmQ0ZTkzYjRiZDRjZDc0ZDUzODI5MmU=
+    N2I2NzU3OThjMzhkMzRlNDNlODAwZThjZjk4NjBmZTE2YTlhMWJiNmM2Nzg1
+    ZDA2NzQzY2MyYzc3MzhkNzQ3NDI4Y2NiY2Y2OGEzZWRiZGVkNmFjYjc4ZWVm
+    MGIzZmEzMjcwYzc2YmJmZGMzZmZjN2NkMmVhMDM1MTQ4MTAwN2M=
   data.tar.gz: !binary |-
-    ZGFhOWE0YjBlMGYyOTA3MTU2MDBlZTljZWM5NjUwYWMxNWVhMzVlYTM0ZGQ5
-    YmE1M2U1NjZhODc1ZDY1NmRjMmFlMmMzOGZlZGIwNzdmZWU3NzdlZWI4NjBh
-    YTJmYTgyMmZkZWFmMGY5YjE3Yjc2NWIxODJjOWM2YWQwMjFjMmI=
+    Y2FlMThkOGNlMWYwMzc3Y2UwNWQ0MjkwOWFlMGEzMGZhMmQ0MzZlYTg4ZmE3
+    ZjcyMGQzYWVkMDNiZjRkOTAxOTg5MjcwZDY1M2ZkNzM1ODFmN2MyMWYxY2I5
+    NzRkMGFiYmZlMmFjZTM0ZjBjMTk4MDNmZmYwNTRlYWE1ZjUyYTQ=

data/VERSION

@@ -1 +1 @@
-1.4.26
+1.4.27

data/lib/spark_api/cli.rb

@@ -32,6 +32,7 @@ module SparkApi
         # OTHER
         :debug=> "DEBUG",
         :middleware => "SPARK_MIDDLEWARE",
+        :dictionary_version => "DICTIONARY_VERSION",
         :console => "SPARK_API_CONSOLE"  # not a public option, meant to distinguish bin/spark_api and script/console
       }
       
@@ -71,7 +72,8 @@ module SparkApi
           :api_user => ENV[OPTIONS_ENV[:api_user]],
           :ssl_verify => ENV.fetch(OPTIONS_ENV[:ssl_verify], true),
           :console => ENV[OPTIONS_ENV[:console]],
-          :middleware => ENV[OPTIONS_ENV[:middleware]]
+          :middleware => ENV[OPTIONS_ENV[:middleware]],
+          :dictionary_version => ENV[OPTIONS_ENV[:dictionary_version]]
         }
         cli_options = {}
         file_options = {}
@@ -133,6 +135,9 @@ module SparkApi
           opts.on("--middleware SPARK_MIDDLEWARE",
                   "spark_api for accessing spark, reso_api for accessing reso adapter",
                   "Default: spark_api") { |arg| cli_options[:middleware] = arg }
+          opts.on("--dictionary_version DICTIONARY_VERSION",
+                  "spark_api for accessing spark, reso_api for accessing reso adapter",
+                  "Default: spark_api") { |arg| cli_options[:dictionary_version] = arg }
 
           # General           
           opts.on("-f", "--file FILE",

data/lib/spark_api/cli/api_auth.rb

@@ -6,5 +6,6 @@ SparkApi.configure do |config|
   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"]
+  config.middleware = ENV["SPARK_MIDDLEWARE"] if ENV["SPARK_MIDDLEWARE"]
+  config.dictionary_version = ENV["DICTIONARY_VERSION"] if ENV["DICTIONARY_VERSION"]
 end

data/lib/spark_api/cli/oauth2.rb

@@ -20,6 +20,7 @@ SparkApi.configure do |config|
   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"]
+  config.dictionary_version = ENV["DICTIONARY_VERSION"] if ENV["DICTIONARY_VERSION"]
 end
 
 # Enables saving and loading serialized oauth2 sessions for the system user. 

data/lib/spark_api/configuration.rb

@@ -11,7 +11,7 @@ module SparkApi
     # 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, :middleware, :request_id_chain].freeze
+      :auth_endpoint, :callback, :compress, :timeout, :middleware, :dictionary_version, :request_id_chain].freeze
     OAUTH2_KEYS = [:authorization_uri, :access_uri, :client_id, :client_secret,
       # Requirements for authorization_code grant type
       :redirect_uri,  
@@ -44,6 +44,7 @@ module SparkApi
     DEFAULT_COMPRESS = false
     DEFAULT_TIMEOUT = 5 # seconds
     DEFAULT_MIDDLEWARE = 'spark_api'
+    DEFAULT_DICTIONARY_VERSION = nil
     DEFAULT_REQUEST_ID_CHAIN = nil
     
     X_SPARK_API_USER_AGENT = "X-SparkApi-User-Agent"
@@ -79,6 +80,7 @@ module SparkApi
       self.compress    = DEFAULT_COMPRESS
       self.timeout     = DEFAULT_TIMEOUT
       self.middleware = DEFAULT_MIDDLEWARE
+      self.dictionary_version = DEFAULT_DICTIONARY_VERSION
       self.request_id_chain = DEFAULT_REQUEST_ID_CHAIN
       self
     end

data/lib/spark_api/request.rb

@@ -66,7 +66,8 @@ module SparkApi
         request_opts = {}
         request_opts.merge!(options)
         request_path = if middleware && middleware.to_sym == :reso_api
-                         "/Reso/OData#{path}"
+                         dd_version = "Dictionary/#{dictionary_version}/" unless dictionary_version.nil?
+                         "/Reso/#{dd_version}OData#{path}"
                        else
                          "/#{version}#{path}"
                        end

data/spec/unit/spark_api/configuration_spec.rb

@@ -14,6 +14,7 @@ describe SparkApi::Client, "Client config"  do
       SparkApi.api_key.should match("my_api_key")
       SparkApi.timeout.should eq(5)
       SparkApi.request_id_chain.should be_nil
+      SparkApi.middleware.should eq('spark_api')
     end
   end
 
@@ -238,5 +239,26 @@ describe SparkApi::Client, "Client config"  do
     end
   end
 
+  describe "RESO configuration" do
+    it "should return a properly configured client" do
+      client = SparkApi::Client.new(:api_key => "key_of_cody", 
+                                    :api_secret => "TopSecret", 
+                                    :api_user => "1234",
+                                    :endpoint => "http://api.coolio.dev.fbsdata.com",
+                                    :timeout => 15,
+                                    :request_id_chain => 'foobar',
+                                    :middleware => 'reso_api',
+                                    :dictionary_version => '1.6')
+ 
+      client.api_key.should match("key_of_cody")
+      client.api_secret.should match("TopSecret")
+      client.api_user.should match("1234")
+      client.endpoint.should match("http://api.coolio.dev.fbsdata.com")
+      client.timeout.should eq(15)
+      client.request_id_chain.should eq('foobar')
+      client.middleware.should eq('reso_api')
+      client.dictionary_version.should eq('1.6')
+    end
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spark_api
 version: !ruby/object:Gem::Version
-  version: 1.4.26
+  version: 1.4.27
 platform: ruby
 authors:
 - Brandon Hornseth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday