sapos-print 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cf330a4cbd6cebe38d5f2c8226e11527f7f498670988f8803ad2ca36338cb7f
-  data.tar.gz: 7339239ef96714e6f0b7599072eb5b2aa55b9f69f8fa8614a6d9cf78fbf508f9
+  metadata.gz: cc0f0e2c23bfce7306d2f9ad61b8c22133ea9a899bfbe7715ad412742e3dc0d1
+  data.tar.gz: 50c06d2cc61e089350ac62b05317d1ad894cf25debe67aba26baa6ddf0b14e35
 SHA512:
-  metadata.gz: 8e740b34123da68ec66c0ba165e9f9e06818e46620aed83796ebfc73bea3aef09dbb970d6ce6b9a7914846d9c3316f0cc17b04e1db93a757746235cd2a208585
-  data.tar.gz: 3cfeb286303fbd876f7e45986d857c022315efeace92f2140bb2d90daa05293025df96601359f765c213d4311aa5d3794e001baa14265ba939828be5dfe9c0b3
+  metadata.gz: bfe1ac23eb6b6696a3f97ee41d5574014e7979fc73735b3befec56c39c5e189d5175111da32e488cda1d9e7525d45a6950cbde53865fcfdfdfd7912714711ab5
+  data.tar.gz: 0fd6bd0aa7a28908221f6ed4a8f08666138542be8d6ae5d728840ede8a06da3f8c9d1e1a9a06a0696862a083a70b8503721ee0caf30c19940deff0e2f9eace03

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sapos-print (1.0.7)
+    sapos-print (1.0.10)
       activesupport
       awesome_print
       json
@@ -12,7 +12,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.2.3)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -34,7 +34,7 @@ GEM
       concurrent-ruby (~> 1.0)
       zeitwerk (~> 2.6)
     dry-inflector (0.2.1)
-    dry-initializer (3.0.4)
+    dry-initializer (3.1.1)
     dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
@@ -63,7 +63,7 @@ GEM
     httpclient (2.8.3)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
+    json (2.6.3)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)

data/lib/sapos/print/cli.rb

@@ -3,17 +3,17 @@ module Sapos
   module Print
     include Thor::Actions
     class CLI < Thor
-      
+            
       desc "setup", "Setup Wizard"
       def setup
         info 
         config = {}
         
-        url = ask("Configuration URL")
+        url = ask("URL de Configuración: ")
         if url.eql?('manual')
           data = {}
-          data["channel"] = ask("Channel:")
-          data["key"] = ask("Queue Key")
+          data["channel"] = ask("Canal:")
+          data["key"] = ask("Llave de la Cola:")
         else
           response = RestClient.get(url)
           data = JSON.parse(response)
@@ -31,15 +31,21 @@ module Sapos
 
         config[:q] = data["channel"]
         config[:key] = data["key"]
-        config[:printer] = ask("Printer Name: ")
-        config[:adapter] = ask("Printer Adapter: ", limited_to: ["console", "cups", "windows"])
+        config[:printer] = ask("Nombre de la impresora default: ")
+        config[:adapter] = ask("Adaptador: ", limited_to: ["console", "cups", "windows"])
         config[:interface] = ask("Interface", limited_to: ["text", "escp"])
         config[:user_id] = user_id
+        config[:duplicate_control] = ask("¿Control Duplicados por MSGID?", limited_to: ["si", "no"])
+        config[:printers] = [config[:printer]]
         
-        if yes?("Are you sure that you want to write the configuration file?")
+        while yes?("¿Tiene impresoras adicionales?")
+          name = ask("Nombre de la impresora adicional: ")
+          config[:printers] << name
+        end
+        if yes?("¿Esta seguro que desea guardar la configuración?")
           Sapos::Print::Configuration.write(config)
           ap config
-          say "Configuration Saved! Cheers"
+          say "La configuración ha sido guardada!"
         end        
       end
       
@@ -48,7 +54,7 @@ module Sapos
       def start
         info
         config = Sapos::Print.config
-        puts ["Q=#{config.q.to_s}", "Printer=#{config.printer.to_s}", "Adapter=#{config.adapter.to_s}", "Interface=#{config.interface}"].join(";")
+        puts ["Q=#{config.q.to_s}", "Printer=#{config.printer.to_s}", "Adapter=#{config.adapter.to_s}", "Interface=#{config.interface}", "DC=#{config.duplicate_control?}"].join(";")
         
         print_dir = File.join(Sapos::Print.app_directory, 'print')
         if File.exists?(print_dir)
@@ -63,9 +69,17 @@ module Sapos
       end
       
       desc "print", "demo print"
+      option :printer_name, type: :string
       def print
         info
         config = Sapos::Print.config
+        printer_name = options[:printer_name]
+        if printer_name.present?
+          if config.printers.any? && config.printers.include?(printer_name)
+            config.printer = printer_name
+          end
+        end
+        puts "Printing to: #{config.printer}"
         printer = Printer.new(config)
         printer.print(document: "This is a test\nprint page\nwithno special commands", document_number: "test", print_control: true)
       end

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
+      attr_accessor :printer, :adapter, :interface, :q, :key, :emv_path, :emv_terminal, :user_id, :verbose, :duplicate_control, :cache, :printers
     
       def self.write(args = {})
         config_file = "#{Sapos::Print.app_directory}/config.yml"
@@ -19,6 +19,7 @@ module Sapos
           template = ERB.new(File.read(config_file))
           result = YAML.load(template.result(binding))
           @printer = result[:printer]
+          @printers = result[:printers] || []
           @adapter = result[:adapter]
           @interface = result[:interface]
           @q = result[:q]
@@ -26,6 +27,8 @@ module Sapos
           @emv_path = result[:emv_path]
           @emv_terminal = result[:emv_terminal]
           @user_id = result[:user_id]
+          @duplicate_control = result[:duplicate_control]
+          @cache = []
         else
           raise Sapos::Print::Error, "Configuration is missing. Make sure to create this file: #{config_file}"
         end
@@ -42,9 +45,13 @@ module Sapos
       def verify?
         @verify == true
       end
+      
+      def duplicate_control?
+        @duplicate_control.to_s.downcase.eql?("si")
+      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 }
+        {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 }
       end
     end
   end

data/lib/sapos/print/printer.rb

@@ -10,11 +10,18 @@ module Sapos
       def print(args = {})
         raw_message = args[:document]
       
-        log_text = "id=#{args[:id]},doc=#{args[:document_number]},control=#{args[:print_control] ? "SI" : "NO"}\t"
+        log_text = "id=#{args[:id]},doc=#{args[:document_number]},control=#{args[:print_control] ? "SI" : "NO"},cache=0\t"
         filename = "#{args[:document_number]}.print" if args[:document_number]
         filename = SecureRandom.hex if filename.nil?
         result = false
         raw = raw_message.force_encoding("UTF-8")
+        msgid = args[:id]
+        if @config.duplicate_control? && @config.cache.include?(msgid)
+          log_text += " => DUPLICADO (DC)"
+          log_text.gsub!("cache=0", "cache=#{@config.cache.size}")
+          puts log_text
+          return true
+        end
         begin
           if args[:print_control] && args[:document_number]
             print_dir = File.join(Sapos::Print.app_directory, 'print')
@@ -39,6 +46,11 @@ module Sapos
             #puts "Result: #{result}"
             log_text += " => OK"
           end
+          if @config.duplicate_control?
+            @config.cache << msgid
+            @config.cache.shift if @config.cache.size > 30
+            log_text.gsub!("cache=0", "cache=#{@config.cache.size}")
+          end
           puts log_text
         rescue => e
           puts "#{e.message}"
@@ -47,8 +59,7 @@ module Sapos
         ensure
           #File.delete(filename) if File.exists?(filename)
           return result
-        end        
-        
+        end
       end
       
       def data(raw_message)

data/lib/sapos/print/q_reader.rb

@@ -7,7 +7,7 @@ module Sapos
         attr_accessor :printer_config, :verbose
       end
     
-      attr_accessor :pubnub, :printer, :config
+      attr_accessor :pubnub, :printer, :config, :printers
     
       def self.run!
         reader = QReader.new
@@ -29,8 +29,14 @@ module Sapos
               end
             
               document = Base64.decode64(msg)
-            
-              if !reader.printer.print(document: document, print_control: print_control, document_number: document_number, id: msgid)
+              
+              current_printer = reader.printer
+              
+              if msg['printer'] && reader.printers[msg['printer']]
+                current_printer = reader.printers[msg['printer']]
+              end
+              
+              if !current_printer.print(document: document, print_control: print_control, document_number: document_number, id: msgid)
                 puts "Printer Error"
               end
             rescue => e
@@ -51,6 +57,12 @@ module Sapos
       def initialize
         @config = QReader.printer_config
         @printer = Printer.new(@config)
+        @printers = {}
+        @config.printers.each do |printer|
+          config = @config.dup
+          config.printer = printer
+          @printers[printer] = Printer.new(config)
+        end
         @pubnub = Pubnub.new(subscribe_key: @config.key, user_id: @config.user_id, ssl: true)
       end        
     end

data/lib/sapos/print/version.rb

@@ -2,6 +2,6 @@
 
 module Sapos
   module Print
-    VERSION = "1.0.9"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sapos-print
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Josef Sauter
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-21 00:00:00.000000000 Z
+date: 2023-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor