da_funk 0.5.4 → 0.6.0

data/lib/device/crypto.rb

@@ -1,6 +1,7 @@
 
 class Device
   class Crypto
+    include DaFunk::Helper
     CCITT_16 = [
       0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
       0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF,
@@ -40,7 +41,7 @@ class Device
       crc = crc16(buf)
       # to swap the number just invert the order of the indexes [0..1] and [2..3]
       #"#{crc.to_s(16).rjust(4,"0")[0..1]}#{crc.to_s(16).rjust(4,"0")[2..3]}".upcase
-      crc.to_s(16).upcase
+      rjust(crc.to_s(16).upcase, 4, "0")
     end
 
     def self.crc16(buf, crc=0)

data/lib/device/io.rb

@@ -85,6 +85,8 @@ class Device
     # @param max [Fixnum] Maximum length of the input string (127 bytes maximum).
     # @param options [Hash]
     #
+    # :value - Represent the current value, to be initially used.
+    #
     # :precision - Sets the level of precision (defaults to 2).
     #
     # :separator - Sets the separator between the units (defaults to “.”).
@@ -109,7 +111,7 @@ class Device
     # @return [String] buffer read from keyboard
     def self.get_format(min, max, options = {})
       set_default_format_option(options)
-      key = text = ""
+      key = text = options[:value] || ""
 
       while key != CANCEL
         Device::Display.clear options[:line]
@@ -117,7 +119,7 @@ class Device
         key = getc
         if key == BACK
           text = text[0..-2]
-        elsif key == ENTER
+        elsif key == ENTER || key == KEY_TIMEOUT
           return text
         elsif key ==  F1 || key == DOWN || key == UP
           change_next(text, check_mask_type(text, options))
@@ -176,6 +178,7 @@ class Device
     def self.getc(timeout = self.timeout); super(timeout); end
 
     def self.format(string, options)
+      options[:label].to_s +
       if options[:mode] == IO_INPUT_MONEY || options[:mode] == IO_INPUT_DECIMAL
         number_to_currency(string, options)
       elsif options[:mode] == IO_INPUT_SECRET

data/lib/device/network.rb

@@ -61,8 +61,12 @@ class Device
     end
 
     def self.connected?
-      return NO_CONNECTION unless self.adapter.started?
-      adapter.connected?
+      if self.adapter.started? ||
+        (self.configured? && Device::Network.init(*self.config) == SUCCESS)
+
+        return adapter.connected?
+      end
+      NO_CONNECTION
     end
 
     def self.configured?
@@ -78,7 +82,11 @@ class Device
     end
 
     def self.sim_id
-      adapter.sim_id
+      if adapter.respond_to? :sim_id
+        adapter.sim_id
+      else
+        ""
+      end
     end
 
     # Check signal value
@@ -139,6 +147,7 @@ class Device
         if ret == SUCCESS && (wifi? || ethernet?)
           Device::Network.dhcp_client(20000)
         end
+        Device::Setting.network_configured = 0 if ret != SUCCESS 
       end
       ret
     end

data/lib/device/notification.rb

@@ -41,7 +41,7 @@ class Device
     end
 
     def self.start
-      if create_fiber? && Device::Network.connected?
+      if create_fiber? && Device::Network.connected? == Device::Network::SUCCESS
         unless Device::Notification.current && Device::Notification.current.closed?
           self.new(*self.config)
         end
@@ -87,7 +87,7 @@ class Device
 
     # Check if there is any notification
     def check
-      if valid_check_interval? && Device::Network.connected?
+      if valid_check_interval? && Device::Network.connected? == Device::Network::SUCCESS
         if @fiber.alive?
           if (notification = @fiber.resume)
             Notification.execute(NotificationEvent.new(notification))
@@ -152,7 +152,7 @@ class Device
             conn.stream(subscription) { |ev| reply(conn, ev) }
           end
           true
-        rescue Serfx::RPCError => exception
+        rescue => exception
           check_errors(exception)
         end
       end

data/lib/device/params_dat.rb

@@ -5,13 +5,14 @@ class Device
     include Device::Helper
 
     class << self
-      attr_accessor :file, :apps, :status
+      attr_accessor :file, :apps, :valid, :files
     end
 
     self.apps = Array.new
+    self.files = Array.new
 
     # To control if there is any app and parse worked
-    self.status = false
+    self.valid = false
 
     def self.file
       self.setup unless @file
@@ -22,6 +23,47 @@ class Device
       @file = FileDb.new(FILE_NAME)
     end
 
+    def self.exists?
+      File.exists?(FILE_NAME)
+    end
+
+    def self.ready?
+      return unless exists?
+      apps.each {|app| return false if app.outdated? } if apps.size > 0
+      files.each {|f| return false if f.outdated? } if files.size > 0
+      true
+    end
+
+    def self.parse_apps
+      new_apps = []
+      self.file["apps_list"].to_s.gsub("\"", "").split(";").each do |app|
+        label, name, type, crc = app.split(",")
+        if application = get_app(name)
+          application.crc = crc
+        else
+          application = Device::Application.new(label, name, type, crc)
+        end
+        new_apps << application
+      end
+      Device::Application.delete(@apps - new_apps)
+      @apps = new_apps
+    end
+
+    def self.parse_files
+      new_files = []
+      self.file["files_list"].to_s.gsub("\"", "").split(";").each do |f|
+        name, crc = f.split(",")
+        if file_ = get_file(name)
+          file_.crc = crc
+        else
+          file_ = DaFunk::FileParameter.new(name, crc)
+        end
+        new_files << file_
+      end
+      Device::Application.delete(@files - new_files)
+      @files = new_files
+    end
+
     # TODO Scalone: Change after @bmsatierf change the format
     # For each apps on apps_list We'll have:
     # Today: <label>,<arquivo>,<pages>,<crc>;
@@ -29,64 +71,85 @@ class Device
     # Today: "1 - App,pc2_app.posxml,1,E0A0;"
     # After: "1 - App,pc2_app.posxml,posxml,E0A0;"
     # After: "1 - App,pc2_app.zip,ruby,E0A0;"
-    def self.parse_apps
-      @apps = []
+    def self.parse
       return unless self.setup
-
-      self.file["apps_list"].to_s.gsub("\"", "").split(";").each do |app|
-        @apps << Device::Application.new(*app.split(","))
-      end
+      parse_apps
+      parse_files
 
       if (@apps.size >= 1)
-        self.status = true
+        self.valid = true
       else
-        self.status = false
+        self.valid = false
       end
+      self.valid
+    end
+
+    def self.get_app(name)
+      @apps.each {|app| return app if app.original == name }
+      nil
+    end
+
+    def self.get_file(name)
+      @files.each {|file_| return file_ if file_.original == name}
+      nil
     end
 
     def self.download
       if attach
-        value = try(3) do |tried|
+        parse
+        ret = try(3) do |tried|
           Device::Display.clear
-          puts "Downloading (#{tried})"
-          puts "Parameters"
+          I18n.pt(:downloading_content, :args => ["PARAMS", 1, 1])
           ret = Device::Transaction::Download.request_param_file(FILE_NAME)
           check_download_error(ret)
         end
-        parse_apps if value
-        value
+        parse if ret
+        ret
       end
     end
 
     def self.update_apps(force = false)
-      if force || ! self.status
-        self.download
-      end
-      if self.status
-        @apps.each do |app|
-          self.update_app(app)
+      self.download if force || ! self.valid
+      if self.valid
+        size_apps = @apps.size
+        @apps.each_with_index do |app, index|
+          self.update_app(app, index+1, size_apps)
+        end
+
+        size_files = @files.size
+        @files.each_with_index do |file_, index|
+          self.update_file(file_, index+1, size_files)
         end
       end
     end
 
     def self.format!
-      self.apps.each do |app|
-        File.delete(app.zip) if File.exists?(app.zip)
-        Dir.delete(app.file_no_ext) if File.exists?(app.file_no_ext) && File.exists?(app.file_no_ext)
-      end
-      File.delete(FILE_NAME) if File.exists?(FILE_NAME)
-      Device::System.restart
+      Device::Application.delete(self.apps)
+      DaFunk::FileParameter.delete(self.files)
+      File.delete(FILE_NAME) if exists?
+      @apps = []
+      @files = []
     end
 
-    def self.update_app(application)
+    def self.update_app(application, index = 1, all = 1, force = false)
       if attach && application
         try(3) do |tried|
           Device::Display.clear
-          puts "Downloading (#{tried})"
-          puts "#{application.file}..."
-          ret = Device::Transaction::Download.request_file(application.file, application.zip)
+          I18n.pt(:downloading_content, :args => [I18n.t(:apps), index, all])
+          ret = check_download_error(application.download(force))
+          sleep(1)
+          ret
+        end
+      end
+    end
 
-          ret = check_download_error(ret)
+    def self.update_file(file_parameter, index = 1, all = 1, force = false)
+      if attach && file_parameter
+        try(3) do |tried|
+          Device::Display.clear
+          I18n.pt(:downloading_content, :args => [I18n.t(:files), index, all])
+          ret = check_download_error(file_parameter.download(force))
+          file_parameter.unzip if ret
           sleep(1)
           ret
         end
@@ -94,13 +157,18 @@ class Device
     end
 
     def self.apps
-      self.parse_apps unless self.status
+      self.parse unless self.valid
       @apps
     end
 
+    def self.files
+      self.parse unless self.valid
+      @files
+    end
+
     def self.executable_app
       selected = self.executable_apps
-      if selected.size == 1
+      if selected && selected.size == 1
         selected.first
       end
     end

data/lib/device/printer.rb

@@ -19,7 +19,7 @@ class Device
     DEFAULT_MULTI_HEIGHT  = 24
 
     def self.adapter
-      Device.adapter::Print
+      Device.adapter::Printer
     end
 
     # Initialize Printer device.

data/lib/device/setting.rb

@@ -43,11 +43,12 @@ class Device
       "notification_stream_timeout" => "", # Time to wait stream message to read
       "cw_switch_version"           => "",
       "cw_pos_timezone"             => "",
-      "tcp_recv_timeout"            => "0",
+      "tcp_recv_timeout"            => "14",
       "iso8583_recv_tries"          => "0",
       "iso8583_send_tries"          => "0",
       "crypto_dukpt_slot"           => "",
       "ctls"                        => "",
+      "locale"                      => "en",
       "company_name"                => ""
     }
 
@@ -89,6 +90,10 @@ class Device
       false
     end
 
+    def self.update_attributes(*args)
+      @file.update_attributes(*args)
+    end
+
     def self.method_missing(method, *args, &block)
       setup unless @file
       param = method.to_s

data/lib/device/transaction/download.rb

@@ -20,12 +20,12 @@ class Device
       MAPREDUCE_RESPONSE_ERROR = -2
       IO_ERROR                 = -3
 
-      def self.request_file(remote_path, local_path)
+      def self.request_file(remote_path, local_path, crc = "")
         download = Device::Transaction::Download.new(Device::System.serial, "", Device.version)
         download.perform(Device::Network.socket,
                          Device::Setting.company_name,
                          remote_path, local_path, Device::System.app,
-                         Device::Setting.logical_number)
+                         Device::Setting.logical_number, crc)
       end
 
       def self.request_param_file(file = PARAMS_FILE)
@@ -44,8 +44,12 @@ class Device
       # -1: Commnucation error
       # -2: Mapreduce response error
       # -3: IO Error
-      def perform(socket_proc, company_name, remote_path, filepath, current_app, logical_number, file_crc = nil)
-        @socket, @buffer, @request, @first_packet = socket_proc.call, "", "", ""
+      def perform(socket_proc, company_name, remote_path, filepath, current_app, logical_number, file_crc = nil, socket_call = true)
+        if socket_call
+          @socket, @buffer, @request, @first_packet = socket_proc.call, "", "", ""
+        else
+          @socket, @buffer, @request, @first_packet = socket_proc, "", "", ""
+        end
         @crc = file_crc ? file_crc : generate_crc(filepath)
         key = "#{company_name}_#{remote_path}"
 
@@ -107,7 +111,9 @@ class Device
 
         # receive 6A
         @socket.read(1) if response_size > 1024
-        @socket.close unless @socket.closed?
+        if socket_call
+          @socket.close unless @socket.closed?
+        end
 
         return_code
       end

data/lib/device/version.rb

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

data/lib/ext/string.rb

@@ -9,5 +9,11 @@ class String
   def chars
     self.split("")
   end
+
+  def integer?
+    !!Integer(self)
+  rescue ArgumentError
+    return false
+  end
 end
 

data/lib/file_db.rb

@@ -30,13 +30,17 @@ class FileDb
     @hash.each do |line_key, line_value|
       file_new.puts("#{line_key}=#{line_value}")
     end
+    true
+  rescue
+    false
+  ensure
     file_new.close
   end
 
   def []=(key, value)
     value = value.to_s
-    old = @hash[key]
-    ret = @hash[key] = value
+    old = @hash[key.to_s]
+    ret = @hash[key.to_s] = value
     save if old != value
     ret
   end
@@ -47,7 +51,7 @@ class FileDb
 
   def update_attributes(values = Hash.new)
     values.each do |key, value|
-      @hash[key] = value
+      @hash[key.to_s] = value.to_s
     end
     save
   end

data/lib/iso8583/bitmap.rb

@@ -39,7 +39,7 @@ module ISO8583
     # Set the bit to the indicated value. Only `true` sets the
     # bit, any other value unsets it.
     def []=(i, value)
-      if i > 128 
+      if i > 128
         raise ISO8583Exception.new("Bits > 128 are not permitted.")
       elsif i < 2
         raise ISO8583Exception.new("Bits < 2 are not permitted (continutation bit is set automatically)")
@@ -59,15 +59,12 @@ module ISO8583
 
     # Generate the bytes representing this bitmap.
     def to_bytes
-      arr = [self.to_s]
-      # tricky and ugly, setting bit[1] only when generating to_s...
-      count = self[1] ? 128 : 64
-      arr.pack("B#{count}")
+      self.to_s.to_i(2).to_s(16).upcase
     end
     alias_method :to_b, :to_bytes
 
     def to_hex
-      "%02x" % self.to_s.to_i(2)
+      self.to_s.to_i(2).to_s(16).upcase.unpack("H*").first
     end
 
     # Generate a String representation of this bitmap in the form: