cupsffi 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac820f12c69456581085fbe72a228553dd9a65b8
-  data.tar.gz: 8de484ae6f6eb15b4c1acf6b2491dbc92a9b1d3e
+  metadata.gz: dbc08d6e444be4d168fa260c3cbf956173b8406d
+  data.tar.gz: afb009dba1a0297adb2d0ac7f00c1bc6e1c47b65
 SHA512:
-  metadata.gz: ebedc3464a41ae253f6a0ebed5ba1d2410e74671777fa8cf5ff33a7afa15b60349f41bc3e4f8138fbdc3491449d7b48c43d0bd783bf0233def6625f67badf662
-  data.tar.gz: 4b632a6e5f0f0f5a0c135a07c72ce78fcb53e775708f23157e760c6946c4e7283f59716d1d17fcd5d76367e20d2165f86a0c20c31598cdab4c977d3eae5858c5
+  metadata.gz: 5f338d344ed18fa3c5807288df26597ac566bea57f08f092110c09c348f459aceeda6173a0cf90042a974da8cb7c1c369d7dae46cbdda2f577de715bb9f6584d
+  data.tar.gz: a2f491527db5a40bc39da4e5144f0b0394cfdfa8f604b19a5d826d1963d17281dcf32d307bb5658debe184211a35933d054543a73f3a936c74ff5d4e4f9fc88a

data/cupsffi.gemspec

@@ -12,7 +12,6 @@ Gem::Specification.new do |s|
   s.summary     = %q{FFI wrapper around libcups}
   s.description = %q{Simple wrapper around libcups to give CUPS printing capabilities to Ruby apps.}
 
-  s.add_development_dependency "ffi"
   s.add_runtime_dependency "ffi"
 
   s.rubyforge_project = "cupsffi"

data/lib/cupsffi/lib.rb

@@ -172,6 +172,7 @@ module CupsFFI
 
   attach_function 'cupsEncryption', [], :int
   attach_function 'httpConnectEncrypt', [ :string, :int, :int], :pointer
+  attach_function 'httpClose', [ :pointer ], :void
 
 
   attach_function 'cupsGetDests', [ :pointer ], :int

data/lib/cupsffi/printer.rb

@@ -37,40 +37,69 @@ class CupsPrinter
     end
   end
 
+  def self.walk_attributes(connection)
+    p = FFI::MemoryPointer.new :pointer
+    dest_count = CupsFFI::cupsGetDests2(connection, p)
+    dest_count.times do |i|
+      dest = CupsFFI::CupsDestS.new(p.get_pointer(0) + (CupsFFI::CupsDestS.size * i))
+      yield dest
+    end
+    CupsFFI::cupsFreeDests(dest_count, p.get_pointer(0))
+  end
+
+  def self.walk_sub_attributes(dest)
+    dest[:num_options].times do |j|
+      options = CupsFFI::CupsOptionS.new(dest[:options] + (CupsFFI::CupsOptionS.size * j))
+      yield options
+    end
+  end
+
+  def self.release_connection(connection)
+    CupsFFI::httpClose(connection)
+  end
+
   def initialize(name, args = {})
     raise "Printer not found" unless CupsPrinter.get_all_printer_names(args).include? name
     @name = name
     @connection = CupsPrinter.get_connection(args)
   end
 
+  def close
+    CupsPrinter.release_connection(@connection)
+  end
+
   def self.get_all_printer_names(args = {})
     connection = get_connection(args)
-
-    p = FFI::MemoryPointer.new :pointer
-    dest_count = CupsFFI::cupsGetDests2(connection, p)
     ary = []
-    dest_count.times do |i|
-      d = CupsFFI::CupsDestS.new(p.get_pointer(0) + (CupsFFI::CupsDestS.size * i))
-      ary.push(d[:name].dup)
+    walk_attributes(connection) do |dest|
+      ary.push(dest[:name].dup)
     end
-    CupsFFI::cupsFreeDests(dest_count, p.get_pointer(0))
+    release_connection(connection)
     ary
   end
 
+  def self.get_all_printer_attrs(args = {})
+    connection = get_connection(args)
+    hash = {}
+    walk_attributes(connection) do |dest|
+      pname = dest[:name].dup
+      hash[pname] ||= {}
+      walk_sub_attributes(dest) do |options|
+        hash[pname][options[:name].dup] = options[:value].dup
+      end
+    end
+    release_connection(connection)
+    hash
+  end
+
   def attributes
-    p = FFI::MemoryPointer.new :pointer
-    dest_count = CupsFFI::cupsGetDests2(@connection, p)
     hash = {}
-    dest_count.times do |i|
-      dest = CupsFFI::CupsDestS.new(p.get_pointer(0) + (CupsFFI::CupsDestS.size * i))
+    CupsPrinter.walk_attributes(@connection) do |dest|
       next unless dest[:name] == @name
-      dest[:num_options].times do |j|
-        options = CupsFFI::CupsOptionS.new(dest[:options] + (CupsFFI::CupsOptionS.size * j))
+      CupsPrinter.walk_sub_attributes(dest) do |options|
         hash[options[:name].dup] = options[:value].dup
       end
     end
-    CupsFFI::cupsFreeDests(dest_count, p.get_pointer(0))
-    hash
   end
 
   def state

data/lib/cupsffi/version.rb

@@ -1,3 +1,3 @@
 module Cupsffi
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cupsffi
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Nathan Ehresman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ffi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement