da_funk 3.23.0 → 3.24.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 578bfb9686acbf39125036a2f0ce6c3463e0ae6789e381143935cb874885d687
-  data.tar.gz: de3bdde3690d6b2bc1a8f44e21892666cbbf1319b589d756b52dc7ffdac609ca
+  metadata.gz: 6d190ea42757a9e1a847740dc4321adcc7bf2bf356f90185fdd8c8b7de3c2398
+  data.tar.gz: b116514238c4c9b2d0458b08231619cbeaa8533ba264491716d5685fd64bbf13
 SHA512:
-  metadata.gz: 341c25f679bd5ca34b5a5a445901e451a8ba5e669dc73d89c9ae5b8dff49551aa3cdad540200eb6cab998b4ef6c895af86341fdc46f64a7adf7bb4fdac2e2cc5
-  data.tar.gz: 2a159ed3938d10c0304f95759a327b56f2d600de26d6dd80308ee52f7c0e111aae07181e51f3e7a1c99bee4d25cc637d72ba75e76c0d855768872373a5936854
+  metadata.gz: 0bedf7264f973b4f96e7de1f8e70a599e47e026cc5c00a1b2418674ab6ed32a32a178b41fa6d4d8ecb5ed5a23ec46bfd894a5b087e71d26997b8326c10d26f56
+  data.tar.gz: c3d53db9952a1e942ba42308491726700809ad5435c1d66d7b8c9dd67099b737063b540e9f0a64f8aede8aed718c1aefcca456ba3658c12f575b4c18d8956305

data/Gemfile.lock

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

data/RELEASE_NOTES.md

@@ -1,5 +1,28 @@
 # DaFunk
 
+### 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.
+
+### 3.24.0 - 2020-07-25
+
+- Added Device::Signature class;
+- Added support of converting signature after updating params.dat;
+- Added support to network state on status bar;
+- Added support to physical number keys on virtual keyboard.
+
 ### 3.23.0 - 2020-06-22
 
 - Remove ThreadPubSub publication before attach;

data/Rakefile

@@ -69,7 +69,8 @@ FILES = FileList[
   "lib/device/support.rb",
   "lib/device/system.rb",
   "lib/device/magnetic.rb",
-  "lib/device/virtual_keyboard.rb"
+  "lib/device/virtual_keyboard.rb",
+  "lib/device/signature.rb"
 ]
 
 DaFunk::RakeTask.new do |t|

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

@@ -7,6 +7,20 @@ module DaFunk
       SLOT_UPDATE             = 2
       SLOT_BATTERY_PERCENTUAL = 6
       SLOT_BATTERY_LEVEL      = 7
+      SLOT_MESSAGE_CONNECTION = {
+        true  => {
+          :slot1 => 2,
+          :slot2 => 3,
+          :message1 => './shared/conectado_01.png',
+          :message2 => './shared/conectado_02.png'
+        },
+        false => {
+          :slot1 => 2,
+          :slot2 => 3,
+          :message1 => './shared/buscando_01.png',
+          :message2 => './shared/buscando_02.png'
+        }
+      }
 
       BATTERY_IMAGES = {
         0..4     => "./shared/battery0.png",
@@ -61,7 +75,7 @@ module DaFunk
       }
 
       class << self
-        attr_accessor :signal, :battery, :power, :managment
+        attr_accessor :signal, :battery, :power, :managment, :connected
       end
 
       def self.check
@@ -75,8 +89,26 @@ module DaFunk
       def self.change_update
         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)
         else
-          PAX::Display.print_status_bar(SLOT_UPDATE, nil)
+          change_message
+        end
+      end
+
+      def self.change_message
+        connected = Device::Network.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]
+
+          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)
         end
       end
 

data/lib/da_funk/params_dat.rb

@@ -83,6 +83,8 @@ module DaFunk
     # After: "1 - App,pc2_app.zip,ruby,E0A0;"
     def self.parse
       return unless self.setup
+
+      Device::Signature.convert
       parse_apps
       parse_files
 

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="3.23.0"
+  VERSION="3.24.4"
 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,7 +60,7 @@ class Device
       "metadata_timestamp"          => "",
       "payment_channel_attempts"    => "0",
       "payment_channel_date"        => "",
-      "infinitepay_authorizer"      => "0",
+      "infinitepay_authorizer"      => "1",
       "infinitepay_api"             => "0",
       "infinitepay_cw_endpoint"     => "1",
       "infinitepay_google_endpoint" => "0",

data/lib/device/signature.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class Device
+  class Signature
+    FILE = './shared/device.sig'
+
+    CONVERTED      = 1
+    FILE_NOT_FOUND = 2
+    IS_THE_SAME    = 3
+
+    def self.convert
+      load
+      return FILE_NOT_FOUND unless @file
+
+      if must_convert?
+        @file.update_attributes({ 'signer' => DaFunk::ParamsDat.file['signer'] })
+        return CONVERTED
+      end
+      IS_THE_SAME
+    end
+
+    def self.must_convert?
+      DaFunk::ParamsDat.file['signer'] && DaFunk::ParamsDat.file['signer'] != @file['signer']
+    end
+
+    def self.load
+      @file = FileDb.new FILE
+    end
+  end
+end

data/lib/device/virtual_keyboard.rb

@@ -114,6 +114,7 @@ class Device
     }
 
     def self.type_text(params = {})
+      phisical_keys = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', "\017"]
       change_keyboard
       Device::Display.print_line("#{self.text}", params[:line], params[:column])
       time = Time.now + (params[:timeout] || Device::IO.timeout) / 1000
@@ -129,6 +130,13 @@ class Device
           break(Device::IO::KEY_TIMEOUT) if Time.now > time
 
           key = getc(100)
+          if phisical_keys.include?(key)
+            if key == Device::IO::BACK
+              show_text({char: :erase}, params)
+            else
+              show_text({char: key}, params)
+            end
+          end
         end
       end
 

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*")

data/test/unit/device/signature_test.rb

@@ -0,0 +1,24 @@
+require 'funky-mock'
+
+class SignatureTest < DaFunk::Test.case
+  def test_signature_should_be_updated
+    FileDb.new(Device::Signature::FILE).update_attributes({'signer' => 'whatever'})
+    DaFunk::ParamsDat.file = {'signer' => 'thebestsignature'}
+
+    assert_equal Device::Signature::CONVERTED, Device::Signature.convert
+  end
+
+  def test_signature_file_not_found
+    FunkyMock::Mock.new
+    Device::Signature.stubs(:load).returns(nil)
+
+    assert_equal Device::Signature::FILE_NOT_FOUND, Device::Signature.convert
+  end
+
+  def test_signature_is_the_same
+    FileDb.new(Device::Signature::FILE).update_attributes({'signer' => 'whatever'})
+    DaFunk::ParamsDat.file = {'signer' => 'whatever'}
+
+    assert_equal Device::Signature::IS_THE_SAME, Device::Signature.convert
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 3.23.0
+  version: 3.24.4
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2020-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -189,6 +189,7 @@ files:
 - lib/device/printer.rb
 - lib/device/runtime.rb
 - lib/device/setting.rb
+- lib/device/signature.rb
 - lib/device/support.rb
 - lib/device/system.rb
 - lib/device/version.rb
@@ -227,6 +228,7 @@ files:
 - test/unit/device/io_test.rb
 - test/unit/device/notification_callback_test.rb
 - test/unit/device/notification_event_test.rb
+- test/unit/device/signature_test.rb
 - test/unit/ext/float_test.rb
 - test/unit/ext/string_test.rb
 - test/unit/file_db_test.rb
@@ -275,6 +277,7 @@ test_files:
 - test/unit/device/io_test.rb
 - test/unit/device/notification_callback_test.rb
 - test/unit/device/notification_event_test.rb
+- test/unit/device/signature_test.rb
 - test/unit/ext/float_test.rb
 - test/unit/ext/string_test.rb
 - test/unit/file_db_test.rb