cloudstack_client 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fff1252133afca0d217d2dba42a9ef41f9d0124
-  data.tar.gz: 8004e1b1557234b62fde004cbd1461f7fc42f4fd
+  metadata.gz: d2b8bddf629215f194cbe11066fad1eabaf171d1
+  data.tar.gz: f043aa77492309917d8276dd210ae5f1ccc20809
 SHA512:
-  metadata.gz: 0b12dc68ad181f9b03338814820d2951779ff5fe994db00ebc63128bd8bdc22c90a93e562297cc713fbea477458e144f5ff471bcac9f4e55bcad2f43ab6b9546
-  data.tar.gz: 0379fd6f4294c0d93cfa500f56fd4133e1b1448046c0ebf20b7c20d85f87e7cae39aa5d407411ad85eec97a5645478d7dabad1e74f79959d96943cdef39f4970
+  metadata.gz: 945d8665611bca4dce415fd3fb749db55578a08ae647b4d9765ce7d4e4b66e354585567e14d50444f003465936af75bb40656ac53f9556e0f7f036c58d5c9314
+  data.tar.gz: d71dfdd42cf8521e9ef1a9a795b1271653a3a6dc337dce3b6f65b9793a483c30fe0dedd6e13f9799dfa3173712ffad807bc8a06ecb3b5f0881c95e46dc368959

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudstack_client (1.4.1)
+    cloudstack_client (1.4.2)
 
 GEM
   remote: https://rubygems.org/
@@ -24,4 +24,4 @@ DEPENDENCIES
   thor (~> 0.19)
 
 BUNDLED WITH
-   1.11.2
+   1.12.0

data/lib/cloudstack_client/connection.rb

@@ -35,32 +35,12 @@ module CloudstackClient
     def send_request(params)
       params['response'] = 'json'
       params['apiKey'] = @api_key
-
-      params_arr = params.sort.map do |key, value|
-        # support for maps (Arrays of Hashes)
-        if value.is_a?(Array)
-          map = []
-          value.each_with_index do |items, i|
-            items.each {|k, v| map << "#{key}[#{i}].#{k}=#{escape(v)}"}
-          end
-          map.sort.join("&")
-        else
-          "#{key}=#{escape(value)}"
-        end
-      end
-
       print_debug_output JSON.pretty_generate(params) if @debug
 
-      data = params_arr.sort.join('&')
-      signature = OpenSSL::HMAC.digest('sha1', @secret_key, data.downcase)
-      signature = Base64.encode64(signature).chomp
-      signature = CGI.escape(signature)
-
-      url = "#{@api_url}?#{data}&signature=#{signature}"
+      data = params_to_data(params)
+      uri = URI.parse "#{@api_url}?#{data}&signature=#{create_signature(data)}"
 
-      uri = URI.parse(url)
       http = Net::HTTP.new(uri.host, uri.port)
-
       if uri.scheme == 'https'
         http.use_ssl = true
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -111,7 +91,6 @@ module CloudstackClient
 
       max_tries.times do
         data = send_request(params)
-
         print "." if @verbose
 
         case data['jobstatus']
@@ -122,7 +101,6 @@ module CloudstackClient
         end
 
         STDOUT.flush if @verbose
-
         sleep @async_poll_interval
       end
 
@@ -139,6 +117,35 @@ module CloudstackClient
       raise InputError, "ASYNC TIMEOUT must be at least 60." if @async_timeout < 60
     end
 
+    def params_to_data(params)
+      params_arr = params.sort.map do |key, value|
+        case value
+        when String
+          "#{key}=#{escape(value)}"
+        when Array # support for maps (Arrays of Hashes)
+          map = []
+          value.each_with_index do |items, i|
+            items.each {|k, v| map << "#{key}[#{i}].#{k}=#{escape(v)}"}
+          end
+          map.sort.join("&")
+        when Hash # support for maps values of values (Hash values of Hashes)
+          value.each_with_index.map do |(k, v), i|
+            "#{key}[#{i}].key=#{escape(k)}&" +
+            "#{key}[#{i}].value=#{escape(v)}"
+          end.join("&")
+        else
+          raise ParameterError, "unsupported parameter value type \"#{value.class}\""
+        end
+      end
+      params_arr.sort.join('&')
+    end
+
+    def create_signature(data)
+      signature = OpenSSL::HMAC.digest('sha1', @secret_key, data.downcase)
+      signature = Base64.encode64(signature).chomp
+      CGI.escape(signature)
+    end
+
     def max_tries
       (@async_timeout / @async_poll_interval).round
     end
@@ -147,5 +154,5 @@ module CloudstackClient
       CGI.escape(input.to_s).gsub('+', '%20').gsub(' ', '%20')
     end
 
-  end
-end
+  end # class
+end # module

data/lib/cloudstack_client/version.rb

@@ -1,3 +1,3 @@
 module CloudstackClient
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack_client
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake