da_funk 3.24.1 → 3.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d44dfedaab6c25ce6e052478bf489480dd2617e2c9f04537c0a57ac6742b526c
-  data.tar.gz: 04d1789a605fb768e9689064d58b1dd9785379e8bbae3c4d75760a2605b57323
+  metadata.gz: c51a5629c6bb3c16b5c95f9f75c31fbdd0c4dad7ab85853b90f22b31c51ac07d
+  data.tar.gz: 0ec037b370257e24893d21e642144b63c94298d066d4539a7deface8906c82c2
 SHA512:
-  metadata.gz: 70221b238e7627133daf23a8e64c1dbf44800c6a7181c45a5bed64bb0f20bb93f3d3fcd3fa8a01d6e5ea9be289d5e629921f52ae9adf6af63629c68afc1db7a6
-  data.tar.gz: bedf894f506861b471d50b8798fed306d55b7fb84f7ab40c802a51e4545182930a0c45315fff21820673930dd1c5d0c2b253dc658b2de7cad3a93ed42cf24761
+  metadata.gz: 01332cd3a315619a08a7011d41b7d2a94d5c8ac4d9331a928a585a968eda3c5e05fb40f56776a4d7bed7b10db36072e5ba1314d71c08add652c653ffd01f1892
+  data.tar.gz: 2e0b2aff3a95c7e7e47b5b0c804e0011d218c42ed9a36ce114b6bf0194ecdf8b1aa52d06c84cdabd638055b19520a9c8e516facf535425d6cb2018509406ba45

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (3.24.1)
+    da_funk (3.25.1)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake

data/RELEASE_NOTES.md

@@ -1,5 +1,26 @@
 # DaFunk
 
+### 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
+
+### 3.24.2 - 2020-08-01
+
+- Do not remove company name to file path when ruby app
+
 ### 3.24.1 - 2020-07-27
 
 - Infinitepay authorizer setting 1 as default.

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
@@ -140,7 +140,11 @@ module DaFunk
       if posxml?
         "./shared/#{path}"
       else
-        "#{path.gsub("#{Device::Setting.company_name}_", "")}.zip"
+        if ruby?
+          "#{path}.zip"
+        else
+          "#{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/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="3.24.1"
+  VERSION="3.25.1"
 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,10 +60,9 @@ 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,

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.1
+  version: 3.25.1
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-27 00:00:00.000000000 Z
+date: 2020-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake