da_funk 3.16.2 → 3.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: c6bcb12aefde376e3ea528fc6e47936a8744602e942f84b56aacb64b387a5f91
-  data.tar.gz: 139783cfef412c0a109d643d5127512f0b69a0ebfaa7cce758deb9b39f5dfe41
+SHA1:
+  metadata.gz: a61984983d2f7c168e0a4e84d60ac44d3060f7be
+  data.tar.gz: 490ef400806c5e7329d28426ca95fa4284c3ea02
 SHA512:
-  metadata.gz: f05b9bc5cae9b80800b6d9d210a6479f7d40449625c4ba895f717251a4eb80abf40705e006da11923b64edaebeb6b935308823e47a7ebbded1d1b4a703ed5770
-  data.tar.gz: 3ebc3ef272baa16c184831898d4381579ccf577de3da767954b0865c00a69b2dbcb463500ad7127f287a518cd5bea2819d3b2418c353e2f6567f14b7833a33df
+  metadata.gz: c0f22c650827eec86b2fb87251771d519c1132d6a8b488b76ad940fb2e66491810e7235033cfe1ac0f4191058520b39022546ba789fa1dedd279f0cebb52f7d3
+  data.tar.gz: 11da367af36fc688bce9ccc0f7979fc17491b5102d4cd056df675b0e69699e7ff79a817f7f25926aa8ab3e25d58ef7da7b3f63066aedde0de7780e09f0884579

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (3.16.2)
+    da_funk (3.20.0)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -15,17 +15,17 @@ GEM
     archive-zip (0.12.0)
       io-like (~> 0.3.0)
     ast (2.4.0)
-    cloudwalk (1.14.3)
+    cloudwalk (1.15.0)
       bundler
       rake
-    cloudwalk_handshake (1.11.0)
+    cloudwalk_handshake (1.13.1)
       funky-simplehttp (~> 0.6)
     funky-emv (1.2.2)
       funky-tlv (~> 0.2)
     funky-mock (0.1.0)
     funky-simplehttp (0.6.0)
     funky-tlv (0.2.3)
-    io-like (0.3.0)
+    io-like (0.3.1)
     jaro_winkler (1.5.4)
     parallel (1.19.1)
     parser (2.7.0.2)

data/RELEASE_NOTES.md

@@ -1,5 +1,34 @@
 # DaFunk
 
+### 3.20.0 - 2020-05-28
+
+- Rename PaymentChannel::client to ::current;
+- Fix status bar change link to cache old value.
+
+### 3.18.1 - 2020-05-20
+
+- Fix issue on DaFunk::Helper#menu_image_touchscreen_or_keyboard it was not checking for special keys
+
+### 3.18.0 - 2020-04-03
+
+- Added enable_txt_ui parameter on the following methods
+ - DaFunk::ParamsDat#download;
+ - DaFunk::ParamsDat#update_apps;
+ - DaFunk::ParamsDat#update_app;
+ - DaFunk::ParamsDat#update_file;
+ - DaFunk::Helper#attach_options;
+ - DaFunk::Helper#check_download_error;
+
+### 3.17.0 - 2020-02-10
+
+- Added support to infinitepay endpoints config on config.dat file;
+- Update cloudwalk (1.15.0);
+- Update cloudwalk_handshake (1.13.0);
+
+### 3.16.3 - 2020-01-31
+
+- Changed setting emv_input_amount_idle to emv_contactless_amount.
+
 ### 3.16.2 - 2020-01-29
 
 - Moved responsability of beep sound for touch event to DaFunk::Helper#parse_touchscreen_event;

data/lib/da_funk/helper.rb

@@ -14,11 +14,11 @@ module DaFunk
       string
     end
 
-    def attach_options
-      if DaFunk::PaymentChannel.client == Context::CommunicationChannel
-        {:print_last => true}
+    def attach_options(enable_txt_ui = true)
+      if DaFunk::PaymentChannel.current == Context::CommunicationChannel
+        {:print_last => true, :enable_txt_ui => enable_txt_ui}
       else
-        {:print_last => false}
+        {:print_last => false, :enable_txt_ui => enable_txt_ui}
       end
     end
 
@@ -35,55 +35,63 @@ module DaFunk
 
     def attach(options = attach_options)
       if Device::Network.configured?
-        print_attach(:attach_connecting, options)
+        print_attach(:attach_connecting, options) if options[:enable_txt_ui]
         unless Device::Network.connected?
           if Device::Network.attach(options) == Device::Network::SUCCESS
             Device::Setting.network_configured = 1
-            print_attach(:attach_connected, options)
+            print_attach(:attach_connected, options) if options[:enable_txt_ui]
           else
             Device::Setting.network_configured = 0 if DaFunk::ParamsDat.file["connection_management"] == "0"
-            print_attach(:attach_fail, options.merge(:args => [Device::Network.code.to_s]))
-            getc(10000)
+            if options[:enable_txt_ui]
+              print_attach(:attach_fail, options.merge(:args => [Device::Network.code.to_s]))
+              getc(10000)
+            end
             return false
           end
         else
-          print_attach(:attach_already_connected, options)
+          print_attach(:attach_already_connected, options) if options[:enable_txt_ui]
         end
         true
       else
-        print_attach(:attach_device_not_configured, options)
-        getc(2000)
+        if options[:enable_txt_ui]
+          print_attach(:attach_device_not_configured, options)
+          getc(2000)
+        end
         false
       end
     end
 
-    def check_download_error(ret)
+    def check_download_error(ret, enable_txt_ui = true)
       value = true
+      ui = {}
+
       case ret
       when DaFunk::Transaction::Download::SERIAL_NUMBER_NOT_FOUND
-        I18n.pt(:download_serial_number_not_found, :args => [ret])
+        ui[:i18n] = :download_serial_number_not_found
         value =  false
       when DaFunk::Transaction::Download::FILE_NOT_FOUND
-        I18n.pt(:download_file_not_found, :args => [ret])
+        ui[:i18n] = :download_file_not_found
         value = false
       when DaFunk::Transaction::Download::FILE_NOT_CHANGE
-        I18n.pt(:download_file_is_the_same, :args => [ret])
+        ui[:i18n] = :download_file_is_the_same
       when DaFunk::Transaction::Download::SUCCESS
-        I18n.pt(:download_success, :args => [ret])
+        ui[:i18n] = :download_success
       when DaFunk::Transaction::Download::COMMUNICATION_ERROR
-        I18n.pt(:download_communication_failure, :args => [ret])
+        ui[:i18n] = :download_communication_failure
         value = false
       when DaFunk::Transaction::Download::MAPREDUCE_RESPONSE_ERROR
-        I18n.pt(:download_encoding_error, :args => [ret])
+        ui[:i18n] = :download_encoding_error
         value = false
       when DaFunk::Transaction::Download::IO_ERROR
-        I18n.pt(:download_io_error, :args => [ret])
+        ui[:i18n] = :download_io_error
         value = false
       else
-        I18n.pt(:download_communication_failure, :args => [ret])
+        ui[:i18n] = :download_communication_failure
         value = false
       end
 
+      I18n.pt(ui[:i18n], :args => [ret]) if enable_txt_ui
+
       value
     end
 
@@ -176,15 +184,21 @@ module DaFunk
       return nil if menu_itens.empty?
 
       Device::Display.print_bitmap(path)
-
       timeout = options[:timeout] || Device::IO.timeout
-      options[:special_keys] = [Device::IO::CANCEL]
+
+      if options.include?(:special_keys)
+        options[:special_keys] += options[:special_keys]
+      else
+        options[:special_keys] = [Device::IO::CANCEL]
+      end
 
       event, key = wait_touchscreen_or_keyboard_event(menu_itens, timeout, options)
 
       if event == :keyboard
         if key == Device::IO::CANCEL
           options[:default]
+        elsif options[:special_keys].include?(key)
+          key
         else
           index = key.to_i-1 == -1 ? 0 : key.to_i-1
           menu_itens.keys[index]

data/lib/da_funk/helper/status_bar.rb

@@ -58,14 +58,14 @@ module DaFunk
       end
 
       def self.change_link
-        if Device::Network.connected?
-          if DaFunk::PaymentChannel.alive?
+        info = (!! DaFunk::PaymentChannel.alive?)
+        if self.link.nil? || self.link != info
+          self.link = info
+          if info
             PAX::Display.print_status_bar(SLOT_LINK, "./shared/link.png")
           else
             PAX::Display.print_status_bar(SLOT_LINK, "./shared/unlink.png")
           end
-        else
-          PAX::Display.print_status_bar(SLOT_LINK, "./shared/unlink.png")
         end
       end
 

data/lib/da_funk/params_dat.rb

@@ -104,15 +104,17 @@ module DaFunk
       nil
     end
 
-    def self.download
-      if attach
+    def self.download(enable_txt_ui = true)
+      if attach(attach_options(enable_txt_ui))
         parse
         ret = try(3) do |attempt|
-          Device::Display.clear
-          I18n.pt(:downloading_content, :args => ["PARAMS", 1, 1])
+          if enable_txt_ui
+            Device::Display.clear
+            I18n.pt(:downloading_content, :args => ["PARAMS", 1, 1])
+          end
           getc(100)
           ret = DaFunk::Transaction::Download.request_param_file(FILE_NAME)
-          unless check_download_error(ret)
+          unless check_download_error(ret, enable_txt_ui)
             getc(2000)
             false
           else
@@ -124,21 +126,21 @@ module DaFunk
       end
     end
 
-    def self.update_apps(force_params = false, force_crc = false, force = false)
-      self.download if force_params || ! self.valid
+    def self.update_apps(force_params = false, force_crc = false, force = false, enable_txt_ui = true)
+      self.download(enable_txt_ui) if force_params || ! self.valid
       main_updated = nil
       if self.valid
         apps_to_update = self.outdated_apps(force_crc, force)
         size_apps = apps_to_update.size
         apps_to_update.each_with_index do |app, index|
-          ret = self.update_app(app, index+1, size_apps, force_crc || force)
+          ret = self.update_app(app, index+1, size_apps, force_crc || force, enable_txt_ui)
           main_updated ||= (ret && app.main_application?)
         end
 
         files_to_update = self.outdated_files(force_crc, force)
         size_files = files_to_update.size
         files_to_update.each_with_index do |file_, index|
-          self.update_file(file_, index+1, size_files, force_crc || force)
+          self.update_file(file_, index+1, size_files, force_crc || force, enable_txt_ui)
         end
       end
     ensure
@@ -179,26 +181,30 @@ module DaFunk
       File.file?(path) && ! keep
     end
 
-    def self.update_app(application, index = 1, all = 1, force = false)
-      if attach && application
+    def self.update_app(application, index = 1, all = 1, force = false, enable_txt_ui = true)
+      if attach(attach_options(enable_txt_ui)) && application
         try(3) do |attempt|
-          Device::Display.clear
-          I18n.pt(:downloading_content, :args => [I18n.t(:apps), index, all])
+          if enable_txt_ui
+            Device::Display.clear
+            I18n.pt(:downloading_content, :args => [I18n.t(:apps), index, all])
+          end
           getc(100)
-          ret = check_download_error(application.download(force))
+          ret = check_download_error(application.download(force), enable_txt_ui)
           getc(1000)
           ret
         end
       end
     end
 
-    def self.update_file(file_parameter, index = 1, all = 1, force = false)
-      if attach && file_parameter
+    def self.update_file(file_parameter, index = 1, all = 1, force = false, enable_txt_ui = true)
+      if attach(attach_options(enable_txt_ui)) && file_parameter
         try(3) do |attempt|
-          Device::Display.clear
-          I18n.pt(:downloading_content, :args => [I18n.t(:files), index, all])
+          if enable_txt_ui
+            Device::Display.clear
+            I18n.pt(:downloading_content, :args => [I18n.t(:files), index, all])
+          end
           getc(100)
-          ret = check_download_error(file_parameter.download(force))
+          ret = check_download_error(file_parameter.download(force), enable_txt_ui)
           file_parameter.unzip if ret
           getc(1000)
           ret

data/lib/da_funk/payment_channel.rb

@@ -3,11 +3,29 @@ module DaFunk
     DEFAULT_HEARBEAT = "180"
 
     class << self
-      attr_accessor :client, :app
+      attr_accessor :current, :app
     end
 
     attr_accessor :handshake_response, :handshake_request, :client, :host, :port
 
+    # Backward compatibility
+    def self.client
+      self.current
+    end
+
+    # Backward compatibility
+    def self.client=(obj)
+      self.current = obj
+    end
+
+    def self.current
+      @current
+    end
+
+    def self.current=(obj)
+      @current = obj
+    end
+
     def self.ready?
       Device::Network.connected? && self.configured?
     end
@@ -22,8 +40,8 @@ module DaFunk
       if @app != application
         @app = application
         # if Context::CommunicationChannel send application name thought threads
-        if @client == Context::CommunicationChannel
-          @client.app = application
+        if self.current == Context::CommunicationChannel
+          self.current.app = application
         else
           Device::System.klass = application
         end
@@ -48,11 +66,11 @@ module DaFunk
         self.print_info(I18n.t(:attach_attaching), display_message)
         create
         self.print_info(I18n.t(:attach_authenticate), display_message)
-        @client.handshake
+        self.current.handshake
       else
         client_clear!
       end
-      @client
+      self.current
     end
 
     def self.payment_channel_limit?
@@ -84,18 +102,16 @@ module DaFunk
       if self.dead?
         unless self.channel_limit_exceed?
           PaymentChannel.connect(display_message)
-          if @client
+          if self.current
             self.print_info(I18n.t(:attach_waiting), display_message)
-            if message = @client.check || @client.handshake?
+            if message = self.current.check || self.current.handshake?
               self.print_info(I18n.t(:attach_connected), display_message)
               message
             end
           end
         end
       else
-        if @client
-          @client.check
-        end
+        self.current&.check
       end
     end
 
@@ -104,11 +120,11 @@ module DaFunk
     end
 
     def self.alive?
-      Device::Network.connected? && @client && @client.connected?
+      Device::Network.connected? && self.current&.connected?
     end
 
     def self.close!
-      @client && @client.close
+      self.current&.close
     ensure
       client_clear!
     end
@@ -133,16 +149,16 @@ module DaFunk
     end
 
     def self.create
-      if @client != Context::CommunicationChannel
+      if self.current != Context::CommunicationChannel
         payment_channel_increment_attempts
-        @client = PaymentChannel.new
+        self.current = PaymentChannel.new
       else
-        @client.connect
+        self.current.connect
       end
     end
 
     def self.client_clear!
-      @client = nil unless @client == Context::CommunicationChannel
+      self.current = nil unless self.current == Context::CommunicationChannel
     end
 
     def initialize(client = nil)
@@ -180,13 +196,13 @@ module DaFunk
     end
 
     def close
-      @client.close if @client
+      @client&.close
       @client = nil
-      PaymentChannel.client = nil
+      PaymentChannel.current = nil
     end
 
     def connected?
-      self.client && self.client.connected?
+      self.client&.connected?
     end
 
     def handshake?
@@ -215,7 +231,7 @@ module DaFunk
       if Context.development?
         ContextLog.exception(exception, exception.backtrace, "PaymentChannel error")
       end
-      PaymentChannel.client = nil
+      PaymentChannel.current = nil
       @client = nil
     end
 

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="3.16.2"
+  VERSION="3.20.0"
 end
 

data/lib/device/setting.rb

@@ -62,10 +62,12 @@ class Device
       "payment_channel_date"        => "",
       "infinitepay_authorizer"      => "0",
       "infinitepay_api"             => "0",
+      "infinitepay_cw_endpoint"     => "0",
+      "infinitepay_google_endpoint" => "1",
       "transaction_http_enabled"    => "1",
       "transaction_http_host"       => HTTP_HOST_PRODUCTION,
       "transaction_http_port"       => HTTP_PORT,
-      "emv_input_amount_idle"       => "0",
+      "emv_contactless_amount"      => "0",
       "network_init"                => ""
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 3.16.2
+  version: 3.20.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -253,7 +253,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: MRuby Embedded System Framework