codec 0.0.4 → 0.0.5

data/lib/codec/bitmap.rb

@@ -44,28 +44,28 @@ module Codec
     def encode(field)
       fields = field.get_value 
       encoded_fields = []
-      fields_list = fields.collect{|id,sf| id.to_i}
+      fields_list = fields.collect{|sf| sf.get_id.to_i}
       # Add field for bitmaps
       bitmap_fields = @num_extended_bitmaps[0,(fields_list.last - 1) / bitmap_length]
       fields_list +=  bitmap_fields
-      fields += bitmap_fields.collect {|id| [id,nil]}
-      fields.sort!{|a,b| a.first.to_i <=> b.first.to_i}
+      fields += bitmap_fields.collect {|id| Field.new(id)}
+      fields.sort!{|a,b| a.get_id.to_i <=> b.get_id.to_i}
       # Encode first bitmap
       out = encode_bitmap(fields_list,0)
       bitmap_index = 1
-      fields.each do |id,sf|
-        codec = @subCodecs[id]
-        if @num_extended_bitmaps.include?(id)
+      fields.each do |sf|
+        codec = @subCodecs[sf.get_id]
+        if @num_extended_bitmaps.include?(sf.get_id)
           out += encode_bitmap(fields_list,bitmap_index)
           bitmap_index += 1
         elsif codec.nil?
-          raise EncodingException, "unknown codec for subfield #{id}"
-        elsif encoded_fields.include?(id.to_i)
-          raise EncodingException, "Multiple subfield #{id} is invalid for Codec::Bitmap"
+          raise EncodingException, "unknown codec for subfield #{sf.get_id}"
+        elsif encoded_fields.include?(sf.get_id.to_i)
+          raise EncodingException, "Multiple subfield #{sf.get_id} is invalid for Codec::Bitmap"
         else
           out += codec.encode(sf)
         end
-        encoded_fields << id.to_i
+        encoded_fields << sf.get_id.to_i
       end
       return out
     end
@@ -99,4 +99,4 @@ module Codec
       return msg,buf
     end
   end
-end
+end

data/lib/codec/composed.rb

@@ -12,10 +12,10 @@ module Codec
     def encode(field)
       subfields = field.get_value
       composed_encoder = subfields.zip(@subCodecs).collect {|sf,sc|
-        if sf.first != sc.first
+        if sf.get_id != sc.first
           raise EncodingException, "subfield #{sf.first} not correspond to subcodec #{sc.first}"
         end
-        [sc.last,sf.last]
+        [sc.last,sf]
       } 
       out = ""
       composed_encoder.each do |subcodec,subfield|
@@ -80,4 +80,4 @@ module Codec
       super(field)
     end
   end
-end
+end

data/lib/codec/field.rb

@@ -14,27 +14,29 @@ module Codec
     end
     
     def self.from_array(id,fields_array)
-      f = Field.new(id)  
-      fields_array.each do |id,value|
-        if value.kind_of?(Array)
-          sf = Field.from_array(id,value)
-        else
-          sf = Field.new(id,value)
-        end
-        f.add_sub_field(sf)
-      end
+      f = Field.new(id,fields_array)  
       return f
     end
     
     def ==(other)
-      (@id == other.get_id && @value == other.get_value)
+      (@id == other.id && @value == other.value)
     end
     
     def get_id ; @id; end
     
     def set_id id ; @id = id ; end
     
-    def get_value ; @value; end
+    def get_value 
+      if @value.kind_of?(Array)
+        v = []
+        @value.each{|id,value|
+          v << Field.new(id,value)
+        }
+        return v
+      else
+        return @value
+      end
+    end
     
     def set_value(value)
 	    raise "Error can not set value that is instance of Array" if value.kind_of? Array
@@ -45,7 +47,7 @@ module Codec
     def add_sub_field(sf)
       @value = [] if @value == ""
 	    raise "Add impossible on not Array valued field" unless @value.kind_of? Array
-	    @value << [sf.get_id,sf]
+	    @value << [sf.id,sf.value]
     end
     
 	  def get_sf_recursivly(ids)
@@ -59,11 +61,45 @@ module Codec
 	  	end
 	  end
 	  
+    def search(path,separator='.')
+      get_sf_recursivly(path.split(separator))
+    end
+    
 	  def get_deep_field(path,separator='.')
 	  	get_sf_recursivly(path.split(separator))
 	  end
     
-	  def get_sub_field(id)
+    def set_node(value,new_value,path_ids)
+      is_set = false
+      value = value.collect{|id,val|
+        if id != path_ids.first
+         [id,val]
+        else
+          is_set = true
+          if path_ids.size == 1
+            [id,new_value]
+          else
+            [id,set_node(val,new_value,path_ids.slice(1,path_ids.size))]
+          end
+        end
+      }
+      unless is_set
+        if path_ids.size == 1
+          value << [path_ids.first,new_value]
+        else
+          value << [path_ids.first,set_node_rec([],new_value,
+            path_ids.slice(1,path_ids.size))]
+        end
+      end
+      return value      
+    end
+    
+    def set_deep_field(sf,path,separator='.')
+      @value = set_node(@value,sf.value,path.split(separator))
+      self
+    end
+	  
+    def get_sub_field(id)
 	    sf_rec = get_sub_fields(id)
 	    if sf_rec.nil?
 	      return NilField.new
@@ -79,8 +115,12 @@ module Codec
 	    sf_rec = @value.select{|v| v.first == id}.collect{|v| v.last}
       if sf_rec == []
         return NilField.new
-      else
-        return sf_rec
+      elsif sf_rec.size == 1
+        return [Field.new(id,sf_rec.first)]
+      else 
+        sfs = []
+        sf_rec.each{|v| sfs << Field.new(id,v)}
+        return sfs
       end
     end
   
@@ -95,6 +135,7 @@ module Codec
 	   else
 	     tab + @id + ": " + @value.to_s + "\n"
 	   end
-   end   
+   end
+   attr_reader :id,:value   
   end
 end

data/lib/codec/fix.rb

@@ -31,6 +31,7 @@ module Codec
         end
         out = out[0,maxlength]
       end
+      out = 0.chr if out == ""
       return out.reverse
     end
   end
@@ -85,4 +86,4 @@ module Codec
       return out
     end 
   end
-end
+end

data/lib/codec/prefix.rb

@@ -91,11 +91,14 @@ module Codec
       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}"
+        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)
       # encode header
       header =  @length_codec.encode(head_field)
       return header + content
@@ -133,4 +136,4 @@ module Codec
       return out
     end
   end
-end
+end

data/lib/codec/tlv.rb

@@ -16,10 +16,10 @@ module Codec
     def encode(field)
       out = ""
       fields = field.get_value
-      fields.each do |id,sf|
-        out += @tag_codec.encode(Field.new(id,id))
-        if @subCodecs[id]
-          content = @subCodecs[id].encode(sf)
+      fields.each do |sf|
+        out += @tag_codec.encode(Field.new('*',sf.get_id))
+        if @subCodecs[sf.get_id]
+          content = @subCodecs[sf.get_id].encode(sf)
           length_buffer = @length_codec.encode(Field.new('*',content.length))
           out += length_buffer + content
         else
@@ -164,13 +164,13 @@ module Codec
       
       while subfields.size > 0
         subfield = subfields.shift
-        out += tag_encode(subfield.first)
+        out += tag_encode(subfield.get_id)
         # TODO : Handle value that is not String
-        value = value_encode(subfield.last.get_value)
+        value = value_encode(subfield.get_value)
         out += length_encode(value.length)
         out += value
       end
       return out
     end
   end
-end
+end

data/lib/codec/version.rb

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

data/lib/codec.rb

@@ -1,5 +1,6 @@
 require 'log4r'
 require 'codec/version'
+require 'codec/logger'
 require 'codec/field'
 require 'codec/exceptions'
 require 'codec/base'
@@ -11,20 +12,5 @@ require 'codec/bitmap'
 require 'codec/tlv'
 
 module Codec
-  
-  Logger = Log4r::Logger.new 'parserLog'
-  Logger.outputters = Log4r::Outputter.stderr
-  Logger.level=Log4r::INFO
-  protocols = []
-  
-  if defined?(CODEC_CONST).nil?
-    CODEC_CONST = true
-  end
-  
-  
-  def self.register_protocol(protocol)
-    protocols << protocol
-    return protocols
-  end
-
+  # TODO : here implements Module constants and methods
 end

data/test/lib/codec/bitmap_test.rb

@@ -10,6 +10,7 @@ describe Codec::Bitmap do
     subject.add_sub_codec('3', Codec::String.new('*',3))
     subject.add_sub_codec('15', Codec::Numbin.new('*',2))
     @buffer = ["1100000000000010","012ABCDE","0012"].pack("B*A*H*")
+    @field = Codec::Field.from_array('Bitmap',[['1',12],['2','ABCDE'],['15',18]])
   end
 
   it "must be a BaseComposed codec" do
@@ -17,10 +18,7 @@ describe Codec::Bitmap do
   end
   
   it "must generate composed field from buffer" do
-    subject.decode(@buffer).first.
-      get_value.collect{ |id,f| 
-        [id,f.get_value]
-      }.must_equal([['1',12],['2',"ABCDE"],['15',18]])
+    subject.decode(@buffer).first.must_equal(@field)
   end
 
 end
@@ -37,9 +35,10 @@ describe Codec::Bitmap do
     subject.add_sub_codec('18', Codec::Numbin.new('*',2))
     subject.add_sub_codec('21', Codec::String.new('*',5))
     @buffer_1 = ["11000000000000000100100000000000","012","0012","ABCDE"].pack("B*A*H*A*")
-    @buffer2 = ["0110000000000000","012","ABCDE"].pack("B*A3A5")
+    @buffer_2 = ["0110000000000000","012","ABCDE"].pack("B*A3A5")
     @field_1 = Codec::Field.from_array('MultipleBitmap',[['2',12],['18',18],['21',"ABCDE"]])
-    @field_2 = Codec::Field.from_array('MultipleBitmap',[['2',12],['41',18],['21',"ABCDE"]])
+    @field_2 = Codec::Field.from_array('MultipleBitmap',[['2',12],['3','ABCDE']])
+    @field_3 = Codec::Field.from_array('MultipleBitmap',[['2',12],['41',18],['21',"ABCDE"]])
   end
 
   it "must be a Bitmap codec" do
@@ -47,17 +46,11 @@ describe Codec::Bitmap do
   end
   
   it "must generate composed field from buffer with extended bitmap" do
-    subject.decode(@buffer_1).first.
-      get_value.collect{ |id,f| 
-        [id,f.get_value]
-      }.must_equal([['2',12],['18',18],['21',"ABCDE"]])
+    subject.decode(@buffer_1).first.must_equal(@field_1)
   end
 
   it "must generate composed field from buffer without extended bitmap" do
-    subject.decode(@buffer2).first.
-      get_value.collect{ |id,f| 
-        [id,f.get_value]
-      }.must_equal([['2',12],['3',"ABCDE"]])
+    subject.decode(@buffer_2).first.must_equal(@field_2)
   end
   
   it "must generate buffer from composed field" do
@@ -65,7 +58,7 @@ describe Codec::Bitmap do
   end
 
   it "must raise Encoding exception if subfield is unknown" do
-    proc { subject.encode(@field_2) }.must_raise(Codec::EncodingException)
+    proc { subject.encode(@field_3) }.must_raise(Codec::EncodingException)
   end  
   
-end
+end

data/test/lib/codec/tlv_test.rb

@@ -56,7 +56,28 @@ describe Codec::Tlv do
     subject.encode(@field).must_equal(@buffer)
   end  
 end
+
+
+describe Codec::Tlv do
+  subject {
+    tag = Codec::Binary.new('T',1)
+    length = Codec::Numbin.new('L',1)
+    value = Codec::Numbin.new('V',0)
+    Codec::Tlv.new('TAG',length,tag,value) }
+    before do
+      @buffer = ["9501009C010181020200"].pack("H*")
+      @field = Codec::Field.from_array('TAG',
+        [['95',0],['9C',1],['81',512]])          
+    end
     
+    it "must decode TLV buffer to field" do
+      subject.decode(@buffer).first.must_equal(@field)
+    end
+    
+    it "must encode TLV field to buffer" do
+      subject.encode(@field).must_equal(@buffer)
+    end
+end
     
 describe Codec::Bertlv do
   subject { Codec::Bertlv.new('Bertlv') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codec
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler