sapos-print 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9efee936fd5ce8384e2d893f19802b36fddf950dd3a7dc9a19f2c2aa075a2ea7
-  data.tar.gz: 1f7dc058f121b6711c98673c391560c4959042492b120bc3b37ca5e1a732e609
+  metadata.gz: 397a8d310cfc4a8f6299f7e3ec9157290c0a840c2738ff5e2208c8aeb45337ec
+  data.tar.gz: 98c4ed59f8606fce18446340d077f1e41930c256a3278f7b27b713b9c654040d
 SHA512:
-  metadata.gz: a94fbcb1e6fccdcc38579c1d1125e13b521bb87d5cdc0faa8e5d604e40cb300dae76fced7ae65e772f43476254b2bfaf1255849373a119073065ff9d13d2b180
-  data.tar.gz: 805d382cf37df0f32628784daab89238717ce85fa616b8ea4b34a7fa02118b4fd942769147009a22b84fd3fcc1e81bcee77b17ae51a765e910546d1b580846e1
+  metadata.gz: 61fe8e46842eb10bd29985d11a5ec1dc64207c5778979ee612460e8d0678a5c0a2e26f86407aaf82ee3e853919318033f6bde8ac9904ae5baa3fdcce5c1df9e9
+  data.tar.gz: 3426f8b36537d04b3106278173862690cf0f0e934f59c0d97834df5d8152f6cf3f4263107b04db95f27967904db99eb7111399d1a0cbb42110a55664160afb77

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sapos-print (1.1.0)
+    sapos-print (1.1.1)
       activesupport (~> 6.1)
       awesome_print
       json
@@ -26,38 +26,38 @@ GEM
       concurrent-ruby (~> 1.1.5)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dry-configurable (1.0.1)
-      dry-core (~> 1.0, < 2)
+    dry-configurable (0.16.1)
+      dry-core (~> 0.6)
       zeitwerk (~> 2.6)
-    dry-core (1.0.0)
+    dry-container (0.11.0)
       concurrent-ruby (~> 1.0)
-      zeitwerk (~> 2.6)
-    dry-inflector (1.0.0)
-    dry-initializer (3.1.1)
-    dry-logic (1.5.0)
+    dry-core (0.9.1)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
-    dry-schema (1.13.2)
+    dry-inflector (0.2.1)
+    dry-initializer (3.0.4)
+    dry-logic (1.2.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.5, >= 0.5)
+    dry-schema (1.8.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 1.0, >= 1.0.1)
-      dry-core (~> 1.0, < 2)
+      dry-configurable (~> 0.13, >= 0.13.0)
+      dry-core (~> 0.5, >= 0.5)
       dry-initializer (~> 3.0)
-      dry-logic (>= 1.4, < 2)
-      dry-types (>= 1.7, < 2)
-      zeitwerk (~> 2.6)
-    dry-types (1.7.1)
+      dry-logic (~> 1.0)
+      dry-types (~> 1.5)
+    dry-types (1.5.1)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 1.0)
-      dry-inflector (~> 1.0)
-      dry-logic (~> 1.4)
-      zeitwerk (~> 2.6)
-    dry-validation (1.10.0)
+      dry-container (~> 0.3)
+      dry-core (~> 0.5, >= 0.5)
+      dry-inflector (~> 0.1, >= 0.1.2)
+      dry-logic (~> 1.0, >= 1.0.2)
+    dry-validation (1.7.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 1.0, < 2)
+      dry-container (~> 0.7, >= 0.7.1)
+      dry-core (~> 0.5, >= 0.5)
       dry-initializer (~> 3.0)
-      dry-schema (>= 1.12, < 2)
-      zeitwerk (~> 2.6)
+      dry-schema (~> 1.8, >= 1.8.0)
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
@@ -68,7 +68,7 @@ GEM
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
-    minitest (5.18.1)
+    minitest (5.18.0)
     netrc (0.11.0)
     public_suffix (5.0.1)
     pubnub (4.8.0)
@@ -85,13 +85,13 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     thor (1.2.2)
-    timers (4.3.5)
+    timers (4.3.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    zeitwerk (2.6.8)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   arm64-darwin-21

data/lib/sapos/print/cli.rb

@@ -37,10 +37,13 @@ module Sapos
         config[:user_id] = user_id
         config[:duplicate_control] = ask("¿Control Duplicados por MSGID?", limited_to: ["si", "no"])
         config[:printers] = [config[:printer]]
+        config[:interfaces] = [config[:interface]]
         
         while yes?("¿Tiene impresoras adicionales?")
           name = ask("Nombre de la impresora adicional: ")
+          interface = ask("Interfaz de la impresora adicional: ", limited_to: ["text", "escp"])
           config[:printers] << name
+          config[:interfaces] << interface
         end
         if yes?("¿Esta seguro que desea guardar la configuración?")
           Sapos::Print::Configuration.write(config)

data/lib/sapos/print/configuration.rb

@@ -6,7 +6,7 @@ module Sapos
   module Print
     class Configuration
     
-      attr_accessor :printer, :adapter, :interface, :q, :key, :emv_path, :emv_terminal, :user_id, :verbose, :duplicate_control, :cache, :printers, :verbose
+      attr_accessor :printer, :adapter, :interface, :q, :key, :emv_path, :emv_terminal, :user_id, :verbose, :duplicate_control, :cache, :printers, :interfaces
     
       def self.write(args = {})
         config_file = "#{Sapos::Print.app_directory}/config.yml"
@@ -20,6 +20,7 @@ module Sapos
           result = YAML.load(template.result(binding))
           @printer = result[:printer]
           @printers = result[:printers] || []
+          @interfaces = result[:interfaces] || []
           @adapter = result[:adapter]
           @interface = result[:interface]
           @q = result[:q]
@@ -52,7 +53,7 @@ module Sapos
       end
     
       def to_h
-        {printer: @printer, adapter: @adapter, interface: @interface, q: @q, key: @key, emv_path: @emv_path, emv_terminal: @emv_terminal, user_id: @user_id, duplicate_control: @duplicate_control, printers: @printers }
+        {printer: @printer, adapter: @adapter, interface: @interface, q: @q, key: @key, emv_path: @emv_path, emv_terminal: @emv_terminal, user_id: @user_id, duplicate_control: @duplicate_control, printers: @printers, interfaces: @interfaces }
       end
     end
   end

data/lib/sapos/print/printer.rb

@@ -3,11 +3,16 @@ module Sapos
     class Printer
       
       attr_accessor :config
+      attr_accessor :name
       
       def initialize(config)
         @config = config
       end
       
+      def to_h
+        {config: config.printer}
+      end
+      
       def print(args = {})
         raw_message = args[:document]
       

data/lib/sapos/print/q_reader.rb

@@ -21,21 +21,23 @@ module Sapos
               document_number = nil
               
               puts msg.inspect if reader.config.verbose
-              
+                            
+              printer_name = nil
               if msg.is_a?(Hash)
                 print_control = msg['print_control']
                 document_number = msg['document_number']
+                printer_name = msg["printer"]
                 msg = msg['document']
               end
             
               document = Base64.decode64(msg)
               
               current_printer = reader.printer
-              printer_name = 'default'
-              if msg['printer'] && reader.printers[msg['printer']]
-                printer_name = msg['printer']
-                current_printer = reader.printers[msg['printer']]
+              
+              if printer_name && reader.printers[printer_name]
+                current_printer = reader.printers[printer_name]
               end
+              puts "Printer Config: #{current_printer.to_h}" if reader.config.verbose
               
               if !current_printer.print(document: document, print_control: print_control, document_number: document_number, id: msgid, printer: printer_name)
                 puts "Printer Error"
@@ -59,9 +61,10 @@ module Sapos
         @config = QReader.printer_config
         @printer = Printer.new(@config)
         @printers = {}
-        @config.printers.each do |printer|
+        @config.printers.each_with_index do |printer, idx|
           config = @config.dup
           config.printer = printer
+          config.interface = @config.interfaces[idx]
           @printers[printer] = Printer.new(config)
         end
         @pubnub = Pubnub.new(subscribe_key: @config.key, user_id: @config.user_id, ssl: true)

data/lib/sapos/print/version.rb

@@ -2,6 +2,6 @@
 
 module Sapos
   module Print
-    VERSION = "1.1.1"
+    VERSION = "1.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sapos-print
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Josef Sauter
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-19 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor