da_funk 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f38c6bd31e1923473ee9fb7e8a2586c580c84ad9
-  data.tar.gz: 3cb20a51106207f50205378c1a7190cf9ac6ee34
+  metadata.gz: 4496b68749b99cd7e94762b1b777bfac209f9c3c
+  data.tar.gz: 93fb97750b50f3b1d8f300f0c966ba711368b1f7
 SHA512:
-  metadata.gz: 3c789324ce787dd86505a0317ff57d84b115e814347e992fea088d842c139329485638655c1a1eb78c83b058dcb03654f25a4468f7f645799a09feed4b0d439d
-  data.tar.gz: facc5c84e2a207eb4897d0fe89aa7223d86e1f026efc7465334b2ce0b467a88570b1f9eea5868341c7a2a4e59fb43e3aba7578046a99ff63fe606bde436c6910
+  metadata.gz: 60b5ebee450a3bdec5338790b9a25f12726690edb5cb715cb1ac8754ee2dcf44660d4fbe9faaf10dc2d1386ce3011520d2571dd1654d5c20b9ccc9d15830c043
+  data.tar.gz: 5fd1b4533020cb09e6e67376e6fb6b831adc9289e868a35d76f2ff52f21f0c25587cc76d473153bdf678b11f831a87bf9f17405554b2405319627480a0422ef6

data/Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    da_funk (0.4.10)
+    da_funk (0.4.11)
       bundler (~> 1.7)
       cloudwalk_handshake (~> 0.4)
       rake (~> 10.4)

data/README.md

@@ -7,14 +7,23 @@ Walk Framework API, responsible for managed compatibility between implemented de
 1. Install Ruby 1.9.3 (mruby compatible)
 
 2. Bundle `$ bundle install`
-	
+
+## Load
+
+### All 
+    require 'da_funk'
+
+### Only ISO8583 module 
+
+    require 'da_funk/iso8583'
+
 	
 ## Docs (yard)
 
 1. Generate: `$ rake yard`
 2. Open: `open docs/index.html`
 
-## How to
+## How to create Device
 
 ### Steps
 

data/RELEASE_NOTES.md

@@ -1,5 +1,15 @@
 # DaFunk
 
+### 0.4.11 - 2015-09-02 - Minor fixes and ISO
+- Bug fix strip key and value strings of FileDb.
+- Add FileDb#sanitize to strip and clean string(from quotes).
+- Update connection message.
+- Remove application crc check for while.
+- Add UI message to Notification process.
+- Fix application selection when just a single application is available.
+- Create DaFunk::Helper from Device::Helper.
+- Isolate ISO8583 to be load individually by require, `require 'da_funk/iso8583'`.
+
 ### 0.4.10 - 2015-08-14 - Check CRC during App Update
 - Update CloudwalkHandshake version.
 - Support to check CRC during app update, avoiding unnecessary download.

data/Rakefile

@@ -10,6 +10,7 @@ FileUtils.cd DA_FUNK_ROOT
 
 FILES = FileList[
   "lib/device/version.rb",
+  "lib/da_funk/helper.rb",
   "lib/da_funk.rb",
   "lib/da_funk/test.rb",
   "lib/device.rb",

data/lib/da_funk/helper.rb

@@ -0,0 +1,164 @@
+module DaFunk
+  module Helper
+    def self.included(base)
+      base.extend self
+    end
+
+    def form(label, options = {})
+      Device::Display.clear
+      options = form_default(options)
+      default = options.delete(:default)
+      puts "#{label} (#{default}):"
+      string = get_format(options.delete(:min), options.delete(:max), options)
+      return default if string.nil? || string.empty?
+      string
+    end
+
+    def attach
+      Device::Display.clear
+      puts "Connecting..."
+      if Device::Network.connected? < 0
+        if (ret = Device::Network.attach) == 0
+          puts "Successfully Connected"
+        else
+          puts "Attach fail #{ret}"
+          sleep 4
+          return false
+        end
+      else
+        puts "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."
+        value =  false
+      when Device::Transaction::Download::FILE_NOT_FOUND
+        puts "File not found."
+        value = false
+      when Device::Transaction::Download::FILE_NOT_CHANGE
+        puts "File is the same."
+      when Device::Transaction::Download::SUCCESS
+        puts "Success."
+      when Device::Transaction::Download::COMMUNICATION_ERROR
+        puts "Communication failure."
+        value = false
+      when Device::Transaction::Download::MAPREDUCE_RESPONSE_ERROR
+        puts "Encoding error."
+        value = false
+      when Device::Transaction::Download::IO_ERROR
+        puts "IO Error."
+        value = false
+      else
+        puts "Communication fail."
+        value = false
+      end
+
+      value
+    end
+
+    # @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}
+    #   }
+    def menu(title, selection, options = {})
+      options[:number] = true if options[:number].nil?
+
+      Device::Display.clear
+      print_title(title, options[:default])
+      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
+      end
+
+      key = getc
+
+      return options[:default] if key == IO::ENTER || key == IO::CANCEL
+      [values[key.to_i - 1]].flatten.first
+    end
+
+    def number_to_currency(value, options = {})
+      options[:delimiter] ||= ","
+      options[:precision] ||= 2
+      options[:separator] ||= "."
+
+      if value.is_a? Float
+        number, unit = value.to_s.split(".")
+        unit = unit.to_s
+        len = number.size + unit.size
+      else
+        len    = value.to_s.size
+        unit   = value.to_s[(len - options[:precision])..-1]
+        if len <= options[:precision]
+          number = ""
+        else
+          number = value.to_s[0..(len - (options[:precision] + 1)).abs]
+        end
+      end
+
+      text = ""
+      i = 0
+      number.reverse.each_char do |ch|
+        i += 1
+        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
+    end
+
+    def ljust(string, size, new_string)
+      string_plain = string.to_s
+      if size > string_plain.size
+        string_plain + (new_string * (size - string_plain.size))
+      else
+        string_plain
+      end
+    end
+
+    def rjust(string, size, new_string)
+      string_plain = string.to_s
+      if size > string_plain.size
+        (new_string * (size - string_plain.size)) + string_plain
+      else
+        string_plain
+      end
+    end
+
+    private
+    def form_default(options = {})
+      options[:default] ||= ""
+      options[:mode]    ||= Device::IO::IO_INPUT_LETTERS
+      options[:min]     ||= 0
+      options[:max]     ||= 20
+      options
+    end
+
+    def print_title(string, default)
+      if default
+        puts("#{string} (#{default}):")
+      else
+        puts("#{string}:")
+      end
+    end
+  end
+
+end
+

data/lib/da_funk/iso8583.rb

@@ -0,0 +1,11 @@
+unless Object.const_defined?(:MTest)
+file_path = File.join(File.dirname(File.realpath(__FILE__)), "..")
+  require file_path + "/iso8583/bitmap.rb"
+  require file_path + "/iso8583/codec.rb"
+  require file_path + "/iso8583/exception.rb"
+  require file_path + "/iso8583/field.rb"
+  require file_path + "/iso8583/fields.rb"
+  require file_path + "/iso8583/message.rb"
+  require file_path + "/iso8583/util.rb"
+  require file_path + "/iso8583/version.rb"
+end

data/lib/da_funk.rb

@@ -1,5 +1,9 @@
 unless Object.const_defined?(:MTest)
   file_path = File.dirname(File.realpath(__FILE__))
+  require file_path + "/da_funk/helper.rb"
+  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 + "/device/support.rb"
   require file_path + "/device/helper.rb"
   require file_path + "/device/crypto.rb"
@@ -24,8 +28,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 + "/da_funk/rake_task.rb"
-  require file_path + "/da_funk/test.rb"
   require file_path + "/../utils/command_line_platform.rb"
 end
 

data/lib/device/helper.rb

@@ -1,163 +1,5 @@
 class Device
-  module Helper
-    def self.included(base)
-      base.extend Device::Helper
-    end
-
-    def form(label, options = {})
-      Device::Display.clear
-      options = form_default(options)
-      default = options.delete(:default)
-      puts "#{label} (#{default}):"
-      string = get_format(options.delete(:min), options.delete(:max), options)
-      return default if string.nil? || string.empty?
-      string
-    end
-
-    def attach
-      Device::Display.clear
-      puts "Connecting..."
-      if Device::Network.connected? < 0
-        if (ret = Device::Network.attach) == 0
-          puts "Connected #{ret}"
-        else
-          puts "Attach fail #{ret}"
-          sleep 4
-          return false
-        end
-      else
-        puts "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."
-        value =  false
-      when Device::Transaction::Download::FILE_NOT_FOUND
-        puts "File not found."
-        value = false
-      when Device::Transaction::Download::FILE_NOT_CHANGE
-        puts "File is the same."
-      when Device::Transaction::Download::SUCCESS
-        puts "Success."
-      when Device::Transaction::Download::COMMUNICATION_ERROR
-        puts "Communication failure."
-        value = false
-      when Device::Transaction::Download::MAPREDUCE_RESPONSE_ERROR
-        puts "Encoding error."
-        value = false
-      when Device::Transaction::Download::IO_ERROR
-        puts "IO Error."
-        value = false
-      else
-        puts "Communication fail."
-        value = false
-      end
-
-      value
-    end
-
-    # @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}
-    #   }
-    def menu(title, selection, options = {})
-      options[:number] = true if options[:number].nil?
-
-      Device::Display.clear
-      print_title(title, options[:default])
-      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
-      end
-
-      key = getc
-
-      return options[:default] if key == IO::ENTER || key == IO::CANCEL
-      [values[key.to_i - 1]].flatten.first
-    end
-
-    def number_to_currency(value, options = {})
-      options[:delimiter] ||= ","
-      options[:precision] ||= 2
-      options[:separator] ||= "."
-
-      if value.is_a? Float
-        number, unit = value.to_s.split(".")
-        unit = unit.to_s
-        len = number.size + unit.size
-      else
-        len    = value.to_s.size
-        unit   = value.to_s[(len - options[:precision])..-1]
-        if len <= options[:precision]
-          number = ""
-        else
-          number = value.to_s[0..(len - (options[:precision] + 1)).abs]
-        end
-      end
-
-      text = ""
-      i = 0
-      number.reverse.each_char do |ch|
-        i += 1
-        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
-    end
-
-    def ljust(string, size, new_string)
-      string_plain = string.to_s
-      if size > string_plain.size
-        string_plain + (new_string * (size - string_plain.size))
-      else
-        string_plain
-      end
-    end
-
-    def rjust(string, size, new_string)
-      string_plain = string.to_s
-      if size > string_plain.size
-        (new_string * (size - string_plain.size)) + string_plain
-      else
-        string_plain
-      end
-    end
-
-    private
-    def form_default(options = {})
-      options[:default] ||= ""
-      options[:mode]    ||= Device::IO::IO_INPUT_LETTERS
-      options[:min]     ||= 0
-      options[:max]     ||= 20
-      options
-    end
-
-    def print_title(string, default)
-      if default
-        puts("#{string} (#{default}):")
-      else
-        puts("#{string}:")
-      end
-    end
-  end
+  # Backward compatibility
+  Helper = DaFunk::Helper
 end
 

data/lib/device/params_dat.rb

@@ -78,7 +78,7 @@ class Device
     end
 
     def self.update_app(application)
-      if attach && application && application.outdated?
+      if attach && application
         Device::Display.clear
         puts "Downloading #{application.file}..."
         ret = Device::Transaction::Download.request_file(application.file, application.zip)
@@ -97,7 +97,7 @@ class Device
     def self.executable_app
       selected = self.executable_apps
       if selected.size == 1
-        selected[selected.keys.first]
+        selected.first
       end
     end
 

data/lib/device/version.rb

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

data/lib/device.rb

@@ -19,6 +19,8 @@ class Device
   end
 
   def self.app_loop(&block)
+    Device::Display.clear
+    puts "Checking Notifications..."
     Notification.setup
     loop do
       Notification.check

data/lib/file_db.rb

@@ -20,8 +20,9 @@ class FileDb
   def parse(text)
     text.split("\n").compact.each do |line|
       key_value = line.split("=")
-      if key_value[1] && (@hash[key_value[0]].nil? || @hash[key_value[0]].empty?)
-        @hash[key_value[0]] = key_value[1]
+      key, value = sanitize(key_value[0]), sanitize(key_value[1])
+      if key_value[1] && (@hash[key].nil? || @hash[key].empty?)
+        @hash[key] = value
       end
     end
   end
@@ -43,5 +44,14 @@ class FileDb
   def [](key)
     @hash[key]
   end
+
+  private
+  def sanitize(string)
+    new_string = string.to_s.strip
+    if new_string[0] == "\"" && new_string[-1] == "\""
+      new_string = new_string[1..-2]
+    end
+    new_string
+  end
 end
 

data/lib/iso8583/bitmap.rb

@@ -11,7 +11,7 @@ module ISO8583
   # In all likelyhood, you won't be using this class much, it's used
   # transparently by the Message class.
   class Bitmap
-    include Device::Helper
+    include DaFunk::Helper
     # create a new Bitmap object. In case an iso message
     # is passed in, that messages bitmap will be parsed. If
     # not, this initializes and empty bitmap.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -96,6 +96,8 @@ files:
 - guides/sample_transaction_iso8583.rb
 - imgs/daft-punk-da-funk.jpg
 - lib/da_funk.rb
+- lib/da_funk/helper.rb
+- lib/da_funk/iso8583.rb
 - lib/da_funk/rake_task.rb
 - lib/da_funk/test.rb
 - lib/device.rb