sapos-print 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2203b37a5896bdfef0ef71bd913dfd1a461fd9c5ee4c7a87205d864043aa1a7b
-  data.tar.gz: 5b241d186803fa7d09814390fa8b941b2e943d22c6be18b2c057a1d6b739d298
+  metadata.gz: 6676d897cee608283071d8a13da6989e1db58cbbab4f4ba819be4b6fc9f80b30
+  data.tar.gz: 7c59412ee4b5d748389662823f5b9502d2aee835d1261c21c9673cee0d561da2
 SHA512:
-  metadata.gz: c8d56b32df32d081146bec0cf5195d2df5c19596c90e84677275f2c4c37d2b8950c359dc6474e4489dc8d89f0352a630f818fd5f608efbe196a492db2c59f184
-  data.tar.gz: 52b50bdcc53db8ea52df802e14ce6d86863d5ca073fa50da38860cc188495e6b8422c1ce07634e0a3387ccc69beb2d4ae2bad35e1ed8b194d1af6e527d7c83cc
+  metadata.gz: cc05e1cdecdca5672a07e874afe94dce4232af5ab3c159352897e61222a24a91a25cbf894fca48cd464fbbbe12d166815e6828fbebece534c12bf27b2b020937
+  data.tar.gz: c1300e4a85fb10fdcba5b1df562b3bcdbb73f612dccea867590ce0fd492fb32b9002c10483c451500a9c8861168f9e97838dc6511f15d76dbd88d5f201924805

data/Gemfile.lock

@@ -1,23 +1,22 @@
 PATH
   remote: .
   specs:
-    sapos-print (1.0.1)
+    sapos-print (1.0.6)
       activesupport
       awesome_print
       json
-      pubnub
+      pubnub (~> 4.8.0)
       rest-client
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (7.0.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     awesome_print (1.9.2)
@@ -26,7 +25,7 @@ GEM
       concurrent-ruby (~> 1.1.5)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dry-configurable (0.13.0)
+    dry-configurable (0.14.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.6)
     dry-container (0.9.0)
@@ -35,7 +34,7 @@ GEM
     dry-core (0.7.1)
       concurrent-ruby (~> 1.0)
     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)
@@ -62,16 +61,16 @@ GEM
     http-cookie (1.0.4)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.8.11)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
     json (2.6.1)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.1115)
-    minitest (5.14.4)
+    mime-types-data (3.2022.0105)
+    minitest (5.15.0)
     netrc (0.11.0)
     public_suffix (4.0.6)
-    pubnub (4.7.1)
+    pubnub (4.8.0)
       addressable (>= 2.0.0)
       concurrent-ruby (~> 1.1.5)
       concurrent-ruby-edge (~> 0.5.0)
@@ -84,14 +83,13 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    thor (1.1.0)
+    thor (1.2.1)
     timers (4.3.3)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8)
-    zeitwerk (2.5.1)
 
 PLATFORMS
   arm64-darwin-21

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.5"
+    VERSION = "1.0.7"
   end
 end

data/sapos-print.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   # guide at: https://bundler.io/guides/creating_gem.html
   
   spec.add_dependency "thor"
-  spec.add_dependency "pubnub"
+  spec.add_dependency "pubnub", "~> 4.8.0"
   spec.add_dependency "rest-client"
   spec.add_dependency "awesome_print"
   spec.add_dependency "activesupport"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sapos-print
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - Josef Sauter
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-05 00:00:00.000000000 Z
+date: 2023-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -28,16 +28,16 @@ dependencies:
   name: pubnub
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -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