da_funk 0.7.9 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b644f1f2ba4859e329c58c00d532b28f794bc6d3
-  data.tar.gz: 5e5a8cb854cac3ef9c3ffc85cc966f7806a20e92
+  metadata.gz: c4ecd5d711aa91a4bbe69de7e6ff18412f259f7e
+  data.tar.gz: aa18938c8a20c6bb4f94135e339990000662c9d6
 SHA512:
-  metadata.gz: abdfd8c783ba7fa829f9138cf1d11ad334b281d87106bac54f9998b79b32ddd800d24badfcf9443ddb0be9d077c69f52bff963452471c03ecc900b4264759a2a
-  data.tar.gz: 3d4d2c213a6975b8e250fb64064113ea96c8681591bd08391880d8ae4279d373803fb64dbafd9b878f4314031194d084de067db6a75e94a599c1b9547e90160c
+  metadata.gz: 09c7a31d90ac5e0d8e2ac2e65fdffea6b5deb5fc1134d4532ec457533abc7f80c2aff9541ef2eb91f6740622f9b2d7334fb9d93242b64970b063f792533d58d1
+  data.tar.gz: 1486c9556783dfb87f8ed7f96cd6d22492ab966679678c428b43fb6fdbe2184973243fa22586c53a2be2c06750fe9b69eb4a1e5a01476b734ba04b2a54a1c6bd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (0.7.9)
+    da_funk (0.7.10)
       bundler (~> 1.7)
       cloudwalk_handshake (~> 0.6)
       funky-emv (~> 0.3)

data/RELEASE_NOTES.md

@@ -1,5 +1,10 @@
 # DaFunk
 
+### 0.7.10 - 2016-10-06
+
+- Refactoring Helper.menu supporting custom forward and back key, and bug fix pagination.
+- Support custom forward and back keys.
+
 ### 0.7.9 - 2016-10-03
 
 - Implement seconds to Scheduler timer.

data/lib/da_funk/helper.rb

@@ -150,21 +150,14 @@ module DaFunk
 
     # TODO Scalone: Refactor.
     def pagination(title, options, collection, &block)
-      if title.nil?
-        start_line = 0
-        options[:limit] ||= STDOUT.max_y
-      else
-        start_line = 1
-        options[:limit] ||= STDOUT.max_y - 1
-      end
-      if collection.size > options[:limit] # minus header
-        key   = Device::IO::F1
-        pages = pagination_page(collection, options[:limit] - 1)
+      start_line, options[:limit] = pagination_limit(title, options[:limit])
+      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::F1 || key == Device::IO::F2)
+        while(key == Device::IO.back_key || key == Device::IO.forward_key)
           Device::Display.clear
-          print_title(title, options[:default]) if title
-          Device::Display.print("< F1 ____ #{page}/#{pages.size} ____ F2 >", start_line, 0)
+          pagination_header(title, page, pages.size, start_line, options[:default])
           values = pages[page].to_a
           block.call(values, start_line+1)
           key  = try_key(pagination_keys(values.size))
@@ -185,10 +178,17 @@ module DaFunk
       end
     end
 
+    def pagination_header(title, page, pages, line, default)
+      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)
+    end
+
     def pagination_key_page(page, key, size)
-      if key == Device::IO::F1
+      if key == Device::IO.back_key
         page == 1 ? page : page -= 1
-      elsif key == Device::IO::F2
+      elsif key == Device::IO.forward_key
         page >= size ? size : page += 1
       end
     end
@@ -197,8 +197,10 @@ module DaFunk
       page = 1
       i = 0
       values.group_by do |value|
-        if size < (i+=1)
-          page+=1; i=0
+        if size <= i
+          page+=1; i=1
+        else
+          i += 1
         end
         page
       end
@@ -206,7 +208,25 @@ module DaFunk
 
     def pagination_keys(size)
       (1..size.to_i).to_a.map(&:to_s) + [Device::IO::ENTER, Device::IO::CLEAR,
-        Device::IO::CANCEL, Device::IO::F1, Device::IO::F2]
+        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
+      if number
+        limit = number
+      else
+        if STDOUT.max_y > 9
+          limit = 9
+        else
+          if title.nil?
+            limit = STDOUT.max_y
+          else
+            limit = STDOUT.max_y - 1 # minus title
+          end
+        end
+      end
+      [start, limit]
     end
 
     def number_to_currency(value, options = {})
@@ -273,6 +293,5 @@ module DaFunk
       end
     end
   end
-
 end
 

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="0.7.9"
+  VERSION="0.7.10"
 end
 

data/lib/device/io.rb

@@ -44,8 +44,12 @@ class Device
     NINE_NUMBER   = "9"
     ZERO_NUMBER   = "0"
 
+    KEYBOARD_DEFAULT = ["qzQZ.", "abcABC", "defDEF", "ghiGHI", "jklJKL",
+      "mnoMNO", "prsPRS", "tuvTUV", "wxyWXY", ", *\#_$%-+="]
+
     class << self
-      attr_accessor :timeout, :keys_range
+      attr_accessor :timeout, :keys_range, :forward_key, :back_key, :back_key_label,
+        :forward_key_label
     end
 
     # Setup Keyboard Map
@@ -67,8 +71,7 @@ class Device
     #   map = [one_letters, two_letters, three_letters, four_letters, five_letters,
     #   six_letters, seven_letters, eight_letters, nine_letters, zero_letters]
     #   Device::IO.setup_keyboard(map)
-    #
-    def self.setup_keyboard(map)
+    def self.setup_keyboard(map, options = {})
       one_letters, two_letters, three_letters, four_letters, five_letters,
         six_letters, seven_letters, eight_letters, nine_letters, zero_letters =
         map
@@ -89,10 +92,14 @@ class Device
         NINE_NUMBER  + nine_letters, ZERO_NUMBER   + zero_letters
       ]
       @keys_range = {MASK_ALPHA => range_alpha, MASK_LETTERS => range_letters, MASK_NUMBERS => range_number}
+
+      self.back_key          = options[:back_key]          || Device::IO::F1
+      self.back_key_label    = options[:back_key_label]    || " F1 "
+      self.forward_key       = options[:forward_key]       || Device::IO::F2
+      self.forward_key_label = options[:forward_key_label] || " F2 "
     end
 
-    self.setup_keyboard(["qzQZ.", "abcABC", "defDEF", "ghiGHI", "jklJKL",
-                        "mnoMNO", "prsPRS", "tuvTUV", "wxyWXY", ", *\#_$%-+="])
+    self.setup_keyboard(KEYBOARD_DEFAULT)
     self.timeout = DEFAULT_TIMEOUT
 
     # Restricted to terminals, get strings and numbers.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.10
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake