iso8583 0.1.6 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjVlYWQ5YmQzY2ZlYWVjYWYxODliYTQ4NjViMzhiZDM3Y2NiY2I5Mw==
-  data.tar.gz: !binary |-
-    YzQ0OTBiYmI4MGQ0NjViMTI2YzNlM2NiZTUzNTIxZTliYWU4OTQzOQ==
+SHA1:
+  metadata.gz: 9a014be2e1455129a38601f8f9490a0856e8f80e
+  data.tar.gz: e845890de100b7b09f52c2dea10709d759a09710
 SHA512:
-  metadata.gz: !binary |-
-    NWU4Zjg3NDQwNjdmNThjOWYwZWYyOWEwZTQ5ZDU1ZDFkNWNlZDE5OWFiOTgw
-    NjY4M2QzNWIxNTlkNDAwM2Y5ZjUzZTM3ZTc3ZGNhMGQ3ODI4Zjg1OWVmOGMx
-    YmIzZWE4YWJlNDc5ZGIwNWJjMmMyZDBkZDE2M2EzMjdjNjU0OTg=
-  data.tar.gz: !binary |-
-    YzQ2YzU2N2E1YzM2YjRjZThiNTdiOWE2NGViYjA1NmMzNWQwZGNjZmJkMTg2
-    MDBlOWU2MTdmOTkyOWZkYmQwYWVmNjJkMTkxMDkyMTY3NDk1MjcyYjI3OWM2
-    MGU1MDVlN2QzNTAxNTAzZjQ4YzA0NmQ2ZmVmMzI0ZDlkMzYyZWQ=
+  metadata.gz: 883e27a230ef51981e2a6fdd95776c4fb310a02712554526bc2f7928835864ffa2c2a2cb1eb38757ec1f736447922d424820bbb84afb1e882512310fdf1693c7
+  data.tar.gz: 692b9a633fd89d7916888c39f9440920e206eef24f979eda4672684eb13864703d94b7484bc363d1240a4ee69a765a8267a08245b7b12902f10d872a175a19c7

data/AUTHORS

@@ -1,3 +1,5 @@
 Tim Becker (tim@kuriositaet.de)
 Slava Kravchenko (cordawyn@gmail.com)
 Tonni Aagesen (https://github.com/ta)
+Lasse Skindstad Ebert (https://github.com/lasseebert)
+Joel Ibaceta (https://github.com/joelibaceta)

data/CHANGELOG

@@ -1,12 +1,21 @@
+0.2.0
+=========
+  no more 1.8 compatibility, byte encoding for 1.9+, ci
+  Inherit ISOException from StandardError
+  Add bundler stuff, and dev dependancy for test-unit which was removed
+     for no good reason in 2.2
+  Use ASCII for all forced_encodings
+
 0.1.6
 =========
-restrict to ruby < 2
-allow removal of empty fields
+  restrict to ruby < 2
+  allow removal of empty fields
+  Thanks: Lasse Skindstad Ebert https://github.com/lasseebert
 
 0.1.5
 =========
-MMDD Codec
-BCD encoder checks odd length fields
+  MMDD Codec
+  BCD encoder checks odd length fields
 
 0.1.4
 =========

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,18 @@
+PATH
+  remote: .
+  specs:
+    iso8583 (0.1.6)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (10.4.2)
+    test-unit (2.1.2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  iso8583!
+  rake
+  test-unit

data/README

@@ -3,17 +3,18 @@
 This package currently contains code for coding an decoding ISO 8583
 Financial Message.
 
-== Using
+== Developing
 
-The best place to get started using the library is the documentation of the
-Message class. Once a stable state is reached, this should be the only
-class you need to use ...
+In case you're using a ruby version >= 2.2, test-unit is no longer in
+the std lib, so it needs to be available. Bundler installs this, if not
+using bundler, you need to run `gem install test-unit` before running
+the tests.
 
 == Installing
 
-You can install the +iso8583+ package by executing:
+You can install the last version of the +iso8583+ package by executing:
 
-	gem install iso8583
+	gem install iso8583 
 
 == Source
 
@@ -24,3 +25,5 @@ The source is most readily available on github[http://github.com/a2800276/8583].
 In case you discover bugs, spelling errors, offer suggestions for
 improvements or would like to help out with the project, you can contact
 me directly (tim@kuriositaet.de).
+
+[![Build Status](https://travis-ci.org/a2800276/8583.svg?branch=master)](https://travis-ci.org/a2800276/8583)

data/lib/iso8583/bitmap.rb

@@ -17,9 +17,7 @@ module ISO8583
     # not, this initializes and empty bitmap.
     def initialize(message = nil)
       @bmp = Array.new(128, false)
-      if !message
-
-      else
+      if message
         initialize_from_message message
       end
     end
@@ -76,7 +74,7 @@ module ISO8583
           break
         end
       }
-      str = ""
+      str = "".force_encoding("ASCII-8BIT")
       1.upto(self[1] ? 128 : 64) {|i|
         str << (self[i] ? "1" : "0")
       }

data/lib/iso8583/exception.rb

@@ -1,4 +1,4 @@
 module ISO8583
-  class ISO8583Exception < Exception; end
+  class ISO8583Exception < StandardError; end
   class ISO8583ParseException < ISO8583Exception; end
 end

data/lib/iso8583/field.rb

@@ -27,7 +27,7 @@ module ISO8583
                    raise ISO8583Exception.new("Cannot determine the length of '#{name}' field")
                  end
 
-      raw_value = raw[0,len]
+      raw_value = raw.byteslice(0,len)
       
       # make sure we have enough data ...
       if raw_value.length != len
@@ -35,7 +35,7 @@ module ISO8583
         raise ISO8583ParseException.new(mes)
       end
 
-      rest = raw[len, raw.length]
+      rest = raw.byteslice(len, raw.length)
       begin
         real_value = codec.decode(raw_value)
       rescue
@@ -70,7 +70,7 @@ module ISO8583
                 when Fixnum
                   raise ISO8583Exception.new("Too long: #{value} (#{name})! length=#{length}")  if encoded_value.length > length
                   raise ISO8583Exception.new("Too short: #{value} (#{name})! length=#{length}") if encoded_value.length < length
-                  "" 
+                  "".force_encoding("ASCII-8BIT")
                 when Field
                   raise ISO8583Exception.new("Max lenth exceeded: #{value}, max: #{max}") if max && encoded_value.length > max
                   length.encode(encoded_value.length)

data/lib/iso8583/message.rb

@@ -173,8 +173,10 @@ module ISO8583
     # Retrieve the byte representation of the bitmap.
     def to_b
       raise ISO8583Exception.new "no MTI set!" unless mti
-      mti_enc = self.class._mti_format.encode(mti)
-      mti_enc << _body.join
+      mti_enc = self.class._mti_format.encode(mti) 
+      str_body="".force_encoding('ASCII-8BIT')
+      _body.map {|b| str_body+=b.force_encoding('ASCII-8BIT')} 
+      mti_enc << str_body
     end
 
     # Returns a nicely formatted representation of this
@@ -202,7 +204,7 @@ module ISO8583
     # [bitmap_bytes, message_bytes]
     def _body
       bitmap  = Bitmap.new
-      message = ""
+      message = "".force_encoding('ASCII-8BIT')
       @values.keys.sort.each do |bmp_num|
         bitmap.set(bmp_num)
         enc_value = @values[bmp_num].encode
@@ -344,6 +346,7 @@ module ISO8583
       
       # Parse the bytes `str` returning a message of the defined type.
       def parse(str)
+        str = str.force_encoding('ASCII-8BIT')
         message = self.new
         message.mti, rest = _mti_format.parse(str)
         bmp,rest = Bitmap.parse(rest)

data/lib/iso8583/util.rb

@@ -19,20 +19,25 @@ module ISO8583
   #
   # 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*")
+
+    [string].pack("H*").force_encoding('ASCII-8BIT')
+
   end
 
+
   def _conv(str, mapping)
-    _str = ""
+    _str = "".force_encoding('ASCII-8BIT')
     str.each_byte{|byte|
-      _str << mapping[byte]
+      _str << [mapping[byte]].pack("C")
     }
     _str
   end

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.6"
+  VERSION = "0.2.0"
 end

data/test/message_test.rb

@@ -45,6 +45,17 @@ class MessageTest < Test::Unit::TestCase
     assert_equal 1430, mes.mti
   end
 
+  def test_rescue_standard_error
+    rescued = false
+    begin
+      BerlinMessage.parse("bogus")
+    rescue => error
+      rescued = true
+    end
+
+    assert rescued
+  end
+
   def test_to_s
     mes     = BerlinMessage.new
     mes.mti = "Network Management Request Response Issuer Gateway or Acquirer Gateway" 

data/test/test_util.rb

@@ -5,9 +5,18 @@ include ISO8583
 
 class UtilTest < Test::Unit::TestCase
   def test_hex2b
-    assert_equal "\xab\xcd\x12", hex2b("abcd12")
-    assert_equal "\xab\xcd\x12", hex2b("a b c d 1 2")
-    assert_equal "\xab\xcd\x12", hex2b("ABCD12")
+    # weird ruby 2.0 workaround:
+    # literal:
+    #   "\xab\xcd\x12"
+    # is interpretted as:
+    #   "\xAB\xCD\u0012"
+    # ...force_encoding(...) fixes this.
+
+    expected = "\xab\xcd\x12".force_encoding("ASCII-8BIT")
+
+    assert_equal expected, hex2b("abcd12")
+    assert_equal expected, hex2b("a b c d 1 2")
+    assert_equal expected, hex2b("ABCD12")
     assert_raise(ISO8583Exception){
       # non hex
       hex2b("ABCDEFGH")
@@ -27,6 +36,6 @@ class UtilTest < Test::Unit::TestCase
   end
 
   def test_ascii2ebcdic
-    assert_equal "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9", ascii2ebcdic("0123456789")
+    assert_equal "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9".force_encoding('ASCII-8BIT'), ascii2ebcdic("0123456789")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iso8583
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Tim Becker
@@ -9,11 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies: []
-description: ! 'Ruby implementation of ISO 8583 financial messaging
-
-'
+description: |
+  Ruby implementation of ISO 8583 financial messaging
 email:
 - tim.becker@kuriositaet.de
 - cordawyn@gmail.com
@@ -23,6 +22,8 @@ extra_rdoc_files: []
 files:
 - AUTHORS
 - CHANGELOG
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README
 - Rakefile
@@ -53,19 +54,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - none
 rubyforge_project: iso8583
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: ! 'iso8583: Ruby implementation of ISO 8583 financial messaging'
+summary: 'iso8583: Ruby implementation of ISO 8583 financial messaging'
 test_files: []