iso8583 0.1.1 → 0.1.3

data/lib/8583/util.rb

@@ -0,0 +1,94 @@
+# Copyright 2009 by Tim Becker (tim.becker@kuriostaet.de)
+# MIT License, for details, see the LICENSE file accompaning
+# this distribution
+
+module ISO8583
+
+  # general utilities
+  #
+  # Convert a String of bytes to their hex representation
+  # E.g.:
+  #
+  #    b2hex "\x12\x34\xab" => "1234AB"
+  #
+  def b2hex(byte_string)
+    r = byte_string.unpack("H*")[0]
+    r.length > 1 ? r : "  "
+  end
+
+  #
+  # Convert a String containing hex data to
+  # a String containing the corresponding bytes:
+  # 
+  #   hex2b "abcd12" => "\xa\cd\12"
+  #
+  def hex2b(hex_string)
+    string = hex_string.gsub(/\s+/, "")
+    raise ISO8583Exception.new("Invalid Hex chars: #{hex_string}") unless string =~ /^[A-Fa-f0-9]*$/
+    raise ISO8583Exception.new("Uneven number of Hex chars #{hex_string}") unless ( (string.length % 2) == 0)
+    [string].pack("H*")
+  end
+
+  def _conv(str, mapping)
+    _str = ""
+    str.each_byte{|byte|
+      _str << mapping[byte]
+    }
+    _str
+  end
+
+  #
+  # Convert a String of ASCII chars to EBCDIC
+  #
+  def ascii2ebcdic(ascii)
+    _conv(ascii, US_ASCII2IBM037)
+  end
+
+  #
+  # Convert an EBCDIC String to ASCII
+  #
+  def ebcdic2ascii(ebcdic)
+    _conv(ebcdic, IBM0372US_ASCII)
+  end
+
+  # The charsets supported by iconv aren't guranteed. At the very least MACs don't support ebcdic,
+  # so providing rudimentary mappings here.
+  US_ASCII2IBM037 = [
+                     0x00, 0x01, 0x02, 0x03, 0x37, 0x2d, 0x2e, 0x2f, 0x16, 0x05, 0x15, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+                     0x10, 0x11, 0x12, 0x13, 0x3c, 0x3d, 0x32, 0x26, 0x18, 0x19, 0x3f, 0x27, 0x1c, 0x1d, 0x1e, 0x1f,
+                     0x40, 0x5a, 0x7f, 0x7b, 0x5b, 0x6c, 0x50, 0x7d, 0x4d, 0x5d, 0x5c, 0x4e, 0x6b, 0x60, 0x4b, 0x61,
+                     0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0x7a, 0x5e, 0x4c, 0x7e, 0x6e, 0x6f,
+                     0x7c, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6,
+                     0xd7, 0xd8, 0xd9, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xba, 0xe0, 0xbb, 0xb0, 0x6d,
+                     0x79, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96,
+                     0x97, 0x98, 0x99, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xc0, 0x4f, 0xd0, 0xa1, 0x07,
+                     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+                     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+                     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+                     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+                     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+                     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+                     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+                     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+                    ]
+
+  IBM0372US_ASCII = [
+                     0x00, 0x01, 0x02, 0x03, 0x3f, 0x09, 0x3f, 0x7f, 0x3f, 0x3f, 0x3f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+                     0x10, 0x11, 0x12, 0x13, 0x3f, 0x0a, 0x08, 0x3f, 0x18, 0x19, 0x3f, 0x3f, 0x1c, 0x1d, 0x1e, 0x1f,
+                     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x0a, 0x17, 0x1b, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x05, 0x06, 0x07,
+                     0x3f, 0x3f, 0x16, 0x3f, 0x3f, 0x3f, 0x3f, 0x04, 0x3f, 0x3f, 0x3f, 0x3f, 0x14, 0x15, 0x3f, 0x1a,
+                     0x20, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x2e, 0x3c, 0x28, 0x2b, 0x7c,
+                     0x26, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x21, 0x24, 0x2a, 0x29, 0x3b, 0x3f,
+                     0x2d, 0x2f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x2c, 0x25, 0x5f, 0x3e, 0x3f,
+                     0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x60, 0x3a, 0x23, 0x40, 0x27, 0x3d, 0x22,
+                     0x3f, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+                     0x3f, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+                     0x3f, 0x7e, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+                     0x5e, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x5b, 0x5d, 0x3f, 0x3f, 0x3f, 0x3f,
+                     0x7b, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+                     0x7d, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+                     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.rb

@@ -1,9 +1,5 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-require "field"
-require "codec"
-require "fields"
-require "exception"
-require "bitmap"
-require "message"
+
+require '8583'

data/test/BitmapTests.rb

@@ -1,68 +1,80 @@
 require 'lib/iso8583'
 require 'test/unit'
 
+include ISO8583
+
 class BitmapTests < Test::Unit::TestCase
-	def test_create_empty
-		b = Bitmap.new
-		assert_equal(b.to_s.size, 64, "proper length: 64")
-		b.set(112)
-		assert_equal(b.to_s.size, 128, "proper length: 128")
-		assert_equal(b.to_s, "10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000")
-		b.unset(112)
-		5.step(20,2){|i| b.set(i)}
-		assert(b.to_s.size==64, "proper length: 64")
-		assert_equal(b.to_s, "0000101010101010101000000000000000000000000000000000000000000000")
-		assert b[5]
-		assert b[7]
-		assert b[11]
-		assert !b[12]
-		assert !b[199]
+  def test_create_empty
+    b = Bitmap.new
+    assert_equal(b.to_s.size, 64, "proper length: 64")
+    b.set(112)
+    assert_equal(b.to_s.size, 128, "proper length: 128")
+    assert_equal(b.to_s, "10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000")
+    b.unset(112)
+    5.step(20,2){|i| b.set(i)}
+    assert(b.to_s.size==64, "proper length: 64")
+    assert_equal(b.to_s, "0000101010101010101000000000000000000000000000000000000000000000")
+    assert b[5]
+    assert b[7]
+    assert b[11]
+    assert !b[12]
+    assert !b[199]
 
-		assert_raises(ISO8583Exception) {b.set 1000 }
-		assert_raises(ISO8583Exception) {	b.set 1 }
-		assert_raises(ISO8583Exception) {	b.set -1 }
-		
-		
-	
-	end
+    assert_raises(ISO8583Exception) {b.set 1000 }
+    assert_raises(ISO8583Exception) {	b.set 1 }
+    assert_raises(ISO8583Exception) {	b.set -1 }
+  end
 
-	def test_out_of_bounds_errors
-		b = Bitmap.new
-		assert_raises(ISO8583Exception) {b.set 1000 }
-		assert_raises(ISO8583Exception) {	b.set 1 }
-		assert_raises(ISO8583Exception) {	b.set -1 }
-	end
+  def test_out_of_bounds_errors
+    b = Bitmap.new
+    assert_raises(ISO8583Exception) {b.set 1000 }
+    assert_raises(ISO8583Exception) {	b.set 1 }
+    assert_raises(ISO8583Exception) {	b.set -1 }
+  end
 
-	def test_parse_bmp
-		# 0000000001001001001001001001001001001001001001001001001001000000
-		# generated by: 10.step(60,3) {|i| mp.set(i)}
+  def test_parse_bmp
+    # 0000000001001001001001001001001001001001001001001001001001000000
+    # generated by: 10.step(60,3) {|i| mp.set(i)}
 
-		tst = "\x00\x49\x24\x92\x49\x24\x92\x40"
-		b = Bitmap.new tst
-		10.step(60,3) {|i| 
-			assert(b[i], "bit #{i} is not set.")
-			assert(!b[i+i], "bit #{i+i} is set.")
-		}
+    tst = "\x00\x49\x24\x92\x49\x24\x92\x40"
+    b = Bitmap.new tst
+    10.step(60,3) {|i| 
+      assert(b[i], "bit #{i} is not set.")
+      assert(!b[i+i], "bit #{i+i} is set.")
+    }
 
-		#10000000000000000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000
-		# generated by: 20.step(128,7) {|i| mp.set(i)}
-		tst = "\x80\x00\x10\x20\x40\x81\x02\x04\x08\x10\x20\x40\x81\x02\x04\x08"
-		b = Bitmap.new tst
-		20.step(128,7) {|i|
-			assert(b[i], "bit #{i} is not set. (128 bit map)")
-			assert(!b[i+i], "bit #{i+i} is set. (128 bit map)")
-		}
-	end
+    #10000000000000000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000000100000010000001000
+    # generated by: 20.step(128,7) {|i| mp.set(i)}
+    tst = "\x80\x00\x10\x20\x40\x81\x02\x04\x08\x10\x20\x40\x81\x02\x04\x08"
+    b = Bitmap.new tst
+    20.step(128,7) {|i|
+      assert(b[i], "bit #{i} is not set. (128 bit map)")
+      assert(!b[i+i], "bit #{i+i} is set. (128 bit map)")
+    }
+  end
 
   def test_parse_rest
     tst = "\x00\x49\x24\x92\x49\x24\x92\x40\x31\x32\x33\x34"
-		b, rest = Bitmap.parse tst
-		10.step(60,3) {|i| 
-			assert(b[i], "bit #{i} is not set.")
-			assert(!b[i+i], "bit #{i+i} is set.")
-		}
+    b, rest = Bitmap.parse tst
+    10.step(60,3) {|i| 
+      assert(b[i], "bit #{i} is not set.")
+      assert(!b[i+i], "bit #{i+i} is set.")
+    }
     assert_equal("1234", rest)
   end
 
+  def test_each
+    bmp = Bitmap.new
+    bmp.set(2)
+    bmp.set(3)
+    bmp.set(5)
+    bmp.set(6)
+    arr = []
+    bmp.each{|bit|
+      arr.push bit
+    }
+    assert_equal [2,3,5,6], arr
+  end
+
 end
-	
+

data/test/message_test.rb

@@ -1,10 +1,12 @@
-require 'lib/iso8583'
-require 'lib/berlin'
+require 'lib/8583'
+require 'lib/8583/berlin'
 require 'test/unit'
 
+include ISO8583
+
 class MessageTest < Test::Unit::TestCase
-	def test_create_empty
-	  mes = BerlinMessage.new
+  def test_create_empty
+    mes = BerlinMessage.new
     mes.mti = 1100
     pan = 474747474747
     mes.pan = pan
@@ -30,15 +32,15 @@ class MessageTest < Test::Unit::TestCase
     assert_equal pan, mes[2]
     assert_equal pan, mes["Primary Account Number (PAN)"]
     assert_equal "1420@\000\000\000\000\000\000\00012474747474747", mes.to_b
-	end
+  end
 
-	def test_parse
+  def test_parse
     pan = 474747474747
 
-		assert_raises(ISO8583Exception) {
-	    mes = BerlinMessage.parse "@\000\000\000\000\000\000\00012474747474747"
+    assert_raises(ISO8583Exception) {
+      mes = BerlinMessage.parse "@\000\000\000\000\000\000\00012474747474747"
     }
-	  mes = BerlinMessage.parse "1430@\000\000\000\000\000\000\00012474747474747"
+    mes = BerlinMessage.parse "1430@\000\000\000\000\000\000\00012474747474747"
     assert_equal pan, mes.pan
     assert_equal 1430, mes.mti
   end
@@ -118,7 +120,44 @@ END
     assert_equal expected, mes.to_s
   end
 
+  def test_round_trip
+    mes     = BerlinMessage.new
+    mes.mti = "Network Management Request Response Issuer Gateway or Acquirer Gateway" 
+    mes[2]  = 12341234
+    mes[3]  = 1111
+    mes[4]  = 100
+    mes[6]  = 101
+    mes[7]  = "0808120000"
+    mes[10] = 100
+    mes[11] = 0
+    mes[12] = "740808120000"
+    mes[14] = "1010"
+    mes[22] = "POSDATACODE"
+    mes[23] = 0
+    mes[24] = 1
+    mes[25] = 90
+    mes[26] = 4444
+    mes[30] = 150
+    mes[32] = 321321
+    mes[35] = ";123123123=123?5"
+    mes[37] = "123 123"
+    mes[38] = "90"
+    mes[39] = 90
+    mes[41] = "TermLoc!"
+    mes[42] = "ID Code!"
+    mes[43] = "Card Acceptor Name Location"
+    mes[49] = "840"
+    mes[51] = 978
+    mes[52] = "\x00\x01\x02\x03"
+    mes[53] = "\x07\x06\x05\x04"
+    mes[54] = "No additional amount"
+    mes[55] = '\x07\x06\x05\x04'
+    mes[56] = 88888888888
+    mes[59] = "I'm you're private data, data for money..."
+    mes[64] = "\xF0\xF0\xF0\xF0"
 
-
+    bytes = mes.to_b
+    mes2 = BerlinMessage.parse(mes.to_b)
+    assert_equal(mes.to_b, mes2.to_b)
+  end
 end
-	

data/test/test_codec.rb

@@ -1,10 +1,9 @@
 require 'test/unit'
 require 'lib/iso8583'
 
-class FieldTest < Test::Unit::TestCase
-
-
+include ISO8583
 
+class FieldTest < Test::Unit::TestCase
   def test_MMDDhhmmssCodec
     dt = MMDDhhmmssCodec.decode "1212121212"
     assert_equal DateTime, dt.class
@@ -14,7 +13,6 @@ class FieldTest < Test::Unit::TestCase
     assert_equal 12, dt.min
     assert_equal 12, dt.sec
 
-
     assert_raise(ISO8583Exception) {
       dt = MMDDhhmmssCodec.decode "1312121212"
     }
@@ -36,7 +34,6 @@ class FieldTest < Test::Unit::TestCase
     assert_equal 12, dt.min
     assert_equal 12, dt.sec
 
-
     assert_raise(ISO8583Exception) {
       dt = YYMMDDhhmmssCodec.decode "091312121212"
     }
@@ -46,15 +43,14 @@ class FieldTest < Test::Unit::TestCase
     }
 
     assert_equal "091212121212", YYMMDDhhmmssCodec.encode("091212121212")
-
   end
+
   def test_YYMMCodec
     dt = YYMMCodec.decode "0812"
     assert_equal DateTime, dt.class
     assert_equal 2008, dt.year
     assert_equal 12, dt.month
 
-
     assert_raise(ISO8583Exception) {
       dt = YYMMCodec.decode "0913"
     }
@@ -64,7 +60,6 @@ class FieldTest < Test::Unit::TestCase
     }
 
     assert_equal "0912", YYMMCodec.encode("0912")
-
   end
 
   def test_AN_Codec
@@ -86,5 +81,17 @@ class FieldTest < Test::Unit::TestCase
     assert_equal ";123123123=123?5", Track2.decode(";123123123=123?5")
   end
 
-  
+  def test_packed_codec
+    assert_equal "\x12", Packed_Number.encode(12)
+    assert_equal "\x12", Packed_Number.encode("12")
+    assert_equal "\x02", Packed_Number.encode("2")
+    assert_equal "\x02", Packed_Number.encode(2)
+    assert_equal "\x02\x55", Packed_Number.encode(0xff)
+    assert_raise(ISO8583Exception) {
+      dt = Packed_Number.encode ";12312312=123?5"
+    }
+    assert_raise(ISO8583Exception) {
+      dt = Packed_Number.encode "F"
+    }
+  end
 end

data/test/test_fields.rb

@@ -1,10 +1,9 @@
 require 'test/unit'
 require 'lib/iso8583'
 
-class FieldTest < Test::Unit::TestCase
-
-
+include ISO8583
 
+class FieldTest < Test::Unit::TestCase
   def test_LLL
     value, rest = LLL.parse "123456"
     assert_equal 123, value
@@ -34,9 +33,12 @@ class FieldTest < Test::Unit::TestCase
     assert_raise(ISO8583Exception) {
       enc = LLL.encode "1234"
     }
-    
-    
+  end
 
+  def test_LL_BCD
+    value, rest = LL_BCD.parse "\x123456"
+    assert_equal 12, value
+    assert_equal "3456", rest    
   end
 
   def test_LLVAR_N
@@ -70,9 +72,9 @@ class FieldTest < Test::Unit::TestCase
     assert_raise(ISO8583Exception) {
       enc = LLLVAR_N.encode "1234ABCD"
     }
-
   end
- def test_LLVAR_Z
+
+  def test_LLVAR_Z
     value, rest = LLVAR_Z.parse "16;123123123=123?5"+"021234"
     assert_equal ";123123123=123?5", value
     assert_equal "021234", rest
@@ -94,10 +96,6 @@ class FieldTest < Test::Unit::TestCase
     assert_raise(ISO8583Exception) {
       enc = LLVAR_Z.encode "1234ABCD"
     }
-    
-    
-    
-
   end
 
   def test_AN
@@ -144,6 +142,7 @@ class FieldTest < Test::Unit::TestCase
     assert_equal "10 ", fld.encode("10")
     assert_equal ["1!", "a"], fld.parse("1! a")
   end
+
   def test_B
     fld = B.dup
     fld.length = 3
@@ -159,6 +158,31 @@ class FieldTest < Test::Unit::TestCase
     assert_equal ["1! ", "a"], fld.parse("1! a")
     assert_equal ["1!", ""], fld.parse("1!\000")
   end
- 
-  
+
+  def test_N_BCD
+    fld = N_BCD.dup
+    fld.length=3
+    value, rest = fld.parse "\x01\x23\x45"
+    assert_equal 123, value
+
+    assert_equal "\x01\x23", fld.encode(123)
+    assert_equal "\x01\x23", fld.encode("123")
+    assert_equal "\x01\x23", fld.encode("0123")
+
+    assert_raise(ISO8583Exception) {
+      fld.encode 12345
+    }
+
+    # There's a bug here. A 4 digit value encodes to 2 digits encoded, 
+    # which passes the test for length ... This test doesn't pass:
+
+    #asssert_raise (ISO8583Exception) {
+    #  fld.encode 1234
+    #}
+  end
+
+  def test_YYMMDDhhmmss
+    fld = YYMMDDhhmmss
+    assert_equal "740808120000", fld.encode("740808120000")
+  end
 end