ffi-cups 0.1.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cd36e5fc525b811e3fedc0ef3b015aa47e04cf93528510a539ae3562a0e0357
-  data.tar.gz: ca00e58337c11b4291dc1debd2908e21e3bb772d4127779fc28937043fd77aa6
+  metadata.gz: 7522a8f004aef5162693ba55306f59971b2ab415210574b2bd9f64ed5b38e108
+  data.tar.gz: 54631757a4c36c0bfcc97d02e17a4f105d1cbd71562c816305bf8b7856448840
 SHA512:
-  metadata.gz: 2f751bb3648d4b66926dc962a469f6446de032c0d309892ff8defae327051c5425bdb54ad7bf52f557e11d4f03e120269abc63b17a0091ac47652042e6350bfa
-  data.tar.gz: 5726071fba04a620382afc78954c3f0790c496befdecc0cad3a3c8327cf440c4fd9f68e03a96d695fa6c2ef737bbcdb709f49cbe89889feb7eaa20292b1c2f14
+  metadata.gz: 1019c7ca45a16385c847b756052adbd2c5d0cef20149ec642e14428af3fe2aa20b3e58932e1da2a9b7bd69f5a62b0aea652905fc3aef67da65f3bab2ef4bba63
+  data.tar.gz: 6d17ccd12bc7449f92ce2dd6b9f4f02d0a2fcb277836984651ae8a05bbef6c8f3d878eb7ad732cdcb91935e89db759f7211ff704dc3f91c63124295a2b12deef

data/README.md

@@ -1,31 +1,18 @@
-# ffi-cups
+# FFI-Cups
 [![Gem Version](https://badge.fury.io/rb/ffi-cups.svg)](https://badge.fury.io/rb/ffi-cups)
 
-ffi-cups is a FFI wrapper around libcups providing access to the Cups API.
-It was written using Ruby 2.7.0.
+ffi-cups is a FFI bindings for libcups providing access to the Cups API through Ruby.
 
-## About
-This is a complete rewrite of the cupsffi gem, it will deprecate
-functions deprecated by the CUPS API, if you wish to continue to use them,
-use the cupsffi gem.
-
-## Authors
-- Hugo Marquez @ www.hugomarquez.mx
-- Contributors @ https://github.com/hugomarquez/ffi-cups/graphs/contributors
+CUPS is the standards-based, open source printing system developed by Apple Inc. for macOS® and other UNIX®-like operating systems. CUPS uses the Internet Printing Protocol (IPP) to support printing to local and network printers. - from http://www.cups.org/
 
 ## Installation
 ```bash
 gem install ffi-cups
 ```
 
-## Setup
+## Setup & Requirements
 ffi-cups requires libcups2 to be installed
 
-## TODO
-- Job's state
-- Cancel jobs
-- Get all jobs with filters
-
 ## Example usage
 ```ruby
 require 'ffi-cups'
@@ -48,12 +35,23 @@ printer.state_reasons
 # Print a file (PDF, JPG, etc) you can pass a hash of printing options if you
 # want to override the printer's default. See Cups::Constants for more options
 options = {
-  Cups::CUPS_MEDIA => Cups::CUPS_MEDIA_A4,
-  Cups::CUPS_ORIENTATION => Cups::CUPS_ORIENTATION_LANDSCAPE
+  Cups::MEDIA => Cups::MEDIA_A4,
+  Cups::ORIENTATION => Cups::ORIENTATION_LANDSCAPE
 }
 
 job = printer.print_file('/tmp/example.jpg', 'Title', options)
+# <Cups::Job:0x000055c87104d1e0 @id=10, @title="README", @printer="Virtual_PDF_Printer", @format="text/plain", @state=:processing, @size=4, @completed_time=1969-12-31 18:00:00 -0600, @creation_time=2021-04-18 17:35:04 -0500, @processing_time=2021-04-18 17:35:04 -0500> 
+
+# Get all jobs from a printer
+jobs = Cups::Job.get_jobs('Virtual_PDF_Printer')
+# [#<Cups::Job:0x0000563aa6359008 @id=1, @title="Test Print", @printer="Virtual_PDF_Printer", @format="text/plain", @state=:completed, @size=1, @completed_time=2021-04-08 07:06:23 -0500, @creation_time=2021-04-08 07:06:18 -0500, @processing_time=2021-04-08 07:06:18 -0500>, ...]
+
+# filtering job's query, see Constants file for more options
+jobs = Cups::Job.get_jobs('Virtual_PDF_Printer', Cups::WHICHJOBS_ACTIVE)
 
+# Query job with id and printer's name
+job = Cups::Job.get_job(10, 'Virtual_PDF_Printer')
+# <Cups::Job:0x000055c870fc8490 @id=10, @title="README", @printer="Virtual_PDF_Printer", @format="text/plain", @state=:completed, @size=4, @completed_time=2021-04-18 17:35:04 -0500, @creation_time=2021-04-18 17:35:04 -0500, @processing_time=2021-04-18 17:35:04 -0500>
 ```
 
 ## Remote CUPS Server
@@ -61,17 +59,23 @@ You may create a connection object passing a :hostname and/or :port arguments.
 
 ```ruby
 # Create a Connection object with hostname and/or port
-connection = Cups::Connection.instance('print.example.com')
+connection = Cups::Connection.new('print.example.com')
 
 # Get all printers from the remote connection
 remote_printers = Cups::Printer.get_destinations(connection)
-
 ```
 
+## Documentation
+Check out the documentation - [docs](https://www.rubydoc.info/gems/ffi-cups/0.2.1)
+
+## Authors
+- Hugo Marquez @ www.hugomarquez.mx
+- Contributors @ https://github.com/hugomarquez/ffi-cups/graphs/contributors
+
 ## License
 The MIT License
 
-Copyright (c) 2021 Hugo Marquez & Contributors
+Copyright (c) 2022 Hugo Marquez & Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/ffi-cups/connection.rb

@@ -3,54 +3,36 @@ module Cups
     extend Gem::Deprecate
 
     attr_accessor :hostname, :port
-    
-    @instance_mutex = Mutex.new
-
-    private_class_method :new
 
     def initialize(hostname, port=nil)
       @hostname = hostname
       @port = port.nil? ? 631 : port
     end
-
-    # Returns or creates a singleton instance
-    # @param hostname [String]
-    # @param port [Integer]
-    # @return [Object] a connection object
-    def self.instance(hostname, port=nil)
-      return @instance if @instance
-
-      @instance_mutex.synchronize do 
-        @instance ||= new(hostname, port)
-      end
-
-      @instance
-    end
-    
-    # Wrapper around {::FFI::Cups::Http#httpConnectEncrypt}
+        
+    # Wrapper around {::Cups::Http#httpConnectEncrypt}
     # @deprecated Use {#httpConnect2} instead
     # @return [Pointer] a http pointer 
     def httpConnectEncrypt
-      http = FFI::Cups::Http.httpConnectEncrypt(hostname, port, FFI::Cups.cupsEncryption())
+      http = Cups::Http.httpConnectEncrypt(hostname, port, Cups.cupsEncryption())
       raise "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
 
-    # Wrapper around {::FFI::Cups::Http#httpConnect2}
+    # Wrapper around {::Cups::Http#httpConnect2}
     # Creates a http connection to a print server
     # @return [Pointer] a http pointer
     def httpConnect2
-      http = FFI::Cups::Http.httpConnect2(hostname, port, nil, 0, FFI::Cups.cupsEncryption(), 1, 30000, nil)
+      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? 
       return http
     end
 
     # Closes the http connection and autoreleases the pointer
-    # Wrapper around {::FFI::Cups::Http#httpClose}
+    # Wrapper around {::Cups::Http#httpClose}
     # @param http (Pointer)
     def self.close(http)
-      FFI::Cups::Http.httpClose(http)
+      Cups::Http.httpClose(http)
     end
   end
 end

data/lib/ffi-cups/constants.rb

@@ -1,95 +1,95 @@
 module Cups
   # cups.h
-  CUPS_FORMAT_JPEG		      = "image/jpeg"
-  CUPS_FORMAT_PDF		        = "application/pdf"
-  CUPS_FORMAT_TEXT		      = "text/plain"
-  CUPS_JOBID_ALL            = -1
-  CUPS_WHICHJOBS_ALL        = -1
-  CUPS_WHICHJOBS_ACTIVE     = 0
-  CUPS_WHICHJOBS_COMPLETED  = 1
-  CUPS_HTTP_DEFAULT         = nil
+  FORMAT_JPEG		        = "image/jpeg"
+  FORMAT_PDF		        = "application/pdf"
+  FORMAT_TEXT		        = "text/plain"
+  JOBID_ALL             = -1
+  WHICHJOBS_ALL         = -1
+  WHICHJOBS_ACTIVE      = 0
+  WHICHJOBS_COMPLETED   = 1
+  HTTP_DEFAULT          = nil
 
   # Options and Values
-  CUPS_COPIES               = "copies"
-  CUPS_COPIES_SUPPORTED     = "copies-supported"
-
-  CUPS_FINISHINGS           = "CUPS_FINISHINGS"
-  CUPS_FINISHINGS_SUPPORTED = "finishings-supported"
-
-  CUPS_FINISHINGS_BIND		  = "7"
-  CUPS_FINISHINGS_COVER		  = "6"
-  CUPS_FINISHINGS_FOLD		  = "10"
-  CUPS_FINISHINGS_NONE		  = "3"
-  CUPS_FINISHINGS_PUNCH		  = "5"
-  CUPS_FINISHINGS_STAPLE	  = "4"
-  CUPS_FINISHINGS_TRIM		  = "11"
+  COPIES                = "copies"
+  COPIES_SUPPORTED      = "copies-supported"
   
-  CUPS_MEDIA			          = "media"
-  CUPS_MEDIA_READY		      = "media-ready"
-  CUPS_MEDIA_SUPPORTED		  = "media-supported"
-
-  CUPS_MEDIA_3X5		        = "na_index-3x5_3x5in"
-  CUPS_MEDIA_4X6	  	      = "na_index-4x6_4x6in"
-  CUPS_MEDIA_5X7		        = "na_5x7_5x7in"
-  CUPS_MEDIA_8X10		        = "na_govt-letter_8x10in"
-  CUPS_MEDIA_A3			        = "iso_a3_297x420mm"
-  CUPS_MEDIA_A4		          = "iso_a4_210x297mm"
-  CUPS_MEDIA_A5			        = "iso_a5_148x210mm"
-  CUPS_MEDIA_A6			        = "iso_a6_105x148mm"
-  CUPS_MEDIA_ENV10		      = "na_number-10_4.125x9.5in"
-  CUPS_MEDIA_ENVDL		      = "iso_dl_110x220mm"
-  CUPS_MEDIA_LEGAL	        = "na_legal_8.5x14in"
-  CUPS_MEDIA_LETTER		      = "na_letter_8.5x11in"
-  CUPS_MEDIA_PHOTO_L		    = "oe_photo-l_3.5x5in"
-  CUPS_MEDIA_SUPERBA3		    = "na_super-b_13x19in"
-  CUPS_MEDIA_TABLOID		    = "na_ledger_11x17in"
-
-  CUPS_MEDIA_SOURCE		        = "media-source"
-  CUPS_MEDIA_SOURCE_SUPPORTED	= "media-source-supported"
-
-  CUPS_MEDIA_SOURCE_AUTO	  = "auto"
-  CUPS_MEDIA_SOURCE_MANUAL	= "manual"
-
-  CUPS_MEDIA_TYPE		        = "media-type"
-  CUPS_MEDIA_TYPE_SUPPORTED	= "media-type-supported"
-
-  CUPS_MEDIA_TYPE_AUTO		      = "auto"
-  CUPS_MEDIA_TYPE_ENVELOPE	    = "envelope"
-  CUPS_MEDIA_TYPE_LABELS	      = "labels"
-  CUPS_MEDIA_TYPE_LETTERHEAD	  = "stationery-letterhead"
-  CUPS_MEDIA_TYPE_PHOTO		      = "photographic"
-  CUPS_MEDIA_TYPE_PHOTO_GLOSSY	= "photographic-glossy"
-  CUPS_MEDIA_TYPE_PHOTO_MATTE	  = "photographic-matte"
-  CUPS_MEDIA_TYPE_PLAIN		      = "stationery"
-  CUPS_MEDIA_TYPE_TRANSPARENCY	= "transparency"
-
-  CUPS_NUMBER_UP		        = "number-up"
-  CUPS_NUMBER_UP_SUPPORTED	= "number-up-supported"
-
-  CUPS_ORIENTATION		        = "orientation-requested"
-  CUPS_ORIENTATION_SUPPORTED	= "orientation-requested-supported"
-
-  CUPS_ORIENTATION_PORTRAIT	  = "3"
-  CUPS_ORIENTATION_LANDSCAPE	= "4"
-
-  CUPS_PRINT_COLOR_MODE		        = "print-color-mode"
-  CUPS_PRINT_COLOR_MODE_SUPPORTED = "print-color-mode-supported"
-
-  CUPS_PRINT_COLOR_MODE_AUTO	      = "auto"
-  CUPS_PRINT_COLOR_MODE_MONOCHROME  = "monochrome"
-  CUPS_PRINT_COLOR_MODE_COLOR	      = "color"
-
-  CUPS_PRINT_QUALITY		        = "print-quality"
-  CUPS_PRINT_QUALITY_SUPPORTED	= "print-quality-supported"
-
-  CUPS_PRINT_QUALITY_DRAFT	= "3"
-  CUPS_PRINT_QUALITY_NORMAL	= "4"
-  CUPS_PRINT_QUALITY_HIGH   = "5"
-
-  CUPS_SIDES			      = "sides"
-  CUPS_SIDES_SUPPORTED	=	"sides-supported"
-
-  CUPS_SIDES_ONE_SIDED		        = "one-sided"
-  CUPS_SIDES_TWO_SIDED_PORTRAIT	  = "two-sided-long-edge"
-  CUPS_SIDES_TWO_SIDED_LANDSCAPE  = "two-sided-short-edge"
+  FINISHINGS            = "CUPS_FINISHINGS"
+  FINISHINGS_SUPPORTED  = "finishings-supported"
+  FINISHINGS_BIND		    = "7"
+  FINISHINGS_COVER		  = "6"
+  FINISHINGS_FOLD		    = "10"
+  FINISHINGS_NONE		    = "3"
+  FINISHINGS_PUNCH		  = "5"
+  FINISHINGS_STAPLE	    = "4"
+  FINISHINGS_TRIM		    = "11"
+  
+  # MEDIA
+  MEDIA			            = "media"
+  MEDIA_READY		        = "media-ready"
+  MEDIA_SUPPORTED		    = "media-supported"
+
+  MEDIA_3X5		          = "na_index-3x5_3x5in"
+  MEDIA_4X6	  	        = "na_index-4x6_4x6in"
+  MEDIA_5X7		          = "na_5x7_5x7in"
+  MEDIA_8X10		        = "na_govt-letter_8x10in"
+  MEDIA_A3			        = "iso_a3_297x420mm"
+  MEDIA_A4		          = "iso_a4_210x297mm"
+  MEDIA_A5			        = "iso_a5_148x210mm"
+  MEDIA_A6			        = "iso_a6_105x148mm"
+  MEDIA_ENV10		        = "na_number-10_4.125x9.5in"
+  MEDIA_ENVDL		        = "iso_dl_110x220mm"
+  MEDIA_LEGAL	          = "na_legal_8.5x14in"
+  MEDIA_LETTER		      = "na_letter_8.5x11in"
+  MEDIA_PHOTO_L		      = "oe_photo-l_3.5x5in"
+  MEDIA_SUPERBA3		    = "na_super-b_13x19in"
+  MEDIA_TABLOID		      = "na_ledger_11x17in"
+
+  MEDIA_SOURCE		        = "media-source"
+  MEDIA_SOURCE_SUPPORTED	= "media-source-supported"
+
+  MEDIA_SOURCE_AUTO	  = "auto"
+  MEDIA_SOURCE_MANUAL	= "manual"
+
+  MEDIA_TYPE		        = "media-type"
+  MEDIA_TYPE_SUPPORTED	= "media-type-supported"
+
+  MEDIA_TYPE_AUTO		      = "auto"
+  MEDIA_TYPE_ENVELOPE	    = "envelope"
+  MEDIA_TYPE_LABELS	      = "labels"
+  MEDIA_TYPE_LETTERHEAD	  = "stationery-letterhead"
+  MEDIA_TYPE_PHOTO		      = "photographic"
+  MEDIA_TYPE_PHOTO_GLOSSY	= "photographic-glossy"
+  MEDIA_TYPE_PHOTO_MATTE	  = "photographic-matte"
+  MEDIA_TYPE_PLAIN		      = "stationery"
+  MEDIA_TYPE_TRANSPARENCY	= "transparency"
+
+  NUMBER_UP		        = "number-up"
+  NUMBER_UP_SUPPORTED	= "number-up-supported"
+
+  ORIENTATION		        = "orientation-requested"
+  ORIENTATION_SUPPORTED	= "orientation-requested-supported"
+
+  ORIENTATION_PORTRAIT	  = "3"
+  ORIENTATION_LANDSCAPE	= "4"
+
+  PRINT_COLOR_MODE		        = "print-color-mode"
+  PRINT_COLOR_MODE_SUPPORTED = "print-color-mode-supported"
+
+  PRINT_COLOR_MODE_AUTO	      = "auto"
+  PRINT_COLOR_MODE_MONOCHROME  = "monochrome"
+  PRINT_COLOR_MODE_COLOR	      = "color"
+
+  PRINT_QUALITY		        = "print-quality"
+  PRINT_QUALITY_SUPPORTED	= "print-quality-supported"
+
+  PRINT_QUALITY_DRAFT	= "3"
+  PRINT_QUALITY_NORMAL	= "4"
+  PRINT_QUALITY_HIGH   = "5"
+
+  SIDES			      = "sides"
+  SIDES_SUPPORTED	=	"sides-supported"
+
+  SIDES_ONE_SIDED		        = "one-sided"
+  SIDES_TWO_SIDED_PORTRAIT	  = "two-sided-long-edge"
+  SIDES_TWO_SIDED_LANDSCAPE  = "two-sided-short-edge"
 end

data/lib/ffi-cups/ffi/array.rb

@@ -1,8 +1,8 @@
-module FFI::Cups
+module Cups
   module Array
     extend FFI::Library
     
-    ffi_lib('cups')
+    ffi_lib(Cups.libcups)
     
     # @overload cupsArrayFirst(pointer)
     #   @param pointer [Pointer] to _cups_array_s struct

data/lib/ffi-cups/ffi/cups.rb

@@ -2,11 +2,11 @@
 # {https://www.cups.org/doc/cupspm.html Programming Manual}
 # {https://github.com/apple/cups/blob/master/cups/cups.h cups.h source}
 
-module FFI::Cups
+module Cups
   extend FFI::Library
-
-  ffi_lib('cups')
   
+  ffi_lib(Cups.libcups)
+
   # Get the current encryption settings.
   # @return [Integer] encryption settings
   # {https://www.cups.org/doc/cupspm.html#cupsEncryption}
@@ -94,14 +94,17 @@ module FFI::Cups
   # @overload cupsCancelJob(string, int)
   #   @param name [String] of the destination
   #   @param id [Ingeger] of the job
-  attach_function 'cupsCancelJob', [:string, :int], :void, blocking: true
+  #   @return [Integer] 1 if canceled, 0 otherwise
+  attach_function 'cupsCancelJob', [:string, :int], :int, blocking: true
 
   # Cancel a job on a destination
   # @overload cupsCancelJob2(pointer, string, int)
   #   @param pointer [Pointer] of the http connection
   #   @param name [String] of the destination
   #   @param id [Ingeger] of the job
-  attach_function 'cupsCancelJob2', [:pointer, :string, :int], :void, blocking: true
+  #   @param purge [Integer] 1 to purge, 0 to cancel
+  #   @return [Enum] Cups::Enun::IPP::Status
+  attach_function 'cupsCancelJob2', [:pointer, :string, :int, :int], Cups::Enum::IPP::Status, blocking: true
 
   # Get the jobs from a connection
   # @overload cupsGetJobs2(pointer, pointer, string, int, int)

data/lib/ffi-cups/ffi/http.rb

@@ -1,8 +1,8 @@
-module FFI::Cups
+module Cups
   module Http
     extend FFI::Library
-
-    ffi_lib('cups')
+    
+    ffi_lib(Cups.libcups)
 
     # @overload httpConnectEncrypt(string, int, int)
     #   @param hostname [String]
@@ -30,7 +30,7 @@ module FFI::Cups
     #   @param port [Integer]
     #   @param addrlist [Pointer] can be NULL
     #   @param family [Integer] (AF_UNSPEC=0)
-    #   @param encryption_settings [Integer] from FFI::Cups.cupsEncryption()
+    #   @param encryption_settings [Integer] from Cups.cupsEncryption()
     #   @param blocking [Integer]
     #   @param msec [Integer] use 5000 or less
     #   @param cancel[Pointer] integer pointer, can be NULL

data/lib/ffi-cups/job.rb

@@ -1,11 +1,89 @@
 module Cups
   class Job
-    attr_reader :id, :title, :printer
-    def initialize(id, title, printer=nil)
+    attr_accessor :id, :title, :printer,
+      :format, :state, :size, :completed_time,
+      :creation_time, :processing_time
+
+    def initialize(id, title, printer)
       @id = id
       @title = title
       @printer = printer
     end
+
+    # get a updated job's state
+    # @param connection [Cups::Connection]
+    # @return [Symbol] job's state
+    def status(connection=nil)
+      job = self.class.get_job(@id, @printer, -1, connection)
+      self.state = job.state if job
+    end
+
+    # Cancel or purge a job
+    # @param connection [Cups::Connection]
+    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
+      return r
+    end
+
+    # Get jobs by filter or destination name
+    # @param name [String]
+    # @param filter [Integer] see Constants
+    # @param connection [Cups::Connection]
+    # @return [Array] jobs
+    def self.get_jobs(name=nil, filter=-1, connection=nil)
+      p_jobs = FFI::MemoryPointer.new :pointer
+      cups_jobs = cupsGetJobs2(p_jobs, name, filter, connection)
+      jobs = []
+      cups_jobs.each do |j|
+        job = Cups::Job.new(j[:id].dup, j[:title].dup, j[:dest].dup)
+        job.format = j[:format]
+        job.state = j[:state]
+        job.size = j[:size]
+        job.completed_time = Time.at(j[:completed_time])
+        job.creation_time = Time.at(j[:creation_time])
+        job.processing_time = Time.at(j[:processing_time])
+        jobs.push(job)
+      end
+      return jobs
+    end
+
+    # Get job from id
+    # @param id [Integer]
+    # @param name [String]
+    # @param filter [Integer] see Constants
+    # @param connection [Cups::Connection]
+    # @return [Job] job object
+    def self.get_job(id, name=nil, filter=-1, connection=nil)
+      jobs = get_jobs(name, filter, connection)
+      jobs.each do |j|
+        return j if j.id == id
+      end
+      raise "Job with id: #{id} not found!"
+    end
+
+    private
+    # Wrapper {::Cups#cupsGetJobs2}
+    # @param pointer [Pointer] pointer to the jobs
+    # @param name [String] name of the destination or NULL
+    # @param filter [Integer] see Constants for more filters
+    # @param connection [Cups::Connection]
+    # @return [Array] array of job structs
+    def self.cupsGetJobs2(pointer, name=nil, filter=-1, connection=nil)
+      http = connection.nil? ? nil : connection.httpConnect2
+      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)
+      end
+
+      Cups::Connection.close(http) if http
+      return jobs
+    end
   end
 end
 

data/lib/ffi-cups/printer.rb

@@ -17,7 +17,7 @@ module Cups
       when '3' then :idle
       when '4' then :printing
       when '5' then :stopped
-      else :unkown
+      else :unknown
       end
     end
 
@@ -33,10 +33,10 @@ module Cups
       http = @connection.nil? ? nil : @connection.httpConnect2
       # Get all destinations with cupsGetDests2
       dests = FFI::MemoryPointer.new :pointer
-      num_dests = FFI::Cups.cupsGetDests2(http, dests)
+      num_dests = Cups.cupsGetDests2(http, dests)
 
       # Get the destination from name with cupsGetDest
-      p_dest = FFI::Cups.cupsGetDest(@name, nil, num_dests, dests.get_pointer(0))
+      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?
 
@@ -48,19 +48,20 @@ module Cups
           unless self.class.cupsCheckDestSupported(p_dest, k, v, http)
             raise "Option:#{k} #{v if v} not supported for printer: #{@name}" 
           end
-          num_options = FFI::Cups.cupsAddOption(k, v, num_options, p_options)
+          num_options = Cups.cupsAddOption(k, v, num_options, p_options)
         end
         p_options = p_options.get_pointer(0)
       end
 
-      job_id = FFI::Cups.cupsPrintFile2(http, @name, filename, title, num_options, p_options)
-      job = Cups::Job.new(job_id, title, self)
+      job_id = Cups.cupsPrintFile2(http, @name, filename, title, num_options, p_options)
 
       if job_id.zero?
         last_error = Cups.cupsLastErrorString()
         self.class.cupsFreeOptions(num_options, p_options) unless options.empty?
         raise last_error
       end
+      #job = Cups::Job.new(job_id, title, @name)
+      job = Cups::Job.get_job(job_id, @name, 0, @connection)
 
       self.class.cupsFreeOptions(num_options, p_options) unless options.empty?
       self.class.cupsFreeDests(num_dests, dests)
@@ -90,10 +91,10 @@ module Cups
       http = connection.nil? ? nil : connection.httpConnect2
       # Get all destinations with cupsGetDests2
       dests = FFI::MemoryPointer.new :pointer
-      num_dests = FFI::Cups.cupsGetDests2(http, dests)
+      num_dests = Cups.cupsGetDests2(http, dests)
 
       # Get the destination from name with cupsGetDest
-      p_dest = FFI::Cups.cupsGetDest(name, nil, num_dests, dests.get_pointer(0))
+      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?
 
@@ -104,13 +105,13 @@ module Cups
     end
 
     private
-    # Wrapper around {::FFI::Cups#cupsGetDests2}
+    # Wrapper around {::Cups#cupsGetDests2}
     # @param connection [Pointer] http pointer from {Cups::Connection#httpConnect2}
     # @param pointer [Pointer] pointer to the destinations
     # @return [Hash] hashmap of destination structs
     def self.cupsGetDests2(pointer, connection=nil)
       http = connection.nil? ? nil : connection.httpConnect2
-      num_dests = FFI::Cups.cupsGetDests2(http, pointer)
+      num_dests = Cups.cupsGetDests2(http, pointer)
       size = Cups::Struct::Destination.size
       destinations = []
       num_dests.times do |i|
@@ -121,15 +122,15 @@ module Cups
       return destinations
     end
 
-    # Wrapper around {::FFI::Cups#cupsCheckDestSupported}
+    # Wrapper around {::Cups#cupsCheckDestSupported}
     # @param dest [Pointer] pointer to the destination
     # @param option [String]
     # @param value [String]
     # @param connection [Pointer] http pointer from {Cups::Connection#httpConnect2}
     # @return [Boolean] true if supported, false otherwise
     def self.cupsCheckDestSupported(dest, option, value, connection=nil)
-      info = FFI::Cups.cupsCopyDestInfo(connection, dest)
-      i = FFI::Cups.cupsCheckDestSupported(connection, dest, info, option, value)
+      info = Cups.cupsCopyDestInfo(connection, dest)
+      i = Cups.cupsCheckDestSupported(connection, dest, info, option, value)
       return !i.zero?
     end
 
@@ -159,18 +160,18 @@ module Cups
       return options
     end
 
-    # Wrapper around {::FFI::Cups#cupsFreeDests}
+    # Wrapper around {::Cups#cupsFreeDests}
     # @param num_dests [Integer]
     # @param pointer [Pointer] pointer to the destinations
     def self.cupsFreeDests(num_dests, pointer)
-      FFI::Cups.cupsFreeDests(num_dests, pointer.get_pointer(0))
+      Cups.cupsFreeDests(num_dests, pointer.get_pointer(0))
     end
 
-    # Wrapper around {::FFI::Cups#cupsFreeOptions}
+    # Wrapper around {::Cups#cupsFreeOptions}
     # @param num_opts [Integer]
     # @param pointer [Pointer] pointer to the options
     def self.cupsFreeOptions(num_opts, pointer)
-      FFI::Cups.cupsFreeOptions(num_opts, pointer)
+      Cups.cupsFreeOptions(num_opts, pointer)
     end
   end
 end

data/lib/ffi-cups/version.rb

@@ -1,3 +1,3 @@
 module Cups
-  VERSION = "0.1.9"
+  VERSION = "0.3.0"
 end

data/lib/ffi-cups.rb

@@ -2,17 +2,16 @@ require 'ffi'
 require 'byebug'
 
 module Cups
-  extend FFI::Library
 
-  begin
+  # Custom or default path for libcups.so
+  def self.libcups
     if ENV['CUPS_LIB']
-      ffi_lib(ENV['CUPS_LIB'])
+      ENV['CUPS_LIB']
     else
-      ffi_lib('cups')
+      'cups'
     end
-  rescue LoadError => e
-    raise LoadError, "Didn't find libcups on your system."
   end
+
 end
 
 # Constants

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-cups
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Hugo Marquez
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-18 00:00:00.000000000 Z
+date: 2022-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: FFI wrapper around libcups