abiquo-api 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcac0cebe8eca1e8436a1e201a4fbc5ec3d7e30c
-  data.tar.gz: d7d7b8036b8746c68e72c8d8d83e5e02a119845f
+  metadata.gz: ac0a5ff9c10d0b39f113f768cb9d93c68bd271b3
+  data.tar.gz: f69f314150ee749e51083511e005cc75b089cb1a
 SHA512:
-  metadata.gz: 772ad5ac86fb5cef5a94a6fb4d623da66dc83c5cf4b76e5e8fbbe2db2af1837ceabd83e917250ab8cc0b56f2d06a4bd8e5076d16fe1d367037b62d2256b06521
-  data.tar.gz: 8ec539f19258de9cf0bf4f9be60050956b27265680e46ba228a5793704547cfaaa0de7609d6c2abfd5c63381712216dc51a836b6027d40f5100a6d8446e874d7
+  metadata.gz: eb7a621e40a32e64d54f5b56e844e2023e058c20ea9b17ffb7744824756d8effa99bc67ff1385637796b1987b99558b67ac8e0fc7539fcb3442c265f668b29da
+  data.tar.gz: d9b10fc59d6f339d1bf63a8969e88d105c6a013e43bbac0ba717fcd69ffd63ef57fb61714b4f0d1d2f86cbb0582fb35de14c7928668cd9d363e7c69b2105fc49

data/README.md

@@ -33,6 +33,22 @@ abq = AbiquoAPI.new(:abiquo_api_url => 'https://10.60.13.40/api',
                   :version => "2.9")
 ```
 
+You can also define some connection parameters that will be applied to HTTP connection:
+
+```ruby
+require 'abiquo-api'
+
+abq = AbiquoAPI.new(:abiquo_api_url => 'https://10.60.13.40/api',
+                  :abiquo_username => "admin",
+                  :abiquo_password => "xabiquo",
+                  :connection_options => {
+                      :connect_timeout => 30,
+                      :read_timeout => 120,
+                      :write_timeout => 120,
+                      :ssl_verify_peer => true,
+                      :ssl_ca_path => "/etc/pki/tls/private/myCA.crt" })
+```
+
 Then you can start browsing the API:
 
 ```ruby

data/lib/abiquo-api.rb

@@ -38,22 +38,31 @@ class AbiquoAPI
   #
   # Required options:
   #
-  #   :abiquo_api_url  => The URL of the Abiquo API. ie. https://yourserver/api
-  #   :abiquo_username => The username used to connect to the Abiquo API.
-  #   :abiquo_password => The password for your user.
-  #   :version         => The Abiquo API version to include in each request.
-  #                       Defaults to whatever is returned in the /api/version resource
+  #   :abiquo_api_url     => The URL of the Abiquo API. ie. https://yourserver/api
+  #   :abiquo_username    => The username used to connect to the Abiquo API.
+  #   :abiquo_password    => The password for your user.
+  #   :version            => The Abiquo API version to include in each request.
+  #                          Defaults to whatever is returned in the /api/version resource
+  #   :connection_options => Excon HTTP client connection options.
+  #                          { :connect_timeout => <time_in_secs>,
+  #                            :read_timeout => <time_in_secs>,
+  #                            :write_timeout => <time_in_secs>,
+  #                            :ssl_verify_peer => <true_or_false>,
+  #                            :ssl_ca_path => <path_to_ca_file> }
   #
   def initialize(options = {})
     api_url = options[:abiquo_api_url]
     api_username = options[:abiquo_username]
     api_password = options[:abiquo_password]
+    connection_options = options[:connection_options] || {}
 
     raise "You need to set :abiquo_api_url, :abiquo_username and :abiquo_password" if api_url.nil? or api_username.nil? or api_password.nil?
 
     @http_client = AbiquoAPIClient::HTTPClient.new(api_url,
                                                   api_username,
-                                                  api_password)
+                                                  api_password,
+                                                  connection_options)
+
     api_path = URI.parse(api_url).path
 
     loginresp = @http_client.request(

data/lib/abiquo-api/httpclient.rb

@@ -28,12 +28,24 @@ module AbiquoAPIClient
     #   :abiquo_api_url:: The URL of the Abiquo API. ie. https://yourserver/api
     #   :abiquo_username:: The username used to connect to the Abiquo API.
     #   :abiquo_password:: The password for your user.
+    #   :connection_options:: { :connect_timeout => <time_in_secs>, :read_timeout => <time_in_secs>, :write_timeout => <time_in_secs>,
+    #                           :ssl_verify_peer => <true_or_false>, :ssl_ca_path => <path_to_ca_file> }
     #
-    def initialize(api_url, api_username, api_password)
-      Excon.defaults[:ssl_verify_peer] = false
+    def initialize(api_url, api_username, api_password, connection_options)
+      Excon.defaults[:ssl_ca_path] = connection_options[:ssl_ca_path] || ''
+      Excon.defaults[:ssl_verify_peer] = connection_options[:ssl_verify_peer] || false
+
+      connect_timeout  = connection_options[:connect_timeout] || 60
+      read_timeout = connection_options[:read_timeout] || 60
+      write_timeout = connection_options[:write_timeout] || 60
+
       @connection = Excon.new(api_url, 
                             :user => api_username, 
-                            :password => api_password )
+                            :password => api_password,
+                            :connect_timeout => connect_timeout,
+                            :read_timeout => read_timeout,
+                            :write_timeout => write_timeout)
+
       self
     end
 

data/lib/abiquo-api/version.rb

@@ -1,3 +1,3 @@
 module AbiquoAPIClient
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abiquo-api
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Marc Cirauqui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon