da_funk 1.4.2 → 1.4.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +2 -2
- data/RELEASE_NOTES.md +4 -0
- data/lib/da_funk/helper.rb +18 -11
- data/lib/da_funk/screen.rb +0 -1
- data/lib/da_funk/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6a5db1b3ea91efc3923037b28c2f82f175e2bc88
|
4
|
+
data.tar.gz: ffa9da01574af14a24d1dd65d6cd1b42756eddd8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2946923ab72e486759c3d5a423638eb04a6355f4fc52e0d01e7b838b68d247d1aec24716b33664734c4e8ef9da830d45669766adc595bdfa73eb7c2cabb3670c
|
7
|
+
data.tar.gz: e84da79538b002001b6f36437a5ed8f0ff264240dfe02420fa07af27db642e2870a07070018c473afb9b38986d1c9326a906df5f372526e6860c357b2ebdc07a
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
da_funk (1.4.
|
4
|
+
da_funk (1.4.3)
|
5
5
|
archive-zip (~> 0.5)
|
6
6
|
bundler
|
7
7
|
cloudwalk_handshake
|
@@ -27,7 +27,7 @@ GEM
|
|
27
27
|
parallel (1.12.1)
|
28
28
|
parser (2.4.0.2)
|
29
29
|
ast (~> 2.3)
|
30
|
-
posxml_parser (1.2.
|
30
|
+
posxml_parser (1.2.2)
|
31
31
|
funky-emv (~> 0.3)
|
32
32
|
powerpack (0.1.1)
|
33
33
|
rainbow (3.0.0)
|
data/RELEASE_NOTES.md
CHANGED
data/lib/da_funk/helper.rb
CHANGED
@@ -170,17 +170,17 @@ module DaFunk
|
|
170
170
|
|
171
171
|
# TODO Scalone: Refactor.
|
172
172
|
def pagination(title, options, collection, &block)
|
173
|
-
start_line, options[:limit] = pagination_limit(title, options)
|
174
|
-
if collection.size > (options[:limit] -
|
173
|
+
start_line, options[:limit], options[:header] = pagination_limit(title, options)
|
174
|
+
if collection.size > (options[:limit] - options[:header]) # minus pagination header
|
175
175
|
key = Device::IO.back_key
|
176
|
-
pages = pagination_page(collection, options[:limit] -
|
176
|
+
pages = pagination_page(collection, options[:limit] - options[:header]) # minus pagination header
|
177
177
|
page = 1
|
178
178
|
while(key == Device::IO.back_key || key == Device::IO.forward_key)
|
179
179
|
Device::Display.clear
|
180
180
|
pagination_header(title, page, pages.size, start_line, options[:default], options[:header])
|
181
181
|
values = pages[page].to_a
|
182
|
-
block.call(values, start_line+
|
183
|
-
key = try_key(pagination_keys(values.size))
|
182
|
+
block.call(values, start_line + options[:header])
|
183
|
+
key = try_key(pagination_keys(values.size, true))
|
184
184
|
page = pagination_key_page(page, key, pages.size)
|
185
185
|
end
|
186
186
|
else
|
@@ -188,7 +188,7 @@ module DaFunk
|
|
188
188
|
print_title(title, options[:default]) if title
|
189
189
|
values = collection.to_a
|
190
190
|
block.call(values, start_line)
|
191
|
-
key = try_key(pagination_keys(collection.size))
|
191
|
+
key = try_key(pagination_keys(collection.size, false))
|
192
192
|
end
|
193
193
|
result = values[key.to_i-1] if key.integer?
|
194
194
|
if result.is_a? Array
|
@@ -202,7 +202,7 @@ module DaFunk
|
|
202
202
|
print_title(title, default) if title
|
203
203
|
back = Device::IO.back_key_label
|
204
204
|
forward = Device::IO.forward_key_label
|
205
|
-
if header
|
205
|
+
if header >= 1
|
206
206
|
Device::Display.print("< #{back} __ #{page}/#{pages} __ #{forward} >", line, 0)
|
207
207
|
end
|
208
208
|
end
|
@@ -228,9 +228,10 @@ module DaFunk
|
|
228
228
|
end
|
229
229
|
end
|
230
230
|
|
231
|
-
def pagination_keys(size)
|
232
|
-
(1..size.to_i).to_a.map(&:to_s) + [Device::IO::ENTER, Device::IO::CLEAR,
|
233
|
-
|
231
|
+
def pagination_keys(size, move = true)
|
232
|
+
keys = ((1..size.to_i).to_a.map(&:to_s) + [Device::IO::ENTER, Device::IO::CLEAR, Device::IO::CANCEL])
|
233
|
+
keys << [Device::IO.back_key, Device::IO.forward_key] if move
|
234
|
+
keys
|
234
235
|
end
|
235
236
|
|
236
237
|
def pagination_limit(title, options = {})
|
@@ -249,9 +250,15 @@ module DaFunk
|
|
249
250
|
end
|
250
251
|
end
|
251
252
|
|
253
|
+
if options[:header].nil? || options[:header]
|
254
|
+
header = 1
|
255
|
+
else
|
256
|
+
header = 0
|
257
|
+
end
|
258
|
+
|
252
259
|
footer = options[:footer] ? options[:footer] : 0
|
253
260
|
|
254
|
-
[start, limit - footer]
|
261
|
+
[start, limit - footer, header]
|
255
262
|
end
|
256
263
|
|
257
264
|
def number_to_currency(value, options = {})
|
data/lib/da_funk/screen.rb
CHANGED
data/lib/da_funk/version.rb
CHANGED
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: 1.4.
|
4
|
+
version: 1.4.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Thiago Scalone
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-01-
|
11
|
+
date: 2018-01-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|