thorsson_cups 0.0.12 → 0.0.13

data/ext/cups.c

@@ -142,7 +142,61 @@ static VALUE cups_print(VALUE self)
     cupsAddOption(iter_str, value_str, num_options++, &options);
   }
 
-  job_id = cupsPrintFile(target, fname, "rCUPS", num_options, options); // Do it. "rCups" should be the filename/path
+  job_id = cupsPrintFile(target, fname, "cloudomat", num_options, options); // Do it. "rCups" should be the filename/path
+
+  cupsFreeOptions(num_options, options);
+
+  rb_iv_set(self, "@job_id", INT2NUM(job_id));
+
+  return Qtrue;    
+}
+
+/*
+* call-seq:
+*   print_job.web_print -> Fixnum
+*
+* Submit a print job from URL to the selected printer or class. Returns true on success.
+*/
+static VALUE cups_web_print(VALUE self)
+{
+  int job_id;
+  VALUE file = rb_iv_get(self, "@filename");
+  VALUE printer = rb_iv_get(self, "@printer");
+  VALUE url_path = rb_iv_get(self, "@url_path");
+
+  char *fname = RSTRING_PTR(file); // Filename
+  char *target = RSTRING_PTR(printer); // Target printer string
+  char *url = RSTRING_PTR(url_path); // URL path for web file
+  
+  VALUE job_options = rb_iv_get(self, "@job_options");
+
+  // Create an array of the keys from the job_options hash
+  VALUE job_options_keys = rb_ary_new();
+  rb_hash_foreach(job_options, cups_keys_i, job_options_keys);
+  
+  VALUE iter;
+  int num_options = 0;
+  cups_option_t *options = NULL;
+
+  // foreach option in the job options array
+  while (!  NIL_P(iter = rb_ary_pop(job_options_keys))) {
+
+    VALUE value = rb_hash_aref(job_options, iter);
+
+    // assert the key and value are strings
+    if (NIL_P(rb_check_string_type(iter)) || NIL_P(rb_check_string_type(value))) {
+      cupsFreeOptions(num_options, options);
+      rb_raise(rb_eTypeError, "job options is not string => string hash");
+      return Qfalse;
+    }
+
+    // convert to char pointers and add to cups optoins
+    char * iter_str  = rb_string_value_ptr(&iter);
+    char * value_str = rb_string_value_ptr(&value);
+    cupsAddOption(iter_str, value_str, num_options++, &options);
+  }
+
+  job_id = cupsPrintFile(url, target, fname, "cloudomat", num_options, options); // Do it. "rCups" should be the filename/path
 
   cupsFreeOptions(num_options, options);
 
@@ -471,12 +525,14 @@ void Init_cups() {
   // Cups::PrintJob Attributes
   rb_define_attr(printJobs, "printer", 1, 0);
   rb_define_attr(printJobs, "filename", 1, 0);
+  rb_define_attr(printJobs, "url_path", 1, 0)
   rb_define_attr(printJobs, "job_id", 1, 0);
   rb_define_attr(printJobs, "job_options", 1, 0);
 
   // Cups::PrintJob Methods
   rb_define_method(printJobs, "initialize", job_init, -1);
   rb_define_method(printJobs, "print", cups_print, 0);
+  rb_define_method(printJobs, "web_print", cups_web_print, 0);
   rb_define_method(printJobs, "cancel", cups_cancel, 0);
   rb_define_method(printJobs, "state", cups_get_job_state, 0);
   rb_define_method(printJobs, "completed?", cups_job_completed, 0);

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Ivan Turkovic
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 +01:00
+date: 2010-12-09 00:00:00 +01:00
 default_executable: 
 dependencies: []