sapos-print 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc0f0e2c23bfce7306d2f9ad61b8c22133ea9a899bfbe7715ad412742e3dc0d1
-  data.tar.gz: 50c06d2cc61e089350ac62b05317d1ad894cf25debe67aba26baa6ddf0b14e35
+  metadata.gz: 9efee936fd5ce8384e2d893f19802b36fddf950dd3a7dc9a19f2c2aa075a2ea7
+  data.tar.gz: 1f7dc058f121b6711c98673c391560c4959042492b120bc3b37ca5e1a732e609
 SHA512:
-  metadata.gz: bfe1ac23eb6b6696a3f97ee41d5574014e7979fc73735b3befec56c39c5e189d5175111da32e488cda1d9e7525d45a6950cbde53865fcfdfdfd7912714711ab5
-  data.tar.gz: 0fd6bd0aa7a28908221f6ed4a8f08666138542be8d6ae5d728840ede8a06da3f8c9d1e1a9a06a0696862a083a70b8503721ee0caf30c19940deff0e2f9eace03
+  metadata.gz: a94fbcb1e6fccdcc38579c1d1125e13b521bb87d5cdc0faa8e5d604e40cb300dae76fced7ae65e772f43476254b2bfaf1255849373a119073065ff9d13d2b180
+  data.tar.gz: 805d382cf37df0f32628784daab89238717ce85fa616b8ea4b34a7fa02118b4fd942769147009a22b84fd3fcc1e81bcee77b17ae51a765e910546d1b580846e1

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    sapos-print (1.0.10)
-      activesupport
+    sapos-print (1.1.0)
+      activesupport (~> 6.1)
       awesome_print
       json
       pubnub (~> 4.8.0)
@@ -12,12 +12,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.3)
+    activesupport (6.1.7.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.1)
+      zeitwerk (~> 2.3)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     awesome_print (1.9.2)
     concurrent-ruby (1.1.10)
@@ -25,49 +26,49 @@ GEM
       concurrent-ruby (~> 1.1.5)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dry-configurable (0.16.1)
-      dry-core (~> 0.6)
+    dry-configurable (1.0.1)
+      dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
-    dry-container (0.11.0)
-      concurrent-ruby (~> 1.0)
-    dry-core (0.9.1)
+    dry-core (1.0.0)
       concurrent-ruby (~> 1.0)
       zeitwerk (~> 2.6)
-    dry-inflector (0.2.1)
+    dry-inflector (1.0.0)
     dry-initializer (3.1.1)
-    dry-logic (1.2.0)
+    dry-logic (1.5.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-schema (1.8.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-schema (1.13.2)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.13, >= 0.13.0)
-      dry-core (~> 0.5, >= 0.5)
+      dry-configurable (~> 1.0, >= 1.0.1)
+      dry-core (~> 1.0, < 2)
       dry-initializer (~> 3.0)
-      dry-logic (~> 1.0)
-      dry-types (~> 1.5)
-    dry-types (1.5.1)
+      dry-logic (>= 1.4, < 2)
+      dry-types (>= 1.7, < 2)
+      zeitwerk (~> 2.6)
+    dry-types (1.7.1)
       concurrent-ruby (~> 1.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)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
+      zeitwerk (~> 2.6)
+    dry-validation (1.10.0)
       concurrent-ruby (~> 1.0)
-      dry-container (~> 0.7, >= 0.7.1)
-      dry-core (~> 0.5, >= 0.5)
+      dry-core (~> 1.0, < 2)
       dry-initializer (~> 3.0)
-      dry-schema (~> 1.8, >= 1.8.0)
+      dry-schema (>= 1.12, < 2)
+      zeitwerk (~> 2.6)
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    minitest (5.17.0)
+    mime-types-data (3.2023.0218.1)
+    minitest (5.18.1)
     netrc (0.11.0)
     public_suffix (5.0.1)
     pubnub (4.8.0)
@@ -83,14 +84,14 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    thor (1.2.1)
-    timers (4.3.3)
-    tzinfo (2.0.5)
+    thor (1.2.2)
+    timers (4.3.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   arm64-darwin-21

data/lib/sapos/print/cli.rb

@@ -111,6 +111,27 @@ module Sapos
         end
       end
       
+      desc "test_q", "q reader test"
+      def test_q
+        config = Sapos::Print.config
+        puts ["Q=#{config.q.to_s}", "Printer=#{config.printer.to_s}", "Adapter=#{config.adapter.to_s}", "Interface=#{config.interface}", "DC=#{config.duplicate_control?}"].join(";")
+        
+        Sapos::Print::QReader.printer_config = config
+        reader = QReader.new
+        puts reader.printer
+        
+        message = {:document => "doc", :printer => "Daniel"}
+        ap reader.printers
+        
+        Sapos::Print.config.printers.each do |p|
+          printer = reader.printers[p]
+          puts "Printing to: #{printer.config.printer}"
+          message[:document] = "Docu. #{p}"
+          printer.print(message)
+        end
+          
+      end
+      
       no_tasks do
         def info
           if @printed.nil?

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
+      attr_accessor :printer, :adapter, :interface, :q, :key, :emv_path, :emv_terminal, :user_id, :verbose, :duplicate_control, :cache, :printers, :verbose
     
       def self.write(args = {})
         config_file = "#{Sapos::Print.app_directory}/config.yml"
@@ -28,6 +28,7 @@ module Sapos
           @emv_terminal = result[:emv_terminal]
           @user_id = result[:user_id]
           @duplicate_control = result[:duplicate_control]
+          @verbose = result[:verbose]
           @cache = []
         else
           raise Sapos::Print::Error, "Configuration is missing. Make sure to create this file: #{config_file}"

data/lib/sapos/print/printer.rb

@@ -2,6 +2,7 @@ module Sapos
   module Print
     class Printer
       
+      attr_accessor :config
       
       def initialize(config)
         @config = config
@@ -11,6 +12,7 @@ module Sapos
         raw_message = args[:document]
       
         log_text = "id=#{args[:id]},doc=#{args[:document_number]},control=#{args[:print_control] ? "SI" : "NO"},cache=0\t"
+        log_text += "printer=#{args[:printer]}\t" if args[:printer]
         filename = "#{args[:document_number]}.print" if args[:document_number]
         filename = SecureRandom.hex if filename.nil?
         result = false
@@ -85,6 +87,7 @@ module Sapos
         case @config.adapter
         when 'console'
           puts "=> CONSOLE: file: #{opts[:file]}<=\n\n"
+          puts "=> Printer: #{@config.printer}"
           puts File.read(opts[:file])
           puts "\n=> END CONSOLE =<"
           return true

data/lib/sapos/print/q_reader.rb

@@ -31,12 +31,13 @@ module Sapos
               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']]
               end
               
-              if !current_printer.print(document: document, print_control: print_control, document_number: document_number, id: msgid)
+              if !current_printer.print(document: document, print_control: print_control, document_number: document_number, id: msgid, printer: printer_name)
                 puts "Printer Error"
               end
             rescue => e

data/lib/sapos/print/version.rb

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

data/sapos-print.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "pubnub", "~> 4.8.0"
   spec.add_dependency "rest-client"
   spec.add_dependency "awesome_print"
-  spec.add_dependency "activesupport"
+  spec.add_dependency "activesupport", "~> 6.1"
   spec.add_dependency "json"
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sapos-print
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Josef Sauter
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2023-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -70,16 +70,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement