thorsson_cups 0.0.30 → 0.0.31

data/ext/cups.c

@@ -441,33 +441,32 @@ static VALUE cups_cancel_print(int argc, VALUE* argv, VALUE self)
  *
  *  Return uri for requested printer.
  */
-static VALUE cups_get_device_uri(VALUE self, VALUE printerName) 
+static VALUE cups_get_device_uri(VALUE self, VALUE printer) 
 {
-   if (!printer_exists(printerName)) 
+   if (!printer_exists(printer)) 
    {
      rb_raise(rb_eRuntimeError, "The printer or destination doesn't exist!");
    }
    
+   VALUE options_list;
    http_t *http;
    ipp_t *request;
    ipp_t *response;
    ipp_attribute_t *attr;
    char uri[1024];
    char *location;
-   char *printer;
    
-   printer = RSTRING_PTR(printerName);
+   char *name = RSTRING_PTR(printer);
    
    request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
-   httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL, "localhost", 0, "/printers/%s", printer);
+   httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL, "localhost", 0, "/printers/%s", name);
    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri);
    
    if ((response = cupsDoRequest(http, request, "/")) != NULL) 
    {
      if((attr = ippFindAttribute(response, "device-uri", IPP_TAG_URI)) != NULL) 
      {
-   //     //int c = 0;
-   //     // sprintf(location, "%s", attr->values[0].string.text);
+        return rb_str_new2(attr->values[0].string.text);
      }
      ippDelete(response);
    }   
@@ -543,4 +542,5 @@ void Init_cups() {
   rb_define_singleton_method(rubyCups, "cancel_print", cups_cancel_print, -1);
   rb_define_singleton_method(rubyCups, "options_for", cups_get_options, 1);
   rb_define_singleton_method(rubyCups, "device_uri_for", cups_get_device_uri, 1);
+  rb_define_singleton_method(rubyCups, "get_connection_for", cups_get_device_uri, 1);
 }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 30
-  version: 0.0.30
+  - 31
+  version: 0.0.31
 platform: ruby
 authors: 
 - Ivan Turkovic