ffi-cups2 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6209044ae5c1ea2448cab3e8d044f33adf328b4fad06cd61869c68dbbf54855
-  data.tar.gz: e4cdd08e543a84abf899938f47a175910476cb5abbb0ff21005c29d951c3c217
+  metadata.gz: eba1754e517994c97f2e5ba9267ec825f66e25d288034fa14c0f95b34a8e595e
+  data.tar.gz: 2e60bc299d09ce8e1140ed6a742668d299f9709c10bd3c7d12f8b0af873feede
 SHA512:
-  metadata.gz: 3afe3c436e6f6f42f70f716289e27d88890e2460302a1bc2dbad2df1e69157228373a2fc37e2419e4dbb5fd32229d32d3681e5f847260e3b87adada433d8735e
-  data.tar.gz: 5f189e1fc6dc75c059bece9e7109a1f3e4254cbf8daff8eef768378230cd632f23df1a58611387befea69a16a9ce2e98d094658caec061efa1a3532fc668e12b
+  metadata.gz: 479520947edf9e94cef4550f7ad3de1706c49eddb0e22a6fce94d4ea1c9562183863cef41e955e88cdceee2d13a3819fdb6f5a669d2eca2c79488f2cbbf02a5c
+  data.tar.gz: ffac852d7a53d8083b7b45869d260353b4a4697fddb2470068ccef370d51cc4b0811bdc6cc658c6a1627454069835539e19555b75df8791ae7824f5f5cd17525

data/lib/ffi-cups/connection.rb

@@ -8,13 +8,13 @@ module Cups
       @hostname = hostname
       @port = port.nil? ? 631 : port
     end
-        
+
     # Wrapper around {::Cups::Http#httpConnectEncrypt}
     # @deprecated Use {#httpConnect2} instead
-    # @return [Pointer] a http pointer 
+    # @return [Pointer] a http pointer
     def httpConnectEncrypt
       http = Cups::Http.httpConnectEncrypt(hostname, port, Cups.cupsEncryption())
-      raise "Print server at #{hostname}:#{port} is not available" if http.null?
+      raise ConnectError, "Print server at #{hostname}:#{port} is not available" if http.null?
       return http
     end
     deprecate :httpConnectEncrypt, "This function is deprecated by CUPS, please use httpConnect2 instead", 2025, 12
@@ -24,7 +24,7 @@ module Cups
     # @return [Pointer] a http pointer
     def httpConnect2
       http = Cups::Http.httpConnect2(hostname, port, nil, 0, Cups.cupsEncryption(), 1, 30000, nil)
-      raise "Print server at #{hostname}:#{port} is not available" if http.null? 
+      raise ConnectError, "Print server at #{hostname}:#{port} is not available" if http.null?
       return http
     end
 

data/lib/ffi-cups/job.rb

@@ -23,7 +23,7 @@ module Cups
     def cancel(purge=0, connection=nil)
       job = self.class.get_job(@id, @printer, -1, connection)
       r = Cups.cupsCancelJob2(connection, @printer, @id, purge)
-      raise Cups.cupsLastErrorString() if r == 0
+      raise CupsError, Cups.cupsLastErrorString() if r == 0
       return r
     end
 
@@ -60,7 +60,7 @@ module Cups
       jobs.each do |j|
         return j if j.id == id
       end
-      raise "Job with id: #{id} not found!"
+      raise JobNotFound, "Job with id: #{id} not found!"
     end
 
     private
@@ -75,7 +75,7 @@ module Cups
       num_jobs = Cups.cupsGetJobs2(http, pointer, name, 0, filter)
       size = Cups::Struct::Job.size
       jobs = []
-      
+
       num_jobs.times do |i|
         job = Cups::Struct::Job.new(pointer.get_pointer(0) + (size * i))
         jobs.push(job)

data/lib/ffi-cups/printer.rb

@@ -34,7 +34,7 @@ module Cups
     #
     # @return [Cups::Job]  can be used to check on the job status.
     def print_file(filename, title, options={})
-      raise "File not found: #{filename}" unless File.exist? filename
+      raise FileNotFound, "File not found: #{filename}" unless File.exist? filename
 
       http = @connection.nil? ? nil : @connection.httpConnect2
       with_destination(http) do |dest|
@@ -55,7 +55,7 @@ module Cups
         job_id = Cups.cupsPrintFile2(http, @name, filename, title, num_options, p_options)
 
         if job_id == 0
-          raise Cups.cupsLastErrorString()
+          raise CupsError, Cups.cupsLastErrorString()
         end
         #Cups::Job.new(job_id, title, @name)
         Cups::Job.get_job(job_id, @name, 0, @connection)
@@ -87,7 +87,7 @@ module Cups
 
         job_id = Cups.cupsCreateJob(http, @name, title, num_options, p_options)
         if job_id == 0
-          raise CupsFFI::cupsLastErrorString()
+          raise CupsError, CupsFFI::cupsLastErrorString()
         end
 
         # Copy the data into a char pointer to allow null bytes
@@ -103,7 +103,7 @@ module Cups
 
         data_pointer.free
 
-        raise ipp_status.to_s unless ipp_status == :ipp_ok
+        raise CupsError, ipp_status.to_s unless ipp_status == :ipp_ok
 
         Cups::Job.get_job(job_id, @name, 0, @connection)
       ensure
@@ -125,7 +125,7 @@ module Cups
       # Get the destination from name with cupsGetDest
       p_dest = Cups.cupsGetDest(name, nil, num_dests, dests.get_pointer(0))
       dest = Cups::Struct::Destination.new(p_dest)
-      raise "Destination with name: #{name} not found!" if dest.null?
+      raise DestinationNotFound, "Destination with name: #{name} not found!" if dest.null?
       yield dest
     ensure
       Cups.cupsFreeDests(num_dests, dests.get_pointer(0))
@@ -213,12 +213,12 @@ module Cups
     def ppd_options
       ppd_path = Cups::Ppd.cupsGetPPD(name)
       if ppd_path.nil? || ppd_path.empty?
-        raise "Error: Could not retrieve PPD for printer '#{name}'"
+        raise CupsError, "Error: Could not retrieve PPD for printer '#{name}'"
       end
 
       ppd_ptr = Cups::Ppd.ppdOpenFile(ppd_path)
       if ppd_ptr.null?
-        raise "Error: Failed to open PPD file at #{ppd_path}"
+        raise CupsError, "Error: Failed to open PPD file at #{ppd_path}"
       end
 
       # Let CUPS evaluate current printer system runtime option defaults

data/lib/ffi-cups/version.rb

@@ -1,3 +1,3 @@
 module Cups
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/ffi-cups.rb

@@ -1,6 +1,18 @@
 require 'ffi'
 
 module Cups
+  class Error < RuntimeError
+  end
+  class FileNotFound < Error
+  end
+  class JobNotFound < Error
+  end
+  class ConnectError < Error
+  end
+  class DestinationNotFound < Error
+  end
+  class CupsError < Error
+  end
 
   # Custom or default path for libcups.so
   def self.libcups

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-cups2
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Hugo Marquez