da_funk 3.21.0 → 3.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc5abcda84d3caf3982e38fe2ec5c10e59de3ea4c171ec086355a4192e610e21
-  data.tar.gz: a3bac877e9dc0e25a3b0da2f015c87ba64431dab8c1bc7db8f513c89cdf46289
+  metadata.gz: d75e33d05a3e451e71ffa6379c421c7477c1555bcaf65d93b7d2a3246ecfb7d7
+  data.tar.gz: 168ad5136f22cf3384a0c6c0374665f93d22862bd6da575950ffff324c69e849
 SHA512:
-  metadata.gz: 32172e2717e34860bd3df6eb6a8a8c1bae0eb54dce61fa45e93b9dcd59af4d9da939450f724defa7a41de8612453f73bd50a05ee8dd60d950a4e56d2000768b6
-  data.tar.gz: 59de0b4dbdca94dbd077c37e220e22305030823b7a171b2a77e1ea1778f05fc17f6eb2d999a98911348a2a57bd0b101a7f2e2535f4acd60fe740a50289195981
+  metadata.gz: d7ec864dbd743edc3855d1e8b8d8e24a0b770c0d9fd21f09396daec03d191d4dacbe3f89cbf5e27af32c8b66451e5020b7f891200225451a5e98bb511f341047
+  data.tar.gz: 36b99ec0a5e6af0bf022ab8d7e267d7c903e4902fa428678ef66da3db149c58f920e8b35f93a2ad32221ce26d65ab31707a0047ad5d355a5f54e1e704619249a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (3.21.0)
+    da_funk (3.24.0)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -18,30 +18,30 @@ GEM
     cloudwalk (1.15.0)
       bundler
       rake
-    cloudwalk_handshake (1.13.1)
+    cloudwalk_handshake (1.14.0)
       funky-simplehttp (~> 0.6)
-    funky-emv (1.3.0)
+    funky-emv (1.4.1)
       funky-tlv (~> 0.2)
     funky-mock (0.1.0)
     funky-simplehttp (0.6.0)
     funky-tlv (0.2.3)
     io-like (0.3.1)
-    parallel (1.19.1)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     posxml_parser (2.26.0)
       funky-emv (~> 1)
     rainbow (3.0.0)
     rake (13.0.1)
     regexp_parser (1.7.1)
     rexml (3.2.4)
-    rubocop (0.85.1)
+    rubocop (0.86.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.0.3)
+      rubocop-ast (>= 0.0.3, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-ast (0.0.3)

data/RELEASE_NOTES.md

@@ -1,5 +1,32 @@
 # DaFunk
 
+### 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;
+- Update funky-emv (1.4.1).
+
+### 3.22.0 - 2020-06-18
+
+- Update libs:
+  - cloudwalk_handshake (1.14.0)
+  - funky-emv (1.4.0)
+
+### 3.21.2 - 2020-06-16
+
+- Fixed timeout return on DaFunK::Helper#menu, it should return Device::IO::KEY_TIMEOUT not options[:timeout];
+- Set cloudwalk endpoint as default.
+
+### 3.21.1 - 2020-06-16
+
+- Fix error when timeout on DaFunk::menu_image_touchscreen_or_keyboard.
+
 ### 3.21.0 - 2020-06-12
 
 - Removed unnecessary processing method call;

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/helper.rb

@@ -179,7 +179,7 @@ module DaFunk
     #   menu_image_touchscreen_or_keyboard('image.bmp', menu_itens, options)
     #
     # @return menu_item_index selected will be returned
-    # @return if timeout nil will be returned
+    # @return if timeout Device::IO::KEY_TIMEOUT will be returned
     def menu_image_touchscreen_or_keyboard(path, menu_itens, options = {})
       return nil if menu_itens.empty?
 
@@ -205,6 +205,8 @@ module DaFunk
         end
       elsif event == :touchscreen
         menu_itens.select {|k, v| k == key}.shift[0]
+      elsif event == :timeout
+        Device::IO::KEY_TIMEOUT
       end
     end
 
@@ -274,7 +276,7 @@ module DaFunk
     #   }
     #
     #   menu("Option menu", selection, options)
-    #
+    # @return nil if user canceled or Device::IO::KEY_TIMEOUT if timeout or option selected
     def menu(title, selection, options = {})
       return nil if selection.empty?
       options[:number]    = true if options[:number].nil?
@@ -297,7 +299,7 @@ module DaFunk
       if key == Device::IO::ENTER
         options[:default]
       elsif key == Device::IO::KEY_TIMEOUT
-        options[:timeout]
+        Device::IO::KEY_TIMEOUT
       else
         selected
       end
@@ -305,7 +307,7 @@ module DaFunk
 
     # TODO Scalone: Refactor.
     def pagination(title, options, collection, &block)
-      timeout = Device::IO.timeout
+      timeout = options[:timeout].nil? ? options[:timeout] : Device::IO.timeout
       touchscreen_options = {}
       start_line, options[:limit], options[:header] = pagination_limit(title, options)
 

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.21.0"
+  VERSION="3.24.0"
 end
 

data/lib/device/network.rb

@@ -191,7 +191,6 @@ class Device
 
     def self.attach(options = nil)
       Device::Network.connected?
-      Context::ThreadPubSub.publish('communication_update')
       if self.code != SUCCESS
         ThreadScheduler.pausing_communication do
           self.code = Device::Network.init(*self.config)

data/lib/device/setting.rb

@@ -62,8 +62,8 @@ class Device
       "payment_channel_date"        => "",
       "infinitepay_authorizer"      => "0",
       "infinitepay_api"             => "0",
-      "infinitepay_cw_endpoint"     => "0",
-      "infinitepay_google_endpoint" => "1",
+      "infinitepay_cw_endpoint"     => "1",
+      "infinitepay_google_endpoint" => "0",
       "transaction_http_enabled"    => "1",
       "transaction_http_host"       => HTTP_HOST_PRODUCTION,
       "transaction_http_port"       => HTTP_PORT,

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/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.21.0
+  version: 3.24.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2020-07-25 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