occi-api 4.2.0.beta.16 → 4.2.0.beta.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a279571e2ef67054f9f5ccaee15e3c3fe9aca22e
-  data.tar.gz: 1160d56dfc697c18f2b1dc0ae0e8522a5e1bd3ba
+  metadata.gz: 028662a3144ea5e6358cf09aa95bf695b34bbd7a
+  data.tar.gz: 75563451bd917491cdb3c2266940335011a2dd5b
 SHA512:
-  metadata.gz: a484c7cf79840350dcdfdde41fd18cf3ea0abad52542f9bf32f98aaadf711f108f3208f3dba423b3a9598d7ac3b22aaa6848d7ecca73c30f319f1d16731164c1
-  data.tar.gz: 7c323695265fc8bac570329e39a26523294ed6c55c10a7f5ca126d322a09c8578ff91f1c8ce13a2e4b172dd216aecc8b2b9acd2a643caf653990175c36bbae00
+  metadata.gz: d0174b927e6e39b06a9b2d7f4302a75cc38ef4c9b5d4055900496c210d42c65ace37ddd98886f98ed9b3f38d31a3623e041f6e8f0bc9471b07ac36f18f7b0178
+  data.tar.gz: 0d47b24bb194e2eb04f140ddcad0599e9a00e418c9969fbfddf1f3eeb8378dcfe530cd868c614cbcfee1b7a10dd16c8c27fdbfb9be288372ed0393011e4d77b0

data/lib/occi/api/client/base/protected_stubs.rb

@@ -3,6 +3,19 @@ module Occi::Api::Client
 
     module ProtectedStubs
 
+      # Sets global connection options before the first call
+      # to a remote server is made. For example, this allows
+      # the configuration of a global connection timeout, including
+      # pre-authentication and authentication calls.
+      #
+      # @example
+      #    configure_connection { :timeout => 180 }
+      #
+      # @param options [Hash] global options
+      def configure_connection(options)
+        raise Occi::Api::Client::Errors::NotImplementedError, "#{__method__} is just a stub!"
+      end
+
       # Sets auth method and appropriate httparty attributes. Supported auth methods
       # are: ["basic", "digest", "x509", "none"]
       #

data/lib/occi/api/client/client_base.rb

@@ -31,6 +31,9 @@ module Occi::Api::Client
       # check the validity and canonize the endpoint URI
       @endpoint = get_endpoint_uri(@options[:endpoint])
 
+      # set global connection options, such as timeout
+      configure_connection(@options)
+
       # pass auth options
       @auth_options = get_auth(@options[:auth])
 

data/lib/occi/api/client/client_http.rb

@@ -40,8 +40,9 @@ module Occi::Api::Client
     def initialize(options = {})
       super options
 
+      # set a global base URI for all subsequent requests
+      # must be done after authN calls
       self.class.base_uri @endpoint.to_s
-      self.class.default_timeout @options[:timeout].to_i unless @options[:timeout].blank?
 
       # get model information from the endpoint
       # and create Occi::Model instance

data/lib/occi/api/client/http/helpers.rb

@@ -11,6 +11,12 @@ module Occi::Api::Client
         logger
       end
 
+      # @see Occi::Api::Client::ClientBase
+      def configure_connection(options)
+        # timeout is the only global connection option at the moment
+        self.class.default_timeout options[:timeout].to_i unless options[:timeout].blank?
+      end
+
       # @see Occi::Api::Client::ClientBase
       def get_auth(auth_options, fallback = false)
         # select appropriate authN type

data/lib/occi/api/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Api
-    VERSION = "4.2.0.beta.16" unless defined?(::Occi::Api::VERSION)
+    VERSION = "4.2.0.beta.17" unless defined?(::Occi::Api::VERSION)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-api
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta.16
+  version: 4.2.0.beta.17
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-15 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-core