iso8583 0.1.5 → 0.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWJiNGY0OGRlMDRjYjIzMzVkMjM0MTM0MjkwNjRmMDUyY2QyM2ZmYQ==
+    NjVlYWQ5YmQzY2ZlYWVjYWYxODliYTQ4NjViMzhiZDM3Y2NiY2I5Mw==
   data.tar.gz: !binary |-
-    ZTVmMDk5YmExZjgzYTY3MTQzYmQ1MjQ4ZGI3MTJhNTVjMzE5NzZjMw==
-!binary "U0hBNTEy":
+    YzQ0OTBiYmI4MGQ0NjViMTI2YzNlM2NiZTUzNTIxZTliYWU4OTQzOQ==
+SHA512:
   metadata.gz: !binary |-
-    ZDE4OTM5MDcwMmE2NDA4MTdmMWJkMTljZWMwZWU0N2I1Yjc5MzIwY2ZmNjUz
-    OGM1OTM4ZjYzNWY1YmM1MWQwYzcwYjdjOTAwZTgxYjk1YTlkNGE2MWRiOGM5
-    OGU0ODJkYmFjNjA3N2UwOGE3ZDY2MWYxMmQzMTdjMWY5OTk2OTk=
+    NWU4Zjg3NDQwNjdmNThjOWYwZWYyOWEwZTQ5ZDU1ZDFkNWNlZDE5OWFiOTgw
+    NjY4M2QzNWIxNTlkNDAwM2Y5ZjUzZTM3ZTc3ZGNhMGQ3ODI4Zjg1OWVmOGMx
+    YmIzZWE4YWJlNDc5ZGIwNWJjMmMyZDBkZDE2M2EzMjdjNjU0OTg=
   data.tar.gz: !binary |-
-    MDc0NGY5Y2EyNGY2YWQ5OThhNzNiZGJhZDliNzU1NzkxNTAxNDYwMDVmNDUz
-    NDJjYjE1NjNlNDNiZDBkNjIyOWRlMTU3MjE1MjU0NzFmODlhNzRlZDI1YWVi
-    Nzc0MGFiYzI4YmRjYjFhMzM2ZDg0YmJjNzE3NjA1MmVkYjgwMDc=
+    YzQ2YzU2N2E1YzM2YjRjZThiNTdiOWE2NGViYjA1NmMzNWQwZGNjZmJkMTg2
+    MDBlOWU2MTdmOTkyOWZkYmQwYWVmNjJkMTkxMDkyMTY3NDk1MjcyYjI3OWM2
+    MGU1MDVlN2QzNTAxNTAzZjQ4YzA0NmQ2ZmVmMzI0ZDlkMzYyZWQ=

data/CHANGELOG

@@ -1,3 +1,18 @@
+0.1.6
+=========
+restrict to ruby < 2
+allow removal of empty fields
+
+0.1.5
+=========
+MMDD Codec
+BCD encoder checks odd length fields
+
+0.1.4
+=========
+  Gemspec
+  reformatting
+
 0.1.3
 ==========
   bugfix, field definitions not duplicated

data/lib/iso8583.rb

@@ -9,4 +9,5 @@ module ISO8583
   require "iso8583/bitmap"
   require "iso8583/message"
   require "iso8583/util"
+  require "iso8583/version"
 end

data/lib/iso8583/codec.rb

@@ -58,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!
@@ -134,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
@@ -192,7 +195,9 @@ module ISO8583
   end
 
   MMDDhhmmssCodec   = _date_codec("%m%d%H%M%S")
+  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")
 
 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

data/lib/iso8583/fields.rb

@@ -33,8 +33,10 @@ 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
 
 
   # Special form to de/encode variable length indicators, two bytes ASCII numerals 
@@ -161,5 +163,13 @@ module ISO8583
   YYMM        = Field.new
   YYMM.codec  = YYMMCodec
   YYMM.length = 4
+  
+  MMDD        = Field.new
+  MMDD.codec  = MMDDCodec
+  MMDD.length = 4
+
+  Hhmmss        = Field.new
+  Hhmmss.codec  = HhmmssCodec
+  Hhmmss.length = 6
 
 end

data/lib/iso8583/message.rb

@@ -147,9 +147,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

data/lib/iso8583/version.rb

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

data/test/message_test.rb

@@ -160,4 +160,14 @@ END
     mes2 = BerlinMessage.parse(mes.to_b)
     assert_equal(mes.to_b, mes2.to_b)
   end
+
+  def test_remove_field
+    mes     = BerlinMessage.new
+    mes.mti = "Network Management Request Response Issuer Gateway or Acquirer Gateway"
+    mes[3]  = nil
+
+    assert_nothing_raised do
+      mes.to_b
+    end
+  end
 end

data/test/test_codec.rb

@@ -4,6 +4,24 @@ require 'lib/iso8583'
 include ISO8583
 
 class FieldTest < Test::Unit::TestCase
+  def test_hhmmssCodec
+    dt = HhmmssCodec.decode "121212"
+    assert_equal DateTime, dt.class
+    assert_equal 12, dt.hour
+    assert_equal 12, dt.min
+    assert_equal 12, dt.sec
+    assert_equal DateTime, dt.class
+    
+    assert_raise(ISO8583Exception) {
+      dt = HhmmssCodec.decode "261212"
+    }
+    assert_raise(ISO8583Exception) {
+      dt = HhmmssCodec.encode "121261"
+    }
+    t = Time.new(2002, 10, 31, 2, 2, 2, "+02:00")
+    assert_equal "020202", HhmmssCodec.encode(t)
+
+  end
   def test_MMDDhhmmssCodec
     dt = MMDDhhmmssCodec.decode "1212121212"
     assert_equal DateTime, dt.class
@@ -12,6 +30,7 @@ class FieldTest < Test::Unit::TestCase
     assert_equal 12, dt.hour
     assert_equal 12, dt.min
     assert_equal 12, dt.sec
+    assert_equal DateTime, dt.class
 
     assert_raise(ISO8583Exception) {
       dt = MMDDhhmmssCodec.decode "1312121212"
@@ -62,6 +81,24 @@ class FieldTest < Test::Unit::TestCase
     assert_equal "0912", YYMMCodec.encode("0912")
   end
 
+  def test_YMMCodec
+    dt = MMDDCodec.decode "0812"
+    assert_equal DateTime, dt.class
+    assert_equal 8, dt.month
+    assert_equal 12, dt.day
+
+    assert_raise(ISO8583Exception) {
+      dt = MMDDCodec.decode "1313"
+    }
+    
+    assert_raise(ISO8583Exception) {
+      dt = MMDDCodec.encode "0231"
+    }
+
+    assert_equal "0912", MMDDCodec.encode("0912")
+    t = Time.new(2002, 10, 31, 2, 2, 2, "+02:00")
+    assert_equal "1031", MMDDCodec.encode(t)
+  end
   def test_A_Codec
     assert_raise(ISO8583Exception) {
       dt = A_Codec.encode "!!!"

data/test/test_fields.rb

@@ -234,4 +234,17 @@ class FieldTest < Test::Unit::TestCase
     fld = YYMMDDhhmmss
     assert_equal "740808120000", fld.encode("740808120000")
   end
+  def test_Hhmmss
+    fld = Hhmmss
+    assert_equal "123456", fld.encode("123456")
+    dt, rest = fld.parse("123456")
+    assert_equal 12, dt.hour
+    assert_equal 34, dt.min
+    assert_equal 56, dt.sec
+    
+    assert_raise(ISO8583Exception) {
+      fld.encode 1234567
+    }
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iso8583
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Tim Becker
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-26 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Ruby implementation of ISO 8583 financial messaging
 
@@ -21,6 +21,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- AUTHORS
+- CHANGELOG
+- LICENSE
+- README
+- Rakefile
+- TODO
 - lib/8583.rb
 - lib/iso8583.rb
 - lib/iso8583/berlin.rb
@@ -32,12 +38,6 @@ files:
 - lib/iso8583/message.rb
 - lib/iso8583/util.rb
 - lib/iso8583/version.rb
-- AUTHORS
-- CHANGELOG
-- LICENSE
-- README
-- Rakefile
-- TODO
 - test/BitmapTests.rb
 - test/message_test.rb
 - test/test_codec.rb
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: iso8583
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ! 'iso8583: Ruby implementation of ISO 8583 financial messaging'