noggin 0.0.2 → 0.0.3

data/ext/noggin/noggin.c

@@ -1,9 +1,14 @@
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-/* Includes */
-#include <ruby.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+  /* Includes */
+  #include <ruby.h>
+  #include <stdlib.h>
+  #include <stdio.h>
+  #include <string.h>
+  #if defined GCC
+    #define OPTIONAL_ATTR __attribute__((unused))
+  #else
+    #define OPTIONAL_ATTR
+  #endif
 #include "cups/cups.h"
 #include "cups/ipp.h"
 #include "ruby.h"
@@ -17,18 +22,24 @@ typedef int rubber_bool;
 /* Prototypes */
 static VALUE mNoggin;
 static VALUE
-Noggin_CLASS_destinations(VALUE self);
+Noggin_CLASS_destinations(VALUE self OPTIONAL_ATTR );
 static VALUE
-Noggin_CLASS_jobs(VALUE self, VALUE printer, VALUE __v_mine, VALUE __v_whichjobs);
-static VALUE
-Noggin_CLASS_ippRequest(VALUE self, VALUE __v_operation, VALUE request_attributes);
+Noggin_CLASS_jobs(VALUE self OPTIONAL_ATTR , VALUE printer OPTIONAL_ATTR, VALUE __v_mine OPTIONAL_ATTR, VALUE __v_whichjobs OPTIONAL_ATTR);
 static VALUE
 Noggin_CLASS_printFile(int __p_argc, VALUE *__p_argv, VALUE self);
 static VALUE mJob;
 static VALUE
-Job_CLASS_cancel(VALUE self, VALUE __v_printer, VALUE __v_job_id);
+Job_CLASS_cancel(VALUE self OPTIONAL_ATTR , VALUE __v_printer OPTIONAL_ATTR, VALUE __v_job_id OPTIONAL_ATTR);
 static VALUE mIPP;
-static VALUE cIppRequest;
+static VALUE mSubscription;
+static VALUE
+Subscription_CLASS_create(int __p_argc, VALUE *__p_argv, VALUE self);
+static VALUE
+Subscription_CLASS_renew(int __p_argc, VALUE *__p_argv, VALUE self);
+static VALUE
+Subscription_CLASS_cancel(VALUE self OPTIONAL_ATTR , VALUE __v_id OPTIONAL_ATTR);
+static VALUE
+Subscription_CLASS_list(int __p_argc, VALUE *__p_argv, VALUE self);
 static VALUE _gcpool_Keep = Qnil;
 static void __gcpool_Keep_add(VALUE val);
 static void __gcpool_Keep_del(VALUE val);
@@ -38,7 +49,7 @@ static void __gcpool_Keep_del(VALUE val);
 /* Inline C code */
 
 
-VALUE inline as_string(const char *string) { return string ? rb_str_new2(string) : Qnil;  }
+inline VALUE as_string(const char *string) { return string ? rb_str_new2(string) : Qnil;  }
 
 #define TO_STRING(v) ((v) ? rb_str_new2((v)) : Qnil)
 
@@ -50,6 +61,7 @@ static VALUE sym_pending = Qnil;
 static VALUE sym_processing = Qnil;
 static VALUE sym_stopped = Qnil;
 
+#define SUBSCRIPTION_DURATION 3600
 #define STATIC_STR(name) static VALUE str_##name = Qnil;
 #define STATIC_STR_INIT(name) KEEP_ADD(str_##name = rb_str_new2(#name)); rb_obj_freeze(str_##name);
 STATIC_STR(completed_time);
@@ -69,6 +81,72 @@ STATIC_STR(instance);
 STATIC_STR(is_default);
 STATIC_STR(options);
 
+struct svp_it {
+  int num_options;
+  cups_option_t *options;
+};
+
+int hash_to_cups_options_it(VALUE key, VALUE val, VALUE data) {
+  struct svp_it *svp  = (struct svp_it *)data;
+  svp->num_options = cupsAddOption(StringValuePtr(key), StringValuePtr(val), svp->num_options, &(svp->options));
+  return ST_CONTINUE;
+}
+
+static VALUE rb_ipp_value_entry(ipp_attribute_t* attr, int count) {
+  char *lang = NULL;
+  char block[4096] = "";
+ 
+  /*char block[4096] = "";
+  ippAttributeString(attr, block, 4096);
+  printf("%s: (0x%x) %s\n", ippGetName(attr), ippGetValueTag(attr), block);*/
+
+  switch (ippGetValueTag(attr)) {
+  case IPP_TAG_INTEGER:
+    return INT2NUM(ippGetInteger(attr, count));
+  case IPP_TAG_RESERVED_STRING:
+  case IPP_TAG_STRING:
+  case IPP_TAG_SUBSCRIPTION:
+  case IPP_TAG_TEXT:
+  case IPP_TAG_NAME:
+  case IPP_TAG_KEYWORD:
+  case IPP_TAG_URI:
+  case IPP_TAG_TEXTLANG:
+  case IPP_TAG_NAMELANG:
+  case IPP_TAG_LANGUAGE:
+  case IPP_TAG_CHARSET:
+  case IPP_TAG_MIMETYPE:
+  case IPP_TAG_MEMBERNAME:
+  case IPP_TAG_URISCHEME:
+    return as_string(ippGetString(attr, count, &lang));
+  case IPP_TAG_BOOLEAN:
+    return ippGetBoolean(attr, count) ? Qtrue : Qfalse;
+  default:
+    ippAttributeString(attr, block, 4096);
+    printf("[UNSUPPORTED] %s: (%i) %s\n", ippGetName(attr), ippGetValueTag(attr), block);
+
+    return Qnil;
+  }
+}
+
+static VALUE rb_ipp_value(ipp_attribute_t* attr) {
+  int num = ippGetCount(attr), i = 0;
+  VALUE val = Qnil;
+
+  switch (num)  {
+    case 0:
+      return Qnil;
+    case 1:
+      return rb_ipp_value_entry(attr, 0);
+    default:
+      val = rb_ary_new();
+      for(i = 0; i < num; i++) {
+        rb_ary_push(val, rb_ipp_value_entry(attr, i));
+      }
+      return val;
+  }
+}
+
+
 VALUE job_state(ipp_jstate_t state) {
   switch(state) {
     case IPP_JOB_ABORTED:
@@ -89,62 +167,190 @@ VALUE job_state(ipp_jstate_t state) {
   return INT2FIX(state);
 }
 
-VALUE rb_ipp_value(ipp_attribute_t* attr) {
-  char *lang = NULL;
-  switch (ippGetValueTag(attr)) {
-  case IPP_TAG_INTEGER:
-    return INT2NUM(ippGetInteger(attr, 0));
-  case IPP_TAG_TEXT:
-  case IPP_TAG_NAME:
-  case IPP_TAG_URI:
-  case IPP_TAG_URISCHEME:
-    return as_string(ippGetString(attr, 0, &lang));
-  case IPP_TAG_BOOLEAN:
-    return ippGetBoolean(attr, 0) ? Qtrue : Qfalse;
+static VALUE renew_subscription(int subscription_id, int duration) {
+  ipp_attribute_t *attr = NULL;
+  http_t *http;
+  ipp_t *request;
+  ipp_t *response;
+
+  if ((http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption ())) == NULL) {
+    return Qnil;
   }
-  return Qnil;
 
+  request = ippNewRequest (IPP_RENEW_SUBSCRIPTION);
+  ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_URI,
+               "printer-uri", NULL, "/");
+  ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+               "requesting-user-name", NULL, cupsUser());
+  ippAddInteger (request, IPP_TAG_OPERATION, IPP_TAG_INTEGER,
+                "notify-subscription-id", subscription_id);
+  ippAddInteger (request, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
+                "notify-lease-duration", duration);
+  ippDelete (cupsDoRequest (http, request, "/"));
+
+  httpClose(http);
+
+  return INT2NUM(subscription_id);
 }
 
-struct svp_it {
-  int num_options;
-  cups_option_t *options;
-};
+static void debug_ipp(ipp_t *ipp) {
+  char block[4096] = "";
+  ipp_attribute_t *attr = NULL;
+  
+   for (attr = ippFirstAttribute(ipp); attr; attr = ippNextAttribute(ipp)) {
+    ippAttributeString(attr, block, 4096);
+    printf("[DEBUG] %s: (%i) %s\n", ippGetName(attr), ippGetValueTag(attr), block);
+  }
+  
+}
 
-int hash_to_cups_options_it(VALUE key, VALUE val, VALUE data) {
-  struct svp_it *svp  = (struct svp_it *)data;
+static VALUE create_subscription(int duration, char *uri, char *printer) {
+  ipp_attribute_t *attr = NULL;
+  http_t *http;
+  ipp_t *request;
+  ipp_t *response;
+  VALUE subscription_id = 0;
+  int num_events = 7;
+  static const char * const events[] = {
+    "job-created",
+    "job-completed",
+    "job-state-changed",
+    "job-state",
+    "printer-added",
+    "printer-deleted",
+    "printer-state-changed"
+  };
+
+  if ((http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption())) == NULL) {
+    return Qnil;
+  }
 
-  svp->num_options = cupsAddOption(StringValuePtr(key), StringValuePtr(val), svp->num_options, &(svp->options));
+  request = ippNewRequest (IPP_CREATE_PRINTER_SUBSCRIPTION);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
+                "printer-uri", NULL, printer);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+                "requesting-user-name", NULL, cupsUser ());
+  ippAddStrings(request, IPP_TAG_SUBSCRIPTION, IPP_TAG_KEYWORD,
+                 "notify-events", num_events, NULL, events);
+  ippAddString(request, IPP_TAG_SUBSCRIPTION, IPP_TAG_KEYWORD,
+                "notify-pull-method", NULL, "ippget");
+  ippAddString(request, IPP_TAG_SUBSCRIPTION, IPP_TAG_URI,
+                "notify-recipient-uri", NULL, uri);
+  ippAddInteger(request, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
+                 "notify-lease-duration", duration);
+  response = cupsDoRequest (http, request, "/");
+
+  if (response != NULL && ippGetStatusCode(response) <= IPP_OK_CONFLICT) {
+    /*debug_ipp(response);*/
+    ippFirstAttribute(response);
+
+    if ((attr = ippFindAttribute(response, "notify-subscription-id", IPP_TAG_INTEGER)) != NULL) {
+      subscription_id = INT2NUM(ippGetInteger(attr, 0));
+    } else {
+      subscription_id = Qnil;
+    }
+  }
 
-  return ST_CONTINUE;
+  if (response) {
+    ippDelete(response);
+  }
+
+  httpClose (http);
+
+  return subscription_id;
 }
-int add_to_request_iterator(VALUE key, VALUE val, VALUE data) {
-  ipp_t *request = (ipp_t*) data;
-  char *name = RSTRING_PTR(key);
-
-  switch(TYPE(val)) {
-    case T_FIXNUM:
-      ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, name, NUM2INT(val));
-      break;
-    case T_STRING:
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, name, NULL, RSTRING_PTR(val));
-      break;
-    case T_TRUE:
-    case T_FALSE:
-      ippAddBoolean(request, IPP_TAG_OPERATION, name, (val) ? 1 : 0);
-      break;
+
+static void
+cancel_subscription(int subscription_id)
+{
+  http_t *http;
+  ipp_t *request;
+
+  if (subscription_id >= 0 &&
+       ((http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption())) != NULL)) {
+
+    request = ippNewRequest(IPP_CANCEL_SUBSCRIPTION);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
+                 "printer-uri", NULL, "/");
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+                 "requesting-user-name", NULL, cupsUser());
+    ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER,
+                  "notify-subscription-id", subscription_id);
+    ippDelete(cupsDoRequest(http, request, "/"));
+
+    httpClose(http);
   }
-  return ST_CONTINUE;
+}
+
+static VALUE list_subscriptions(bool my_subscriptions) {
+  ipp_attribute_t *attr = NULL;
+  http_t *http;
+  ipp_t *request;
+  ipp_t *response;
+  VALUE subscription_id = 0;
+  VALUE ary = rb_ary_new();
+  static const char * const req_attr[] = {
+    "all"
+  };
+
+  if ((http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption ())) == NULL) {
+    return Qnil;
+  }
+
+  request = ippNewRequest (IPP_GET_SUBSCRIPTIONS);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
+                "printer-uri", NULL, "/");
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+                "requesting-user-name", NULL, cupsUser ());
+  ippAddStrings(request, IPP_TAG_SUBSCRIPTION, IPP_TAG_KEYWORD,
+                 "requested-attributes", 1, NULL, req_attr);
+  ippAddBoolean(request, IPP_TAG_SUBSCRIPTION, "my-subscriptions",
+                 my_subscriptions);
+  response = cupsDoRequest (http, request, "/");
+
+  if (response != NULL && ippGetStatusCode(response) <= IPP_OK_CONFLICT) {
+    char block[4096] = "", *name;
+    VALUE hash = rb_hash_new();
+
+    attr = ippFirstAttribute(response);
+    ippNextAttribute(response);
+    ippNextAttribute(response);
+
+    rb_ary_push(ary, hash);
+
+    for (; attr != NULL; attr = ippNextAttribute(response)) {
+      name = ippGetName(attr);
+
+      if (name == NULL) {
+        hash = rb_hash_new();
+        rb_ary_push(ary, hash);
+      } else {
+        rb_hash_aset(hash, as_string(name), rb_ipp_value(attr));
+        /*puts(ippGetName(attr));
+        if (ippAttributeString(attr, block, 4096) > 0) {
+          puts(block);
+        }*/
+      }
+    }
+  }
+
+  if (response) {
+    ippDelete(response);
+  }
+
+  httpClose (http);
+
+  return ary;
 }
 
 
 /* Code */
 static VALUE
-Noggin_CLASS_destinations(VALUE self)
+Noggin_CLASS_destinations(VALUE self OPTIONAL_ATTR )
 {
-  VALUE __p_retval = Qnil;
+  VALUE __p_retval OPTIONAL_ATTR = Qnil;
 
-#line 161 "/home/geoff/Projects/noggin/ext/noggin/noggin.cr"
+#line 356 "/home/geoff/Projects/noggin/ext/noggin/noggin.cr"
 
   do {
   VALUE  list  =
@@ -178,9 +384,9 @@ out:
 }
 
 static VALUE
-Noggin_CLASS_jobs(VALUE self, VALUE printer, VALUE __v_mine, VALUE __v_whichjobs)
+Noggin_CLASS_jobs(VALUE self OPTIONAL_ATTR , VALUE printer OPTIONAL_ATTR, VALUE __v_mine OPTIONAL_ATTR, VALUE __v_whichjobs OPTIONAL_ATTR)
 {
-  VALUE __p_retval = Qnil;
+  VALUE __p_retval OPTIONAL_ATTR = Qnil;
   bool mine; bool __orig_mine;
   int whichjobs; int __orig_whichjobs;
   if (! ((TYPE(printer) == T_NIL) || (TYPE(printer) == T_STRING)) )
@@ -188,7 +394,7 @@ Noggin_CLASS_jobs(VALUE self, VALUE printer, VALUE __v_mine, VALUE __v_whichjobs
   __orig_mine = mine = RTEST(__v_mine);
   __orig_whichjobs = whichjobs = NUM2INT(__v_whichjobs);
 
-#line 192 "/home/geoff/Projects/noggin/ext/noggin/noggin.cr"
+#line 386 "/home/geoff/Projects/noggin/ext/noggin/noggin.cr"
 
   do {
   VALUE  list  =
@@ -222,41 +428,10 @@ out:
   return __p_retval;
 }
 
-static VALUE
-Noggin_CLASS_ippRequest(VALUE self, VALUE __v_operation, VALUE request_attributes)
-{
-  VALUE __p_retval = Qnil;
-  int operation; int __orig_operation;
-  __orig_operation = operation = NUM2INT(__v_operation);
-
-#line 227 "/home/geoff/Projects/noggin/ext/noggin/noggin.cr"
-
-  do {
-  VALUE  resp  =
- Qnil;
-  ipp_t * request  =
- NULL , *response = NULL;
-  ipp_attribute_t * attr  =
- NULL;
-  request = ippNewRequest(operation);
-  rb_hash_foreach(request_attributes, add_to_request_iterator, (VALUE)request);
-  response = cupsDoRequest(CUPS_HTTP_DEFAULT, request, "/");
-  resp = rb_hash_new();
-  for (attr = ippFirstAttribute(response);
-  attr != NULL;
-  attr = ippNextAttribute(response)) { rb_hash_aset(resp, as_string(ippGetName(attr)), rb_ipp_value(attr));
-  } do { __p_retval = resp; goto out; } while(0);
-
-  } while(0);
-
-out:
-  return __p_retval;
-}
-
 static VALUE
 Noggin_CLASS_printFile(int __p_argc, VALUE *__p_argv, VALUE self)
 {
-  VALUE __p_retval = Qnil;
+  VALUE __p_retval OPTIONAL_ATTR = Qnil;
   VALUE __v_destinationName = Qnil;
   char * destinationName; char * __orig_destinationName;
   VALUE __v_fileName = Qnil;
@@ -282,7 +457,7 @@ Noggin_CLASS_printFile(int __p_argc, VALUE *__p_argv, VALUE self)
     rb_raise(rb_eArgError, "options argument must be one of Hash, Nil");
 
 
-#line 246 "/home/geoff/Projects/noggin/ext/noggin/noggin.cr"
+#line 417 "/home/geoff/Projects/noggin/ext/noggin/noggin.cr"
 
   do {
   struct svp_it  info  =
@@ -300,19 +475,118 @@ out:
 }
 
 static VALUE
-Job_CLASS_cancel(VALUE self, VALUE __v_printer, VALUE __v_job_id)
+Job_CLASS_cancel(VALUE self OPTIONAL_ATTR , VALUE __v_printer OPTIONAL_ATTR, VALUE __v_job_id OPTIONAL_ATTR)
 {
   char * printer; char * __orig_printer;
   int job_id; int __orig_job_id;
   __orig_printer = printer = ( NIL_P(__v_printer) ? NULL : StringValuePtr(__v_printer) );
   __orig_job_id = job_id = NUM2INT(__v_job_id);
 
-#line 152 "/home/geoff/Projects/noggin/ext/noggin/noggin.cr"
+#line 347 "/home/geoff/Projects/noggin/ext/noggin/noggin.cr"
   if (cupsCancelJob(printer, job_id) == 0) { rb_raise(rb_eRuntimeError, "CUPS Error: %d - %s", cupsLastError(), cupsLastErrorString());
   }
   return Qnil;
 }
 
+static VALUE
+Subscription_CLASS_create(int __p_argc, VALUE *__p_argv, VALUE self)
+{
+  VALUE __p_retval OPTIONAL_ATTR = Qnil;
+  VALUE __v_duration = Qnil;
+  int duration; int __orig_duration;
+  VALUE __v_notify_uri = Qnil;
+  char * notify_uri; char * __orig_notify_uri;
+  VALUE __v_printer = Qnil;
+  char * printer; char * __orig_printer;
+
+  /* Scan arguments */
+  rb_scan_args(__p_argc, __p_argv, "03",&__v_duration, &__v_notify_uri, &__v_printer);
+
+  /* Set defaults */
+  if (__p_argc > 0)
+    __orig_duration = duration = NUM2INT(__v_duration);
+  else
+    duration = 0;
+
+  if (__p_argc > 1)
+    __orig_notify_uri = notify_uri = ( NIL_P(__v_notify_uri) ? NULL : StringValuePtr(__v_notify_uri) );
+  else
+    notify_uri = "dbus://";
+
+  if (__p_argc > 2)
+    __orig_printer = printer = ( NIL_P(__v_printer) ? NULL : StringValuePtr(__v_printer) );
+  else
+    printer = "/";
+
+
+#line 435 "/home/geoff/Projects/noggin/ext/noggin/noggin.cr"
+  do { __p_retval = create_subscription(duration, notify_uri, printer); goto out; } while(0);
+out:
+  return __p_retval;
+}
+
+static VALUE
+Subscription_CLASS_renew(int __p_argc, VALUE *__p_argv, VALUE self)
+{
+  VALUE __p_retval OPTIONAL_ATTR = Qnil;
+  VALUE __v_id = Qnil;
+  int id; int __orig_id;
+  VALUE __v_duration = Qnil;
+  int duration; int __orig_duration;
+
+  /* Scan arguments */
+  rb_scan_args(__p_argc, __p_argv, "11",&__v_id, &__v_duration);
+
+  /* Set defaults */
+  __orig_id = id = NUM2INT(__v_id);
+
+  if (__p_argc > 1)
+    __orig_duration = duration = NUM2INT(__v_duration);
+  else
+    duration = 0;
+
+
+#line 438 "/home/geoff/Projects/noggin/ext/noggin/noggin.cr"
+  do { __p_retval = renew_subscription(id, duration); goto out; } while(0);
+out:
+  return __p_retval;
+}
+
+static VALUE
+Subscription_CLASS_cancel(VALUE self OPTIONAL_ATTR , VALUE __v_id OPTIONAL_ATTR)
+{
+  int id; int __orig_id;
+  __orig_id = id = NUM2INT(__v_id);
+
+#line 441 "/home/geoff/Projects/noggin/ext/noggin/noggin.cr"
+  cancel_subscription(id);
+ 
+  return Qnil;
+}
+
+static VALUE
+Subscription_CLASS_list(int __p_argc, VALUE *__p_argv, VALUE self)
+{
+  VALUE __p_retval OPTIONAL_ATTR = Qnil;
+  VALUE __v_my_subscriptions = Qnil;
+  bool my_subscriptions; bool __orig_my_subscriptions;
+
+  /* Scan arguments */
+  rb_scan_args(__p_argc, __p_argv, "01",&__v_my_subscriptions);
+
+  /* Set defaults */
+  if (__p_argc > 0)
+    __orig_my_subscriptions = my_subscriptions = RTEST(__v_my_subscriptions);
+  else
+    my_subscriptions = 1;
+
+
+#line 444 "/home/geoff/Projects/noggin/ext/noggin/noggin.cr"
+  do { __p_retval = list_subscriptions(my_subscriptions); goto out; } while(0);
+out:
+  return __p_retval;
+}
+
 static void __gcpool_Keep_add(VALUE val)
     {
       if (_gcpool_Keep == Qnil)
@@ -345,7 +619,6 @@ Init_noggin(void)
   mNoggin = rb_define_module("Noggin");
   rb_define_singleton_method(mNoggin, "destinations", Noggin_CLASS_destinations, 0);
   rb_define_singleton_method(mNoggin, "jobs", Noggin_CLASS_jobs, 3);
-  rb_define_singleton_method(mNoggin, "ippRequest", Noggin_CLASS_ippRequest, 2);
   rb_define_singleton_method(mNoggin, "printFile", Noggin_CLASS_printFile, -1);
     rb_define_const(mNoggin, "WHICHJOBS_ALL", INT2NUM(CUPS_WHICHJOBS_ALL));
     rb_define_const(mNoggin, "WHICHJOBS_ACTIVE", INT2NUM(CUPS_WHICHJOBS_ACTIVE));
@@ -356,7 +629,11 @@ Init_noggin(void)
     rb_define_const(mJob, "ALL", INT2NUM(CUPS_JOBID_ALL));
   mIPP = rb_define_module_under(mNoggin, "IPP");
     rb_define_const(mIPP, "GET_JOBS", INT2NUM(IPP_GET_JOBS));
-  cIppRequest = rb_define_class_under(mNoggin, "IppRequest", rb_cObject);
+  mSubscription = rb_define_module_under(mNoggin, "Subscription");
+  rb_define_singleton_method(mSubscription, "create", Subscription_CLASS_create, -1);
+  rb_define_singleton_method(mSubscription, "renew", Subscription_CLASS_renew, -1);
+  rb_define_singleton_method(mSubscription, "cancel", Subscription_CLASS_cancel, 1);
+  rb_define_singleton_method(mSubscription, "list", Subscription_CLASS_list, -1);
 rb_gc_register_address(&_gcpool_Keep);
 
   KEEP_ADD(sym_cancelled = ID2SYM(rb_intern("cancelled")));

data/ext/noggin/noggin.cr

@@ -8,7 +8,7 @@
 
 %{
 
-VALUE inline as_string(const char *string) { return string ? rb_str_new2(string) : Qnil;  }
+inline VALUE as_string(const char *string) { return string ? rb_str_new2(string) : Qnil;  }
 
 #define TO_STRING(v) ((v) ? rb_str_new2((v)) : Qnil)
 
@@ -20,6 +20,7 @@ static VALUE sym_pending = Qnil;
 static VALUE sym_processing = Qnil;
 static VALUE sym_stopped = Qnil;
 
+#define SUBSCRIPTION_DURATION 3600
 #define STATIC_STR(name) static VALUE str_##name = Qnil;
 #define STATIC_STR_INIT(name) KEEP_ADD(str_##name = rb_str_new2(#name)); rb_obj_freeze(str_##name);
 STATIC_STR(completed_time);
@@ -39,6 +40,72 @@ STATIC_STR(instance);
 STATIC_STR(is_default);
 STATIC_STR(options);
 
+struct svp_it {
+  int num_options;
+  cups_option_t *options;
+};
+
+int hash_to_cups_options_it(VALUE key, VALUE val, VALUE data) {
+  struct svp_it *svp  = (struct svp_it *)data;
+  svp->num_options = cupsAddOption(StringValuePtr(key), StringValuePtr(val), svp->num_options, &(svp->options));
+  return ST_CONTINUE;
+}
+
+static VALUE rb_ipp_value_entry(ipp_attribute_t* attr, int count) {
+  char *lang = NULL;
+  char block[4096] = "";
+ 
+  /*char block[4096] = "";
+  ippAttributeString(attr, block, 4096);
+  printf("%s: (0x%x) %s\n", ippGetName(attr), ippGetValueTag(attr), block);*/
+
+  switch (ippGetValueTag(attr)) {
+  case IPP_TAG_INTEGER:
+    return INT2NUM(ippGetInteger(attr, count));
+  case IPP_TAG_RESERVED_STRING:
+  case IPP_TAG_STRING:
+  case IPP_TAG_SUBSCRIPTION:
+  case IPP_TAG_TEXT:
+  case IPP_TAG_NAME:
+  case IPP_TAG_KEYWORD:
+  case IPP_TAG_URI:
+  case IPP_TAG_TEXTLANG:
+  case IPP_TAG_NAMELANG:
+  case IPP_TAG_LANGUAGE:
+  case IPP_TAG_CHARSET:
+  case IPP_TAG_MIMETYPE:
+  case IPP_TAG_MEMBERNAME:
+  case IPP_TAG_URISCHEME:
+    return as_string(ippGetString(attr, count, &lang));
+  case IPP_TAG_BOOLEAN:
+    return ippGetBoolean(attr, count) ? Qtrue : Qfalse;
+  default:
+    ippAttributeString(attr, block, 4096);
+    printf("[UNSUPPORTED] %s: (%i) %s\n", ippGetName(attr), ippGetValueTag(attr), block);
+
+    return Qnil;
+  }
+}
+
+static VALUE rb_ipp_value(ipp_attribute_t* attr) {
+  int num = ippGetCount(attr), i = 0;
+  VALUE val = Qnil;
+
+  switch (num)  {
+    case 0:
+      return Qnil;
+    case 1:
+      return rb_ipp_value_entry(attr, 0);
+    default:
+      val = rb_ary_new();
+      for(i = 0; i < num; i++) {
+        rb_ary_push(val, rb_ipp_value_entry(attr, i));
+      }
+      return val;
+  }
+}
+
+
 VALUE job_state(ipp_jstate_t state) {
   switch(state) {
     case IPP_JOB_ABORTED:
@@ -59,52 +126,180 @@ VALUE job_state(ipp_jstate_t state) {
   return INT2FIX(state);
 }
 
-VALUE rb_ipp_value(ipp_attribute_t* attr) {
-  char *lang = NULL;
-  switch (ippGetValueTag(attr)) {
-  case IPP_TAG_INTEGER:
-    return INT2NUM(ippGetInteger(attr, 0));
-  case IPP_TAG_TEXT:
-  case IPP_TAG_NAME:
-  case IPP_TAG_URI:
-  case IPP_TAG_URISCHEME:
-    return as_string(ippGetString(attr, 0, &lang));
-  case IPP_TAG_BOOLEAN:
-    return ippGetBoolean(attr, 0) ? Qtrue : Qfalse;
+static VALUE renew_subscription(int subscription_id, int duration) {
+  ipp_attribute_t *attr = NULL;
+  http_t *http;
+  ipp_t *request;
+  ipp_t *response;
+
+  if ((http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption ())) == NULL) {
+    return Qnil;
   }
-  return Qnil;
 
+  request = ippNewRequest (IPP_RENEW_SUBSCRIPTION);
+  ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_URI,
+               "printer-uri", NULL, "/");
+  ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+               "requesting-user-name", NULL, cupsUser());
+  ippAddInteger (request, IPP_TAG_OPERATION, IPP_TAG_INTEGER,
+                "notify-subscription-id", subscription_id);
+  ippAddInteger (request, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
+                "notify-lease-duration", duration);
+  ippDelete (cupsDoRequest (http, request, "/"));
+
+  httpClose(http);
+
+  return INT2NUM(subscription_id);
 }
 
-struct svp_it {
-  int num_options;
-  cups_option_t *options;
-};
+static void debug_ipp(ipp_t *ipp) {
+  char block[4096] = "";
+  ipp_attribute_t *attr = NULL;
+  
+   for (attr = ippFirstAttribute(ipp); attr; attr = ippNextAttribute(ipp)) {
+    ippAttributeString(attr, block, 4096);
+    printf("[DEBUG] %s: (%i) %s\n", ippGetName(attr), ippGetValueTag(attr), block);
+  }
+  
+}
 
-int hash_to_cups_options_it(VALUE key, VALUE val, VALUE data) {
-  struct svp_it *svp  = (struct svp_it *)data;
+static VALUE create_subscription(int duration, char *uri, char *printer) {
+  ipp_attribute_t *attr = NULL;
+  http_t *http;
+  ipp_t *request;
+  ipp_t *response;
+  VALUE subscription_id = 0;
+  int num_events = 7;
+  static const char * const events[] = {
+    "job-created",
+    "job-completed",
+    "job-state-changed",
+    "job-state",
+    "printer-added",
+    "printer-deleted",
+    "printer-state-changed"
+  };
+
+  if ((http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption())) == NULL) {
+    return Qnil;
+  }
 
-  svp->num_options = cupsAddOption(StringValuePtr(key), StringValuePtr(val), svp->num_options, &(svp->options));
+  request = ippNewRequest (IPP_CREATE_PRINTER_SUBSCRIPTION);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
+                "printer-uri", NULL, printer);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+                "requesting-user-name", NULL, cupsUser ());
+  ippAddStrings(request, IPP_TAG_SUBSCRIPTION, IPP_TAG_KEYWORD,
+                 "notify-events", num_events, NULL, events);
+  ippAddString(request, IPP_TAG_SUBSCRIPTION, IPP_TAG_KEYWORD,
+                "notify-pull-method", NULL, "ippget");
+  ippAddString(request, IPP_TAG_SUBSCRIPTION, IPP_TAG_URI,
+                "notify-recipient-uri", NULL, uri);
+  ippAddInteger(request, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
+                 "notify-lease-duration", duration);
+  response = cupsDoRequest (http, request, "/");
+
+  if (response != NULL && ippGetStatusCode(response) <= IPP_OK_CONFLICT) {
+    /*debug_ipp(response);*/
+    ippFirstAttribute(response);
+
+    if ((attr = ippFindAttribute(response, "notify-subscription-id", IPP_TAG_INTEGER)) != NULL) {
+      subscription_id = INT2NUM(ippGetInteger(attr, 0));
+    } else {
+      subscription_id = Qnil;
+    }
+  }
 
-  return ST_CONTINUE;
+  if (response) {
+    ippDelete(response);
+  }
+
+  httpClose (http);
+
+  return subscription_id;
 }
-int add_to_request_iterator(VALUE key, VALUE val, VALUE data) {
-  ipp_t *request = (ipp_t*) data;
-  char *name = RSTRING_PTR(key);
-
-  switch(TYPE(val)) {
-    case T_FIXNUM:
-      ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, name, NUM2INT(val));
-      break;
-    case T_STRING:
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, name, NULL, RSTRING_PTR(val));
-      break;
-    case T_TRUE:
-    case T_FALSE:
-      ippAddBoolean(request, IPP_TAG_OPERATION, name, (val) ? 1 : 0);
-      break;
+
+static void
+cancel_subscription(int subscription_id)
+{
+  http_t *http;
+  ipp_t *request;
+
+  if (subscription_id >= 0 &&
+       ((http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption())) != NULL)) {
+
+    request = ippNewRequest(IPP_CANCEL_SUBSCRIPTION);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
+                 "printer-uri", NULL, "/");
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+                 "requesting-user-name", NULL, cupsUser());
+    ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER,
+                  "notify-subscription-id", subscription_id);
+    ippDelete(cupsDoRequest(http, request, "/"));
+
+    httpClose(http);
   }
-  return ST_CONTINUE;
+}
+
+static VALUE list_subscriptions(bool my_subscriptions) {
+  ipp_attribute_t *attr = NULL;
+  http_t *http;
+  ipp_t *request;
+  ipp_t *response;
+  VALUE subscription_id = 0;
+  VALUE ary = rb_ary_new();
+  static const char * const req_attr[] = {
+    "all"
+  };
+
+  if ((http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption ())) == NULL) {
+    return Qnil;
+  }
+
+  request = ippNewRequest (IPP_GET_SUBSCRIPTIONS);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
+                "printer-uri", NULL, "/");
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+                "requesting-user-name", NULL, cupsUser ());
+  ippAddStrings(request, IPP_TAG_SUBSCRIPTION, IPP_TAG_KEYWORD,
+                 "requested-attributes", 1, NULL, req_attr);
+  ippAddBoolean(request, IPP_TAG_SUBSCRIPTION, "my-subscriptions",
+                 my_subscriptions);
+  response = cupsDoRequest (http, request, "/");
+
+  if (response != NULL && ippGetStatusCode(response) <= IPP_OK_CONFLICT) {
+    char block[4096] = "", *name;
+    VALUE hash = rb_hash_new();
+
+    attr = ippFirstAttribute(response);
+    ippNextAttribute(response);
+    ippNextAttribute(response);
+
+    rb_ary_push(ary, hash);
+
+    for (; attr != NULL; attr = ippNextAttribute(response)) {
+      name = ippGetName(attr);
+
+      if (name == NULL) {
+        hash = rb_hash_new();
+        rb_ary_push(ary, hash);
+      } else {
+        rb_hash_aset(hash, as_string(name), rb_ipp_value(attr));
+        /*puts(ippGetName(attr));
+        if (ippAttributeString(attr, block, 4096) > 0) {
+          puts(block);
+        }*/
+      }
+    }
+  }
+
+  if (response) {
+    ippDelete(response);
+  }
+
+  httpClose (http);
+
+  return ary;
 }
 
 %}
@@ -180,7 +375,6 @@ module Noggin
         rb_hash_aset(options, as_string(dest->options[j].name), as_string(dest->options[j].value));
       }
 
-
       rb_ary_push(list, hash);
     }
 
@@ -220,29 +414,6 @@ module Noggin
     return list;
   end
 
-  class IppRequest
-
-  end
-
-  def self.ippRequest(int operation, VALUE request_attributes)
-    VALUE resp = Qnil;
-    ipp_t *request = NULL , *response = NULL;
-    ipp_attribute_t *attr = NULL;
-
-    request = ippNewRequest(operation);
-    rb_hash_foreach(request_attributes, add_to_request_iterator, (VALUE)request);
-
-    response = cupsDoRequest(CUPS_HTTP_DEFAULT, request, "/");
-
-    resp = rb_hash_new();
-
-    for (attr = ippFirstAttribute(response); attr != NULL; attr = ippNextAttribute(response)) {
-      rb_hash_aset(resp, as_string(ippGetName(attr)), rb_ipp_value(attr));
-    }
-
-    return resp;
-  end
-
   def int:self.printFile(char *destinationName, char *fileName, char *title, T_HASH|T_NIL options = Qnil)
     struct svp_it info = {0, NULL};
     int job_id = -1;
@@ -259,4 +430,19 @@ module Noggin
 
     return job_id;
   end
+
+  module Subscription
+    def self.create(int duration=0, char *notify_uri="dbus://", char *printer="/")
+      return create_subscription(duration, notify_uri, printer);
+    end
+    def self.renew(int id, int duration=0)
+      return renew_subscription(id, duration);
+    end
+    def self.cancel(int id)
+      cancel_subscription(id);
+    end
+    def self.list(bool my_subscriptions=1)
+      return list_subscriptions(my_subscriptions);
+    end
+  end
 end

data/ext/noggin/noggin.rd

@@ -5,9 +5,6 @@
 --- Noggin.jobs(String printer, Boolean mine, Integer whichjobs)
 
 
---- Noggin.ippRequest(Integer operation, request_attributes)
-
-
 --- Noggin.printFile(String destinationName, String fileName, String title, Hash options)
 
 
@@ -22,4 +19,16 @@
 === Noggin::Job::ALL
 == module Noggin::IPP
 === Noggin::IPP::GET_JOBS
-== class Noggin::IppRequest
+== module Noggin::Subscription
+--- Noggin::Subscription.create(Integer duration, String notify_uri, String printer)
+
+
+--- Noggin::Subscription.renew(Integer id, Integer duration)
+
+
+--- Noggin::Subscription.cancel(Integer id)
+
+
+--- Noggin::Subscription.list(Boolean my_subscriptions)
+
+

data/lib/noggin/version.rb

@@ -1,4 +1,4 @@
 module Noggin
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end
 

metadata

@@ -1,45 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: noggin
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
+  prerelease: 
 platform: ruby
 authors:
 - Geoff Youngs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubber-generate
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.21
 - !ruby/object:Gem::Dependency
   name: prawn
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.21
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.21
-description: |
-  smb
+description: ! 'smb
+
+'
 email: git@intersect-uk.co.uk
 executables: []
 extensions:
@@ -57,25 +63,29 @@ files:
 homepage: http://github.com/geoffyoungs/noggin
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 211198722336226809
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: libcups bindings for ruby
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 4f3c0bc5a5a640b5822bf85970579af604d006d3
-  data.tar.gz: d47a8a20702b937c304b1b7af1fc6aa32c89fbe3
-SHA512:
-  metadata.gz: c2474bab572fff36b7f0e7566d8dfad018df21ae0aec337fc02be0c742dda55eab029f80953c0e4ed739bfd0cd20305be3b17d3e8ea891ecad132bc6fd0d70d9
-  data.tar.gz: dac26f05f9844e3763d55b9d917a219c064e13495e0686db719c63ae530a1892084fecf826fb67df3cf973c1ceadc0533af1b76715a7256ad0e96bc6590e5549