da_funk 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1428a015e59da2c2ba1c5b7db367d3a675d8dc27
-  data.tar.gz: 9932163afefdab19e28393464f99aeebbc3a450b
+  metadata.gz: ec1d9846f46aa2dac82e6aa65bcda41838400d2b
+  data.tar.gz: 81335482ebcc090564b03cfeec21434f29fc6be2
 SHA512:
-  metadata.gz: 99b76fb9cf5da0fbdc7e1b9c40fd3e687ef5f650facf6b89b228f0680e3e949e9d5ff06e60e8fbe8be8c12de2898689ba66c4592ee3d10e0ef8d78d355ccf80c
-  data.tar.gz: 39ad52f41a43b49e6c6e053a9a0c1c691a4d4755d37414221678bc4be7533c4b75169fe325d90cc42e31eee2c8e9333c4a8ff680ea1e6bc831ada8a4edf5dc12
+  metadata.gz: cf63404ca741cae273ba0c59ab2c88ba9c46b3b211d82faaa41a18f25bec532f8458fc7d4e6db258189a071be125f91e640d240e1ab6242620a9b0c5ea908b44
+  data.tar.gz: e9d59a6978b202957fb58e522d1c76835c8649d7dc86545cd9a50ce3f28a502affa7da2b2c39856209a34b41ae4ac89f2a78ebf6b6bc78ef57a9cd1d1b5f6d25

data/README.md

@@ -18,34 +18,19 @@ Walk Framework API, responsible for managed compatibility between implemented de
 
 ### Steps
 
-1. Add da_funk as submodule `$ git submodule add git@github.com:cloudwalkio/da_funk.git <path/to/lib/da_funk>`
+1. Add da_funk as submodule of your platform project, check the sample  [here](https://github.com/cloudwalkio/around_the_world) `$ git submodule add git@github.com:cloudwalkio/da_funk.git <path/to/lib/da_funk>`
 
-2. Develop start method in platform abstraction.
+2. Develop setup method in platform abstraction.
 
-	Start method is responsible for start the runtime in our platform. And should require the da_funk lib(common lib between platforms).
+	Setup method will be called in every app execution, should be use to filesystem preparation or any shore needed by the app environment. Check the sample [here](https://github.com/cloudwalkio/mruby-cloudwalk-platform).
 
 		class PlatformInterface
-		  	def self.start(file = "./main.mrb")
-			    begin
-					require "./da_funk.mrb"
-					require "./platform.mrb"
-					require file
-
-					app = Device::Support.path_to_class file
-
-					loop do
-						app.call
-					end
-			    rescue => @exception
-					puts "#{@exception.class}: #{@exception.message}"
-					puts "#{@exception.backtrace[0..2].join("\n")}"
-    				IO.getc
-					return nil
-				end
-			end
+		    def self.setup
+		        # Configuration and initialization before apps execution
+		    end
 		end
 		
-3. Develop interface required by DaFunk on PlatformInterface, could be the same file you have start method.
+3. Develop interface required by DaFunk on PlatformInterface, could be the same file you have setup method.
 
 		class PlatformInterface
 			Network = ::Network # Implemented on C
@@ -66,7 +51,7 @@ Walk Framework API, responsible for managed compatibility between implemented de
 4. Configure Adapter
 
 		class Device # Class from DaFunk
-			self.adapter = PlatformAbstraction
+			self.adapter = PlatformInterface
 		end
 
 5. Compile da_funk into mrb file `$ rake`.

data/RELEASE_NOTES.md

@@ -1,5 +1,16 @@
 # DaFunk
 
+### 0.4.5 - 2015-06-09 - ISO8583, environment and abstraction classes
+- Implementing support to change host environment configuration with Setting.to_production! and Setting.to_staging!.
+- Fix da_funk.mrb out path getting the app name to output da_funk.mrb.
+- Add tests to FileDb and ParamsDat.
+- Improve README adding chapters about AroundTheWorld project.
+- Add return 7 to Device::System.battery, which means power supply connected and has no battery.
+- Support to Network::Ethernet abstraction.
+- Support to Print abstraction.
+- Fix number_to_currency on the 1.1.0 mruby version.
+- Update ISO8583 library.
+
 ### 0.4.4 - 2015-03-27 - Gemspec summary and description.
 - Fix gemspec summary and description.
 

data/Rakefile

@@ -19,7 +19,7 @@ FILES = FileList[
   "lib/device/io.rb",
   "lib/device/network.rb",
   "lib/device/params_dat.rb",
-  "lib/device/printer.rb",
+  "lib/device/print.rb",
   "lib/device/runtime.rb",
   "lib/device/setting.rb",
   "lib/device/support.rb",

data/lib/da_funk/rake_task.rb

@@ -69,6 +69,16 @@ module DaFunk
       end
     end
 
+    def check_gem_out(gem)
+      if File.exists?(path = File.join(gem.full_gem_path, "out", gem.name)) && File.file?(path)
+      elsif File.exists?(path = File.join(gem.full_gem_path, "out", gem.name, "main.mrb")) && File.file?(path)
+      elsif File.exists?(path = File.join(gem.full_gem_path, "out", gem.name, "#{gem.name}.mrb")) && File.file?(path)
+      else
+        return nil
+      end
+      return path
+    end
+
     def define
       task :resources do
         FileUtils.rm_rf File.join(root_path, "out")
@@ -86,7 +96,8 @@ module DaFunk
         FileUtils.mkdir_p out_path
 
         Bundler.load.specs.each do |gem|
-          sh "cp #{File.join(gem.full_gem_path, "out", gem.name)}.mrb #{out_path}/#{gem.name}.mrb" if File.exists? "#{File.join(gem.full_gem_path, "out", gem.name)}.mrb"
+          path = check_gem_out(gem)
+          FileUtils.cp(path, File.join(out_path, "#{gem.name}.mrb")) if path
         end
 
         sh "#{mrbc} -g -o #{main_out} #{libs} "

data/lib/da_funk.rb

@@ -6,7 +6,7 @@ unless Object.const_defined?(:MTest)
   require file_path + "/device/display.rb"
   require file_path + "/device/io.rb"
   require file_path + "/device/network.rb"
-  require file_path + "/device/printer.rb"
+  require file_path + "/device/print.rb"
   require file_path + "/device/setting.rb"
   require file_path + "/device/system.rb"
   require file_path + "/device/version.rb"

data/lib/device/helper.rb

@@ -96,6 +96,7 @@ class Device
 
       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

data/lib/device/network.rb

@@ -2,8 +2,9 @@
 class Device
   class Network
 
-    MEDIA_GPRS = "gprs"
-    MEDIA_WIFI = "wifi"
+    MEDIA_GPRS     = "gprs"
+    MEDIA_WIFI     = "wifi"
+    MEDIA_ETHERNET = "ethernet"
 
     AUTH_NONE_OPEN       = "open"
     AUTH_NONE_WEP        = "wep"
@@ -149,7 +150,7 @@ class Device
       while(ret == PROCESSING)
         ret = Device::Network.connected?
       end
-      if ret == SUCCESS && wifi?
+      if ret == SUCCESS && (wifi? || ethernet?)
         Device::Network.dhcp_client(20000)
       end
       ret
@@ -177,6 +178,8 @@ class Device
           cipher:         Device::Setting.cipher,
           mode:           Device::Setting.mode
         }
+      elsif ethernet?
+        Hash.new
       end
     end
 
@@ -187,6 +190,10 @@ class Device
     def self.wifi?
       Device::Setting.media == "wifi"
     end
+
+    def self.ethernet?
+      Device::Setting.media == "ethernet"
+    end
   end
 end
 

data/lib/device/params_dat.rb

@@ -13,12 +13,13 @@ class Device
     # To control if there is any app and parse worked
     self.status = false
 
+    def self.file
+      self.setup unless @file
+      @file
+    end
+
     def self.setup
-      if File.exists?(FILE_NAME)
-        @file = FileDb.new(FILE_NAME)
-      else
-        false
-      end
+      @file = FileDb.new(FILE_NAME)
     end
 
     # TODO Scalone: Change after @bmsatierf change the format

data/lib/device/print.rb

@@ -0,0 +1,189 @@
+
+class Device
+  class Print
+    RET_OK                = 0
+    ERR_PRN_BUSY          = -3701 # Printer busy
+    ERR_PRN_PAPEROUT      = -3702 # Out of paper
+    ERR_PRN_WRONG_PACKAGE = -3703 # The format of print data packet error
+    ERR_PRN_OVERHEAT      = -3704 # Printer over heating
+    ERR_PRN_OUTOFMEMORY   = -3705 # The print data is too large, and exceeds the buffer length.
+    ERR_PRN_OVERVOLTAGE   = -3706 # Voltage is too high.
+    ERR_INVALID_PARAM     = -1003 # Invalid parameter.
+    ERR_DEV_NOT_EXIST     = -1004 # Device does not exist.
+    ERR_DEV_BUSY          = -1005 # Device is busy.
+    ERR_FONT_NOT_EXIST    = -1008 # Font does not exist.
+
+    DEFAULT_SINGLE_WIDTH  = 12
+    DEFAULT_SINGLE_HEIGHT = 24
+    DEFAULT_MULTI_WIDTH   = 24
+    DEFAULT_MULTI_HEIGHT  = 24
+
+    def self.adapter
+      Device.adapter::Print
+    end
+
+    # Initialize Printer device.
+    #
+    # @param singlecode_width [Fixnum] The width control of single code font.
+    #  (For non-monospaced font, width of each character may not meet the settings).
+    #  The value ranges from 8 to 64.
+    # @param singlecode_height [Fixnum] The height control of single code font.
+    #  The value ranges from 8 to 64.
+    # @param multicode_width [Fixnum] The width control of multiple code font.
+    #  The value ranges from 12 to 64.
+    # @param multicode_height [Fixnum] The height control of multiple code font
+    #  The value ranges from 12 to 64.
+    #
+    # @retval RET_OK Success.
+    # @retval ERR_FONT_NOT_EXIST Font does not exist.
+    # @retval ERR_INVALID_PARAM Invalid parameter.
+    # @retval ERR_DEV_BUSY Device is busy.
+    #
+    # @return [Fixnum] Return number.
+    def self.start(singlecode_width=DEFAULT_SINGLE_WIDTH,
+                   singlecode_height=DEFAULT_SINGLE_HEIGHT,
+                   multicode_width=DEFAULT_MULTI_WIDTH,
+                   multicode_height=DEFAULT_MULTI_HEIGHT)
+      self.adapter.start(singlecode_width, singlecode_height, multicode_width, multicode_height)
+    end
+
+    # Check printer status, useful for paper check.
+    #
+    # @retval RET_OK Success.
+    # @retval ERR_FONT_NOT_EXIST Font does not exist.
+    # @retval ERR_INVALID_PARAM Invalid parameter.
+    # @retval ERR_DEV_BUSY Device is busy.
+    #
+    # @return [Fixnum] Return number.
+    def self.open
+      self.adapter.open
+    end
+
+    # Restore the printer default settings and clear the print buffer data.
+    #
+    # @return [NilClass] Allways returns nil.
+    def self.reset
+      self.adapter.reset
+    end
+
+    # Closes the printer.
+    #
+    # @return [NilClass] Allways returns nil.
+    def self.close
+      self.adapter.close
+    end
+
+    # Selects print font.
+    #
+    # @param filename [String] Font filename.
+    #
+    # @retval RET_OK Success.
+    # @retval ERR_FONT_NOT_EXIST Font does not exist.
+    # @retval ERR_INVALID_PARAM Invalid parameter.
+    def self.font=(path)
+      self.adapter.font = path
+    end
+
+    # Sets printing gray level.
+    #
+    # @param value [Fixnum] Value to define level
+    # 􏰀 Level =0, reserved,
+    # 􏰀 Level =1, default level, normal print slip,
+    # 􏰀 Level =2, reserved,
+    # 􏰀 Level =3, two-layer thermal printing,
+    # 􏰀 Level =4, two-layer thermal printing, higher gray
+    # level than 3,
+    # 􏰀 The default level is 1.
+    # 􏰀 The illegal value does not change current settings.
+    #
+    # @return [NilClass] Allways returns nil.
+    def self.level=(value)
+      self.adapter.level = value
+    end
+
+    # Define size, in pixel, of printing
+    #
+    # @param singlecode_width [Fixnum] The width control of single code font.
+    # (For non-monospaced font, width of each character may not meet the settings).
+    #  The value ranges from 8 to 64.
+    # @param singlecode_height [Fixnum] The height control of single code font.
+    #  The value ranges from 8 to 64.
+    # @param multicode_width [Fixnum] The width control of multiple code font.
+    #  The value ranges from 12 to 64.
+    # @param multicode_height [Fixnum] The height control of multiple code font
+    #  The value ranges from 12 to 64.
+    #
+    # @return [NilClass] Allways returns nil.
+    def self.size(singlecode_width=DEFAULT_SINGLE_WIDTH,
+                   singlecode_height=DEFAULT_SINGLE_HEIGHT,
+                   multicode_width=DEFAULT_MULTI_WIDTH,
+                   multicode_height=DEFAULT_MULTI_HEIGHT)
+      self.adapter.size(singlecode_width, singlecode_height, multicode_width, multicode_height)
+    end
+
+    # Feeds printing paper.
+    #
+    # @return [NilClass] Allways returns nil.
+    def self.paperfeed
+      self.adapter.feed
+    end
+
+    # Write text on print buffer.
+    #
+    # @param string [String] Text to be printed.
+    #
+    # @return [NilClass] Allways returns nil.
+    def self.print(string)
+      self.adapter.print(string)
+    end
+
+    # Write text on print buffer.
+    #
+    # @param string [String] Text to be printed.
+    #
+    # @return [NilClass] Allways returns nil.
+    def self.puts(string)
+      self.adapter.puts(string)
+    end
+
+    # Print bmp file.
+    #
+    # Details:
+    # Bitmap data is generated as monochromatic, bmp format.
+    # Printing bitmap size limit up to 384 pixels in width, spocket with 180 pixels and the height is unlimited.
+    # If the bitmap width is larger than the limit of the printer, then it will be sliced on the right side.
+    # If the data packet is too long, then this function will remove the LOGO message.
+    #
+    # @param path [String] Path to bmp file.
+    #
+    # @return [NilClass] Allways returns nil.
+    def self.print_bmp(path)
+      self.adapter.print_bmp(path)
+    end
+
+    # Check printer status, useful for paper check.
+    #
+    # @retval RET_OK Success.
+    # @retval ERR_FONT_NOT_EXIST Font does not exist.
+    # @retval ERR_INVALID_PARAM Invalid parameter.
+    # @retval ERR_PRN_BUSY Printer is busy.
+    # @retval ERR_PRN_PAPEROUT Out of paper.
+    # @retval ERR_PRN_OVERHEAT Printer overheating.
+    def self.check
+      self._check
+    end
+
+    # Check if printer has paper
+    #
+    # @return [TrueClass] Has paper.
+    # @return [FalseClass] No paper.
+    def self.paper?
+      if self.check == ERR_PRN_PAPEROUT
+        false
+      else
+        true
+      end
+    end
+  end
+end
+

data/lib/device/setting.rb

@@ -4,10 +4,12 @@ class Device
     FILE_PATH       = "./main/config.dat"
     HOST_PRODUCTION = "switch.cloudwalk.io"
     HOST_STAGING    = "switch-staging.cloudwalk.io"
+    PORT_TCP        = "31415"
+    PORT_TCP_SSL    = "31416"
 
     DEFAULT     = {
-      "host"                        => "switch-staging.cloudwalk.io",
-      "host_port"                   => "31416",
+      "host"                        => HOST_PRODUCTION,
+      "host_port"                   => PORT_TCP_SSL,
       "ssl"                         => "1",
       "user"                        => "",
       "password"                    => "", #WIFI
@@ -35,10 +37,18 @@ class Device
 
     def self.setup
       @file = FileDb.new(FILE_PATH, DEFAULT)
-      self.host = HOST_STAGING if self.staging?
+      self.check_environment!
       @file
     end
 
+    def self.check_environment!
+      if self.staging?
+        self.to_staging!
+      else
+        self.to_production!
+      end
+    end
+
     def self.production?
       self.environment == "production"
     end
@@ -47,6 +57,14 @@ class Device
       self.environment == "staging"
     end
 
+    def self.to_production!
+      self.host = HOST_PRODUCTION
+    end
+
+    def self.to_staging!
+      self.host = HOST_STAGING
+    end
+
     def self.method_missing(method, *args, &block)
       setup unless @file
       param = method.to_s

data/lib/device/system.rb

@@ -37,6 +37,7 @@ class Device
     #  4 Battery icon displays 4 grids
     #  5 Powered by external power supply and the battery in charging. Battery icon displays form empty to full cycle. The battery status indicator on the bottom of terminal is displaying red
     # 6 Powered by external power supply and the battery charging 6 finished. Battery icon displays full grids. The battery status indicator on the bottom of terminal is displaying green.
+    # 7 Powered by external power supply and has no battery.
     def self.battery
       adapter.battery
     end

data/lib/iso8583/bitmap.rb

@@ -1,3 +1,6 @@
+# Copyright 2009 by Tim Becker (tim.becker@kuriostaet.de)
+# MIT License, for details, see the LICENSE file accompaning
+# this distribution
 
 module ISO8583
 
@@ -8,24 +11,26 @@ 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
     # 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.
-    def initialize(message = nil)
-      @bmp = Array.new(128, false)
-      if !message
+    def initialize(message = nil, hex_bitmap=false)
+      @bmp        = Array.new(128, false)
+      @hex_bitmap = hex_bitmap
 
-      else
-        initialize_from_message message
-      end
+      message ? initialize_from_message(message) : nil
     end
-    
+
+    def hex_bitmap?
+      !!@hex_bitmap
+    end
+
     # yield once with the number of each set field.
-    def each #:yields: each bit set in the bitmap.
-      @bmp.each_with_index {|set, i| yield i+1 if set}
+    def each #:yields: each bit set in the bitmap except the first bit.
+      @bmp[1..-1].each_with_index {|set, i| yield i+2 if set}
     end
-    
+
     # Returns whether the bit is set or not.
     def [](i)
       @bmp[i-1]
@@ -46,7 +51,7 @@ module ISO8583
     def set(i)
       self[i] = true
     end
-    
+
     # Unsets bit #i
     def unset(i)
       self[i] = false
@@ -61,22 +66,22 @@ module ISO8583
     end
     alias_method :to_b, :to_bytes
 
+    def to_hex
+      "%02x" % self.to_s.to_i(2)
+    end
+
     # Generate a String representation of this bitmap in the form:
-    # 01001100110000011010110110010100100110011000001101011011001010
+    #	01001100110000011010110110010100100110011000001101011011001010
     def to_s
       #check whether any `high` bits are set
-      @bmp[0] = false
-      65.upto(128) {|i|
-        if self[i]
-          # if so, set continuation bit
-          @bmp[0] = true
-          break
-        end
-      }
+      ret           = (65..128).one? {|bit| self[bit]}
+      high, @bmp[0] = ret ? [128, true] : [64, false]
+
       str = ""
-      1.upto(self[1] ? 128 : 64) {|i|
-        str << (self[i] ? "1" : "0")
-      }
+      1.upto(high) do|i|
+        str << (self[i] ? '1' : '0')
+      end
+
       str
     end
 
@@ -84,9 +89,18 @@ module ISO8583
     private
 
     def initialize_from_message(message)
-      bmp = message.to_i(16).to_s(2)
+      bmp = if hex_bitmap?
+              rjust(message[0..15].to_i(16).to_s(2), 64, '0')
+            else
+              message.unpack("B64")[0]
+            end
+
       if bmp[0,1] == "1"
-        bmp = message.to_i(16).to_s(2)
+        bmp = if hex_bitmap?
+                rjust(message[0..31].to_i(16).to_s(2), 128,'0')
+              else
+                message.unpack("B128")[0]
+              end
       end
 
       0.upto(bmp.length-1) do |i|
@@ -97,18 +111,19 @@ module ISO8583
     class << self
       # Parse the bytes in string and return the Bitmap and bytes remaining in `str`
       # after the bitmap is taken away.
-      def parse(str)
-        bmp  = Bitmap.new(str)
-        rest = bmp[1] ? str[32, str.length] : str[16, str.length]
+      def parse(str, hex_bitmap = false)
+        bmp  = Bitmap.new(str, hex_bitmap)
+
+        rest = if bmp.hex_bitmap?
+                 bmp[1] ? str[32, str.length] : str[16, str.length]
+               else
+                 bmp[1] ? str[16, str.length] : str[8, str.length]
+               end
+
         [ bmp, rest ]
       end
     end
-    
+
   end
 end
 
-if __FILE__==$0
-  mp = ISO8583::Bitmap.new
-  20.step(128,7) {|i| mp.set(i)}
-  print mp.to_bytes
-end

data/lib/iso8583/codec.rb

@@ -1,3 +1,7 @@
+# Copyright 2009 by Tim Becker (tim.becker@kuriostaet.de)
+# MIT License, for details, see the LICENSE file accompaning
+# this distribution
+
 #require 'date'
 
 module ISO8583
@@ -54,6 +58,9 @@ module ISO8583
   # [+MMDDhhmmssCodec+]   encodes Time, Datetime or String to the described date format, checking 
   #                       that it is a valid date. Decodes to a DateTime instance, decoding and 
   #                       encoding perform validity checks!
+  # [+MMDDCodec+]   encodes Time, Datetime or String to the described date format, checking 
+  #                       that it is a valid date. Decodes to a DateTime instance, decoding and 
+  #                       encoding perform validity checks!
   # [+YYMMDDhhmmssCodec+] encodes Time, Datetime or String to the described date format, checking 
   #                       that it is a valid date. Decodes to a DateTime instance, decoding and 
   #                       encoding perform validity checks!
@@ -130,7 +137,7 @@ module ISO8583
 
   ANS_Codec = Codec.new
   ANS_Codec.encoder = lambda{|str|
-    raise ISO8583Exception.new("Invalid value: #{str} must be [\x20-\x7E]") unless str =~ /^[\x20-\x7E]*$/
+    raise ISO8583Exception.new("Invalid value: #{str} must be [\\x20-\\x7E]") unless str =~ /^[\x20-\x7E]*$/
     str
   }
   ANS_Codec.decoder = PASS_THROUGH_DECODER
@@ -191,7 +198,7 @@ module ISO8583
   HhmmssCodec       = _date_codec("%H%M%S")
   YYMMDDhhmmssCodec = _date_codec("%y%m%d%H%M%S")
   YYMMCodec         = _date_codec("%y%m")
-  MMDDCodec         = _date_codec("%m%d")      
-  YYMMDDCodec       = _date_codec("%y%m%d")  
+  MMDDCodec         = _date_codec("%m%d")
 
 end
+

data/lib/iso8583/exception.rb

@@ -2,3 +2,4 @@ module ISO8583
   class ISO8583Exception < Exception; end
   class ISO8583ParseException < ISO8583Exception; end
 end
+

data/lib/iso8583/field.rb

@@ -52,7 +52,11 @@ module ISO8583
     # special treatment, you may need to override this method alltogether.
     # In other cases, the padding has to be implemented by the codec, such as BCD with an odd number of nibbles.
     def encode(value)
-      encoded_value = codec.encode(value) 
+      begin
+        encoded_value = codec.encode(value) 
+      rescue ISO8583Exception
+        raise ISO8583Exception.new($!.message+" (#{name})")
+      end
 
       if padding
         if padding.arity == 1
@@ -88,3 +92,4 @@ module ISO8583
   end
 
 end
+

data/lib/iso8583/fields.rb

@@ -1,3 +1,9 @@
+#--
+# Copyright 2009 by Tim Becker (tim.becker@kuriostaet.de)
+# MIT License, for details, see the LICENSE file accompaning
+# this distribution
+#++
+
 module ISO8583
 
   # This file contains a number of preinstantiated Field definitions. You
@@ -27,6 +33,7 @@ module ISO8583
   # [+ANS+]          fixed length ASCII  [\x20-\x7E], padding left, spaces
   # [+B+]            binary data, padding left using nulls (0x00)
   # [+MMDDhhmmss+]   Date, formatted as described in ASCII numerals
+  # [+MMDD+]         Date, formatted as described in ASCII numerals
   # [+YYMMDDhhmmss+] Date, formatted as named in ASCII numerals
   # [+YYMM+]         Expiration Date, formatted as named in ASCII numerals
   # [+Hhmmss+]       Date, formatted in ASCII hhmmss
@@ -156,16 +163,13 @@ module ISO8583
   YYMM        = Field.new
   YYMM.codec  = YYMMCodec
   YYMM.length = 4
-  
-  Hhmmss        = Field.new
-  Hhmmss.codec  = HhmmssCodec
-  Hhmmss.length = 6
 
   MMDD        = Field.new
   MMDD.codec  = MMDDCodec
   MMDD.length = 4
 
-  YYMMDD        = Field.new
-  YYMMDD.codec  = YYMMDDCodec
-  YYMMDD.length = 6
+  Hhmmss        = Field.new
+  Hhmmss.codec  = HhmmssCodec
+  Hhmmss.length = 6
 end
+

data/lib/iso8583/message.rb

@@ -1,3 +1,6 @@
+# Copyright 2009 by Tim Becker (tim.becker@kuriostaet.de)
+# MIT License, for details, see the LICENSE file accompaning
+# this distribution
 
 module ISO8583
 
@@ -37,7 +40,7 @@ module ISO8583
   # be accessed later either via their name or value:
   #
   #    mes = MyMessage.new 1100
-  #
+  # 
   # or
   #    mes = MyMessage.new "Authorization Request Acquirer Gateway"
   #
@@ -107,44 +110,22 @@ module ISO8583
   class Message
 
     # The value of the MTI (Message Type Indicator) of this message.
-    attr_reader :mti, :size_endianness
+    attr_reader :mti 
+
+    # ISO8583 allows hex or binary bitmap, so it should be configurable
+    attr_reader :use_hex_bitmap
 
     # Instantiate a new instance of this type of Message
     # optionally specifying an mti. 
-    def initialize(mti = nil, size_endianness = :little, format = :ascii)
+    def initialize(mti = nil, use_hex_bitmap = false)
       # values is an internal field used to collect all the
       # bmp number | bmp name | field en/decoders | values
       # which are set in this message.
       @values = {}
-      @size_endianness = size_endianness
-      @format = :ascii
-      self.mti = mti if mti
-    end
-
-    def build
-      message = self.to_b
-      message_size = self.size(message)
-
-      if size_endianness == :little
-        binary_size = [message_size].pack("s")
-      elsif size_endianness == :big
-        binary_size = [message_size].pack("s>")
-      else
-        raise ISO8583Exception.new "size endianness no recognized"
-      end
 
-      binary_size + message
-    end
+      self.mti = mti if mti
+      @use_hex_bitmap = use_hex_bitmap
 
-    def size(message)
-      case format
-      when :ascii
-        message.size
-      when :bcd
-        (message.size / 2)
-      else
-        raise ISO8583Exception.new "format no recognized"
-      end
     end
 
     # Set the mti of the Message using either the actual value
@@ -172,9 +153,13 @@ module ISO8583
     #    mes[2]=47474747                          # bmp 2 is generally the PAN
     #    mes["Primary Account Number"]=47474747   # if thats what you called the field in Message.bmp.
     def []=(key, value)
-      bmp_def              = _get_definition key
-      bmp_def.value        = value
-      @values[bmp_def.bmp] = bmp_def 
+      if value.nil?
+        @values.delete(key)
+      else
+        bmp_def              = _get_definition key
+        bmp_def.value        = value
+        @values[bmp_def.bmp] = bmp_def
+      end
     end
 
     # Retrieve the decoded value of the contents of a bitmap
@@ -196,14 +181,6 @@ module ISO8583
       raise ISO8583Exception.new "no MTI set!" unless mti
       mti_enc = self.class._mti_format.encode(mti)
       mti_enc << _body.join
-
-      # length = mti_enc.length.to_s(16).rjust(4, '0')
-
-      length_dec = [mti_enc.length]
-      length_hex = length_dec.pack("s>")
-      mti_enc = length_hex + mti_enc
-
-      return mti_enc
     end
 
     # Returns a nicely formatted representation of this
@@ -237,7 +214,12 @@ module ISO8583
         enc_value = @values[bmp_num].encode
         message << enc_value
       end
-      [ bitmap.to_s.to_i(2).to_s(16).upcase, message ]
+
+      if use_hex_bitmap
+        [bitmap.to_hex, message]
+      else
+        [bitmap.to_bytes, message]
+      end
     end
 
     def _get_definition(key) #:nodoc:
@@ -333,7 +315,7 @@ module ISO8583
         field.bmp  = bmp
         _handle_opts(field, opts) if opts
 
-        bmp_def = ISO8583::BMP.new bmp, name, field
+        bmp_def = BMP.new bmp, name, field
 
         @defs[bmp]  = bmp_def
         @defs[name] = bmp_def
@@ -372,17 +354,22 @@ module ISO8583
       end
 
       # Parse the bytes `str` returning a message of the defined type.
-      def parse(str)
-        message = self.new
+      def parse(str, use_hex_bitmap = false)
+        message = self.new(nil, use_hex_bitmap)
+
         message.mti, rest = _mti_format.parse(str)
 
-        bmp,rest = Bitmap.parse(rest)
+        bmp, rest = Bitmap.parse(rest, use_hex_bitmap)
+
         bmp.each {|bit|
-          if bit > 1 && bit <= 128
-            bmp_def      = _definitions[bit]
-            value, rest  = bmp_def.field.parse(rest)
-            message[bit] = value
+          bmp_def      = _definitions[bit]
+
+          unless bmp_def
+            raise ISO8583ParseException.new "The message contains fields not defined"
           end
+
+          value, rest  = bmp_def.field.parse(rest)
+          message[bit] = value
         }
         message
       end
@@ -421,7 +408,7 @@ module ISO8583
       # in through the `bmp` and `mti_format` class methods.
       #
       def _handle_opts(field, opts)
-        opts.each {|key, value|
+        opts.each_pair {|key, value|
           key = (key.to_s+"=").to_sym
           if field.respond_to?(key)
             field.send(key, value)

data/lib/iso8583/util.rb

@@ -1,3 +1,6 @@
+# Copyright 2009 by Tim Becker (tim.becker@kuriostaet.de)
+# MIT License, for details, see the LICENSE file accompaning
+# this distribution
 
 module ISO8583
 
@@ -87,5 +90,5 @@ module ISO8583
     0x5c, 0x3f, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
   ]
-
 end
+

data/lib/iso8583/version.rb

@@ -1,6 +1,4 @@
 # -*- mode: ruby; encoding: utf-8; tab-width: 2; indent-tabs-mode: nil -*-
-
 module ISO8583
-  VERSION = "0.1.5.a"
+  VERSION = "0.1.6"
 end
-

data/lib/version.rb

@@ -1,5 +1,5 @@
 
 class Device
-  API_VERSION="0.4.4"
+  API_VERSION="0.4.5"
 end
 

data/test/unit/file_db_test.rb

@@ -0,0 +1,14 @@
+
+class FileDbTest < DaFunk::Test.case
+  def test_create
+    file_name = "test_create.dat"
+    assert_equal false, File.exists?(file_name)
+    assert FileDb.new(file_name, Hash.new).hash.is_a? Hash
+  end
+
+  def test_define_unset_value
+    file = FileDb.new("test_define_unset_value.dat", {})
+    file["unknown"] = "any"
+    assert_equal "any", file["unknown"]
+  end
+end

data/test/unit/iso8583_test.rb

@@ -0,0 +1,55 @@
+
+class WilliamMessage < ISO8583::Message
+  include ISO8583
+  mti_format N, :length => 4
+  mti 200, "Authorization Request Acquirer Gateway"
+  bmp  3  , "Processing Code"      , N          , :length =>  6
+  bmp  4  , "Amount (Transaction)" , N          , :length => 12
+  bmp  7  , "Amount (Transaction)" , N          , :length => 10
+  bmp  11 , "Amount (Transaction)" , N          , :length => 6
+  bmp  12 , "Amount (Transaction)" , N          , :length => 6
+  bmp  13 , "Amount (Transaction)" , N          , :length => 4
+  bmp  22 , "Amount (Transaction)" , N          , :length => 3
+  bmp  32 , "Amount (Transaction)" , LLVAR_N
+  bmp  35 , "Amount (Transaction)" , LLVAR_N
+  bmp  41 , "Amount (Transaction)" , ANS        , :length => 8
+  bmp  42 , "Amount (Transaction)" , ANS        , :length => 15
+  bmp  45 , "Amount (Transaction)" , LLVAR_ANS
+  bmp  48 , "Amount (Transaction)" , LLLVAR_ANS
+  bmp  49 , "Amount (Transaction)" , AN         , :length => 3
+  bmp  55 , "Amount (Transaction)" , LLLVAR_ANS
+  bmp  61 , "Amount (Transaction)" , LLLVAR_ANS
+end
+
+#004 Amount (Transaction) : 600
+#007 Amount (Transaction) : 608201250
+#011 Amount (Transaction) : 55
+#012 Amount (Transaction) : 171250
+
+class DeviceISO8583Test < DaFunk::Test.case
+  def setup
+    @str = "02003238040120C98208003000000000000600060820125000005517125006080511100000001941379999701163750703=160320100190277164640000061100040000000000448 !'#$%&'()0123456789@ABCDEFGHIPQRSTUVWXY`abcdefg008003002019862705A0899997011637507039F02060000000006009F03060000000000009F1A020076950500804080005F2A0209869A031506089C01009F3704F6164711820258009F360200629F10200FA5F1A078F0000000000000000000010F0108520000000000000000000000009F260881CEEAA12263D32F9F2701809F0607A09900000010109F3403410302102001008EL0107SC002020000000002311315669050040160000000000003.3100500800000611006020000000000000INGENICO"
+    @iso = WilliamMessage.parse(@str, true)
+  end
+
+  def test_bmp_3
+    assert_equal @iso[3], 3000
+  end
+
+  def test_bmp_4
+    assert_equal @iso[4], 600
+  end
+
+  def test_bmp_7
+    assert_equal @iso[7], 608201250
+  end
+
+  def test_bmp_11
+    assert_equal @iso[11], 55
+  end
+
+  def test_bmp_12
+    assert_equal @iso[12], 171250
+  end
+end
+

data/test/unit/params_dat_test.rb

@@ -0,0 +1,11 @@
+
+class ParamsDatTest < DaFunk::Test.case
+  def test_params_dat_not_nil_file
+    assert_equal false, Device::ParamsDat.file.nil?
+  end
+
+  def test_params_dat_initialize_calling_file
+    assert Device::ParamsDat.file.hash.is_a? Hash
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -100,7 +100,7 @@ files:
 - lib/device/notification_callback.rb
 - lib/device/notification_event.rb
 - lib/device/params_dat.rb
-- lib/device/printer.rb
+- lib/device/print.rb
 - lib/device/runtime.rb
 - lib/device/setting.rb
 - lib/device/support.rb
@@ -137,6 +137,9 @@ files:
 - test/unit/device/notification_callback_test.rb
 - test/unit/device/notification_event_test.rb
 - test/unit/device/notification_test.rb
+- test/unit/file_db_test.rb
+- test/unit/iso8583_test.rb
+- test/unit/params_dat_test.rb
 - utils/command_line_platform.rb
 - utils/test_run.rb
 homepage: http://github.com/cloudwalkio/da_funk
@@ -174,4 +177,7 @@ test_files:
 - test/unit/device/notification_callback_test.rb
 - test/unit/device/notification_event_test.rb
 - test/unit/device/notification_test.rb
+- test/unit/file_db_test.rb
+- test/unit/iso8583_test.rb
+- test/unit/params_dat_test.rb
 has_rdoc: 

data/lib/device/printer.rb

@@ -1,35 +0,0 @@
-
-class Device
-  class Printer
-    def self.adapter
-      Device.adapter::Printer
-    end
-
-    # Same as print, but add "\n" at end of print
-    #
-    # @param buf [String] Text to be printed.
-    # @param option [Symbol] :big, :bar_code, :bitmap
-    # @return [String] buffer read from keyboard
-    def self.puts(buf, option=nil)
-      adapter.puts(buf, option)
-    end
-
-    # Print buffer
-    #
-    # @param buf [String] Text to be printed.
-    # @param option [Symbol] :big, :bar_code, :bitmap
-    # @return [String] buffer read from keyboard
-    def self.print(buf, option=nil)
-      adapter.print(buf, option)
-    end
-
-    def self.paper?
-      adapter.paper?
-    end
-
-    def self.paperfeed
-      adapter.paperfeed
-    end
-  end
-end
-