cups 0.1.6 → 0.1.7

data/ext/cups.c

@@ -40,7 +40,7 @@ int printer_exists(VALUE printer){
   // First call Cups#show_destinations
   VALUE dest_list = rb_funcall(rubyCups, rb_intern("show_destinations"), 0);
   // Then check the printer arg is included in the returned array...
-  rb_ary_includes(dest_list, printer) ? 1 : 0;
+  return rb_ary_includes(dest_list, printer) ? 1 : 0;
 }
 
 /*
@@ -116,7 +116,7 @@ static VALUE cups_print(VALUE self)
   char *fname = RSTRING_PTR(file); // Filename
   char *title = T_STRING == TYPE(rname) ? RSTRING_PTR(rname) : "rCups";
   char *target = RSTRING_PTR(printer); // Target printer string
-  char *url = RSTRING_PTR(url_path); // Server URL address
+  const char *url = RSTRING_PTR(url_path); // Server URL address
   int port = 631; // Default CUPS port
 
   VALUE job_options = rb_iv_get(self, "@job_options");
@@ -198,8 +198,9 @@ static VALUE cups_get_default(VALUE self)
     VALUE def_p = rb_str_new2(default_printer);
 
     return def_p;
+  } else {
+    return Qnil;
   }
-  // should return nil if no default printer is found!
 }
 
 /*
@@ -336,27 +337,27 @@ static VALUE cups_job_completed(VALUE self)
 
   if (NIL_P(job_id)) {
     return Qfalse;
-  } else {
-    num_jobs = cupsGetJobs(&jobs, printer_arg, 1, -1); // Get jobs
-    // job_state = IPP_JOB_COMPLETED;
+  }
 
-    for (i = 0; i < num_jobs; i ++) {
-      if (jobs[i].id == NUM2INT(job_id)) {
-        job_state = jobs[i].state;
-        break;
-      }
-      
-      // Free job array
-      cupsFreeJobs(num_jobs, jobs);
-      
-      if (job_state == IPP_JOB_COMPLETED) {
-        return Qtrue;
-      } else {
-        return Qfalse;
-      }
-      
+  num_jobs = cupsGetJobs(&jobs, printer_arg, 1, -1); // Get jobs
+
+  // find our job
+  for (i = 0; i < num_jobs; i ++) {
+    if (jobs[i].id == NUM2INT(job_id)) {
+      job_state = jobs[i].state;
+      break;
     }
-  }  
+  }
+
+  // Free job array
+  cupsFreeJobs(num_jobs, jobs);
+
+  if (job_state == IPP_JOB_COMPLETED) {
+    return Qtrue;
+  } else {
+    return Qfalse;
+  }
+
 }
 
 /*

data/test/cups_test.rb

@@ -20,61 +20,59 @@ class CupsTest < Test::Unit::TestCase
     assert cups_destinations.is_a?(Array)
     assert_equal cups_destinations, lplist
   end
-  
+
   def test_can_instantiate_print_job_object_with_correct_args
     assert_raise(ArgumentError) do
       Cups::PrintJob.new
     end
-    
+
     assert_nothing_raised do
       Cups::PrintJob.new("/path", @printer)
-      Cups::PrintJob.new("/path")
+      Cups::PrintJob.new("/path") if Cups.default_printer
     end
   end
-  
+
   def test_job_defaults_to_default
     assert_nothing_raised do
-      pj = Cups::PrintJob.new("/non/existent/file")
-
-      assert_equal Cups.default_printer, pj.instance_variable_get(:@printer)
+      if Cups.default_printer
+        pj = Cups::PrintJob.new( "/non/existent/file" )
+        assert_equal Cups.default_printer, pj.instance_variable_get(:@printer)
+      end
     end
   end
-  
+
   def test_we_cant_print_to_nonexistent_printers
-    assert_raise(RuntimeError) do
+    assert_raise(ArgumentError) do
       pj = Cups::PrintJob.new("/non/existent/file", "bollocks_printer")
-      
       assert !Cups.show_destinations.include?(pj.instance_variable_get(:@printer))
     end
   end
 
   def test_we_cant_print_nonexistent_files
-    pj = Cups::PrintJob.new("soft_class")
-    
+    pj = Cups::PrintJob.new("soft_class",@printer)
     assert_raise(RuntimeError) do
-      pj.print
+          pj.print
     end
-  
     assert_nil pj.job_id
   end
-  
+
   def test_we_can_pass_args_down_as_options
     options = {:foo => 'bar'}
     pj = Cups::PrintJob.new(sample, @printer, options)
     assert_equal(options, pj.job_options)
   end
-  
+
   def test_we_can_only_pass_strings_down_as_options
     options = {:foo => 'bar'}
     pj = Cups::PrintJob.new(sample, @printer, options)
     assert_raise(TypeError) { pj.print }
   end
-  
+
   def test_we_can_omit_options_and_will_set_to_empty
     pj = Cups::PrintJob.new(sample, @printer)
     assert_equal({}, pj.job_options)
   end
-  
+
   def test_print_job_cancellation
     pj = Cups::PrintJob.new(sample, @printer)
     pj.print
@@ -82,13 +80,13 @@ class CupsTest < Test::Unit::TestCase
     assert_equal pj.cancel, true
     assert pj.job_id.is_a?(Fixnum)
   end
-  
+
   def test_all_jobs_raises_with_nonexistent_printers
     assert_raise(RuntimeError) { Cups.all_jobs(nil) }
   end
-  
+
   def test_all_jobs_returns_hash
-    assert Cups.all_jobs(Cups.default_printer).is_a?(Hash)
+    assert Cups.all_jobs(@printer).is_a?(Hash)
   end
 
   def test_all_jobs_hash_contains_info_hash
@@ -98,11 +96,11 @@ class CupsTest < Test::Unit::TestCase
     assert info.is_a?(Hash)
     assert info.keys.all?{|key| [:title, :format, :submitted_by, :state, :size].include?(key)}
   end
-  
+
   def test_dest_list_returns_array
     assert Cups.show_destinations.is_a?(Array)
   end
-  
+
   def test_dest_options_returns_hash_if_real
     assert Cups.options_for(@printer).is_a?(Hash)
   end
@@ -128,7 +126,7 @@ class CupsTest < Test::Unit::TestCase
   end
 
   def test_returns_failure_string_on_cancellation
-    pj = Cups::PrintJob.new(blank_sample, @printer)
+    pj = Cups::PrintJob.new(sample, @printer)
     pj.print
 
     # assert pj.job_id == 0 # Failed jobs have an ID of zero
@@ -148,20 +146,20 @@ class CupsTest < Test::Unit::TestCase
     assert pj.state == :cancelled
     assert !pj.completed?
   end
-  
+
   def test_print_job_attributes
-    pj = Cups::PrintJob.new(sample)
+    pj = Cups::PrintJob.new(sample, @printer)
     [:printer, :filename, :job_id].each do |attr|
       assert pj.respond_to?(attr)
     end
   end
 
   private
-  
+
   def sample
     "#{File.dirname(__FILE__)}/sample.txt"
   end
-  
+
   def blank_sample
     "#{File.dirname(__FILE__)}/sample_blank.txt"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cups
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-14 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