da_funk 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d44ae33e7fa0e7a6d6c78ef44fc2312988f0edf
-  data.tar.gz: a5779923dc64ff7c18877d591208399b58b7531b
+  metadata.gz: e2deca81b9c82dbcffb3f707550ad3cd63784362
+  data.tar.gz: aba07fa8b4ec242317d7c31efb73bdf6f80651c7
 SHA512:
-  metadata.gz: 70bb506683c6f05418f9ef60ca01e53873596927ed8586721987847f8fb435dd68b35bae35bf5590f34926b4108d11b20602486c6db89a423e323c7747724bc8
-  data.tar.gz: 2c83a78af55d08bc6b0045ac7a69e2d0f9651b6fdd6c9789ff14e70ad637f294bbcaa4363d92596d4c3573bce7b82b2631c762764eb16eb2d20171afceb07fdc
+  metadata.gz: f6f9b06820c97c1a4814c9fee6a8d423de1cdfe0099c725f44c1fcca83a3153e619eac4642017fc05b36d3235b3975463688cee70235f145feabc606ee3e1f82
+  data.tar.gz: 181cacd28882a28283227d4cc4a5c5d3d0b5f15d2c0d80ae743116ae5632b511d15ec80ab6d24f007da33e517b5c329eb26c6da0825e704e9831e06079a786b1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (1.4.1)
+    da_funk (1.4.2)
       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.0)
+    posxml_parser (1.2.1)
       funky-emv (~> 0.3)
     powerpack (0.1.1)
     rainbow (3.0.0)

data/RELEASE_NOTES.md

@@ -1,5 +1,11 @@
 # DaFunk
 
+### 1.4.2 - 2018-01-17
+
+- Extract background pagination helper.
+- Refactoring menu helper to support footer, header
+and background customization.
+
 ### 1.4.1 - 2018-01-17
 
 - Fix Notification parse to make communication management works.

data/lib/da_funk/helper.rb

@@ -170,14 +170,14 @@ module DaFunk
 
     # TODO Scalone: Refactor.
     def pagination(title, options, collection, &block)
-      start_line, options[:limit] = pagination_limit(title, options[:limit])
+      start_line, options[:limit] = pagination_limit(title, options)
       if collection.size > (options[:limit] - 1) # minus pagination header
         key   = Device::IO.back_key
         pages = pagination_page(collection, options[:limit] - 1) # 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])
+          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))
@@ -198,11 +198,13 @@ module DaFunk
       end
     end
 
-    def pagination_header(title, page, pages, line, default)
+    def pagination_header(title, page, pages, line, default = nil, header = nil)
       print_title(title, default) if title
       back    = Device::IO.back_key_label
       forward = Device::IO.forward_key_label
-      Device::Display.print("< #{back} __ #{page}/#{pages} __ #{forward} >", line, 0)
+      if header || header.nil?
+        Device::Display.print("< #{back} __ #{page}/#{pages} __ #{forward} >", line, 0)
+      end
     end
 
     def pagination_key_page(page, key, size)
@@ -231,22 +233,25 @@ module DaFunk
         Device::IO::CANCEL, Device::IO.back_key, Device::IO.forward_key]
     end
 
-    def pagination_limit(title, number = nil)
-      start = title.nil? ? 0 : 1 # start in next line if title
+    def pagination_limit(title, options = {})
+      number = options[:limit]
+      unless (start = options[:start])
+        start = title.nil? ? 0 : 1 # start in next line if title
+      end
+
       if number
         limit = number
       else
-        if STDOUT.max_y > 9
+        if STDOUT.max_y > (9 + start)
           limit = 9
         else
-          if title.nil?
-            limit = STDOUT.max_y
-          else
-            limit = STDOUT.max_y - 1 # minus title
-          end
+          limit = STDOUT.max_y - start # minus title
         end
       end
-      [start, limit]
+
+      footer = options[:footer] ? options[:footer] : 0
+
+      [start, limit - footer]
     end
 
     def number_to_currency(value, options = {})
@@ -305,8 +310,12 @@ module DaFunk
       options
     end
 
+    def pagination_bg_image(string)
+      string.to_s.downcase.include?(".bmp") && (path = "./shared/#{string}") && File.file?(path) && path
+    end
+
     def print_title(string, default)
-      if string.to_s.downcase.include?(".bmp") && (path = "./shared/#{string}") && File.file?(path)
+      if path = pagination_bg_image(string)
         Device::Display.print_bitmap(path)
       else
         if default

data/lib/da_funk/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Thiago Scalone