sapos-print 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa9dbe51b563ee70ee2027c134a1bd153f324320b3de2fe8edeaf746cacf0074
-  data.tar.gz: dbd27b3c96dbd8f3f16a1127380e863e7e39abd2281f9fbd0e661257e6f34628
+  metadata.gz: 6676d897cee608283071d8a13da6989e1db58cbbab4f4ba819be4b6fc9f80b30
+  data.tar.gz: 7c59412ee4b5d748389662823f5b9502d2aee835d1261c21c9673cee0d561da2
 SHA512:
-  metadata.gz: 1ede8347459232583ccdef4f6b7f9750272c566b79f4c019fdc7043e30c9e685759527b3c2a5d692130abf53c81d012c2cd694d1feb423fc4cf089077e437fa8
-  data.tar.gz: d10655107cdad90e67da0e0a4ec2c97af27087e85b91e3859eb6edc23d1beb9c2381bc5a6311b1dd80960d4c103a4d3efedb9b8b72690c379e720f7bedc4d3fd
+  metadata.gz: cc05e1cdecdca5672a07e874afe94dce4232af5ab3c159352897e61222a24a91a25cbf894fca48cd464fbbbe12d166815e6828fbebece534c12bf27b2b020937
+  data.tar.gz: c1300e4a85fb10fdcba5b1df562b3bcdbb73f612dccea867590ce0fd492fb32b9002c10483c451500a9c8861168f9e97838dc6511f15d76dbd88d5f201924805

data/lib/sapos/print/cli.rb

@@ -12,12 +12,23 @@ module Sapos
         url = ask("Configuration URL")
         response = RestClient.get(url)
         data = JSON.parse(response)
+        
+        config_file = "#{Sapos::Print.app_directory}/config.yml"
+        user_id = nil
+        if File.exist?(config_file)
+          template = ERB.new(File.read(config_file))
+          result = YAML.load(template.result(binding))
+          user_id = result[:user_id]
+        end
+        
+        user_id = SecureRandom.uuid if user_id.nil?
 
         config[:q] = data["channel"]
         config[:key] = data["key"]
         config[:printer] = ask("Printer Name: ")
         config[:adapter] = ask("Printer Adapter: ", limited_to: ["console", "cups", "windows"])
         config[:interface] = ask("Interface", limited_to: ["text", "escp"])
+        config[:user_id] = user_id
         
         if yes?("Are you sure that you want to write the configuration file?")
           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
+      attr_accessor :printer, :adapter, :interface, :q, :key, :emv_path, :emv_terminal, :user_id
     
       def self.write(args = {})
         config_file = "#{Sapos::Print.app_directory}/config.yml"
@@ -26,6 +26,7 @@ module Sapos
           @key = result[:key]
           @emv_path = result[:emv_path]
           @emv_terminal = result[:emv_terminal]
+          @user_id = result[:user_id]
         else
           raise Sapos::Print::Error, "Configuration is missing. Make sure to create this file: #{config_file}"
         end
@@ -44,7 +45,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 }
+        {printer: @printer, adapter: @adapter, interface: @interface, q: @q, key: @key, emv_path: @emv_path, emv_terminal: @emv_terminal, user_id: @user_id }
       end
     end
   end

data/lib/sapos/print/q_reader.rb

@@ -13,9 +13,17 @@ module Sapos
         reader = QReader.new
         callback = Pubnub::SubscribeCallback.new(
           message: -> (envelope){
-            document = Base64.decode64(envelope.result[:data][:message]['document'])
-            print_control = envelope.result[:data][:message]['print_control']
-            document_number = envelope.result[:data][:message]['document_number']
+            msg = envelope.result[:data][:message]
+            print_control = nil
+            document_number = nil
+            
+            if msg.is_a?(Hash)
+              msg = msg['document']
+              print_control = msg['print_control']
+              document_number = msg['document_number']
+            end
+            
+            document = Base64.decode64(msg)
             
             if reader.printer.print(document: document, print_control: print_control, document_number: document_number)
               puts "OK"
@@ -37,7 +45,7 @@ module Sapos
       def initialize
         @config = QReader.printer_config
         @printer = Printer.new(@config)
-        @pubnub = Pubnub.new(subscribe_key: @config.key)
+        @pubnub = Pubnub.new(subscribe_key: @config.key, user_id: @config.user_id)
       end        
     end
   end

data/lib/sapos/print/version.rb

@@ -2,6 +2,6 @@
 
 module Sapos
   module Print
-    VERSION = "1.0.6"
+    VERSION = "1.0.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sapos-print
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Josef Sauter
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2023-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: SAPOSCLOUD PRINT