codec 0.0.5 → 0.0.7

data/lib/codec/base.rb

@@ -21,7 +21,20 @@ module Codec
       l = eval_length(buf,@length)
       return build_field(buf,l),buf[l,buf.length]
     end    
+
+    def encode(field)
+      return field.get_value
+    end
+    
+    def encode_with_length(field)
+      buf = encode(field)
+      return buf.length, buf
+    end
     
+    def get_length(field)
+      field.get_value.length
+    end
+
     def eval_length(buf,length)
 	    length = 0 if length.nil?
       if(length != 0)

data/lib/codec/composed.rb

@@ -10,6 +10,7 @@ module Codec
     end
     
     def encode(field)
+      return "" if field.empty?
       subfields = field.get_value
       composed_encoder = subfields.zip(@subCodecs).collect {|sf,sc|
         if sf.get_id != sc.first

data/lib/codec/field.rb

@@ -13,6 +13,10 @@ module Codec
       @value = value
     end
     
+    def empty?
+      return true if @value == ""
+    end
+    
     def self.from_array(id,fields_array)
       f = Field.new(id,fields_array)  
       return f
@@ -38,9 +42,13 @@ module Codec
       end
     end
     
-    def set_value(value)
-	    raise "Error can not set value that is instance of Array" if value.kind_of? Array
-      @value = value
+    def set_value(value,path = nil,separator =".")
+      if path.nil?
+  	    raise "Error can not set value that is instance of Array" if value.kind_of? Array
+        @value = value
+      else
+        @value = set_node(@value,value,path.split(separator))
+      end
       return self
     end
     
@@ -123,19 +131,7 @@ module Codec
         return sfs
       end
     end
-  
-   def to_yaml(tab="")
-     if @value.kind_of? Array
-	     s = tab + @id +": \n" 
-	     tab += "  "
-	     @value.each{|v|
-	       s += v.last.to_yaml(tab)
-	     }
-	     return s
-	   else
-	     tab + @id + ": " + @value.to_s + "\n"
-	   end
-   end
+
    attr_reader :id,:value   
   end
 end

data/lib/codec/logger.rb

@@ -0,0 +1,5 @@
+module Codec
+  Logger = Log4r::Logger.new 'codec_logger'
+  Logger.outputters = Log4r::Outputter.stderr
+  Logger.level=Log4r::INFO
+end

data/lib/codec/packed.rb

@@ -4,7 +4,7 @@ module Codec
       ((length + 1) / 2)
     end
     
-    def eval_pck_length(field)
+    def get_length(field)
       if @length > 0
         return @length 
       else
@@ -12,6 +12,10 @@ module Codec
       end
     end	
     
+    def encode_with_length(field)
+      return get_length(field),encode(field)
+    end
+    
     def decode_with_length(buf,length)
       l = eval_length(buf,get_pck_length(length))
       return build_field(buf,l),buf[l,buf.length]

data/lib/codec/prefix.rb

@@ -43,8 +43,8 @@ module Codec
 	  end
     
     def encode(field)
-      val = @value_codec.encode(field)
-      length = @length_codec.encode(Field.new.set_value(val.length))
+      l, val = @value_codec.encode_with_length(field)
+      length = @length_codec.encode(Field.new.set_value(l))
       out = length + val
       return out
     end
@@ -87,18 +87,12 @@ module Codec
     
     def encode(field)
       # encode content
-      content = @value_codec.encode(field.get_sub_field(@value_codec.id))
+      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)
       length_field = head_field.get_deep_field(@path,@separator)
-      if length_field.nil?
-        raise EncodingException,"Length field #{@path} is not present in
-         header for encoding #{@id} => #{field.to_yaml}"
-      end
       # update length field in header
-      # TOFIX: No more working after field refactoring due 
-      # => need to implement set_deep_field
-      length_field.set_value(content.length)
-      head_field.set_deep_field(length_field,@path,@separator)
+      head_field.set_value(length,@path,@separator)
       # encode header
       header =  @length_codec.encode(head_field)
       return header + content

data/lib/codec/tlv.rb

@@ -2,6 +2,9 @@ module Codec
   class Tlv < Prefixedlength
     def initialize(id,length,header,content)
       super(id,length,content)
+      unless  header.kind_of?(Codec::Base)
+        raise InitializeException," Invalid tag codec for Tlv class"
+      end
       @tag_codec = header
       @subCodecs = {}
     end
@@ -9,7 +12,7 @@ module Codec
     def decode_with_length(buf,length)
       l = eval_length(buf,length)
       f,r = decode(buf[0,l])
-      Logger.warn("Remain data in a tlv buffer :[#{r.unpack("H*").first}]") if r.length > 0
+      Logger.warn("Remain data in a tlv buffer :[#{r.unpack("H*").first}]") if r.nil? || r.length > 0
       return f,buf[l,buf.length]
     end
     
@@ -34,11 +37,13 @@ module Codec
       while(buffer.length > 0)
         begin
           tag,buffer = @tag_codec.decode(buffer)
-        rescue 
+        rescue => e
           val = Field.new("ERR")
-          val.set_value("Error on parsing tag for TLV with following data [#{buffer.unpack("H*").first}]")
+          val.set_value("[#{buffer.unpack("H*").first}]")
           msg.add_sub_field(val)
-          return msg
+          Logger.error("in #{@id} tlv codec: #{e.message}\n #{e.backtrace.join(10.chr)}")
+          Logger.error("Decoding failed for #{id} : #{msg.to_yaml}")
+          return msg,""
         end
         begin
           if @subCodecs[tag.get_value.to_s].nil?

data/lib/codec/version.rb

@@ -1,3 +1,3 @@
 module Codec
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/test/lib/codec/pckd_test.rb

@@ -13,7 +13,7 @@ describe Codec::Packed do
   end
   
   it "must retrieve field length" do
-    subject.eval_pck_length(@f_pck).must_equal(6)
+    subject.get_length(@f_pck).must_equal(6)
   end
 
 end

data/test/lib/codec/prefix_test.rb

@@ -28,6 +28,35 @@ describe Codec::Prefixedlength do
   end
 end
 
+describe Codec::Prefixedlength do
+  before do
+    @length = Codec::Numasc.new('length',3)
+    @content = Codec::Strpck.new('content',0)
+    @field = Codec::Field.new
+    @field.set_value("0012AB")
+    @buffer = "006" +["0012AB"].pack("H*")
+  end
+
+  subject { Codec::Prefixedlength.new('Test_lvar',@length,@content) }
+  
+  it "must be a Prefixedlength codec" do
+    subject.must_be_instance_of(Codec::Prefixedlength)
+  end
+  
+  it "must generate a field with computed value" do
+    subject.decode(@buffer).first.get_value.upcase.must_equal("0012AB")
+  end
+  
+  it "must also return remaining data" do
+    subject.decode(@buffer).last.must_equal("")
+  end
+
+  it "must encode value prefixed with length" do
+    subject.encode(@field).must_equal(@buffer)
+  end
+end
+
+
 describe Codec::Headerlength do
   before do
     tag = Codec::Binary.new('T',1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codec
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -81,6 +81,7 @@ files:
 - lib/codec/factory.rb
 - lib/codec/field.rb
 - lib/codec/fix.rb
+- lib/codec/logger.rb
 - lib/codec/packed.rb
 - lib/codec/prefix.rb
 - lib/codec/tlv.rb