thorsson_cups 0.0.18 → 0.0.20

data/ext/cups.c

@@ -53,13 +53,17 @@ int printer_exists(VALUE printer){
 */
 static VALUE job_init(int argc, VALUE* argv, VALUE self)
 {
-  VALUE filename, printer, job_options;
+  VALUE filename, printer, job_options, job_id;
   
-  rb_scan_args(argc, argv, "12", &filename, &printer, &job_options);
+  rb_scan_args(argc, argv, "12", &filename, &printer, &job_options, &job_id);
   
   rb_iv_set(self, "@filename", filename);
   rb_iv_set(self, "@url_path", rb_str_new2(cupsServer()));
   
+  if(!NIL_P(job_id)) {
+    rv_iv_set(self, "@job_id", NUM2INT(job_id));
+  }
+  
   if (NIL_P(job_options)) {
     rb_iv_set(self, "@job_options", rb_hash_new());
   } else {
@@ -117,7 +121,7 @@ static VALUE cups_print(VALUE self)
   char *target = RSTRING_PTR(printer); // Target printer string
   char *url = RSTRING_PTR(url_path); // Server URL address
   int port = 631; // Default CUPS port
-  
+    
   VALUE job_options = rb_iv_get(self, "@job_options");
 
   // Create an array of the keys from the job_options hash
@@ -413,14 +417,17 @@ static VALUE cups_get_jobs(VALUE self, VALUE printer)
 
 /*
 * call-seq:
-*   Cups.cancel_print(cups_id) -> true or false
+*   Cups.cancel_print(cups_id, printer_name) -> true or false
 *
 * Cancel the print job. Returns true if successful, false otherwise.
 */
 static VALUE cups_cancel_print(int argc, VALUE* argv, VALUE self)
 {
   VALUE printer, job_id;
-  rb_scan_args(argc, argv, "12", &job_id, &printer);
+  rb_scan_args(argc, argv, "20", &job_id, &printer);
+  
+  VALUE url_path = cupsServer();
+  char *url = RSTRING_PTR(url_path);
   
   if (NIL_P(job_id)) {
     return Qfalse; // If @job_id is nil

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 18
-  version: 0.0.18
+  - 20
+  version: 0.0.20
 platform: ruby
 authors: 
 - Ivan Turkovic
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 +01:00
+date: 2011-01-11 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -31,13 +31,13 @@ extra_rdoc_files: []
 
 files: 
 - test/cups_test.rb
-- test/sample_blank.txt
 - test/sample.txt
+- test/sample_blank.txt
 - ext/cups.c
 - ext/ruby_cups.h
 - ext/extconf.rb
-- lib/cups/printer/printer.rb
 - lib/cups/print_job/transient.rb
+- lib/cups/printer/printer.rb
 has_rdoc: true
 homepage: https://github.com/Thorsson/cups
 licenses: []