da_funk 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2deca81b9c82dbcffb3f707550ad3cd63784362
-  data.tar.gz: aba07fa8b4ec242317d7c31efb73bdf6f80651c7
+  metadata.gz: 6a5db1b3ea91efc3923037b28c2f82f175e2bc88
+  data.tar.gz: ffa9da01574af14a24d1dd65d6cd1b42756eddd8
 SHA512:
-  metadata.gz: f6f9b06820c97c1a4814c9fee6a8d423de1cdfe0099c725f44c1fcca83a3153e619eac4642017fc05b36d3235b3975463688cee70235f145feabc606ee3e1f82
-  data.tar.gz: 181cacd28882a28283227d4cc4a5c5d3d0b5f15d2c0d80ae743116ae5632b511d15ec80ab6d24f007da33e517b5c329eb26c6da0825e704e9831e06079a786b1
+  metadata.gz: 2946923ab72e486759c3d5a423638eb04a6355f4fc52e0d01e7b838b68d247d1aec24716b33664734c4e8ef9da830d45669766adc595bdfa73eb7c2cabb3670c
+  data.tar.gz: e84da79538b002001b6f36437a5ed8f0ff264240dfe02420fa07af27db642e2870a07070018c473afb9b38986d1c9326a906df5f372526e6860c357b2ebdc07a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (1.4.2)
+    da_funk (1.4.3)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -27,7 +27,7 @@ GEM
     parallel (1.12.1)
     parser (2.4.0.2)
       ast (~> 2.3)
-    posxml_parser (1.2.1)
+    posxml_parser (1.2.2)
       funky-emv (~> 0.3)
     powerpack (0.1.1)
     rainbow (3.0.0)

data/RELEASE_NOTES.md

@@ -1,5 +1,9 @@
 # DaFunk
 
+### 1.4.3 - 2018-01-18
+
+- Refact automatic menu header reviewing limits.
+
 ### 1.4.2 - 2018-01-17
 
 - Extract background pagination helper.

data/lib/da_funk/helper.rb

@@ -170,17 +170,17 @@ module DaFunk
 
     # TODO Scalone: Refactor.
     def pagination(title, options, collection, &block)
-      start_line, options[:limit] = pagination_limit(title, options)
-      if collection.size > (options[:limit] - 1) # minus pagination header
+      start_line, options[:limit], options[:header] = pagination_limit(title, options)
+      if collection.size > (options[:limit] - options[:header]) # minus pagination header
         key   = Device::IO.back_key
-        pages = pagination_page(collection, options[:limit] - 1) # minus pagination header
+        pages = pagination_page(collection, options[:limit] - options[:header]) # minus pagination header
         page  = 1
         while(key == Device::IO.back_key || key == Device::IO.forward_key)
           Device::Display.clear
           pagination_header(title, page, pages.size, start_line, options[:default], options[:header])
           values = pages[page].to_a
-          block.call(values, start_line+1)
-          key  = try_key(pagination_keys(values.size))
+          block.call(values, start_line + options[:header])
+          key  = try_key(pagination_keys(values.size, true))
           page = pagination_key_page(page, key, pages.size)
         end
       else
@@ -188,7 +188,7 @@ module DaFunk
         print_title(title, options[:default]) if title
         values = collection.to_a
         block.call(values, start_line)
-        key = try_key(pagination_keys(collection.size))
+        key = try_key(pagination_keys(collection.size, false))
       end
       result = values[key.to_i-1] if key.integer?
       if result.is_a? Array
@@ -202,7 +202,7 @@ module DaFunk
       print_title(title, default) if title
       back    = Device::IO.back_key_label
       forward = Device::IO.forward_key_label
-      if header || header.nil?
+      if header >= 1
         Device::Display.print("< #{back} __ #{page}/#{pages} __ #{forward} >", line, 0)
       end
     end
@@ -228,9 +228,10 @@ module DaFunk
       end
     end
 
-    def pagination_keys(size)
-      (1..size.to_i).to_a.map(&:to_s) + [Device::IO::ENTER, Device::IO::CLEAR,
-        Device::IO::CANCEL, Device::IO.back_key, Device::IO.forward_key]
+    def pagination_keys(size, move = true)
+      keys = ((1..size.to_i).to_a.map(&:to_s) + [Device::IO::ENTER, Device::IO::CLEAR, Device::IO::CANCEL])
+      keys << [Device::IO.back_key, Device::IO.forward_key] if move
+      keys
     end
 
     def pagination_limit(title, options = {})
@@ -249,9 +250,15 @@ module DaFunk
         end
       end
 
+      if options[:header].nil? || options[:header]
+        header = 1
+      else
+        header = 0
+      end
+
       footer = options[:footer] ? options[:footer] : 0
 
-      [start, limit - footer]
+      [start, limit - footer, header]
     end
 
     def number_to_currency(value, options = {})

data/lib/da_funk/screen.rb

@@ -51,7 +51,6 @@ class Screen
   end
 
   def add(string, line, column)
-    ContextLog.info "STRING: #{string.inspect}"
     string.split("\n", -1).each_with_index do |str, i|
       self.y = i + line
       self.x = column

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="1.4.2"
+  VERSION="1.4.3"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake