codec 0.0.10 → 0.0.11

data/lib/codec/packed.rb

@@ -27,10 +27,17 @@ module Codec
   end
 
   class Numpck < Packed
-    def build_field(buf,length)
+    def decode_with_length(buf,length)
+      l = eval_length(buf,get_pck_length(length))
       f = Field.new(@id)
-      f.set_value(buf[0,length].unpack("H*").first.to_i)
-      return f
+      val = buf[0,l].unpack("H*").first
+      if @length.odd?
+        val = val[1,val.length]
+      else
+        val = val[1,val.length] if length.odd?
+      end
+      f.set_value(val.to_i)
+      return f,buf[l,buf.length]
     end
     
     def encode(field)
@@ -47,13 +54,17 @@ module Codec
   end
   
   class Strpck < Packed
-    def build_field(buf,length)
+    def decode_with_length(buf,length)
+      l = eval_length(buf,get_pck_length(length))
       f = Field.new(@id)
-      val = buf[0,length].unpack("H*").first
-      # TODO : handle odd length for packed field with prefixed length
-      val.chop! if @length.odd?
+      val = buf[0,l].unpack("H*").first
+      if @length.odd?
+        val.chop! 
+      else
+        val.chop! if length.odd?
+      end
       f.set_value(val)
-      return f
+      return f,buf[l,buf.length]
     end
     
     def encode(field)
@@ -68,5 +79,32 @@ module Codec
       return out
     end
   end
-
+  
+  class Nstpck < Packed
+    def decode_with_length(buf,length)
+      l = eval_length(buf,get_pck_length(length))
+      f = Field.new(@id)
+      val = buf[0,l].unpack("H*").first
+      if @length.odd?
+        val = val[1,val.length]
+      else
+        val = val[1,val.length] if length.odd?
+      end
+      f.set_value(val)
+      return f,buf[l,buf.length]
+    end
+    
+    def encode(field)
+      out = field.get_value
+      if @length > 0
+        out = out.rjust(@length,"0")
+        raise TooLongDataException if out.length > @length
+      end
+      l = out.length
+      out.prepend("0") if out.length.odd?
+      out = [out].pack("H*")
+      return out
+    end
+  end
+  
 end

data/lib/codec/version.rb

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

data/test/lib/codec/field_test.rb

@@ -56,5 +56,33 @@ describe Codec::Field do
     subject.must_equal(Codec::Field.from_array('Test',
     [['SF1',"123"],['SF2',"321"],['SF3',[['SF31',"456"],['SF32','789']]]]))
   end
-
+  
 end
+
+describe Codec::Field do
+
+  subject { f = Codec::Field.new('Test')
+    sf1 = Codec::Field.new('SF1')
+    sf1.set_value("123")
+    f.add_sub_field(sf1)
+    sf2 = Codec::Field.new('SF2')
+    sf2.set_value("321")
+    f.add_sub_field(sf2)
+    sf3 = Codec::Field.new('SF3')
+    sf31 = Codec::Field.new('SF31')
+    sf31.set_value("456")
+    sf3.add_sub_field(sf31)
+    sf32 = Codec::Field.new('SF32')
+    sf32.set_value("789")
+    sf3.add_sub_field(sf32)
+    f.add_sub_field(sf3)
+    f
+    [Codec::Field.from_array('Test',[['SF1',"123"],['SF2',"321"],
+              ['SF3',[['SF31',"456"],['SF32','789']]]]),f]
+  }
+  
+  it "must return one uniq element" do
+    subject.uniq.size.must_equal(1)
+  end
+  
+end

metadata

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