thorsson_cups 0.0.11 → 0.0.12

data/ext/cups.c

@@ -113,52 +113,42 @@ static VALUE cups_print(VALUE self)
 
   char *fname = RSTRING_PTR(file); // Filename
   char *target = RSTRING_PTR(printer); // Target printer string
-
-  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);
   
-    VALUE iter;
-    int num_options = 0;
-    cups_option_t *options = NULL;
+  VALUE job_options = rb_iv_get(self, "@job_options");
 
-    // foreach option in the job options array
-    while (!  NIL_P(iter = rb_ary_pop(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;
 
-      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
+    // 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);
+  }
 
-    cupsFreeOptions(num_options, options);
+  job_id = cupsPrintFile(target, fname, "rCUPS", num_options, options); // Do it. "rCups" should be the filename/path
 
-    rb_iv_set(self, "@job_id", INT2NUM(job_id));
+  cupsFreeOptions(num_options, options);
 
-    return Qtrue;
-  } else {
-  // and if it doesn't...
-    rb_raise(rb_eRuntimeError, "Couldn't find file");
-    return Qfalse;
-  }
+  rb_iv_set(self, "@job_id", INT2NUM(job_id));
+
+  return Qtrue;    
 }
 
 /*

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Ivan Turkovic