iso8583 0.1.3 → 0.1.4

data/AUTHORS

@@ -1,2 +1,3 @@
 Tim Becker (tim@kuriositaet.de)
 Slava Kravchenko (cordawyn@gmail.com)
+Tonni Aagesen (https://github.com/ta)

data/README

@@ -1,4 +1,3 @@
-
 = ISO 8583 Financial Messaging for Ruby
 
 This package currently contains code for coding an decoding ISO 8583
@@ -18,7 +17,7 @@ You can install the +iso8583+ package by executing:
 
 == Source
 
-The source is most readily available on github[http://github.com/cordawyn/8583].
+The source is most readily available on github[http://github.com/a2800276/8583].
 
 == Mailing List
 

data/Rakefile

@@ -1,5 +1,5 @@
-require "rake/rdoctask"
-require "rake/gempackagetask"
+require "rdoc/task"
+require "rubygems/package_task"
 require "rake/testtask"
 require "rake/clean"
 require "rubygems"
@@ -9,7 +9,7 @@ require "rubygems"
 
 SHORTNAME	= "iso8583"	# this should be the rubyforge project name
 DESC		= "Ruby implementation of ISO 8583 financial messaging"
-PKG_VERSION 	= "0.1.3"
+PKG_VERSION 	= "0.1.4"
 LONG_DESC	= <<END_DESC
 Ruby implementation of ISO 8583 financial messaging
 END_DESC
@@ -88,7 +88,7 @@ end
 
 # Adding a new GemPackageTask adds a task named `package`, which generates
 # packages as gems, tarball and zip archives.
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.need_zip = true
   pkg.need_tar_gz = true
 end
@@ -120,7 +120,7 @@ end
 
 Rake::TestTask.new do |t|
   t.libs << "test"
-  t.libs << "lib"
+  t.libs << "."
   t.ruby_opts = ["-rubygems"]
   t.test_files = FileList["test/*.rb"]
   t.verbose = true

data/lib/8583.rb

@@ -1,12 +1,5 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-module ISO8583
-  require "8583/field"
-  require "8583/codec"
-  require "8583/fields"
-  require "8583/exception"
-  require "8583/bitmap"
-  require "8583/message"
-  require "8583/util"
-end
+# DEPRECATED
+require 'iso8583'

data/lib/iso8583.rb

@@ -1,5 +1,12 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-
-require '8583'
+module ISO8583
+  require "iso8583/field"
+  require "iso8583/codec"
+  require "iso8583/fields"
+  require "iso8583/exception"
+  require "iso8583/bitmap"
+  require "iso8583/message"
+  require "iso8583/util"
+end

data/lib/{8583 → iso8583}/codec.rb

@@ -45,6 +45,8 @@ module ISO8583
   # [+ASCII_Number+]      encodes either a Number or String representation of 
   #                       a number to the ASCII represenation of the number, 
   #                       decodes ASCII  numerals to a number
+  # [+A_Codec+]           passes through ASCII string checking they conform to [A-Za-z]
+  #                       during encoding, no validity check during decoding. 
   # [+AN_Codec+]          passes through ASCII string checking they conform to [A-Za-z0-9]
   #                       during encoding, no validity check during decoding. 
   # [+ANP_Codec+]         passes through ASCII string checking they conform to [A-Za-z0-9 ] 
@@ -109,6 +111,13 @@ module ISO8583
     d = encoded.unpack("H*")[0].to_i
   }
 
+  A_Codec = Codec.new
+  A_Codec.encoder = lambda{|str|
+    raise ISO8583Exception.new("Invalid value: #{str} must be [A-Za-z]") unless str =~ /^[A-Za-z]*$/
+    str
+  }
+  A_Codec.decoder = PASS_THROUGH_DECODER
+
   AN_Codec = Codec.new
   AN_Codec.encoder = lambda{|str|
     raise ISO8583Exception.new("Invalid value: #{str} must be [A-Za-y0-9]") unless str =~ /^[A-Za-z0-9]*$/

data/lib/{8583 → iso8583}/fields.rb

@@ -20,10 +20,13 @@ module ISO8583
   # [+LLVAR_N+]      two byte variable length ASCII numeral, payload ASCII numerals
   # [+LLLVAR_N+]     three byte variable length ASCII numeral, payload ASCII numerals
   # [+LLVAR_Z+]      two byte variable length ASCII numeral, payload Track2 data 
+  # [+LLVAR_AN+]    two byte variable length ASCII numeral, payload ASCII
   # [+LLVAR_ANS+]    two byte variable length ASCII numeral, payload ASCII+special
+  # [+LLLVAR_AN+]   three byte variable length ASCII numeral, payload ASCII
   # [+LLLVAR_ANS+]   three byte variable length ASCII numeral, payload ASCII+special
   # [+LLVAR_B+]      Two byte variable length binary payload
   # [+LLLVAR_B+]     Three byte variable length binary payload
+  # [+A+]            fixed length letters, represented in ASCII
   # [+N+]            fixed lengh numerals, repesented in ASCII, padding right justified using zeros
   # [+AN+]          fixed lengh ASCII [A-Za-z0-9], padding left justified using spaces.
   # [+ANP+]          fixed lengh ASCII [A-Za-z0-9] and space, padding left, spaces
@@ -70,11 +73,21 @@ module ISO8583
   LLVAR_Z.length  = LL
   LLVAR_Z.codec   = Track2
 
+  # Two byte variable length ASCII numeral, payload ASCII, fixed length, zeropadded (right)
+  LLVAR_AN        = Field.new
+  LLVAR_AN.length = LL
+  LLVAR_AN.codec  = AN_Codec
+
   # Two byte variable length ASCII numeral, payload ASCII+special
   LLVAR_ANS        = Field.new
   LLVAR_ANS.length = LL
   LLVAR_ANS.codec  = ANS_Codec
 
+  # Three byte variable length ASCII numeral, payload ASCII, fixed length, zeropadded (right)
+  LLLVAR_AN        = Field.new
+  LLLVAR_AN.length = LLL
+  LLLVAR_AN.codec  = AN_Codec
+
   # Three byte variable length ASCII numeral, payload ASCII+special
   LLLVAR_ANS        = Field.new
   LLLVAR_ANS.length = LLL
@@ -105,6 +118,10 @@ module ISO8583
     sprintf "%-#{len}s", val
   }
 
+  # Fixed length ASCII letters [A-Za-z]
+  A = Field.new
+  A.codec = A_Codec
+
   # Fixed lengh ASCII [A-Za-z0-9], padding left justified using spaces.
   AN = Field.new
   AN.codec = AN_Codec

data/lib/iso8583/version.rb

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

data/test/message_test.rb

@@ -1,5 +1,5 @@
-require 'lib/8583'
-require 'lib/8583/berlin'
+require 'lib/iso8583'
+require 'lib/iso8583/berlin'
 require 'test/unit'
 
 include ISO8583

data/test/test_codec.rb

@@ -62,6 +62,14 @@ class FieldTest < Test::Unit::TestCase
     assert_equal "0912", YYMMCodec.encode("0912")
   end
 
+  def test_A_Codec
+    assert_raise(ISO8583Exception) {
+      dt = A_Codec.encode "!!!"
+    }
+    assert_equal "bla", AN_Codec.encode("bla")
+    assert_equal "bla", AN_Codec.decode("bla")
+  end
+
   def test_AN_Codec
     assert_raise(ISO8583Exception) {
       dt = AN_Codec.encode "!!!"

data/test/test_fields.rb

@@ -41,6 +41,39 @@ class FieldTest < Test::Unit::TestCase
     assert_equal "3456", rest    
   end
 
+  def test_LLVAR_AN
+    value, rest = LLVAR_AN.parse "03123ABC"
+    assert_equal "123", value
+    assert_equal "ABC", rest
+
+    value, rest = LLLVAR_AN.parse "006123ABC"
+    assert_equal "123ABC", value
+    assert_equal "", rest
+    assert_raise(ISO8583ParseException) {
+      l,rest = LLLVAR_AN.parse "12"
+    }
+    assert_raise(ISO8583ParseException) {
+      l,rest = LLVAR_AN.parse "12123"
+    }
+
+    enc = LLVAR_AN.encode "123A"
+    assert_equal "04123A", enc
+    
+    enc = LLVAR_AN.encode "123ABC123ABC"
+    assert_equal "12123ABC123ABC", enc
+    
+    assert_raise(ISO8583Exception) {
+      enc = LLVAR_AN.encode "1234 ABCD"
+    }
+    
+    enc = LLLVAR_AN.encode "123ABC123ABC"
+    assert_equal "012123ABC123ABC", enc
+    
+    assert_raise(ISO8583Exception) {
+      enc = LLLVAR_AN.encode "1234 ABCD"
+    }
+  end
+
   def test_LLVAR_N
     value, rest = LLVAR_N.parse "021234"
     assert_equal 12, value
@@ -98,6 +131,22 @@ class FieldTest < Test::Unit::TestCase
     }
   end
 
+  def test_A
+    fld = A.dup
+    fld.length = 3
+    value, rest = fld.parse "abcd"
+    assert_equal "abc", value
+    assert_equal "d", rest
+    
+    assert_raise(ISO8583ParseException) {
+      fld.parse "ab"
+    }
+
+    assert_raise(ISO8583Exception) {
+      fld.encode "abcdef"
+    }
+  end
+
   def test_AN
     fld = AN.dup
     fld.length = 3

data/test/test_seperate_msg.rb

@@ -1,5 +1,5 @@
-require 'lib/8583'
-require 'lib/8583/berlin'
+require 'lib/iso8583'
+require 'lib/iso8583/berlin'
 require 'test/unit'
 
 include ISO8583

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: iso8583
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Tim Becker
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-29 00:00:00 +02:00
+date: 2012-10-30 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -27,21 +32,22 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/8583/berlin.rb
-- lib/8583/bitmap.rb
-- lib/8583/codec.rb
-- lib/8583/exception.rb
-- lib/8583/field.rb
-- lib/8583/fields.rb
-- lib/8583/message.rb
-- lib/8583/util.rb
 - lib/8583.rb
+- lib/iso8583/berlin.rb
+- lib/iso8583/bitmap.rb
+- lib/iso8583/codec.rb
+- lib/iso8583/exception.rb
+- lib/iso8583/field.rb
+- lib/iso8583/fields.rb
+- lib/iso8583/message.rb
+- lib/iso8583/util.rb
+- lib/iso8583/version.rb
 - lib/iso8583.rb
 - AUTHORS
 - CHANGELOG
 - LICENSE
-- Rakefile
 - README
+- Rakefile
 - TODO
 - test/BitmapTests.rb
 - test/message_test.rb
@@ -62,18 +68,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
 - none
 rubyforge_project: iso8583
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: "iso8583: Ruby implementation of ISO 8583 financial messaging"