sapos-print 1.0.8 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c6213f40144b180efcab3601be965bd4eb27538e24ce1061d5645294c7771d3
-  data.tar.gz: b6ebb3d3b2faa32eaff6c7f65b488582a79c6ca7e3006dc574baa0eea9d3a80c
+  metadata.gz: e1f30efb41b794e0457aba97ebd82d77a7c225d82768f86dfde2523e8cc1d77c
+  data.tar.gz: 6895fb38bc99778737c7a126b6fd759505017c7362450c855d2a941e9589c218
 SHA512:
-  metadata.gz: f5c29e07f820962d25be97d733a566397ce59de91f6b0f9ab14b2735bcc392b9da026f887612db38e8a7e3e9325266814f4b22f2789d2f07efdc7572083cf49e
-  data.tar.gz: da79df111441d3512408add3a69fab610a07573ae7104a7ee16a84da4644684fcf5386971aa9a6367e47529a043cfe7316c72706f48723ad975a6470c8455ae5
+  metadata.gz: 6efbd8f30e2c9446c76fdd7e2cd7547c80dd90b6b04fc680c1d4c3eb245a696c6372a25a19e350ac64e7b1b807ab8a8ca22a7b2f5310d2080fa2375d10bb24cc
+  data.tar.gz: 78b637abab89f3745d43c9b1cea5628997076c52f9f0399d840461d8c7a70793faada466143d8d230f6ac92ff698d97012fb00992f6197ffa7657c21b3b24c10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sapos-print (1.0.7)
+    sapos-print (1.0.9)
       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

@@ -35,6 +35,7 @@ module Sapos
         config[:adapter] = ask("Printer Adapter: ", 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"])
         
         if yes?("Are you sure that you want to write the configuration file?")
           Sapos::Print::Configuration.write(config)
@@ -48,7 +49,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)

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
     
       def self.write(args = {})
         config_file = "#{Sapos::Print.app_directory}/config.yml"
@@ -26,6 +26,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 +44,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 }
       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

@@ -51,7 +51,7 @@ module Sapos
       def initialize
         @config = QReader.printer_config
         @printer = Printer.new(@config)
-        @pubnub = Pubnub.new(subscribe_key: @config.key, user_id: @config.user_id)
+        @pubnub = Pubnub.new(subscribe_key: @config.key, user_id: @config.user_id, ssl: true)
       end        
     end
   end

data/lib/sapos/print/version.rb

@@ -2,6 +2,6 @@
 
 module Sapos
   module Print
-    VERSION = "1.0.8"
+    VERSION = "1.0.10"
   end
 end

metadata

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