BitStructEx 0.0.54 → 0.0.64

data/Rakefile

@@ -33,8 +33,10 @@ end
 desc "Increment the build number and upate the Version file"
 task :increment_build_number => [ :run_tests ] do
     src = Dir.glob "#{SRC_DIR}/**/*"
+    test = Dir.glob "#{TEST_DIR}/**/*"
+    files = src + test
     target = 'Version'
-    unless uptodate?( target, src )
+    unless uptodate?( target, files )
         new_version = PKG_VERSION.increment( :build )
         puts "Version: #{new_version}"
     end

data/Version

@@ -1 +1 @@
-0.0.54
+0.0.64

data/src/ruby/bit_struct/struct_base.rb

@@ -99,7 +99,7 @@ module BitStruct
         require "bit_struct/#{symbol.id2name}"
 
         class_name = make_class_name symbol
-        clazz = const_get class_name.to_sym
+        clazz = eval "BitStruct::#{class_name.to_sym}"
         self.class.send :define_method, symbol do |*args|
           add_field clazz.new( *args )
         end

data/src/ruby/bit_struct/text.rb

@@ -0,0 +1,28 @@
+
+require 'bit_struct/field'
+
+module BitStruct
+
+  class TextField < Field
+
+    def initialize( name, length, description = nil )
+      raise "Length must be multiple of 8" unless ( length % 8 ) == 0
+      super name, length, description
+      @length_in_bytes = length / 8
+    end
+
+    def read( slicer )
+      res = ''
+      slicer.get_bytes.reverse.each { |b| res << b }
+      res
+    end
+
+    def write( slicer, new_value )
+      bytes = []
+      new_value.each_byte { |b| bytes << b }
+      slicer.set_bytes bytes.reverse
+    end
+
+  end
+
+end

data/test/ruby/bit_struct/test_struct_base.rb

@@ -20,6 +20,8 @@ class Entry < StructBase
   unsigned :cache_id, 16
 end
 
+
+
 class TestBitStruct < Test::Unit::TestCase
 
   def test_flags_class

data/test/ruby/bit_struct/test_text.rb

@@ -0,0 +1,54 @@
+
+require 'test/unit'
+
+require 'bit_struct/text'
+
+include BitStruct
+
+
+
+class TestTextField < Test::Unit::TestCase
+
+  # Note: The TextField doesn't check the length. It is part of the
+  # contract between the field and the slicer that only the expected
+  # number of bytes (or less) are passed to the field :)
+
+  def test_initialize
+    TextField.new 'dummy', 8
+    TextField.new 'dummy', 16
+    TextField.new 'dummy', 24
+    assert_raise( RuntimeError ) { TextField.new 'dummy', 5 }
+  end
+
+  def test_read
+    slicer = FakeSlicer.new 'toast'.bytes
+    field = TextField.new 'dummy', 24
+    assert_equal 'tsaot', field.read( slicer )
+  end
+
+  def test_write
+    slicer = FakeSlicer.new
+    field = TextField.new 'dummy', 24
+    field.write slicer, 'toast'
+    assert_equal 'tsaot', slicer.get_bytes.stringify
+  end
+
+end
+
+
+
+class FakeSlicer
+
+  def initialize( data = '' )
+    @data = data
+  end
+
+  def get_bytes
+    @data
+  end
+
+  def set_bytes( data )
+    @data = data
+  end
+
+end

data/test/ruby/bit_struct/test_text_struct.rb

@@ -0,0 +1,58 @@
+
+require 'test/unit'
+
+require 'bit_struct/struct_base'
+
+include BitStruct
+
+
+
+class TestTextStruct < Test::Unit::TestCase
+
+  class AlignedText < StructBase
+    unsigned :before,  8
+    text     :aligned, 32
+    unsigned :after,   8
+  end
+
+  def test_aligned_text
+    data = [ 0x12, ?t, ?s, ?e, ?t, 0x34 ].pack( 'C*' )
+    struct = AlignedText.new data
+    assert_equal 0x34, struct.before
+    assert_equal 'test', struct.aligned
+    assert_equal 0x12, struct.after
+
+    struct.before = ?A
+    struct.aligned = 'goal'
+    struct.after = ?B
+    assert_equal ?A, struct.before
+    assert_equal 'goal', struct.aligned
+    assert_equal ?B, struct.after
+
+    assert_equal 'BlaogA', struct.data
+  end
+
+  class UnalignedText < StructBase
+    unsigned :before,    4
+    text     :unaligned, 24
+    unsigned :after,     4
+  end
+
+  def test_unaligned_text
+    a_hi, a_lo = get_hi_lo ?a
+    b_hi, b_lo = get_hi_lo ?b
+    c_hi, c_lo = get_hi_lo ?c
+
+    data = [ 12 << 4 | c_hi, c_lo << 4 | b_hi, b_lo << 4 | a_hi, a_lo << 4 | 3 ].pack( 'C*' )
+
+    struct = UnalignedText.new data
+    assert_equal 3, struct.before
+    assert_equal 'abc', struct.unaligned
+    assert_equal 12, struct.after
+  end
+
+  def get_hi_lo( char )
+    return char >> 4, char & 0x0F
+  end
+
+end

data/test/ruby/runner.rb

@@ -5,6 +5,12 @@ require 'test/unit/autorunner'
 
 class String
 
+  def bytes
+    bytes = []
+    self.each_byte { |b| bytes << b }
+    bytes
+  end
+
   def hexify
     result = ''
     each_byte do |b|
@@ -17,6 +23,12 @@ end
 
 class Array
 
+  def stringify
+    res = ''
+    self.each { |b| res << b }
+    res
+  end
+
   def hexify
     map { |b| "0x#{b && b.hexify}" }.join( ' ' )
   end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: BitStructEx
 version: !ruby/object:Gem::Version 
-  version: 0.0.54
+  version: 0.0.64
 date: 2006-04-13 00:00:00 +02:00
 summary: Simple DSL for defining bit-based structures on byte data.
 require_paths: 
@@ -33,10 +33,13 @@ files:
 - src/ruby/bit_struct/field.rb
 - src/ruby/bit_struct/nested.rb
 - src/ruby/bit_struct/struct_base.rb
+- src/ruby/bit_struct/text.rb
 - src/ruby/bit_struct/unsigned.rb
 - test/ruby/runner.rb
 - test/ruby/bit_struct/test_bit_slicer.rb
 - test/ruby/bit_struct/test_struct_base.rb
+- test/ruby/bit_struct/test_text.rb
+- test/ruby/bit_struct/test_text_struct.rb
 - Rakefile
 - Version
 test_files: []