cups 0.0.7 → 0.1.5

data/ext/cups.c

@@ -6,7 +6,6 @@ VALUE rubyCups, printJobs;
 // Need to abstract this out of cups.c
 VALUE ipp_state_to_symbol(int state)
 {
-
   VALUE jstate;
 
   switch (state) {
@@ -58,6 +57,7 @@ static VALUE job_init(int argc, VALUE* argv, VALUE self)
   rb_scan_args(argc, argv, "12", &filename, &printer, &job_options);
   
   rb_iv_set(self, "@filename", filename);
+  rb_iv_set(self, "@url_path", rb_str_new2(cupsServer()));
   
   if (NIL_P(job_options)) {
     rb_iv_set(self, "@job_options", rb_hash_new());
@@ -110,55 +110,53 @@ static VALUE cups_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); // Server URL address
+  int port = 631; // Default CUPS port
+    
+  VALUE job_options = rb_iv_get(self, "@job_options");
 
-  FILE *fp = fopen(fname,"r");
-  // Check @filename actually exists...
-  if( fp ) {
-    fclose(fp);
-
-    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);
+  // 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 iter;
+  int num_options = 0;
+  cups_option_t *options = NULL;
 
-      VALUE value = rb_hash_aref(job_options, iter);
+  // foreach option in the job options array
+  while (!  NIL_P(iter = rb_ary_pop(job_options_keys))) {
 
-      // 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;
-      }
+    VALUE value = rb_hash_aref(job_options, iter);
 
-      // 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);
+    // 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;
     }
 
-    job_id = cupsPrintFile(target, fname, "rCUPS", num_options, options); // Do it. "rCups" should be the filename/path
-
-    cupsFreeOptions(num_options, options);
-
-    rb_iv_set(self, "@job_id", INT2NUM(job_id));
+    // 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);
+  }
 
-    return Qtrue;
-  } else {
-  // and if it doesn't...
-    rb_raise(rb_eRuntimeError, "Couldn't find file");
-    return Qfalse;
+  if(NIL_P(url)) {
+    url = cupsServer();
   }
+    
+  int encryption = (http_encryption_t)cupsEncryption();
+  http_t *http = httpConnectEncrypt (url, port, (http_encryption_t) encryption);
+  job_id = cupsPrintFile2(http, target, fname, "rCups", 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;    
 }
 
 /*
@@ -178,6 +176,8 @@ static VALUE cups_show_dests(VALUE self)
     VALUE destination = rb_str_new2(dest->name);
     rb_ary_push(dest_list, destination); // Add this testination name to dest_list string
   }
+  
+  cupsFreeDests(num_dests, dests);  
   return dest_list;
 }
 
@@ -194,6 +194,7 @@ static VALUE cups_get_default(VALUE self)
 
   if (default_printer != NULL) {
     VALUE def_p = rb_str_new2(default_printer);
+
     return def_p;
   }
   // should return nil if no default printer is found!
@@ -309,7 +310,6 @@ static VALUE cups_get_job_state(VALUE self)
     cupsFreeJobs(num_jobs, jobs);
  
     jstate = ipp_state_to_symbol(job_state);
-
     return jstate;
   }
 }
@@ -407,10 +407,69 @@ static VALUE cups_get_jobs(VALUE self, VALUE printer)
 
   // Free job array
   cupsFreeJobs(num_jobs, jobs);
-
   return job_list;
 }
 
+/*
+* call-seq:
+*   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, "20", &job_id, &printer);
+    
+  if (NIL_P(job_id)) {
+    return Qfalse; // If @job_id is nil
+  } else { // Otherwise attempt to cancel
+    int job = NUM2INT(job_id);
+    char *target = RSTRING_PTR(printer); // Target printer string
+    int cancellation;
+    cancellation = cupsCancelJob(target, job);
+          
+    return Qtrue;
+  }
+}
+
+/*
+ *  call-seq:
+ *    Cups.device_uri_for(printer_name) -> String
+ *
+ *  Return uri for requested printer.
+ */
+static VALUE cups_get_device_uri(VALUE self, VALUE printer) 
+{
+   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 *name = RSTRING_PTR(printer);
+      
+   request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
+   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) 
+     {
+       return rb_str_new2(attr->values[0].string.text);
+     }
+     ippDelete(response);
+   }
+   return Qtrue;
+}
+
 /*
  * call-seq:
  *   Cups.options_for(name) -> Hash or nil
@@ -436,13 +495,12 @@ static VALUE cups_get_options(VALUE self, VALUE printer)
   cups_dest_t *dest = cupsGetDest(printer_arg, NULL, num_dests, dests);
 
   if (dest == NULL) {
-    cupsFreeDests(num_dests, dests);
+    cupsFreeDests(num_dests, dests);    
     return Qnil;
   } else {
     for(i =0; i< dest->num_options; i++) {
       rb_hash_aset(options_list, rb_str_new2(dest->options[i].name), rb_str_new2(dest->options[i].value));
     }
-
     cupsFreeDests(num_dests, dests);
     return options_list;
   }
@@ -459,6 +517,7 @@ 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);
 
@@ -476,5 +535,8 @@ void Init_cups() {
   rb_define_singleton_method(rubyCups, "show_destinations", cups_show_dests, 0);
   rb_define_singleton_method(rubyCups, "default_printer", cups_get_default, 0);
   rb_define_singleton_method(rubyCups, "all_jobs", cups_get_jobs, 1);
+  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);
+}

data/ext/extconf.rb

@@ -5,11 +5,18 @@ unless have_library("cups") && find_executable("cups-config")
   exit
 end
 
+def has_cups_1_6_installed?
+  puts 'cups version:'
+  puts `cups-config --version`
+  `cups-config --version`.scan(/1.6/).size > 0
+end
+
 cups_cflags = `cups-config --cflags`.chomp || ""
+cups_cflags += ' -D_IPP_PRIVATE_STRUCTURES' if has_cups_1_6_installed?
 cups_libs = `cups-config --libs`.chomp || ""
 
 with_cflags(cups_cflags) {
   with_ldflags(cups_libs) {
     create_makefile("cups")
   }
-}
+}

metadata

@@ -1,72 +1,62 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cups
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 7
-  version: 0.0.7
+version: !ruby/object:Gem::Version
+  version: 0.1.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
+- Tadej Murovec
+- Ivan Turkovic
 - Chris Mowforth
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-12 00:00:00 +00:00
-default_executable: 
+date: 2013-04-28 00:00:00.000000000 Z
 dependencies: []
-
-description: "    Ruby CUPS provides a wrapper for the Common UNIX Printing System, allowing rubyists to perform basic tasks like printer discovery, job submission & querying.\n"
-email: 
+description: ! '    Ruby CUPS provides a wrapper for the Common UNIX Printing System,
+  allowing rubyists to perform basic tasks like printer discovery, job submission
+  & querying.
+
+'
+email:
+- tadej.murovec@gmail.com
+- me@ivanturkovic.com
 - chris@mowforth.com
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
-
-files: 
-- test/cups_test.rb
+files:
 - test/sample.txt
 - test/sample_blank.txt
+- test/cups_test.rb
 - ext/cups.c
 - ext/ruby_cups.h
 - ext/extconf.rb
 - lib/cups/print_job/transient.rb
 - lib/cups/printer/printer.rb
-has_rdoc: true
-homepage: http://cups.rubyforge.org/
+homepage: https://github.com/m0wfo/cups
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: cups
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A lightweight Ruby library for printing.
 test_files: []
-