da_funk 3.24.3 → 3.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91f0c14d46a6f608799ab707b6a4ae79b403f3e8bb510eae756e39e599cf518e
-  data.tar.gz: '058eab0c210e854e5da8ca0ef52335054d0298c907734e44057e99b802f65abb'
+  metadata.gz: ff3ff842f6205b4abaa8991b98a810c3f91fdb7bc8d1efe0ef906d68c300bad0
+  data.tar.gz: 0440bbafb2757b6f5cc65932c5e474a5e1cfd81d384a5197698134686d6729f7
 SHA512:
-  metadata.gz: 00d71a62fa02c271681106685ed444ffd3ab5501ee3e31cb28eba17a50144d387c71a37cdf978b90886385a01eb3727f514773fa4458f3877b38fe0986325264
-  data.tar.gz: 2ac216bfb1fbf10e02c8024b523369b7a570876d1052fa17e2d5c3a6b19b7ad7f8e5a74ddabf7c1db63c0068c1a1e1b9a4a5f972349eccac12cecd15cdcb672e
+  metadata.gz: 463973562fa833932df7a091af9a54c9027958380bfecd54baf35ffbfd452fbdb9e4672e650b4580f3f93010c4476c70b88a01b6af8cb79ee0749ddab9f58243
+  data.tar.gz: 985c8a70c342a6eba544a266023345b388dabcfb970d30a17ba402bc8589150a6eed5f6758a0e5f8a8634b6b0433a029847dfc47754c52300fedbd7c1090fd81

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (3.24.3)
+    da_funk (3.27.0)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -18,7 +18,7 @@ GEM
     cloudwalk (1.15.0)
       bundler
       rake
-    cloudwalk_handshake (1.14.0)
+    cloudwalk_handshake (1.20.0)
       funky-simplehttp (~> 0.6)
     funky-emv (1.4.1)
       funky-tlv (~> 0.2)
@@ -35,17 +35,17 @@ GEM
     rake (13.0.1)
     regexp_parser (1.7.1)
     rexml (3.2.4)
-    rubocop (0.86.0)
+    rubocop (0.90.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.0.3, < 1.0)
+      rubocop-ast (>= 0.3.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
-      parser (>= 2.7.0.1)
+    rubocop-ast (0.4.0)
+      parser (>= 2.7.1.4)
     ruby-progressbar (1.10.1)
     unicode-display_width (1.7.0)
     yard (0.9.25)

data/RELEASE_NOTES.md

@@ -1,5 +1,28 @@
 # DaFunk
 
+### 3.27.0 - 2020-09-25
+
+- Print bitmap if exists on DaFunk::ParamsDat#restart;
+- Add main application version on config.dat file.
+
+### 3.26.0 - 2020-09-14
+
+- Fixed error on virtual keyboard, chars y and Y were duplicated;
+- Update cloudwalk_handshake (1.20.0).
+
+### 3.25.1 - 2020-08-28
+
+- Set DaFunk::Helper::StatusBar#connected as false on system update process so it will cache again.
+
+### 3.25.0 - 2020-08-18
+
+- Added switch_http_enabled setting;
+- Removed infinitepay_authorizer and infinitepay_api settings.
+
+### 3.24.4 - 2020-08-07
+
+- Add defensive code to gsub calls.
+
 ### 3.24.3 - 2020-08-03
 
 - Fixed path name on DaFunk::Application

data/lib/da_funk/application.rb

@@ -23,7 +23,7 @@ module DaFunk
       company    = check_company(remote)
       @remote    = remote.sub("#{company}_", "")
       @name      = remote.sub("#{company}_", "").split(".")[0]
-      @file      = check_path(@remote)
+      @file      = check_path("#{@remote}")
     end
 
     def crc_local
@@ -143,7 +143,7 @@ module DaFunk
         if ruby?
           "#{path}.zip"
         else
-          "#{path.gsub("#{Device::Setting.company_name}_", "")}.zip"
+          "#{path.to_s.gsub("#{Device::Setting.company_name}_", "")}.zip"
         end
       end
     end

data/lib/da_funk/helper/status_bar.rb

@@ -90,25 +90,28 @@ module DaFunk
         if File.exists?('./shared/system_update')
           PAX::Display.print_status_bar(SLOT_UPDATE, "./shared/system_update_download.png")
           PAX::Display.print_status_bar(3, nil)
+          self.connected = false
         else
           change_message
         end
       end
 
       def self.change_message
-        connected = Device::Network.connected?
+        unless File.exists?('./shared/system_update')
+          connected = Device::Network.connected?
 
-        if connected != self.connected
-          self.connected = connected
+          if connected != self.connected
+            self.connected = connected
 
-          slot_message_1 = SLOT_MESSAGE_CONNECTION[self.connected][:slot1]
-          slot_message_2 = SLOT_MESSAGE_CONNECTION[self.connected][:slot2]
+            slot_message_1 = SLOT_MESSAGE_CONNECTION[self.connected][:slot1]
+            slot_message_2 = SLOT_MESSAGE_CONNECTION[self.connected][:slot2]
 
-          message_1 = SLOT_MESSAGE_CONNECTION[self.connected][:message1]
-          message_2 = SLOT_MESSAGE_CONNECTION[self.connected][:message2]
+            message_1 = SLOT_MESSAGE_CONNECTION[self.connected][:message1]
+            message_2 = SLOT_MESSAGE_CONNECTION[self.connected][:message2]
 
-          Device::Display.print_status_bar(slot_message_1, message_1)
-          Device::Display.print_status_bar(slot_message_2, message_2)
+            Device::Display.print_status_bar(slot_message_1, message_1)
+            Device::Display.print_status_bar(slot_message_2, message_2)
+          end
         end
       end
 

data/lib/da_funk/params_dat.rb

@@ -151,10 +151,14 @@ module DaFunk
 
     def self.restart
       Device::Display.clear
-      I18n.pt(:admin_main_update_message)
-      3.times do |i|
-        Device::Display.print("REBOOTING IN #{3 - i}",3,3)
-        sleep(1)
+      if File.exists?('./shared/init_reboot.bmp')
+        Device::Display.print_bitmap('./shared/init_reboot.bmp')
+      else
+        I18n.pt(:admin_main_update_message)
+        3.times do |i|
+          Device::Display.print("REBOOTING IN #{3 - i}",3,3)
+          sleep(1)
+        end
       end
       Device::System.restart
     end

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="3.24.3"
+  VERSION="3.27.0"
 end
 

data/lib/device.rb

@@ -8,7 +8,7 @@ class Device
   #
   # @return [Class] the class object flatted
   def self.flat_api
-    klass_version = Device.version.gsub(".", "")
+    klass_version = Device.version.to_s.gsub(".", "")
     # Sample
     #if Device.version == "0.4.3"
       #const_get("VersionFlat#{klass_version}").flat Device

data/lib/device/setting.rb

@@ -60,15 +60,15 @@ class Device
       "metadata_timestamp"          => "",
       "payment_channel_attempts"    => "0",
       "payment_channel_date"        => "",
-      "infinitepay_authorizer"      => "1",
-      "infinitepay_api"             => "0",
       "infinitepay_cw_endpoint"     => "1",
       "infinitepay_google_endpoint" => "0",
+      "switch_http_enabled"         => "0",
       "transaction_http_enabled"    => "1",
       "transaction_http_host"       => HTTP_HOST_PRODUCTION,
       "transaction_http_port"       => HTTP_PORT,
       "emv_contactless_amount"      => "0",
-      "network_init"                => ""
+      "network_init"                => "",
+      "main_app_version"            => ""
     }
 
     class << self

data/lib/device/virtual_keyboard.rb

@@ -28,7 +28,7 @@ class Device
         { x: 0..201, y: 223..241, char: 'k' },
         { x: 0..230, y: 223..241, char: 'l' },
         { x: 0..30,  y: 223..273, char: :keyboard_uppercase },
-        { x: 0..56,  y: 223..273, char: 'y' },
+        { x: 0..56,  y: 223..273, char: 'z' },
         { x: 0..82,  y: 223..273, char: 'x' },
         { x: 0..109, y: 223..273, char: 'c' },
         { x: 0..130, y: 223..273, char: 'v' },
@@ -65,7 +65,7 @@ class Device
         { x: 0..201, y: 223..241, char: 'K' },
         { x: 0..230, y: 223..241, char: 'L' },
         { x: 0..30,  y: 223..273, char: :keyboard_capital },
-        { x: 0..56,  y: 223..273, char: 'Y' },
+        { x: 0..56,  y: 223..273, char: 'Z' },
         { x: 0..82,  y: 223..273, char: 'X' },
         { x: 0..109, y: 223..273, char: 'C' },
         { x: 0..130, y: 223..273, char: 'V' },

data/lib/iso8583/util.rb

@@ -23,7 +23,7 @@ module ISO8583
   #   hex2b "abcd12" => "\xa\cd\12"
   #
   def hex2b(hex_string)
-    string = hex_string.gsub(/\s+/, "")
+    string = hex_string.to_s.gsub(/\s+/, "")
     raise ISO8583Exception.new("Invalid Hex chars: #{hex_string}") unless string =~ /^[A-Fa-f0-9]*$/
     raise ISO8583Exception.new("Uneven number of Hex chars #{hex_string}") unless ( (string.length % 2) == 0)
     [string].pack("H*")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 3.24.3
+  version: 3.27.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-03 00:00:00.000000000 Z
+date: 2020-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake