da_funk 0.5.4 → 0.6.0

data/lib/da_funk/helper.rb

@@ -16,46 +16,45 @@ module DaFunk
 
     def attach
       Device::Display.clear
-      puts "Connecting..."
+      I18n.pt(:attach_connecting)
       if Device::Network.connected? < 0
         if (ret = Device::Network.attach) == 0
-          puts "Successfully Connected"
+          I18n.pt(:attach_connected)
         else
-          puts "Attach fail #{ret}"
+          I18n.pt(:attach_fail, :args => [ret.to_s])
           sleep 4
           return false
         end
       else
-        puts "Already connected"
+        I18n.pt(:attach_already_connected)
       end
       true
     end
 
-    # TODO Add i18n or something
     def check_download_error(ret)
       value = true
       case ret
       when Device::Transaction::Download::SERIAL_NUMBER_NOT_FOUND
-        puts "Serial number not found."
+        I18n.pt(:download_serial_number_not_found, :args => [ret])
         value =  false
       when Device::Transaction::Download::FILE_NOT_FOUND
-        puts "File not found."
+        I18n.pt(:download_file_not_found, :args => [ret])
         value = false
       when Device::Transaction::Download::FILE_NOT_CHANGE
-        puts "File is the same."
+        I18n.pt(:download_file_is_the_same, :args => [ret])
       when Device::Transaction::Download::SUCCESS
-        puts "Success."
+        I18n.pt(:download_success, :args => [ret])
       when Device::Transaction::Download::COMMUNICATION_ERROR
-        puts "Communication failure."
+        I18n.pt(:download_communication_failure, :args => [ret])
         value = false
       when Device::Transaction::Download::MAPREDUCE_RESPONSE_ERROR
-        puts "Encoding error."
+        I18n.pt(:download_encoding_error, :args => [ret])
         value = false
       when Device::Transaction::Download::IO_ERROR
-        puts "IO Error."
+        I18n.pt(:download_io_error, :args => [ret])
         value = false
       else
-        puts "Communication fail."
+        I18n.pt(:download_communication_failure, :args => [ret])
         value = false
       end
 
@@ -72,6 +71,17 @@ module DaFunk
       ret
     end
 
+    def try_key(keys, timeout = Device::IO.timeout)
+      key = nil
+      keys = [keys].flatten
+      time = Time.now + timeout / 1000 if (timeout != 0)
+      while (! keys.include?(key)) do
+        return Device::IO::KEY_TIMEOUT if (timeout != 0 && time < Time.now)
+        key = getc(timeout)
+      end
+      key
+    end
+
     # Create a form menu.
     #
     # @param title [String] Text to display on line 0. If nil title won't be
@@ -98,26 +108,86 @@ module DaFunk
     #   menu("Option menu", selection, options)
     #
     def menu(title, selection, options = {})
-      options[:number] = true if options[:number].nil?
+      return nil if selection.empty?
+      options[:number]    = true if options[:number].nil?
+      options[:timeout] ||= Device::IO.timeout
+      key, selected = pagination(title, options, selection) do |collection, line_zero|
+        collection.each_with_index do |value,i|
+          display = value.is_a?(Array) ? value[0] : value
+          if options[:number]
+            Device::Display.print("#{i+1} #{display}", i+line_zero, 0)
+          else
+            Device::Display.print("#{display}", i+line_zero, 0)
+          end
+        end
+      end
 
-      if title
-        Device::Display.clear
-        print_title(title, options[:default])
+      if key == Device::IO::ENTER || key == Device::IO::CANCEL
+        options[:default]
+      else
+        selected
       end
-      values = Hash.new
-      selection.each_with_index do |value,i|
-        values[i.to_i] = value[1]
-        if options[:number]
-          Device::Display.print("#{i+1} - #{value[0]}", i+2, 0)
-        else
-          Device::Display.print(value[0], i+2, 0)
+    end
+
+    # 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)
+        page  = 1
+        while(key == Device::IO::F1 || key == Device::IO::F2)
+          Device::Display.clear
+          print_title(title, options[:default]) if title
+          Device::Display.print("< F1 ____ #{page}/#{pages.size} ____ F2 >", start_line, 0)
+          values = pages[page].to_a
+          block.call(values, start_line+1)
+          key  = try_key(pagination_keys(values.size))
+          page = pagination_key_page(page, key, pages.size)
         end
+      else
+        Device::Display.clear
+        print_title(title, options[:default]) if title
+        values = collection.to_a
+        block.call(values, start_line)
+        key = try_key(pagination_keys(collection.size))
+      end
+      result = values[key.to_i-1] if key.integer?
+      if result.is_a? Array
+        [key, result[1]]
+      else
+        [key, result]
       end
+    end
 
-      key = getc(options[:timeout] || Device::IO.timeout)
+    def pagination_key_page(page, key, size)
+      if key == Device::IO::F1
+        page == 1 ? page : page -= 1
+      elsif key == Device::IO::F2
+        page >= size ? size : page += 1
+      end
+    end
 
-      return options[:default] if key == Device::IO::ENTER || key == Device::IO::CANCEL
-      [values[key.to_i - 1]].flatten.first
+    def pagination_page(values, size)
+      page = 1
+      i = 0
+      values.group_by do |value|
+        if size < (i+=1)
+          page+=1; i=0
+        end
+        page
+      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::F1, Device::IO::F2]
     end
 
     def number_to_currency(value, options = {})
@@ -146,12 +216,7 @@ module DaFunk
         text << ch
         text << options[:delimiter] if (i % 3 == 0) && (len - unit.size) != i
       end
-      currency = [rjust(text.reverse, 1, "0"),rjust(unit, options[:precision], "0")].join options[:separator]
-      if options[:label]
-        options[:label] + currency
-      else
-        currency
-      end
+      [rjust(text.reverse, 1, "0"),rjust(unit, options[:precision], "0")].join options[:separator]
     end
 
     def ljust(string, size, new_string)
@@ -183,9 +248,9 @@ module DaFunk
 
     def print_title(string, default)
       if default
-        puts("#{string} (#{default}):")
+        puts("#{string} (#{default})")
       else
-        puts("#{string}:")
+        puts("#{string}")
       end
     end
   end

data/lib/da_funk/i18n.rb

@@ -0,0 +1,77 @@
+class I18n
+  include DaFunk::Helper
+  class << self
+    attr_accessor :locale, :hash, :block_parse, :klasses
+  end
+
+  self.block_parse = Proc.new do |hash_,values_|
+    if values_[1].is_a?(Hash)
+      hash_[values_[0]] = values_[1].inject({}, &block_parse)
+    else
+      hash_[values_[0].to_sym] = values_[1]
+    end
+    hash_
+  end
+
+  def self.filepath(klass)
+    "./#{klass}/i18n.json"
+  end
+
+  def self.configure(klass, locale)
+    raise I18nError.new("File not found") if (! File.exists?(filepath(klass)))
+    self.parse(klass)
+    @locale = locale
+    raise I18nError.new("Locale not found") unless language
+  end
+
+  def self.parse(klass)
+    @klasses ||= []
+    if @hash
+      self.merge(JSON.parse(File.read(filepath(klass))).inject({}, &block_parse))
+    else
+      @hash = JSON.parse(File.read(filepath(klass))).inject({}, &block_parse)
+    end
+    @klasses << klass
+  end
+
+  def self.merge(hash2)
+    @hash ||= {}
+    hash2.keys.each do |key|
+      @hash[key] ||= {}
+      @hash[key].merge!(hash2[key] || {})
+    end
+  end
+
+  def self.language
+    @hash[@locale]
+  end
+
+  def self.t(symbol, options = {})
+    if ! options[:time].nil?
+      parse_time(get(symbol), options[:time])
+    elsif options[:args]
+      get(symbol) % options[:args]
+    else
+      get(symbol)
+    end
+  end
+
+  def self.get(symbol)
+    language[symbol] || "No Translation"
+  end
+
+  def self.pt(symbol, options = {})
+    puts(t(symbol, options))
+  end
+
+  def self.parse_time(value, time)
+    value.sub("yy", time.year.to_s).
+      sub("y", time.year.to_s[2..3]).
+      sub("M", rjust(time.month.to_s, 2, "0")).
+      sub("d", rjust(time.day.to_s, 2, "0")).
+      sub("h", rjust(time.hour.to_s, 2, "0")).
+      sub("m", rjust(time.min.to_s, 2, "0")).
+      sub("s", rjust(time.sec.to_s, 2, "0"))
+  end
+end
+

data/lib/da_funk/i18n_error.rb

@@ -0,0 +1,3 @@
+class I18nError < StandardError
+end
+

data/lib/da_funk/iso8583.rb

@@ -9,4 +9,5 @@ file_path = File.join(File.dirname(File.realpath(__FILE__)), "..")
   require file_path + "/iso8583/message.rb"
   require file_path + "/iso8583/util.rb"
   require file_path + "/iso8583/version.rb"
+  require file_path + "/iso8583/file_parser.rb"
 end

data/lib/da_funk/rake_task.rb

@@ -10,7 +10,8 @@ module DaFunk
     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, :debug
+      :test_out, :resources, :mrbc, :mruby, :out_path, :resources_out, :debug,
+      :tests_resources, :tests_res_out
 
     def initialize
       yield self if block_given?
@@ -20,6 +21,7 @@ module DaFunk
       @tests             ||= FileList['test/**/*test.rb']
       @tests_integration ||= FileList['test/integration/**/*test.rb']
       @tests_unit        ||= FileList['test/unit/**/*test.rb']
+      @tests_resources   ||= FileList['test/resources/**/*']
       @root_path         ||= "./"
       @name              ||= File.basename(File.expand_path(@root_path))
       @out_path          ||= File.join(root_path, "out", @name)
@@ -27,6 +29,7 @@ module DaFunk
       @test_out          ||= File.join(out_path, "test.mrb")
       @resources         ||= FileList['resources/**/*']
       @resources_out     ||= @resources.pathmap("%{resources,#{out_path}}p")
+      @tests_res_out     ||= @tests_resources.pathmap("%{test/resources,out}p")
       @mruby             ||= "cloudwalk run"
       @mrbc              = get_mrbc_bin(@mrbc)
 
@@ -117,6 +120,9 @@ module DaFunk
       namespace :test do
         task :setup => :resources do
           ENV["RUBY_PLATFORM"] = "mruby"
+          tests_resources.each_with_index do |file,dest_i|
+            FileUtils.cp(file, tests_res_out[dest_i]) if File.file?(file)
+          end
         end
 
         desc "Run unit test on mruby"

data/lib/da_funk/screen_flow.rb

@@ -0,0 +1,30 @@
+module DaFunk
+  class ScreenFlow
+    attr_accessor :list
+
+    def self.add(method, &block)
+      define_method method do
+        @list << CallbackFlow.new(self, @list.last, &block)
+        self
+      end
+    end
+
+    def initialize
+      self.list = []
+      order
+    end
+
+    def order
+    end
+
+    def start
+      first = self.list.first
+      first.dispatch(true) if first
+    end
+
+    def confirm(text)
+      puts text.chomp
+      getc(0)
+    end
+  end
+end

data/lib/device.rb

@@ -20,7 +20,7 @@ class Device
 
   def self.app_loop(&block)
     Device::Display.clear
-    puts "Checking Notifications..."
+    puts "SETUP NOTIFICATIONS..."
     Notification.setup
     loop do
       Notification.check

data/lib/device/application.rb

@@ -1,40 +1,98 @@
+# Scenario
+# 1. Load from scratch
+# - No file downloaded
+# - with file downloaded
+# 2. Second load
+# - No crc update
+# - With crc update
+
 class Device
   class Application
-    attr_reader :label, :file_path, :type, :crc, :order, :name
+    attr_accessor  :crc
+    attr_reader :label, :file, :type, :order, :name, :remote, :original, :crc_local
+
+    def self.delete(collection)
+      collection.each do |app|
+        begin
+          app.delete
+        rescue RuntimeError
+        end
+      end
+    end
 
-    def initialize(label, file_path, type, crc)
-      @name = label
+    def initialize(label, remote, type, crc)
+      @type     = type
+      @crc      = crc
+      @original = remote
       @order, @label = split_label(label)
-      @file_path = file_path
-      @type      = type
-      @crc       = crc
+      @remote    = remote.sub("#{Device::Setting.company_name}_", "")
+      @name      = remote.sub("#{Device::Setting.company_name}_", "").split(".")[0]
+      @file      = check_path(@remote)
+      @crc_local = @crc if File.exists?(@file)
     end
 
-    def file
-      @file ||= file_path.gsub("#{Device::Setting.company_name}_", "")
+    def download(force = false)
+      if force || outdated?
+        ret = Device::Transaction::Download.request_file(remote, file, crc_local)
+      else
+        ret = Device::Transaction::Download::FILE_NOT_CHANGE
+      end
+      @crc_local = @crc if ret == Device::Transaction::Download::SUCCESS
+      ret
     end
 
-    def file_no_ext
-      @file_no_ext ||= file.split(".")[0]
+    def dir
+      @name
     end
 
-    def zip
-      @zip ||= "#{file_no_ext}.zip"
+    def exists?
+      File.exists? file
+    end
+
+    def delete
+      File.delete(self.file) if exists?
+      if self.ruby? && Dir.exist?(self.dir) && self.dir != "main"
+        Dir.delete(self.dir)
+      end
     end
 
     def outdated?
-      return false unless File.exists?(@file_path)
-      file = File.open(@file_path)
-      Device::Crypto.crc16_hex(file.read) == @crc
+      return true unless File.exists?(file)
+      unless @crc_local
+        handle = File.open(file)
+        @crc_local = Device::Crypto.crc16_hex(handle.read)
+      end
+      @crc_local != @crc
     ensure
-      file.close if file
+      handle.close if handle
     end
 
     def execute(json = "")
-      Device::Runtime.execute(file_no_ext, json)
+      if posxml?
+        Device::Runtime.execute(remote, json)
+      else
+        Device::Runtime.execute(name, json)
+      end
+    end
+
+    def posxml?
+      @type == "posxml" || remote.include?(".posxml")
+    end
+
+    def ruby?
+      @type == "ruby" || (! remote.include? ".posxml")
     end
 
     private
+
+    def check_path(path)
+      if posxml?
+        "./shared/#{path}"
+      else
+        "#{path.gsub("#{Device::Setting.company_name}_", "")}.zip"
+      end
+    end
+
     def split_label(text)
       if text == "X"
         number, text = 0, "X"