codec 0.0.11 → 0.0.12

data/lib/codec/bitmap.rb

@@ -93,7 +93,7 @@ module Codec
   	      f = Field.new("ERR") 
   	      f.set_value(buf.unpack("H*").first)
   	      msg.add_sub_field(f)
-          raise ParsingException,msg.to_yaml + "\nError unknown field #{field_tag} : "
+          raise ParsingException.new "#{msg}\nError unknown field #{field_tag} : "
         end
       end
       return msg,buf

data/lib/codec/eight_bits_encoding.rb

@@ -0,0 +1,65 @@
+# coding: utf-8
+module Codec
+  module EightBitsEncoding
+    ASCII_EBCDIC = ["
+    00010203372D2E2F1605250B0C0D0E0F101112133C3D322618193F271C1D1E1F
+    405A7F7B5B6C507D4D5D5C4E6B604B61F0F1F2F3F4F5F6F7F8F97A5E4C7E6E6F
+    7CC1C2C3C4C5C6C7C8C9D1D2D3D4D5D6D7D8D9E2E3E4E5E6E7E8E94AE05A5F6D
+    79818283848586878889919293949596979899A2A3A4A5A6A7A8A9C06AD0A107
+    C3E4858181818183858585898989C1C1C50707969696A4A4A8D6E40707070707
+    818996A495D5810707070707070707070707070707C1C1C10707070707070707
+    07070707070781C10707070707070707070707070789C9C9C907070707070707
+    D607D6D696D6070707E4E4E4A8E8070707070707070707070707070707070707
+    ".gsub(/[^0-9a-fA-F]/i,'')].pack("H*")
+    
+    EBCDIC_ASCII = ["
+    000102037F097F7F7F7F600B0C0D0E0F101112133C0A087F18197F7F1C1D1E1F
+    7F7F7F7F7F0A171B7F7F7F7F7F0506077F7F167F7F7F7F047F7F7F7F14157F1A
+    207F7F7F7F7F7F7F7F7F5B2E3C282B21267F7F7F7F7F7F7F7F7F21242A293B5E
+    2D2F7F7F7F7F7F7F7F7F7C2C255F3E3F7F7F7F7F7F7F7F7F7F603A2340273D22
+    7F6162636465666768697F7F7F7F7F7F7F6A6B6C6D6E6F7071727F7F7F7F7F7F
+    7F7E737475767778797A7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F
+    7B4142434445464748497F7F7F7F7F7F7D4A4B4C4D4E4F5051527F7F7F7F7F7F
+    5C7F535455565758595A7F7F7F7F7F7F303132333435363738397F7F7F7F7F7F
+    ".gsub(/[^0-9a-fA-F]/i,'')].pack("H*")
+    
+    ASCII_EXTENTION = (128..175).to_a + (224..255).to_a + 
+      ["B5B6B7B8BDBEC6C7CFD0D1D2D3D4D5D6D7D8DE"].pack("H*").bytes.to_a
+    UTF_8_EXTENTION = ["ÇÜéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø׃áíóúñѪº¿®¬½¼¡«»",
+      "ÓßÔÒõÕμþÞÚÛÙýݯ´-±_¾¶§÷¸°¨·¹³²_.", "ÁÂÀ©¢¥ãäðÐÊËÈiÍÎÏÌ"].join.chars.to_a
+    EXT_ASC_TO_UTF8 = Hash[ASCII_EXTENTION.zip(UTF_8_EXTENTION)]
+    EXT_UTF8_TO_ASC = Hash[UTF_8_EXTENTION.zip(ASCII_EXTENTION)]
+    
+    def self.UTF8_2_ASCII(buf)
+      buf.chars.collect { |c| 
+        if c.getbyte(0) < 128
+          c
+        elsif EXT_UTF8_TO_ASC[c].nil?
+          127.chr
+        else
+          EXT_UTF8_TO_ASC[c].chr
+        end
+      }.join 
+    end
+    
+    def self.ASCII_2_UTF8(buf)
+      buf.bytes.collect { |b| 
+        if b < 128
+          b.chr
+        elsif EXT_ASC_TO_UTF8[b].nil?
+          127.chr # using ascii padding character
+        else
+          EXT_ASC_TO_UTF8[b]
+        end
+      }.join
+    end
+    
+    def self.EBCDIC_2_UTF8(buf)
+      ASCII_2_UTF8(buf.bytes.collect { |b| EBCDIC_ASCII.getbyte(b).chr }.join)
+    end
+    
+    def self.UTF8_2_EBCDIC(buf)
+      UTF8_2_ASCII(buf).bytes.collect { |b| ASCII_EBCDIC.getbyte(b).chr }.join
+    end
+  end
+end

data/lib/codec/fix.rb

@@ -1,4 +1,5 @@
 module Codec
+  
   class Numbin < Base
     def build_field(buf,length)
       f = Field.new(@id)
@@ -36,7 +37,7 @@ module Codec
     end
   end
 
-  class Numasc < Base
+  class Numstr < Base
     def build_field(buf,length)
       f = Field.new(@id)
       f.set_value(buf[0,length].to_i)
@@ -53,6 +54,64 @@ module Codec
     end
   end
 
+  class Numasc < Numstr
+    # This class is a copy of Numstr class because UTF8 and ASCII 
+    # have the same encoding for digits number
+  end
+  
+  class Numebc < Base
+    def build_field(buf,length)
+      f = Field.new(@id)
+      f.set_value(EightBitsEncoding::EBCDIC_2_UTF8(buf[0,length]).to_i)
+      return f
+    end
+    
+    def encode(field)
+      out = field.get_value.to_s
+      if @length > 0
+        out = out.rjust(@length,"0")
+        raise TooLongDataException if out.length > @length
+      end
+      return EightBitsEncoding::UTF8_2_EBCDIC(out)
+    end
+    
+  end
+  
+  class Ebcdic < Base
+    def build_field(buf,length)
+      f = Field.new(@id)
+      f.set_value(EightBitsEncoding::EBCDIC_2_UTF8(buf[0,length]))
+      return f
+    end
+    
+    def encode(f)
+      out = f.get_value
+      if @length >  0
+        raise TooLongDataException if out.length > @length
+        out = out.ljust(@length," ")
+      end
+      return EightBitsEncoding::UTF8_2_EBCDIC(out)
+    end  
+  end
+  
+  class Ascii < Base
+    def build_field(buf,length)
+      f = Field.new(@id)
+      f.set_value(EightBitsEncoding::ASCII_2_UTF8(buf[0,length]))
+      return f
+    end
+    
+    def encode(f)
+      out = f.get_value
+      if @length >  0
+        raise TooLongDataException if out.length > @length
+        out = out.ljust(@length," ")
+      end
+      return EightBitsEncoding::UTF8_2_ASCII(out)
+    end    
+  end
+  
+  
   class String < Base
     def build_field(buf,length)
       f = Field.new(@id)
@@ -86,4 +145,45 @@ module Codec
       return out
     end 
   end
+
+  # Class Auto Converting Ebcdic to ASCII for number and string
+    EBCDIC_2_ASCII = ["000102039C09867F978D8E0B0C0D0E0F101112139D8508871819928F1C1D1E1F"+
+      "80818283840A171B88898A8B8C050607909116939495960498999A9B14159E1A"+
+      "20A0A1A2A3A4A5A6A7A8D52E3C282B7C26A9AAABACADAEAFB0B121242A293B5E"+
+      "2D2FB2B3B4B5B6B7B8B9E52C255F3E3FBABBBCBDBEBFC0C1C2603A2340273D22"+
+      "C3616263646566676869C4C5C6C7C8C9CA6A6B6C6D6E6F707172CBCCCDCECFD0"+
+      "D17E737475767778797AD2D3D45BD6D7D8D9DADBDCDDDEDFE0E1E2E3E45DE6E7"+
+      "7B414243444546474849E8E9EAEBECED7D4A4B4C4D4E4F505152EEEFF0F1F2F3"+
+      "5C9F535455565758595AF4F5F6F7F8F930313233343536373839FAFBFCFDFEFF"].pack("H*")
+  
+  class Numace < Numstr
+    def build_field(buf,length)
+      f = Field.new(@id)
+      
+      data = ""
+      # if buf to decode is in EBCDIC then convert buf in ASCII
+      if ( buf[0,length].unpack("C*").select{|c| c >= 128}.size > 0)
+        buf[0,length].unpack("C*").each { |c| data += EBCDIC_2_ASCII[c] }
+      else
+        data = buf[0,length]
+      end
+      f.set_value(data.to_i)
+      return f
+    end
+  end
+
+  class Strace < String
+    def build_field(buf,length)
+      f = Field.new(@id)
+      data = ""
+      # if buf to decode is in EBCDIC then convert buf in ASCII
+      if ( buf[0,length].unpack("C*").select{|c| c >= 128}.size > 0)
+        buf[0,length].unpack("C*").each { |c| data += EBCDIC_2_ASCII[c] }
+      else
+        data = buf[0,length]
+      end
+      f.set_value(data)
+      return f
+    end
+  end
 end

data/lib/codec/prefix.rb

@@ -24,7 +24,7 @@ module Codec
 		      f,remain = @value_codec.decode_with_length(buf,len)
 		    rescue => e
 		      Logger.error "Error in #{@id} decoder \n #{e.message}\n#{e.backtrace.join(10.chr)}"
-		      raise ParsingException, e.message
+		      raise ParsingException.new e.message
 		    end
         
         f.set_id(@id)
@@ -35,8 +35,8 @@ module Codec
 	  def build_field(buf,length)
 	    begin
 	      f,r = decode(buf[0,length])
-	    rescue ErrorBufferUnderflow => e
-	      raise ParsingException, e.message
+	    rescue BufferUnderflow => e
+	      raise ParsingException.new e.message
 	    end
 	    Logger.error "Error remain data in Prefixedlength" if r != ""
 	    return f
@@ -90,7 +90,7 @@ module Codec
       content_field = field.get_sub_field(@value_codec.id)
       length, content = @value_codec.encode_with_length(content_field)
       head_field = field.get_sub_field(@length_codec.id)
-      raise EncodingException, "Missing header for encoding #{@id}" if head_field.empty?
+      raise EncodingException.new "Missing header for encoding #{@id}" if head_field.empty?
       # update length field in header if length !=0
       head_field.set_value(length,@path,@separator) if length !=0
       # encode header
@@ -113,7 +113,7 @@ module Codec
     def decode(buffer)
       tag,buf = @tag_codec.decode(buffer)
       if @subCodecs[tag.get_value.to_s].nil?
-        raise ParsingException, "Unknown tag #{tag.get_value.to_s} for #{@id} decoder"
+        raise ParsingException.new "Unknown tag #{tag.get_value.to_s} for #{@id} decoder"
       end
       f,buf = @subCodecs[tag.get_value.to_s].decode(buf)
       f.set_id(tag.get_value.to_s)
@@ -124,7 +124,7 @@ module Codec
       head = Field.new(@tag_codec.id, field.get_id)
       out = @tag_codec.encode(head)
       if @subCodecs[field.get_id].nil?
-        raise EncodingException, "Unknown tag #{field.get_id} for #{@id} encoder"
+        raise EncodingException.new "Unknown tag #{field.get_id} for #{@id} encoder"
       end
       out += @subCodecs[field.get_id].encode(field)
       return out

data/lib/codec/tlv.rb

@@ -130,7 +130,7 @@ module Codec
     
     def value_decode(buf,length)
       if length > buf.length
-        raise ErrorBufferUnderflow,"Not enough data for parsing BER TLV 
+        raise BufferUnderflow.new "Not enough data for parsing BER TLV 
            #{@id} length value #{length} remaining only #{buf.length}"
       end
       value = buf[0,length]

data/lib/codec/version.rb

@@ -1,3 +1,3 @@
 module Codec
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/lib/codec.rb

@@ -3,6 +3,7 @@ require 'codec/version'
 require 'codec/logger'
 require 'codec/field'
 require 'codec/exceptions'
+require 'codec/eight_bits_encoding'
 require 'codec/base'
 require 'codec/fix'
 require 'codec/packed'

data/test/lib/codec/eightbits_test.rb

@@ -0,0 +1,38 @@
+# coding: utf-8
+require_relative '../../test_helper'
+ 
+describe Codec::Ascii do
+
+  subject { Codec::Ascii.new('test',3) }
+  
+  it "must be a Codec::Ascii" do
+    subject.must_be_instance_of(Codec::Ascii)
+  end
+  
+  it "must encode field from utf-8 to ascii" do
+    subject.encode(Codec::Field.new('test','été')).must_equal(["827482"].pack("H*"))
+  end
+
+  it "must decode from ascii stream to utf-8 field" do
+    subject.decode(["827482"].pack("H*")).first.must_equal(Codec::Field.new('test','été'))
+  end
+
+end
+
+describe Codec::Ebcdic do
+
+  subject { Codec::Ebcdic.new('test',3) }
+  
+  it "must be a Codec::Ebcdic" do
+    subject.must_be_instance_of(Codec::Ebcdic)
+  end
+  
+  it "must encode field from utf-8 to Ebcdic" do
+    subject.encode(Codec::Field.new('test','été')).must_equal(["85A385"].pack("H*"))
+  end
+
+  it "must decode from Ebcdic stream to utf-8 field" do
+    subject.decode(["85A385"].pack("H*")).first.must_equal(Codec::Field.new('test','ete'))
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codec
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,6 +77,7 @@ files:
 - lib/codec/base.rb
 - lib/codec/bitmap.rb
 - lib/codec/composed.rb
+- lib/codec/eight_bits_encoding.rb
 - lib/codec/exceptions.rb
 - lib/codec/factory.rb
 - lib/codec/field.rb
@@ -88,6 +89,7 @@ files:
 - lib/codec/version.rb
 - test/lib/codec/bitmap_test.rb
 - test/lib/codec/composed_test.rb
+- test/lib/codec/eightbits_test.rb
 - test/lib/codec/field_test.rb
 - test/lib/codec/fix_test.rb
 - test/lib/codec/pckd_test.rb
@@ -124,6 +126,7 @@ summary: This Gem provide class that permit to instantiate Codec to parse or bui
 test_files:
 - test/lib/codec/bitmap_test.rb
 - test/lib/codec/composed_test.rb
+- test/lib/codec/eightbits_test.rb
 - test/lib/codec/field_test.rb
 - test/lib/codec/fix_test.rb
 - test/lib/codec/pckd_test.rb