da_funk 3.24.2 → 3.26.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +7 -7
- data/RELEASE_NOTES.md +22 -0
- data/lib/da_funk/application.rb +3 -3
- data/lib/da_funk/helper/status_bar.rb +12 -9
- data/lib/da_funk/version.rb +1 -1
- data/lib/device.rb +1 -1
- data/lib/device/setting.rb +1 -2
- data/lib/device/virtual_keyboard.rb +2 -2
- data/lib/iso8583/util.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 74ed04e91a2835da1b6ac8a32738190f6f6ad3b1bfb867df409d70e138f7935e
|
4
|
+
data.tar.gz: a39e91339b6e9a1ee64b6292a2bce50f2d384826bf1d9434438049bba2f5f918
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 436ae480832d515c74f1d6ab89a97c3e3aacdcdaafefe6a434d7145291d66e1722d629cd77bb2e024a86b31ac40ad8ad5af2256120bcfb5ab1de177cde9869f9
|
7
|
+
data.tar.gz: 22cd5633ff6197cbc0b9d8fcbe54dd17af8fcbcfc852fbc243c051e1a476ff5814c2e11f4e4dca29c8f986a2e8a0d6b5c62d04fcab1a0a27be49566da67b6ca1
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
da_funk (3.
|
4
|
+
da_funk (3.26.0)
|
5
5
|
archive-zip (~> 0.5)
|
6
6
|
bundler
|
7
7
|
cloudwalk_handshake
|
@@ -18,7 +18,7 @@ GEM
|
|
18
18
|
cloudwalk (1.15.0)
|
19
19
|
bundler
|
20
20
|
rake
|
21
|
-
cloudwalk_handshake (1.
|
21
|
+
cloudwalk_handshake (1.20.0)
|
22
22
|
funky-simplehttp (~> 0.6)
|
23
23
|
funky-emv (1.4.1)
|
24
24
|
funky-tlv (~> 0.2)
|
@@ -35,17 +35,17 @@ GEM
|
|
35
35
|
rake (13.0.1)
|
36
36
|
regexp_parser (1.7.1)
|
37
37
|
rexml (3.2.4)
|
38
|
-
rubocop (0.
|
38
|
+
rubocop (0.90.0)
|
39
39
|
parallel (~> 1.10)
|
40
|
-
parser (>= 2.7.
|
40
|
+
parser (>= 2.7.1.1)
|
41
41
|
rainbow (>= 2.2.2, < 4.0)
|
42
42
|
regexp_parser (>= 1.7)
|
43
43
|
rexml
|
44
|
-
rubocop-ast (>= 0.0
|
44
|
+
rubocop-ast (>= 0.3.0, < 1.0)
|
45
45
|
ruby-progressbar (~> 1.7)
|
46
46
|
unicode-display_width (>= 1.4.0, < 2.0)
|
47
|
-
rubocop-ast (0.0
|
48
|
-
parser (>= 2.7.
|
47
|
+
rubocop-ast (0.4.0)
|
48
|
+
parser (>= 2.7.1.4)
|
49
49
|
ruby-progressbar (1.10.1)
|
50
50
|
unicode-display_width (1.7.0)
|
51
51
|
yard (0.9.25)
|
data/RELEASE_NOTES.md
CHANGED
@@ -1,5 +1,27 @@
|
|
1
1
|
# DaFunk
|
2
2
|
|
3
|
+
### 3.26.0 - 2020-09-14
|
4
|
+
|
5
|
+
- Fixed error on virtual keyboard, chars y and Y were duplicated;
|
6
|
+
- Update cloudwalk_handshake (1.20.0).
|
7
|
+
|
8
|
+
### 3.25.1 - 2020-08-28
|
9
|
+
|
10
|
+
- Set DaFunk::Helper::StatusBar#connected as false on system update process so it will cache again.
|
11
|
+
|
12
|
+
### 3.25.0 - 2020-08-18
|
13
|
+
|
14
|
+
- Added switch_http_enabled setting;
|
15
|
+
- Removed infinitepay_authorizer and infinitepay_api settings.
|
16
|
+
|
17
|
+
### 3.24.4 - 2020-08-07
|
18
|
+
|
19
|
+
- Add defensive code to gsub calls.
|
20
|
+
|
21
|
+
### 3.24.3 - 2020-08-03
|
22
|
+
|
23
|
+
- Fixed path name on DaFunk::Application
|
24
|
+
|
3
25
|
### 3.24.2 - 2020-08-01
|
4
26
|
|
5
27
|
- Do not remove company name to file path when ruby app
|
data/lib/da_funk/application.rb
CHANGED
@@ -23,7 +23,7 @@ module DaFunk
|
|
23
23
|
company = check_company(remote)
|
24
24
|
@remote = remote.sub("#{company}_", "")
|
25
25
|
@name = remote.sub("#{company}_", "").split(".")[0]
|
26
|
-
@file = check_path(@remote)
|
26
|
+
@file = check_path("#{@remote}")
|
27
27
|
end
|
28
28
|
|
29
29
|
def crc_local
|
@@ -141,9 +141,9 @@ module DaFunk
|
|
141
141
|
"./shared/#{path}"
|
142
142
|
else
|
143
143
|
if ruby?
|
144
|
-
path
|
144
|
+
"#{path}.zip"
|
145
145
|
else
|
146
|
-
"#{path.gsub("#{Device::Setting.company_name}_", "")}.zip"
|
146
|
+
"#{path.to_s.gsub("#{Device::Setting.company_name}_", "")}.zip"
|
147
147
|
end
|
148
148
|
end
|
149
149
|
end
|
@@ -90,25 +90,28 @@ module DaFunk
|
|
90
90
|
if File.exists?('./shared/system_update')
|
91
91
|
PAX::Display.print_status_bar(SLOT_UPDATE, "./shared/system_update_download.png")
|
92
92
|
PAX::Display.print_status_bar(3, nil)
|
93
|
+
self.connected = false
|
93
94
|
else
|
94
95
|
change_message
|
95
96
|
end
|
96
97
|
end
|
97
98
|
|
98
99
|
def self.change_message
|
99
|
-
|
100
|
+
unless File.exists?('./shared/system_update')
|
101
|
+
connected = Device::Network.connected?
|
100
102
|
|
101
|
-
|
102
|
-
|
103
|
+
if connected != self.connected
|
104
|
+
self.connected = connected
|
103
105
|
|
104
|
-
|
105
|
-
|
106
|
+
slot_message_1 = SLOT_MESSAGE_CONNECTION[self.connected][:slot1]
|
107
|
+
slot_message_2 = SLOT_MESSAGE_CONNECTION[self.connected][:slot2]
|
106
108
|
|
107
|
-
|
108
|
-
|
109
|
+
message_1 = SLOT_MESSAGE_CONNECTION[self.connected][:message1]
|
110
|
+
message_2 = SLOT_MESSAGE_CONNECTION[self.connected][:message2]
|
109
111
|
|
110
|
-
|
111
|
-
|
112
|
+
Device::Display.print_status_bar(slot_message_1, message_1)
|
113
|
+
Device::Display.print_status_bar(slot_message_2, message_2)
|
114
|
+
end
|
112
115
|
end
|
113
116
|
end
|
114
117
|
|
data/lib/da_funk/version.rb
CHANGED
data/lib/device.rb
CHANGED
@@ -8,7 +8,7 @@ class Device
|
|
8
8
|
#
|
9
9
|
# @return [Class] the class object flatted
|
10
10
|
def self.flat_api
|
11
|
-
klass_version = Device.version.gsub(".", "")
|
11
|
+
klass_version = Device.version.to_s.gsub(".", "")
|
12
12
|
# Sample
|
13
13
|
#if Device.version == "0.4.3"
|
14
14
|
#const_get("VersionFlat#{klass_version}").flat Device
|
data/lib/device/setting.rb
CHANGED
@@ -60,10 +60,9 @@ class Device
|
|
60
60
|
"metadata_timestamp" => "",
|
61
61
|
"payment_channel_attempts" => "0",
|
62
62
|
"payment_channel_date" => "",
|
63
|
-
"infinitepay_authorizer" => "1",
|
64
|
-
"infinitepay_api" => "0",
|
65
63
|
"infinitepay_cw_endpoint" => "1",
|
66
64
|
"infinitepay_google_endpoint" => "0",
|
65
|
+
"switch_http_enabled" => "0",
|
67
66
|
"transaction_http_enabled" => "1",
|
68
67
|
"transaction_http_host" => HTTP_HOST_PRODUCTION,
|
69
68
|
"transaction_http_port" => HTTP_PORT,
|
@@ -28,7 +28,7 @@ class Device
|
|
28
28
|
{ x: 0..201, y: 223..241, char: 'k' },
|
29
29
|
{ x: 0..230, y: 223..241, char: 'l' },
|
30
30
|
{ x: 0..30, y: 223..273, char: :keyboard_uppercase },
|
31
|
-
{ x: 0..56, y: 223..273, char: '
|
31
|
+
{ x: 0..56, y: 223..273, char: 'z' },
|
32
32
|
{ x: 0..82, y: 223..273, char: 'x' },
|
33
33
|
{ x: 0..109, y: 223..273, char: 'c' },
|
34
34
|
{ x: 0..130, y: 223..273, char: 'v' },
|
@@ -65,7 +65,7 @@ class Device
|
|
65
65
|
{ x: 0..201, y: 223..241, char: 'K' },
|
66
66
|
{ x: 0..230, y: 223..241, char: 'L' },
|
67
67
|
{ x: 0..30, y: 223..273, char: :keyboard_capital },
|
68
|
-
{ x: 0..56, y: 223..273, char: '
|
68
|
+
{ x: 0..56, y: 223..273, char: 'Z' },
|
69
69
|
{ x: 0..82, y: 223..273, char: 'X' },
|
70
70
|
{ x: 0..109, y: 223..273, char: 'C' },
|
71
71
|
{ x: 0..130, y: 223..273, char: 'V' },
|
data/lib/iso8583/util.rb
CHANGED
@@ -23,7 +23,7 @@ module ISO8583
|
|
23
23
|
# hex2b "abcd12" => "\xa\cd\12"
|
24
24
|
#
|
25
25
|
def hex2b(hex_string)
|
26
|
-
string = hex_string.gsub(/\s+/, "")
|
26
|
+
string = hex_string.to_s.gsub(/\s+/, "")
|
27
27
|
raise ISO8583Exception.new("Invalid Hex chars: #{hex_string}") unless string =~ /^[A-Fa-f0-9]*$/
|
28
28
|
raise ISO8583Exception.new("Uneven number of Hex chars #{hex_string}") unless ( (string.length % 2) == 0)
|
29
29
|
[string].pack("H*")
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: da_funk
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.
|
4
|
+
version: 3.26.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Thiago Scalone
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-09-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|