ovirt-engine-sdk 4.1.13 → 4.2.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d15c7864e456a822afbdb20f8c4402658dd9553f
-  data.tar.gz: 672c896f5270dd6fc76acd585b58d78d44d1405e
+  metadata.gz: 734038b717ae55b9d1335c8740cfdbd5ed1f0b3f
+  data.tar.gz: e3cf776841605c2a8cd66fdb77e37fde1b09a8d0
 SHA512:
-  metadata.gz: 801bc3ab19bf21cdc701dcbcd0f18b2a6f1b9b7077805e4e54066b0ab6360da34a1e1184f6794944ae7174bd5ad556d5a31cca388926728e82f263c66553e544
-  data.tar.gz: 2e1a6c15399706216eef641a5bb207608121052dd09fbe7ca120900c642d866cafe53a484ee1ed7deb733b3e83d8c24b6e47fa0a651e5b6cce495ffd1b37e397
+  metadata.gz: ee1b0abae867f5b48a430a02d257d6d9f723da92256a4a9141b1252d88be0a0169679b2d929aad9ead3eabaa9c43c55c2bcf7bfdc4357841b1152f5034ed9b96
+  data.tar.gz: 786ded331b9d30f7cfa99437d98bd6be32ef2d189837ae24b8fa2de8d35664974d90cf225df2f45eb6e5143bee2ec810d75b7e7219f95ae67a684f7a265cc596

data/CHANGES.adoc

@@ -2,105 +2,11 @@
 
 This document describes the relevant changes between releases of the SDK.
 
-== 4.1.13 / Nov 16 2017
+== 4.2.0-alpha1 / Jun 6 2017
 
 Bug fixes:
 
-* Don't include sensible data in `inspect`
-  https://bugzilla.redhat.com/1513620[#1513620].
-
-== 4.1.12 / Nov 6 2017
-
-Bug fixes:
-
-* Virtual machine remove fails due to spelling mistake
-  https://bugzilla.redhat.com/1509020[#1509020].
-
-== 4.1.11 / Nov 6 2017
-
-Bug fixes:
-
-* Improve error message for empty response body
-  https://bugzilla.redhat.com/1509020[#1509020].
-
-* Don't send `Expect: 100-continue`
-  https://bugzilla.redhat.com/1509910[#1509910].
-
-== 4.1.10 / Nov 3 2017
-
-Update to model 4.1.40:
-
-* Add `image` parameter to `HostService.upgrade`
-  https://bugzilla.redhat.com/1488434[#1488434].
-
-New features:
-
-* Add support for cookies.
-
-* Add `connect_timeout` parameter
-  https://bugzilla.redhat.com/1508944[#1508944].
-
-Bug fixes:
-
-* Check the types of the `HttpClient` constructor parameters.
-
-* Require `redhat-rpm-config` for building
-  https://bugzilla.redhat.com/1505427[#1505427].
-
-== 4.1.9 / Oct 13 2017
-
-Update to model 4.1.39:
-
-* Add a `refresh` parameter to `FilesService.list`.
-    
-* Add support for Link Layer Discovery Protocol (LLDP).
-    
-* Add support for listing cluster level features, and enabling/disabing
-  them for clusters.
-
-New features:
-
-* Improve log messages so that in addition to the response codes they
-  also contain the request method and URL.
-
-Bug fixes:
-
-* Add support for multiple threads
-  https://bugzilla.redhat.com/1496846[#1496846].
-
-== 4.1.8 / Jul 17 2017
-
-Update to model 4.1.37:
-
-* Add the `all_content` parameter to `Host.Get` and `Hosts.List`
-  https://bugzilla.redhat.com/1444081[#1444081].
-
-* Fix the documentation of the method that lists events
-  https://bugzilla.redhat.com/1447622[#1447622].
-
-* Fix the direction of the main parameter of the method that adds a
-  CDROM to a virtual machine. It should be input and output.
-
-* Improve the documentation explaining that in general the order of the
-  results of _list_ methods isn't guaranteed.
-
-* Add the `index` attribute to the `Event` type
-  https://bugzilla.redhat.com/1448511[#1448511].
-
-New features:
-
-* Add a new `Probe.exists?` method to check whether an oVirt instance
-  exists.
-
-Bug fixes:
-
-* Handle correctly HTTP 201 and 200 response codes.
-
-* Ignore unreleated responses from server
-  https://bugzilla.redhat.com/1459254[#1459254].
-
-* Use `bundler` instead of `bundle`
-  https://bugzilla.redhat.com/1462664[#1462664].
+* Handle correctly actions that return HTTP 201 and 202 response codes.
 
 == 4.1.7 / Jun 2 2017
 

data/README.adoc

@@ -41,41 +41,16 @@ CentOS:
   gcc \
   libcurl-devel \
   libxml2-devel \
-  redhat-rpm-config \
-  ruby \
-  ruby-devel \
-  rubygems \
-  rubygems-devel
-
-NOTE: The installation of the `ruby`, `ruby-devel`, `rubygems` and
-`rubygems-devel` packages is necessary if you are going to use the Ruby
-version included in your distribution. If you are using tools like
-`rbenv` or `rvm` then this is not necessary.
+  ruby-devel
 
 If you are using distributions like Debian, or Ubuntu:
 
   # apt-get --assume-yes install \
   gcc \
-  libcurl4-openssl-dev \
   libxml2-dev \
-  ruby \
+  libcurl-dev \
   ruby-dev
 
-NOTE: The installation of the `ruby` and `ruby-dev` packages is
-necessary if you are going to use the Ruby version included in your
-distribution. If you are using tools like `rbenv` or `rvm` then this is
-not necessary.
-
-Some Linux distributions, like Debian and Ubuntu, provide multiple
-versions of `libcurl`, compiled with support for different TLS
-libraries: OpenSSL, NSS and GnuTLS. Currently the SDK only supports
-OpenSSL, so make sure that you have that version of `libcurl` installed.
-For example, in Ubuntu 16.04 if you have the NSS version installed, you
-will have to remove it and then install the OpenSSL version:
-
-  # apt-get --assume-yes remove libcurl4-nss-dev
-  # apt-get --assume-yes install libcurl4-openssl-dev
-
 NOTE: The examples above use the `dnf` command, which is the default in
 Fedora 24. In CentOS 7 you may need to use the `yum` command, as `dnf`
 is optional.
@@ -131,7 +106,7 @@ locators_ and _service methods_ (described later) may change in the
 future.
 
 There are other classes, like HTTP client classes, readers and writers.
-These are used to implement the HTTP communication, and for XML
+These are used to implement the HTTP communication, and to for XML
 parsing and rendering. Refrain from using them, as they are internal
 implementation details that may change in the future: backwards
 compatibility isn't guaranteed.
@@ -152,9 +127,6 @@ connection = OvirtSDK4::Connection.new(
   password: '...',
   ca_file: 'ca.pem',
 )
-
-# Get the reference to the root of the tree of services:
-system_service = connection.system_service
 ----
 
 The connection holds expensive resources, including a pool of HTTP
@@ -167,8 +139,7 @@ important to free these resources when they are no longer in use:
 connection.close
 ----
 
-The connection and all the services that have been obtained from it
-can't be used after the connection has been closed.
+Once a connection is closed it can't be reused.
 
 The `ca.pem` file is required when connecting to a server protected
 with TLS. In an usual oVirt installation it will be in
@@ -185,9 +156,9 @@ The type classes are pure data containers, they don't have any logic or
 operations. Instances can be created and modified at will.
 
 Creating or modifying one of this instances does *not* have any effect
-in the server side, unless they are explicitly passed to a call to one
-of the service methods described below. Changes in the server side are
-*not* automatically reflected in the instances that already exist in
+in the server side, unless one they are explicitly passed to a call to
+one of the service methods described below. Changes in the server side
+are *not* automatically reflected in the instances that already exist in
 memory.
 
 The constructors of these classes have multiple optional arguments, one
@@ -210,28 +181,6 @@ vm = OvirtSDK4::Vm.new(
 )
 ----
 
-The hashes passed to these constructors are processed recursively. For
-example, in the above code instead of explicitly calling the constructor
-for the `Cluster` and `Template` classes it is also possible to use
-plain hashes:
-
-[source,ruby]
-----
-vm = OvirtSDK4::Vm.new(
-  name: 'myvm',
-  cluster: {
-    name: 'mycluster'
-  },
-  template: {
-    name: 'mytemplate'
-  },
-  memory: 1073741824
-)
-----
-
-The SDK will internally convert those hashes to the required classes, so
-the result will be exactly the same.
-
 Using the constructors in this way is recommended, but not mandatory.
 You can also create the instance with no arguments in the call to the
 constructor, and then populate the object step by step, using the
@@ -243,7 +192,7 @@ vm = OvirtSDK4::Vm.new
 vm.name = 'myvm'
 vm.cluster = OvirtSDK4::Cluster.new(name: 'mycluster')
 vm.template = OvirtSDK4::Template.new(name: 'mytemplate')
-vm.memory = 1073741824
+vm.memory=1073741824
 ----
 
 Attributes that are defined as lists of objects in the specification of
@@ -350,7 +299,7 @@ manages the collection of virtual machines of the system lives in
 
 In the SDK the root of that tree of services is implemented by the
 _system service_. It is obtained calling the
-{reference}/Connection#system_service-instance_method[system_service]
+{rererence}/Connection#system_service-instance_method[system_service]
 method of the connection:
 
 [source,ruby]
@@ -403,8 +352,7 @@ The services that manage a single object usually have the `get`,
 
 Both kinds of services can also have additional _action methods_, which
 perform actions other than retrieving, creating, updating or removing.
-Most frequently they are available in services that manage a single
-object.
+Most frequently they available in services that manage a single object.
 
 ==== Using the _get_ methods
 
@@ -479,7 +427,7 @@ vms_service = system_service.vms_service
 vms = vms_service.list
 ----
 
-The result will be a Ruby array containing the instances of the
+The result will be a Ruby array containing the instances of
 corresponding types. For example, in this case, the result will be a
 list of instances of the Ruby class {reference}/Vm[Vm].
 
@@ -508,8 +456,8 @@ of the failure.
 
 ==== Using the _add_ methods
 
-These service methods add new elements to collections. They receive an
-instance of the relevant type describing the object to add, send the
+These service methods add new elements to the collection. They receive
+an instance of the relevant type describing the object to add, send the
 request to add it, and return an instance of the type describing the
 added object.
 
@@ -521,12 +469,12 @@ For example, to add a new virtual machine named `myvm`:
 vm = vms_service.add(
   OvirtSDK4::Vm.new(
     name: 'myvm',
-    cluster: {
+    cluster: OvirtSDK4::Cluster.new(
       name: 'mycluster'
-    },
-    template: {
+    ),
+    template: OvirtSDK4::Template.new(
       name: 'mytemplate'
-    }
+    )
   )
 )
 ----
@@ -591,10 +539,10 @@ updated.
 
 ==== Using the _update_ methods
 
-These service methods update existing objects. They receive an instance
-of the relevant type describing the update to perform, send the request
-to update it, and return an instance of the type describing the updated
-object.
+These service methods update existing objects. They receive
+an instance of the relevant type describing the update to perform, send
+the request to update it, and return an instance of the type describing
+the updated object.
 
 For example, to update the name of a virtual machine from `myvm` to
 `newvm`:
@@ -621,7 +569,7 @@ update. For example, try to *avoid* this:
 [source,ruby]
 ----
 # Retrieve the current representation:
-vm = vm_service.get
+vm = vm_service.get()
 
 # Update the representation, in memory, no request sent
 # to the server:

data/ext/ovirtsdk4c/ov_http_client.c

@@ -50,8 +50,7 @@ static VALUE PROXY_PASSWORD_SYMBOL;
 static VALUE PROXY_URL_SYMBOL;
 static VALUE PROXY_USERNAME_SYMBOL;
 static VALUE TIMEOUT_SYMBOL;
-static VALUE CONNECT_TIMEOUT_SYMBOL;
-static VALUE COOKIES_SYMBOL;
+static VALUE USERNAME_SYMBOL;
 
 /* Method identifiers: */
 static ID COMPARE_BY_IDENTITY_ID;
@@ -155,7 +154,6 @@ static void ov_http_client_free(void* vptr) {
     /* Release the resources used by libcurl: */
     if (ptr->handle != NULL) {
         curl_multi_cleanup(ptr->handle);
-        curl_share_cleanup(ptr->share);
         ptr->handle = NULL;
     }
 
@@ -164,7 +162,6 @@ static void ov_http_client_free(void* vptr) {
     ov_string_free(ptr->proxy_url);
     ov_string_free(ptr->proxy_username);
     ov_string_free(ptr->proxy_password);
-    ov_string_free(ptr->cookies);
 
     /* Free this object: */
     xfree(ptr);
@@ -189,21 +186,6 @@ static VALUE ov_http_client_alloc(VALUE klass) {
     ov_http_client_object* ptr;
 
     ptr = ALLOC(ov_http_client_object);
-    ptr->handle = NULL;
-    ptr->share = NULL;
-    ptr->log = Qnil;
-    ptr->pending = Qnil;
-    ptr->completed = Qnil;
-    ptr->compress = false;
-    ptr->debug = false;
-    ptr->insecure = false;
-    ptr->ca_file = NULL;
-    ptr->proxy_url = NULL;
-    ptr->proxy_username = NULL;
-    ptr->proxy_password = NULL;
-    ptr->timeout = 0;
-    ptr->connect_timeout = 0;
-    ptr->cookies = NULL;
     return TypedData_Wrap_Struct(klass, &ov_http_client_type, ptr);
 }
 
@@ -329,17 +311,9 @@ static void* ov_http_client_header_task(void* data) {
     /* We should always tell the library that we processed all the data: */
     context_ptr->result = context_ptr->size * context_ptr->nitems;
 
-    /* The library provides the headers for all the responses it receives, including the responses for intermediate
-       requests used for authentication negotation. We are interested only in the headers of the last response, so
-       if the given data is the begin of a new response, we clear the headers hash. */
+    /* Remove trailing white space: */
     length = context_ptr->result;
     buffer = context_ptr->buffer;
-    if (length >= 5 && strncmp("HTTP/", buffer, 5) == 0) {
-        rb_hash_clear(response_ptr->headers);
-        return NULL;
-    }
-
-    /* Remove trailing white space: */
     while (length > 0 && isspace(buffer[length - 1])) {
         length--;
     }
@@ -484,13 +458,7 @@ static VALUE ov_http_client_initialize(int argc, VALUE* argv, VALUE self) {
 
     /* Get the value of the 'ca_file' parameter: */
     opt = rb_hash_aref(opts, CA_FILE_SYMBOL);
-    if (NIL_P(opt)) {
-        ptr->ca_file = NULL;
-    }
-    else {
-        Check_Type(opt, T_STRING);
-        ptr->ca_file = ov_string_dup(opt);
-    }
+    ptr->ca_file = ov_string_dup(opt);
 
     /* Get the value of the 'insecure' parameter: */
     opt = rb_hash_aref(opts, INSECURE_SYMBOL);
@@ -514,45 +482,17 @@ static VALUE ov_http_client_initialize(int argc, VALUE* argv, VALUE self) {
         ptr->timeout = NUM2INT(opt);
     }
 
-    /* Get the value of the 'connect_timeout' parameter: */
-    opt = rb_hash_aref(opts, CONNECT_TIMEOUT_SYMBOL);
-    if (NIL_P(opt)) {
-        ptr->connect_timeout = 0;
-    }
-    else {
-        Check_Type(opt, T_FIXNUM);
-        ptr->connect_timeout = NUM2INT(opt);
-    }
-
     /* Get the value of the 'proxy_url' parameter: */
     opt = rb_hash_aref(opts, PROXY_URL_SYMBOL);
-    if (NIL_P(opt)) {
-        ptr->proxy_url = NULL;
-    }
-    else {
-        Check_Type(opt, T_STRING);
-        ptr->proxy_url = ov_string_dup(opt);
-    }
+    ptr->proxy_url = ov_string_dup(opt);
 
     /* Get the value of the 'proxy_username' parameter: */
     opt = rb_hash_aref(opts, PROXY_USERNAME_SYMBOL);
-    if (NIL_P(opt)) {
-        ptr->proxy_username = NULL;
-    }
-    else {
-        Check_Type(opt, T_STRING);
-        ptr->proxy_username = ov_string_dup(opt);
-    }
+    ptr->proxy_username = ov_string_dup(opt);
 
     /* Get the value of the 'proxy_password' parameter: */
     opt = rb_hash_aref(opts, PROXY_PASSWORD_SYMBOL);
-    if (NIL_P(opt)) {
-        ptr->proxy_password = NULL;
-    }
-    else {
-        Check_Type(opt, T_STRING);
-        ptr->proxy_password = ov_string_dup(opt);
-    }
+    ptr->proxy_password = ov_string_dup(opt);
 
     /* Get the value of the 'log' parameter: */
     opt = rb_hash_aref(opts, LOG_SYMBOL);
@@ -578,20 +518,6 @@ static VALUE ov_http_client_initialize(int argc, VALUE* argv, VALUE self) {
         connections = NUM2LONG(opt);
     }
 
-   /* Get the value of the 'cookies' parameter. If it is a string it will be used as the path of the file where the
-      cookies will be stored. If it is any other thing it will be treated as a boolean flag indicating if cookies
-      should be enabled but not loaded/saved from/to any file. */
-    opt = rb_hash_aref(opts, COOKIES_SYMBOL);
-    if (TYPE(opt) == T_STRING) {
-        ptr->cookies = ov_string_dup(opt);
-    }
-    else if (RTEST(opt)) {
-        ptr->cookies = ov_string_dup(rb_str_new2(""));
-    }
-    else {
-        ptr->cookies = NULL;
-    }
-
     /* Create the hash that contains the transfers are pending an completed. Both use the identity of the request
        as key. */
     ptr->completed = rb_funcall(rb_hash_new(), COMPARE_BY_IDENTITY_ID, 0);
@@ -600,16 +526,7 @@ static VALUE ov_http_client_initialize(int argc, VALUE* argv, VALUE self) {
     /* Create the libcurl multi handle: */
     ptr->handle = curl_multi_init();
     if (ptr->handle == NULL) {
-        rb_raise(ov_error_class, "Can't create libcurl multi object");
-    }
-
-    /* Create the libcurl share handle in order to share cookie data: */
-    ptr->share = curl_share_init();
-    if (ptr->share == NULL) {
-        rb_raise(ov_error_class, "Can't create libcurl share object");
-    }
-    if (ptr->cookies != NULL) {
-        curl_share_setopt(ptr->share, CURLSHOPT_SHARE, CURL_LOCK_DATA_COOKIE);
+        rb_raise(ov_error_class, "Can't create libcurl object");
     }
 
     /* Enable pipelining: */
@@ -662,7 +579,6 @@ static void* ov_http_client_complete_task(void* data) {
     VALUE transfer;
     long code;
     ov_http_client_object* client_ptr;
-    ov_http_request_object* request_ptr;
     ov_http_response_object* response_ptr;
     ov_http_transfer_object* transfer_ptr;
 
@@ -676,7 +592,6 @@ static void* ov_http_client_complete_task(void* data) {
     /* Get the pointers to the transfer, client and response: */
     ov_http_transfer_ptr(transfer, transfer_ptr);
     ov_http_client_ptr(transfer_ptr->client, client_ptr);
-    ov_http_request_ptr(transfer_ptr->request, request_ptr);
     ov_http_response_ptr(transfer_ptr->response, response_ptr);
 
     /* Remove the transfer from the pending hash: */
@@ -694,10 +609,8 @@ static void* ov_http_client_complete_task(void* data) {
         /* Send a summary of the response to the log: */
         ov_http_client_log_info(
             client_ptr->log,
-            "Received response code %"PRIsVALUE" for %"PRIsVALUE" request to URL '%"PRIsVALUE"'.",
-            response_ptr->code,
-            request_ptr->method,
-            request_ptr->url
+            "Received response code '%"PRIsVALUE"'.",
+            response_ptr->code
         );
     }
     else {
@@ -797,14 +710,6 @@ static void ov_http_client_prepare_handle(ov_http_client_object* client_ptr, ov_
     VALUE header;
     VALUE url;
     int timeout;
-    int connect_timeout;
-
-    /* Configure sharing of cookies with other handlers created by the client: */
-    curl_easy_setopt(handle, CURLOPT_SHARE, client_ptr->share);
-    if (client_ptr->cookies != NULL && strlen(client_ptr->cookies) > 0) {
-        curl_easy_setopt(handle, CURLOPT_COOKIEFILE, client_ptr->cookies);
-        curl_easy_setopt(handle, CURLOPT_COOKIEJAR, client_ptr->cookies);
-    }
 
     /* Configure TLS parameters: */
     if (client_ptr->insecure) {
@@ -815,20 +720,13 @@ static void ov_http_client_prepare_handle(ov_http_client_object* client_ptr, ov_
         curl_easy_setopt(handle, CURLOPT_CAINFO, client_ptr->ca_file);
     }
 
-    /* Configure the total timeout: */
+    /* Configure the timeout: */
     timeout = client_ptr->timeout;
     if (!NIL_P(request_ptr->timeout)) {
         timeout = NUM2INT(request_ptr->timeout);
     }
     curl_easy_setopt(handle, CURLOPT_TIMEOUT, timeout);
 
-    /* Configure the connect timeout: */
-    connect_timeout = client_ptr->connect_timeout;
-    if (!NIL_P(request_ptr->connect_timeout)) {
-        connect_timeout = NUM2INT(request_ptr->connect_timeout);
-    }
-    curl_easy_setopt(handle, CURLOPT_CONNECTTIMEOUT, connect_timeout);
-
     /* Configure compression of responses (setting the value to zero length string means accepting all the
        compression types that libcurl supports): */
     if (client_ptr->compress) {
@@ -866,7 +764,6 @@ static void ov_http_client_prepare_handle(ov_http_client_object* client_ptr, ov_
        curl_easy_setopt(handle, CURLOPT_POST, 1L);
     }
     else if (rb_eql(request_ptr->method, PUT_SYMBOL)) {
-       *headers = curl_slist_append(*headers, "Expect:");
        curl_easy_setopt(handle, CURLOPT_UPLOAD, 1L);
        curl_easy_setopt(handle, CURLOPT_PUT, 1L);
     }
@@ -901,7 +798,7 @@ static void ov_http_client_prepare_handle(ov_http_client_object* client_ptr, ov_
     /* Send a summary of the request to the log: */
     ov_http_client_log_info(
         client_ptr->log,
-        "Sending %"PRIsVALUE" request to URL '%"PRIsVALUE"'.",
+        "Sending '%"PRIsVALUE"' request to URL '%"PRIsVALUE"'.",
         request_ptr->method,
         url
     );
@@ -1012,13 +909,6 @@ static VALUE ov_http_client_wait(VALUE self, VALUE request) {
     return Qnil;
 }
 
-static VALUE ov_http_client_inspect(VALUE self) {
-    ov_http_client_object* ptr;
-
-    ov_http_client_ptr(self, ptr);
-    return rb_sprintf("#<%"PRIsVALUE":%p>", ov_http_client_class, ptr);
-}
-
 void ov_http_client_define(void) {
     CURLcode code;
 
@@ -1034,27 +924,24 @@ void ov_http_client_define(void) {
     rb_define_method(ov_http_client_class, "initialize", ov_http_client_initialize, -1);
 
     /* Define the methods: */
-    rb_define_method(ov_http_client_class, "close",   ov_http_client_close,   0);
-    rb_define_method(ov_http_client_class, "inspect", ov_http_client_inspect, 0);
-    rb_define_method(ov_http_client_class, "send",    ov_http_client_send,    1);
-    rb_define_method(ov_http_client_class, "to_s",    ov_http_client_inspect, 0);
-    rb_define_method(ov_http_client_class, "wait",    ov_http_client_wait,    1);
+    rb_define_method(ov_http_client_class, "close", ov_http_client_close, 0);
+    rb_define_method(ov_http_client_class, "send",  ov_http_client_send,  1);
+    rb_define_method(ov_http_client_class, "wait",  ov_http_client_wait,  1);
 
     /* Define the symbols: */
-    CA_FILE_SYMBOL         = ID2SYM(rb_intern("ca_file"));
-    COMPRESS_SYMBOL        = ID2SYM(rb_intern("compress"));
-    CONNECTIONS_SYMBOL     = ID2SYM(rb_intern("connections"));
-    DEBUG_SYMBOL           = ID2SYM(rb_intern("debug"));
-    INSECURE_SYMBOL        = ID2SYM(rb_intern("insecure"));
-    LOG_SYMBOL             = ID2SYM(rb_intern("log"));
-    PASSWORD_SYMBOL        = ID2SYM(rb_intern("password"));
-    PIPELINE_SYMBOL        = ID2SYM(rb_intern("pipeline"));
-    PROXY_PASSWORD_SYMBOL  = ID2SYM(rb_intern("proxy_password"));
-    PROXY_URL_SYMBOL       = ID2SYM(rb_intern("proxy_url"));
-    PROXY_USERNAME_SYMBOL  = ID2SYM(rb_intern("proxy_username"));
-    TIMEOUT_SYMBOL         = ID2SYM(rb_intern("timeout"));
-    CONNECT_TIMEOUT_SYMBOL = ID2SYM(rb_intern("connect_timeout"));
-    COOKIES_SYMBOL         = ID2SYM(rb_intern("cookies"));
+    CA_FILE_SYMBOL        = ID2SYM(rb_intern("ca_file"));
+    COMPRESS_SYMBOL       = ID2SYM(rb_intern("compress"));
+    CONNECTIONS_SYMBOL    = ID2SYM(rb_intern("connections"));
+    DEBUG_SYMBOL          = ID2SYM(rb_intern("debug"));
+    INSECURE_SYMBOL       = ID2SYM(rb_intern("insecure"));
+    LOG_SYMBOL            = ID2SYM(rb_intern("log"));
+    PASSWORD_SYMBOL       = ID2SYM(rb_intern("password"));
+    PIPELINE_SYMBOL       = ID2SYM(rb_intern("pipeline"));
+    PROXY_PASSWORD_SYMBOL = ID2SYM(rb_intern("proxy_password"));
+    PROXY_URL_SYMBOL      = ID2SYM(rb_intern("proxy_url"));
+    PROXY_USERNAME_SYMBOL = ID2SYM(rb_intern("proxy_username"));
+    TIMEOUT_SYMBOL        = ID2SYM(rb_intern("timeout"));
+    USERNAME_SYMBOL       = ID2SYM(rb_intern("username"));
 
     /* Define the method identifiers: */
     COMPARE_BY_IDENTITY_ID = rb_intern("compare_by_identity");