da_funk 0.4.12 → 0.4.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bca50eede080553cf6fa25ad14e52d2202186ec
-  data.tar.gz: 45727a4dc48d2bb22cdbedbd98c26f0d8c7c83df
+  metadata.gz: c71a022894a2992a96f807725594df7a54d9a27d
+  data.tar.gz: ae01716d14310f7cfb1a6d9621cfd1bb3bc80766
 SHA512:
-  metadata.gz: d7d29e9d7cf081450c088c906e0b29c8df40f337508ae80c165a7b4d8e0c7bbe48e5302fce1fa5a262c83657a29ac2c240c7be93d94cabd6edff4103e94a76e8
-  data.tar.gz: 34f0af6e7974b2c42ff063ee026701d808481048d0e60d0ecb0ccd1ec5464071b4a1e5c4b2bf1984ce7c7aea044bc21e9cf54cac7224b5b851a68647e6d27f00
+  metadata.gz: 29d9509398e039740dbbcda5ab21276c192e465fac94f4eb725166d09b9759b6f5a46947e29316e7821ddaea8373f39761125ffab51f993a2b65f8e3a5f5358e
+  data.tar.gz: 3fe51480128815ddfedd6b7442bda0c81a2c1aaae3a863e41829f8a859d181ba54ec450d510b0af5313b70ce4300c2bd161e2bd1bb6a377edb40447d16901cb7

data/Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    da_funk (0.4.12)
+    da_funk (0.4.15)
       bundler (~> 1.7)
       cloudwalk_handshake (~> 0.4)
       rake (~> 10.4)
@@ -16,7 +16,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    cloudwalk_handshake (0.4.1)
+    cloudwalk_handshake (0.4.5)
     rake (10.4.2)
     yard (0.8.7.6)
 

data/RELEASE_NOTES.md

@@ -1,5 +1,35 @@
 # DaFunk
 
+### 0.4.15 - 2015-11-24 - Screen limitation abstraction
+- Implement class Screen to replace STDOUT and perform column and line display abstraction on place that doesn’t support screen display by STDOUT.
+
+### 0.4.14 - 2015-11-23 - Improve IO functions
+- Update cloudwalk_handshake to version 0.4.5.
+- Apply relative path on compilation and tests paths to make it work properly on windows.
+- Move from Print to Printer.
+- Implement Device::Print.print_big.
+- Support to display in line at Device::IO.get_format.
+- On Helper.menu support Device::IO.timeout if timeout isn’t send.
+- Refactoring the documentation of Helper.menu.
+- Refactoring Device::IO.get_format: Add support masquerade values; Improve the input letters and numbers; Add input alpha.
+- Add the compilation of lib/ext/string.rb on Rakefile.
+- Implement ISO8583 fields Unknown, XN(BCD), LLLVAR_Z and Z (LL Track2).
+- Add iso8583_recv_tries setting.
+- Add uclreceivetimeout to Setting.
+- Add ISO8583::FileParser to parse bitmap.dat file.
+
+
+### 0.4.13 - 2015-10-30 - Implement get_string byt getc
+- Implement Debug Flag.
+- Fix Device::IO.change_next to return the first option and restart the loop.
+- Refactor System.restart/reboot
+- Implement timeout on Device::IO.
+- Send nil to getc when show notification message to be blocking.
+- Invert the check of string size on get_string.
+- Use default timeout to menu getc.
+- Call IO::ENTER adding Device:: scope on helpers.
+- Change Device::IO.get_string to work only by getc formatting letters and secret. - Implement DeviceIOTest class.
+
 ### 0.4.12 - 2015-09-02 - helper on ISO8583 load
 - Bug fix helper load on iso8583.
 

data/Rakefile

@@ -13,6 +13,7 @@ FILES = FileList[
   "lib/da_funk/helper.rb",
   "lib/da_funk.rb",
   "lib/da_funk/test.rb",
+  "lib/da_funk/screen.rb",
   "lib/device.rb",
   "lib/device/audio.rb",
   "lib/device/crypto.rb",
@@ -21,7 +22,7 @@ FILES = FileList[
   "lib/device/io.rb",
   "lib/device/network.rb",
   "lib/device/params_dat.rb",
-  "lib/device/print.rb",
+  "lib/device/printer.rb",
   "lib/device/runtime.rb",
   "lib/device/setting.rb",
   "lib/device/support.rb",
@@ -49,7 +50,8 @@ FILES = FileList[
   "lib/device/application.rb",
   "lib/zip.rb",
   "lib/device/magnetic.rb",
-  "lib/ext/kernel.rb"
+  "lib/ext/kernel.rb",
+  "lib/ext/string.rb"
 ]
 
 DaFunk::RakeTask.new do |t|

data/lib/da_funk.rb

@@ -4,13 +4,14 @@ unless Object.const_defined?(:MTest)
   require file_path + "/da_funk/iso8583.rb"
   require file_path + "/da_funk/rake_task.rb"
   require file_path + "/da_funk/test.rb"
+  require file_path + "/da_funk/screen.rb"
   require file_path + "/device/support.rb"
   require file_path + "/device/helper.rb"
   require file_path + "/device/crypto.rb"
   require file_path + "/device/display.rb"
   require file_path + "/device/io.rb"
   require file_path + "/device/network.rb"
-  require file_path + "/device/print.rb"
+  require file_path + "/device/printer.rb"
   require file_path + "/device/setting.rb"
   require file_path + "/device/system.rb"
   require file_path + "/device/version.rb"
@@ -28,7 +29,6 @@ unless Object.const_defined?(:MTest)
   require file_path + "/device/transaction/download.rb"
   require file_path + "/device/transaction/emv.rb"
   require file_path + "/device/transaction/iso.rb"
-  require file_path + "/../utils/command_line_platform.rb"
 end
 
 module DaFunk

data/lib/da_funk/helper.rb

@@ -62,18 +62,39 @@ module DaFunk
       value
     end
 
+
+    # Create a form menu.
+    #
+    # @param title [String] Text to display on line 0. If nil title won't be
+    #   displayed and Display.clear won't be called on before the option show.
+    # @param selection [Hash] Hash (display text => value that will return)
+    #   containing the list options.
+    # @param options [Hash] Hash containing options to change the menu behaviour.
+    #
     # @example
-    #   {
-    #     :default => {:detail => 10}, # default value to return if enter
-    #     :number => true, # Add number to label or not
-    #     "option X" => {:detail => 10},
-    #     "option Y" => {:detail => 11}
+    #   options = {
+    #     # default value to return if enter, you can work with complex data.
+    #     :default => 10,
+    #     # Add number to label or not
+    #     :number => true,
+    #     # Input Timeout in miliseconds
+    #     :timeout => 30_000
+    #   }
+    #
+    #   selection = {
+    #     "option X" => 10,
+    #     "option Y" => 11
     #   }
+    #
+    #   menu("Option menu", selection, options)
+    #
     def menu(title, selection, options = {})
       options[:number] = true if options[:number].nil?
 
-      Device::Display.clear
-      print_title(title, options[:default])
+      if title
+        Device::Display.clear
+        print_title(title, options[:default])
+      end
       values = Hash.new
       selection.each_with_index do |value,i|
         values[i.to_i] = value[1]
@@ -84,9 +105,9 @@ module DaFunk
         end
       end
 
-      key = getc
+      key = getc(options[:timeout] || Device::IO.timeout)
 
-      return options[:default] if key == IO::ENTER || key == IO::CANCEL
+      return options[:default] if key == Device::IO::ENTER || key == Device::IO::CANCEL
       [values[key.to_i - 1]].flatten.first
     end
 
@@ -145,7 +166,7 @@ module DaFunk
     private
     def form_default(options = {})
       options[:default] ||= ""
-      options[:mode]    ||= Device::IO::IO_INPUT_LETTERS
+      options[:mode]    ||= Device::IO::IO_INPUT_ALPHA
       options[:min]     ||= 0
       options[:max]     ||= 20
       options

data/lib/da_funk/rake_task.rb

@@ -9,17 +9,19 @@ module DaFunk
   class RakeTask < ::Rake::TaskLib
     include ::Rake::DSL if defined?(::Rake::DSL)
 
-    attr_accessor :name, :libs, :tests, :tests_unit, :tests_integration, :root_path, :main_out, :test_out, :resources, :mrbc, :mruby, :out_path, :resources_out
+    attr_accessor :name, :libs, :tests, :tests_unit, :tests_integration, :root_path, :main_out,
+      :test_out, :resources, :mrbc, :mruby, :out_path, :resources_out, :debug
 
     def initialize
       yield self if block_given?
 
+      @debug             ||= true
       @libs              ||= FileList['lib/**/*.rb']
       @tests             ||= FileList['test/**/*test.rb']
       @tests_integration ||= FileList['test/integration/**/*test.rb']
       @tests_unit        ||= FileList['test/unit/**/*test.rb']
-      @root_path         ||= File.expand_path("./")
-      @name              ||= File.basename(root_path)
+      @root_path         ||= "./"
+      @name              ||= File.basename(File.expand_path(@root_path))
       @out_path          ||= File.join(root_path, "out", @name)
       @main_out          ||= File.join(out_path, "main.mrb")
       @test_out          ||= File.join(out_path, "test.mrb")
@@ -31,6 +33,14 @@ module DaFunk
       define
     end
 
+    def debug_flag
+      if @debug
+        "-g"
+      else
+        ""
+      end
+    end
+
     def get_mrbc_bin(from_user)
       if (! system("type mrbc > /dev/null 2>&1 ")) && from_user
         from_user
@@ -61,11 +71,12 @@ module DaFunk
     end
 
     def execute_tests(files)
+      # Debug is always on during tests(-g)
       all_files = FileList["test/test_helper.rb"] + libs + files + [File.join(File.dirname(__FILE__), "..", "..", "utils", "command_line_platform.rb")] + [File.join(File.dirname(__FILE__), "..", "..", "utils", "test_run.rb")]
       if sh("#{mrbc} -g -o #{test_out} #{all_files.uniq}")
         puts "cd #{File.dirname(out_path)}"
         FileUtils.cd File.dirname(out_path)
-        sh("#{mruby} #{File.join(out_path, "test.mrb")}")
+        sh("#{mruby} #{File.join(name, "test.mrb")}")
       end
     end
 
@@ -98,7 +109,7 @@ module DaFunk
 
       desc "Compile app to mrb and process resources"
       task :build => :resources do
-        sh "#{mrbc} -g -o #{main_out} #{libs} "
+        sh "#{mrbc} #{debug_flag} -o #{main_out} #{libs} "
       end
 
       namespace :test do

data/lib/da_funk/screen.rb

@@ -0,0 +1,95 @@
+
+class Screen
+  SCREEN_X_SIZE = 21
+  SCREEN_Y_SIZE = 7
+
+  attr_accessor :x, :y, :max_x, :max_y
+
+  def self.setup(max_x, max_y)
+    $stdout.close
+    Kernel.const_set(:STDOUT, self.new(max_x, max_y))
+    $stdout = Kernel::STDOUT
+  end
+
+  def initialize(max_x = SCREEN_X_SIZE, max_y = SCREEN_Y_SIZE)
+    @max_x = max_x
+    @max_y = max_y
+    self.fresh
+  end
+
+  def fresh(value_y = nil, value_x = nil)
+    @x = value_x || 0
+    @y = value_y || 0
+  end
+
+  def jump_line(value = 1)
+    #CommandLinePlatform::Display._puts "=" * 50
+    #CommandLinePlatform::Display._puts x
+    #CommandLinePlatform::Display._puts y
+    #CommandLinePlatform::Display._puts max_x
+    #CommandLinePlatform::Display._puts max_y
+    #CommandLinePlatform::Display._puts "=" * 50
+
+    @y += value
+    @x = 0
+    @y = 0 if (@y > (@max_y-1))
+  end
+
+  def print(*args)
+    if n_strings?(args)
+      loop_n_strings(*args)
+    else
+      loop_split_strings(*args)
+    end
+    nil
+  end
+
+  def printf(*args)
+    print(sprintf(*args))
+  end
+
+  def puts(*args)
+    if n_strings?(args)
+      args = args.map {|str| "#{str}\n" }
+    else
+      args[0] = "#{args[0]}\n"
+    end
+    print(*args)
+  end
+
+  private
+  def loop_split_strings(*args)
+    str, value_y, value_x = *args
+
+    str.lines.each_with_index do |string, index|
+      jump_line if string[-1] == "\n"
+      string = string.chomp
+      if (@x + string.size) < @max_x
+        Device::IO.print_line(string, @y, @x)
+        @x += string.size
+      else
+        space = @max_x - @x
+        Device::IO.print_line("#{string[0..(space - 1)]}", @y, @x)
+        jump_line
+        loop_split_strings("#{string[(space)..-1]}")
+      end
+    end
+  end
+
+  def loop_n_strings(*args)
+    args.each { |str| self.print(str) }
+  end
+
+  # various arguments as string, example:
+  #   puts "12", "23", "34"
+  #   # or
+  #   puts "12", 1, 2
+  def n_strings?(args)
+    if args[0].is_a?(String) && args[1].is_a?(String)
+      true
+    else
+      false
+    end
+  end
+end
+

data/lib/device/io.rb

@@ -17,14 +17,67 @@ class Device
     CANCEL           = 0x1B.chr
     IO_INPUT_NUMBERS = :numbers
     IO_INPUT_LETTERS = :letters
+    IO_INPUT_ALPHA   = :alpha
     IO_INPUT_SECRET  = :secret
     IO_INPUT_DECIMAL = :decimal
     IO_INPUT_MONEY   = :money
+    IO_INPUT_MASK    = :mask
+
+    MASK_ALPHA       = :alpha
+    MASK_LETTERS     = :letters
+    MASK_NUMBERS     = :number
+
+    DEFAULT_TIMEOUT  = 30000
 
     NUMBERS = %w(1 2 3 4 5 6 7 8 9 0)
 
+    ONE_LETTERS   = "qzQZ _,."
+    TWO_LETTERS   = "abcABC"
+    THREE_LETTERS = "defDEF"
+    FOUR_LETTERS  = "ghiGHI"
+    FIVE_LETTERS  = "jklJKL"
+    SIX_LETTERS   = "mnoMNO"
+    SEVEN_LETTERS = "prsPRS"
+    EIGHT_LETTERS = "tuvTUV"
+    NINE_LETTERS  = "wxyWXY"
+    ZERO_LETTERS  = "spSP"
+
+    ONE_NUMBER    = "1"
+    TWO_NUMBER    = "2"
+    THREE_NUMBER  = "3"
+    FOUR_NUMBER   = "4"
+    FIVE_NUMBER   = "5"
+    SIX_NUMBER    = "6"
+    SEVEN_NUMBER  = "7"
+    EIGHT_NUMBER  = "8"
+    NINE_NUMBER   = "9"
+    ZERO_NUMBER   = "0"
+
+    ONE_ALPHA     = ONE_NUMBER   + ONE_LETTERS
+    TWO_ALPHA     = TWO_NUMBER   + TWO_LETTERS
+    THREE_ALPHA   = THREE_NUMBER + THREE_LETTERS
+    FOUR_ALPHA    = FOUR_NUMBER  + FOUR_LETTERS
+    FIVE_ALPHA    = FIVE_NUMBER  + FIVE_LETTERS
+    SIX_ALPHA     = SIX_NUMBER   + SIX_LETTERS
+    SEVEN_ALPHA   = SEVEN_NUMBER + SEVEN_LETTERS
+    EIGHT_ALPHA   = EIGHT_NUMBER + EIGHT_LETTERS
+    NINE_ALPHA    = NINE_NUMBER  + NINE_LETTERS
+    ZERO_ALPHA    = ZERO_NUMBER  + ZERO_LETTERS
+
+    RANGE_ALPHA   = [ONE_ALPHA, TWO_ALPHA, THREE_ALPHA, FOUR_ALPHA, FIVE_ALPHA, SIX_ALPHA, SEVEN_ALPHA, EIGHT_ALPHA, NINE_ALPHA, ZERO_ALPHA]
+    RANGE_NUMBER  = [ONE_NUMBER, TWO_NUMBER, THREE_NUMBER, FOUR_NUMBER, FIVE_NUMBER, SIX_NUMBER, SEVEN_NUMBER, EIGHT_NUMBER, NINE_NUMBER, ZERO_NUMBER]
+    RANGE_LETTERS = [ONE_LETTERS, TWO_LETTERS, THREE_LETTERS, FOUR_LETTERS, FIVE_LETTERS, SIX_LETTERS, SEVEN_LETTERS, EIGHT_LETTERS, NINE_LETTERS, ZERO_LETTERS]
+
+    KEYS_RANGE    = {MASK_ALPHA => RANGE_ALPHA, MASK_LETTERS => RANGE_LETTERS, MASK_NUMBERS => RANGE_NUMBER}
+
     include Device::Helper
 
+    class << self
+      attr_accessor :timeout
+    end
+
+    self.timeout = DEFAULT_TIMEOUT
+
     # Restricted to terminals, get strings and numbers.
     # The switch method between uppercase, lowercase and number characters is to keep pressing a same button quickly. The timeout of this operation is 1 second.
     #
@@ -40,47 +93,109 @@ class Device
     #
     # :label - Sets the label display before currency, eg.: "U$:", "R$:"
     #
+    # :mask - If mode IO_INPUT_MASK a mask should send
+    #   (only numbers and letters are allowed), eg.: "9999-AAAA"
+    #
     # :mode - Define input modes:
     #
     #   :numbers (IO_INPUT_NUMBERS) - Only number.
-    #   :letters (IO_INPUT_LETTERS) - Letters and numbers.
+    #   :letters (IO_INPUT_LETTERS) - Only Letters.
+    #   :alpha (IO_INPUT_ALPHA) - Letters and numbers.
     #   :secret (IO_INPUT_SECRET) - Secret *.
     #   :decimal (IO_INPUT_DECIMAL) - Decimal input, only number.
     #   :money (IO_INPUT_MONEY) - Money input, only number.
+    #   :mask (IO_INPUT_MASK) - Custom mask.
     #
     # @return [String] buffer read from keyboard
     def self.get_format(min, max, options = {})
-      options[:mode] ||= IO_INPUT_LETTERS
-      if options[:mode] == IO_INPUT_MONEY || options[:mode] == IO_INPUT_DECIMAL
+      set_default_format_option(options)
+      key = text = ""
 
-        text = ""
-        key = ""
-
-        while key != CANCEL
-          Device::Display.clear 2
-          Device::Display.print_line number_to_currency(text, options), 2, 0
-          key = getc
-          if key == BACK
-            text = text[0..-2]
-          elsif text.size >= max
-            next
-          elsif NUMBERS.include? key
-            text << key
-          elsif key == ENTER
-            return text
-          end
+      while key != CANCEL
+        Device::Display.clear options[:line]
+        Device::Display.print_line format(text, options), options[:line], options[:column]
+        key = getc
+        if key == BACK
+          text = text[0..-2]
+        elsif key == ENTER
+          return text
+        elsif key ==  F1 || key == DOWN || key == UP
+          change_next(text, check_mask_type(text, options))
+          next
+        elsif text.size >= max
+          next
+        elsif insert_key?(key, options)
+          text << key
         end
+      end
+    end
+
+    def self.set_default_format_option(options)
+      options[:mode]   ||= IO_INPUT_LETTERS
+      options[:line]   ||= 2
+      options[:column] ||= 0
+
+      if options[:mask]
+        options[:mask_clean] = options[:mask].chars.reject{|ch| ch.match(/[^0-9A-Za-z]/) }.join
+      end
+    end
+
+    def self.check_mask_type(text, options)
+      if options[:mode] == Device::IO::IO_INPUT_ALPHA
+        Device::IO::MASK_ALPHA
+      elsif options[:mode] == Device::IO::IO_INPUT_LETTERS
+        Device::IO::MASK_LETTERS
+      elsif options[:mode] == Device::IO::IO_INPUT_MASK
+        options[:mask_clean][text.length - 1].match(/[0-9]/) ? Device::IO::MASK_NUMBERS : Device::IO::MASK_LETTERS
       else
-        get_string(min, max, options[:mode])
+        Device::IO::MASK_ALPHA
+      end
+    end
+
+    def self.change_next(text, mask_type = Device::IO::MASK_ALPHA)
+      char = text[-1]
+      if char && (range = KEYS_RANGE[mask_type].detect { |range| range.include?(char) })
+        index = range.index(char)
+        new_value = range[index+1]
+        if new_value
+          text[-1] = new_value
+        else
+          text[-1] = range[0]
+        end
       end
+      text
     end
 
     # Read 1 byte on keyboard, wait until be pressed
     #
     # @param timeout [Fixnum] Timeout in milliseconds to wait for key.
+    # If not sent the default timeout is 30_000.
+    # If nil should be blocking.
     #
     # @return [String] key read from keyboard
-    def self.getc(timeout = 0); super(timeout); end
+    def self.getc(timeout = self.timeout); super(timeout); end
+
+    def self.format(string, options)
+      if options[:mode] == IO_INPUT_MONEY || options[:mode] == IO_INPUT_DECIMAL
+        number_to_currency(string, options)
+      elsif options[:mode] == IO_INPUT_SECRET
+        "*" * string.size
+      elsif options[:mode] == IO_INPUT_MASK
+        string.to_mask(options[:mask])
+      else
+        string
+      end
+    end
+
+    def self.insert_key?(key, options)
+      if options[:mode] == IO_INPUT_MONEY || options[:mode] == IO_INPUT_DECIMAL || options[:mode] == IO_INPUT_NUMBERS
+        NUMBERS.include?(key)
+      elsif options[:mode] != IO_INPUT_NUMBERS && options[:mode] != IO_INPUT_MONEY && options[:mode] != IO_INPUT_DECIMAL
+        true
+      else
+        false
+      end
+    end
   end
 end
 

data/lib/device/network.rb

@@ -91,14 +91,17 @@ class Device
     end
 
     def self.attach
-      Device::Network.init(*self.config)
-      ret = Device::Network.connect
-      ret = Device::Network.connected? if ret != SUCCESS
-      while(ret == PROCESSING)
-        ret = Device::Network.connected?
-      end
-      if ret == SUCCESS && (wifi? || ethernet?)
-        Device::Network.dhcp_client(20000)
+      ret = Device::Network.connected?
+      if ret != SUCCESS
+        ret = Device::Network.init(*self.config)
+        ret = Device::Network.connect
+        ret = Device::Network.connected? if ret != SUCCESS
+        while(ret == PROCESSING)
+          ret = Device::Network.connected?
+        end
+        if ret == SUCCESS && (wifi? || ethernet?)
+          Device::Network.dhcp_client(20000)
+        end
       end
       ret
     end

data/lib/device/notification.rb

@@ -57,7 +57,7 @@ class Device
         date = datetime.sub(" ", "-").split("-")
         Device::Display.print_line("#{date[1]}/#{date[0]}/#{date[2]} #{date[3]}", 0)
         Device::Display.print_line("#{message}", 2)
-        getc(0)
+        getc nil
       }
     end
 

data/lib/device/{print.rb → printer.rb}

@@ -1,6 +1,6 @@
 
 class Device
-  class Print
+  class Printer
     RET_OK                = 0
     ERR_PRN_BUSY          = -3701 # Printer busy
     ERR_PRN_PAPEROUT      = -3702 # Out of paper
@@ -144,6 +144,18 @@ class Device
       self.adapter.puts(string)
     end
 
+    # Write text on print buffer changing the size only for this print.
+    #   Big size is  (24, 64, 64, 64)
+    #
+    # @param string [String] Text to be printed.
+    #
+    # @return [NilClass] Allways returns nil.
+    def self.print_big(string)
+      size(24, 48, 48, 48)
+      self.adapter.print(string)
+      size
+    end
+
     # Print bmp file.
     #
     # Details:

data/lib/device/setting.rb

@@ -34,6 +34,8 @@ class Device
       "notification_stream_timeout" => "",
       "cw_switch_version"           => "",
       "cw_pos_timezone"             => "",
+      "uclreceivetimeout"           => "0",
+      "iso8583_recv_tries"          => "0",
       "company_name"                => ""
     }
 

data/lib/device/system.rb

@@ -47,7 +47,11 @@ class Device
     end
 
     def self.restart
-      adapter.restart
+      adapter.reboot
+    end
+
+    def self.reboot
+      adapter.reboot
     end
 
     def self.app

data/lib/device/version.rb

@@ -1,6 +1,6 @@
 
 class Device
-  API_VERSION="0.4.12"
+  API_VERSION="0.4.15"
 
   def self.api_version
     Device::API_VERSION

data/lib/ext/string.rb

@@ -0,0 +1,9 @@
+class String
+  def to_mask(mask_string)
+    mask_clean = mask_string.chars.reject{|ch| ch.match(/[^0-9A-Za-z]/) }.join
+
+    str = mask_string.chars.map{|s| s.match(/[0-9A-Za-z]/) ? "%s" : s }.join
+    str % self.ljust(mask_clean.size, " ").chars
+  end
+end
+

data/lib/iso8583/fields.rb

@@ -75,6 +75,11 @@ module ISO8583
   LLVAR_Z.length  = LL
   LLVAR_Z.codec   = Track2
 
+  # Two byte variable length ASCII numeral, payload Track2 data
+  Z         = Field.new
+  Z.length  = LL
+  Z.codec   = Track2
+
   # Two byte variable length ASCII numeral, payload ASCII, fixed length, zeropadded (right)
   LLVAR_AN        = Field.new
   LLVAR_AN.length = LL
@@ -85,6 +90,11 @@ module ISO8583
   LLVAR_ANS.length = LL
   LLVAR_ANS.codec  = ANS_Codec
 
+  # Thre byte variable length ASCII numeral, payload Track2 data
+  LLLVAR_Z         = Field.new
+  LLLVAR_Z.length  = LLL
+  LLLVAR_Z.codec   = Track2
+
   # Three byte variable length ASCII numeral, payload ASCII, fixed length, zeropadded (right)
   LLLVAR_AN        = Field.new
   LLLVAR_AN.length = LLL
@@ -113,6 +123,12 @@ module ISO8583
     sprintf("%0#{len}d", val)
   }
 
+  XN        = BCDField.new
+  XN.codec  = ASCII_Number
+  XN.padding = lambda {|val, len|
+    sprintf("%0#{len}d", val)
+  }
+
   N_BCD = BCDField.new
   N_BCD.codec = Packed_Number
 
@@ -171,5 +187,8 @@ module ISO8583
   Hhmmss        = Field.new
   Hhmmss.codec  = HhmmssCodec
   Hhmmss.length = 6
+
+  # Unknown
+  UNKNOWN = Field.new
 end
 

data/lib/iso8583/file_parser.rb

@@ -0,0 +1,47 @@
+
+module ISO8583
+  class FileParser
+    PATH_DEFAULT = "/shared/bitmap.dat"
+
+    def self.mount_parameters(data)
+      if data[3].match(/[0-9]/)
+        [data[1].to_i, "", ISO8583.const_get(data[2]), {:length => data[3].to_i}]
+      else
+        [data[1].to_i, "", ISO8583.const_get("#{data[3]}_#{data[2]}")]
+      end
+    end
+
+    def create_mti(klass, mti_format, mti_messages)
+      klass.mti_format *mti_format
+      mti_messages.each do |number, description|
+        klass.mti number, description
+      end
+    end
+
+    def parse_file(filepath)
+      return [] unless File.exists?(path)
+      file = File.open(path, "r")
+
+      file.readlines.inject([]) do |array, line|
+        data = line.match(/([0-9]+)=\"ATT_([a-zA-Z]+);([0-9A-Z]+)/)
+        next(array) unless data
+        array << mount_parameters(data)
+      end
+    ensure
+      file.close
+    end
+
+    def self.build_klass(mti_format, mti_messages, filepath = PATH_DEFAULT)
+      Class.new(ISO8583::Message) do |klass|
+        klass.include ISO8583
+        #klass.mti_format ISO8583::N, :length => 4
+        #klass.mti 200, "Authorization Request Acquirer Gateway"
+        create_mti(klass, mti_format, mti_messages)
+
+        parse_file(filepath).each do |parameters|
+          klass.bmp(*parameters)
+        end
+      end
+    end
+  end
+end

data/test/unit/device/display_test.rb

@@ -40,4 +40,46 @@ class DisplayTest < DaFunk::Test.case
     assert_equal nil, puts("test", 0)
     assert_equal nil, puts("test", 0, 0)
   end
+
+  def test_kernel_puts_break_line
+    $stdout.fresh
+    assert_equal nil, puts("\n")
+    assert_equal 0, $stdout.x
+    assert_equal 2, $stdout.y
+    assert_equal nil, puts("")
+    assert_equal 0, $stdout.x
+    assert_equal 3, $stdout.y
+  end
+
+  def test_kernel_puts_string_20_plus_1
+    $stdout.fresh
+    assert_equal nil, puts("12345678901234567890")
+    assert_equal 20, $stdout.x
+    assert_equal 1, $stdout.y
+    assert_equal nil, puts("1")
+    assert_equal 1, $stdout.x
+    assert_equal 2, $stdout.y
+  end
+
+  def test_kernel_puts_string_21
+    $stdout.fresh
+    assert_equal nil, puts("123456789012345678901")
+    assert_equal 0, $stdout.x
+    assert_equal 2, $stdout.y
+  end
+
+  def test_kernel_puts_string_43
+    $stdout.fresh
+    assert_equal nil, puts("1234567890123456789012345678901234567890123")
+    assert_equal 1, $stdout.x
+    assert_equal 3, $stdout.y
+  end
+
+  def test_kernel_puts_string_22
+    $stdout.fresh
+    assert_equal nil, puts("1234567890123456789012")
+    assert_equal 1, $stdout.x
+    assert_equal 2, $stdout.y
+  end
 end
+

data/test/unit/device/io_test.rb

@@ -0,0 +1,134 @@
+
+class IOTest < DaFunk::Test.case
+  def test_io_change_next_alphanumeric_mask
+    text = "TES8"
+    assert_equal "TESt", Device::IO.change_next(text)
+    assert_equal "TESu", Device::IO.change_next(text)
+    assert_equal "TESv", Device::IO.change_next(text)
+    assert_equal "TEST", Device::IO.change_next(text)
+    assert_equal "TESU", Device::IO.change_next(text)
+    assert_equal "TESV", Device::IO.change_next(text)
+    assert_equal "TES8", Device::IO.change_next(text)
+  end
+
+  def test_io_change_next_number_mask
+    text = "TES8"
+    assert_equal "TES8", Device::IO.change_next(text, :number)
+    assert_equal "TES8", Device::IO.change_next(text, :number)
+  end
+
+  def test_io_change_next_letters_mask
+    text = "TESt"
+    assert_equal "TESu", Device::IO.change_next(text, :letters)
+    assert_equal "TESv", Device::IO.change_next(text, :letters)
+    assert_equal "TEST", Device::IO.change_next(text, :letters)
+    assert_equal "TESU", Device::IO.change_next(text, :letters)
+    assert_equal "TESV", Device::IO.change_next(text, :letters)
+    assert_equal "TESt", Device::IO.change_next(text, :letters)
+  end
+
+  def test_io_insert_key_number
+    assert Device::IO.insert_key?("1", {:mode => Device::IO::IO_INPUT_NUMBERS})
+  end
+
+  def test_io_insert_key_decimal
+    assert Device::IO.insert_key?("1", {:mode => Device::IO::IO_INPUT_DECIMAL})
+  end
+
+  def test_io_insert_key_money
+    assert Device::IO.insert_key?("1", {:mode => Device::IO::IO_INPUT_MONEY})
+  end
+
+  def test_io_insert_key_number_false
+    assert_equal false, Device::IO.insert_key?("a", {:mode => Device::IO::IO_INPUT_NUMBERS})
+  end
+
+  def test_io_insert_key_decimal_false
+    assert_equal false, Device::IO.insert_key?("a", {:mode => Device::IO::IO_INPUT_DECIMAL})
+  end
+
+  def test_io_insert_key_money_false
+    assert_equal false, Device::IO.insert_key?("a", {:mode => Device::IO::IO_INPUT_MONEY})
+  end
+
+  def test_io_format_string_to_money
+    options = {:mode => Device::IO::IO_INPUT_MONEY}
+    assert_equal "10,000.00", Device::IO.format("1000000", options)
+  end
+
+  def test_io_format_string_to_decimal
+    options = {:mode => Device::IO::IO_INPUT_DECIMAL}
+    assert_equal "10,000.00", Device::IO.format("1000000", options)
+  end
+
+  def test_io_format_string_to_secret
+    options = {:mode => Device::IO::IO_INPUT_SECRET}
+    assert_equal "*******", Device::IO.format("1000000", options)
+  end
+
+  def test_io_set_default_format_option
+    options = {}
+    options_default = {:mode => Device::IO::IO_INPUT_LETTERS, :line => 2, :column => 0}
+    Device::IO.set_default_format_option(options)
+    assert_equal options_default, options
+  end
+
+  def test_io_set_default_format_option_for_mask
+    options = {:mode => Device::IO::IO_INPUT_MASK, :mask => "999-AAA-999/99.99"}
+    options_default = {
+      :mode => Device::IO::IO_INPUT_MASK,
+      :mask_clean => "999AAA9999999",
+      :mask => "999-AAA-999/99.99",
+      :line => 2, :column => 0
+    }
+    Device::IO.set_default_format_option(options)
+    assert_equal options_default, options
+  end
+
+  def test_io_check_mask_type_alpha
+    options = { :mode => Device::IO::IO_INPUT_ALPHA }
+    assert_equal Device::IO::MASK_ALPHA, Device::IO.check_mask_type("", options)
+  end
+
+  def test_io_check_mask_type_number
+    options = { :mode => Device::IO::IO_INPUT_LETTERS }
+    assert_equal Device::IO::MASK_LETTERS, Device::IO.check_mask_type("", options)
+  end
+
+  def test_io_check_mask_type_number_mask
+    options = {
+      :mode => Device::IO::IO_INPUT_MASK,
+      :mask => "999-999/99.99",
+      :mask_clean => "9999999999"
+    }
+    assert_equal Device::IO::MASK_NUMBERS, Device::IO.check_mask_type("", options)
+  end
+
+  def test_io_check_mask_type_letters_mask
+    options = {
+      :mode => Device::IO::IO_INPUT_MASK,
+      :mask => "AAA-AAA/AA.AA",
+      :mask_clean => "AAAAAAAAAA"
+    }
+    assert_equal Device::IO::MASK_LETTERS, Device::IO.check_mask_type("", options)
+  end
+
+  def test_io_check_mask_type_mix_letters_mask
+    options = {
+      :mode => Device::IO::IO_INPUT_MASK,
+      :mask => "999-A99/99.99",
+      :mask_clean => "999A999999"
+    }
+    assert_equal Device::IO::MASK_LETTERS, Device::IO.check_mask_type("111B", options)
+  end
+
+  def test_io_check_mask_type_mix_number_mask
+    options = {
+      :mode => Device::IO::IO_INPUT_MASK,
+      :mask => "AAA-9AA/AA.AA",
+      :mask_clean => "AAA9AAAAAA"
+    }
+    assert_equal Device::IO::MASK_NUMBERS, Device::IO.check_mask_type("SDF4", options)
+  end
+end
+

data/test/unit/ext/string_test.rb

@@ -0,0 +1,15 @@
+
+class StringTest < DaFunk::Test.case
+  def test_to_mask_number
+    assert_equal "(12) 341-234", "12341234".to_mask("(99) 999-999")
+  end
+
+  def test_to_mask_letters
+    assert_equal "(12) 341-234", "12341234".to_mask("(99) 999-999")
+  end
+
+  def test_to_mask_alpha
+    assert_equal "(12) ac34-123", "12ac341234".to_mask("(99) 9AAA-999")
+  end
+end
+

data/utils/command_line_platform.rb

@@ -8,6 +8,8 @@ class CommandLinePlatform
   IO = ::IO
 
   def self.setup
+    CommandLinePlatform::Display.standard_output = STDOUT
+    Screen.setup(21, 20)
     begin
       require 'cloudwalk_handshake'
       CloudwalkHandshake.configure!
@@ -27,9 +29,13 @@ class CommandLinePlatform
   end
 
   class Display
+    class << self
+      attr_accessor :standard_output
+    end
+
     def self.print_in_line(buf, row = nil, column = nil)
       buf = (" " * column) + buf if column != nil && column > 0
-      puts buf
+      _puts buf
     end
 
     def self.clear
@@ -44,6 +50,10 @@ class CommandLinePlatform
 
     def self.display_bitmap(path, row, column)
     end
+
+    def self._puts(*args)
+      standard_output.puts(*args)
+    end
   end
 
   class Network

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.15
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -99,6 +99,7 @@ files:
 - lib/da_funk/helper.rb
 - lib/da_funk/iso8583.rb
 - lib/da_funk/rake_task.rb
+- lib/da_funk/screen.rb
 - lib/da_funk/test.rb
 - lib/device.rb
 - lib/device/application.rb
@@ -113,7 +114,7 @@ files:
 - lib/device/notification_callback.rb
 - lib/device/notification_event.rb
 - lib/device/params_dat.rb
-- lib/device/print.rb
+- lib/device/printer.rb
 - lib/device/runtime.rb
 - lib/device/setting.rb
 - lib/device/support.rb
@@ -123,12 +124,14 @@ files:
 - lib/device/transaction/iso.rb
 - lib/device/version.rb
 - lib/ext/kernel.rb
+- lib/ext/string.rb
 - lib/file_db.rb
 - lib/iso8583/bitmap.rb
 - lib/iso8583/codec.rb
 - lib/iso8583/exception.rb
 - lib/iso8583/field.rb
 - lib/iso8583/fields.rb
+- lib/iso8583/file_parser.rb
 - lib/iso8583/message.rb
 - lib/iso8583/util.rb
 - lib/iso8583/version.rb
@@ -147,9 +150,11 @@ files:
 - test/unit/device/application_test.rb
 - test/unit/device/display_test.rb
 - test/unit/device/helper_test.rb
+- test/unit/device/io_test.rb
 - test/unit/device/notification_callback_test.rb
 - test/unit/device/notification_event_test.rb
 - test/unit/device/notification_test.rb
+- test/unit/ext/string_test.rb
 - test/unit/file_db_test.rb
 - test/unit/iso8583_test.rb
 - test/unit/params_dat_test.rb
@@ -188,9 +193,11 @@ test_files:
 - test/unit/device/application_test.rb
 - test/unit/device/display_test.rb
 - test/unit/device/helper_test.rb
+- test/unit/device/io_test.rb
 - test/unit/device/notification_callback_test.rb
 - test/unit/device/notification_event_test.rb
 - test/unit/device/notification_test.rb
+- test/unit/ext/string_test.rb
 - test/unit/file_db_test.rb
 - test/unit/iso8583_test.rb
 - test/unit/params_dat_test.rb