Merge pull request #115 from avasachinbaijal/AVS-Devport764

Fixes for ASV and DEVPORT-764

Author: svc-developer

lib/avatax/client.rb

@@ -31,5 +31,7 @@ class Client < API
     include AvaTax::Client::Upcs
     include AvaTax::Client::Users
     include AvaTax::Client::Utilities
+    include AvaTax::Client::ShippingVerification
+    include AvaTax::Client::AgeVerification
   end
 end

lib/avatax/connection.rb

@@ -8,7 +8,7 @@ module Connection
     REMOVED_LABEL = '\1[REMOVED]'
 
     def connection
-      client_id = "#{app_name};#{app_version};RubySdk;#{AvaTax::VERSION.dup};#{machine_name}"
+      client_id = "#{app_name};#{app_version};RubySdk;API_VERSION;#{machine_name}"
       options = {
         :headers =>
           {

lib/avatax/request.rb

@@ -6,24 +6,25 @@
 module AvaTax
   module Request
 
-    def get(path, options={})
-      request(:get, path, nil, options)
+    def get(path, options={}, apiversion="")
+      request(:get, path, nil, options, apiversion)
     end
 
-    def post(path, model, options={})
-      request(:post, path, model, options)
+    def post(path, model, options={}, apiversion="")
+      request(:post, path, model, options, apiversion)
     end
 
-    def put(path, model, options={})
-      request(:put, path, model, options)
+    def put(path, model, options={}, apiversion="")
+      request(:put, path, model, options, apiversion)
     end
 
-    def delete(path, options={})
-      request(:delete, path, nil, options)
+    def delete(path, options={}, apiversion="")
+      request(:delete, path, nil, options, apiversion)
     end
 
-    def request(method, path, model, options={})
+    def request(method, path, model, options={}, apiversion="")
       response = connection.send(method) do |request|
+        request.headers['X-Avalara-Client'] = request.headers['X-Avalara-Client'].gsub("API_VERSION", apiversion)
         case method
         when :get, :delete
           request.url("#{encode_path(path)}?#{URI.encode_www_form(options)}")