bindata 0.9.0 → 0.9.1

data/spec/single_spec.rb

@@ -1,12 +1,13 @@
 #!/usr/bin/env ruby
 
 require File.expand_path(File.dirname(__FILE__)) + '/spec_common'
+require 'bindata/io'
 require 'bindata/single'
 
 # An implementation of a unsigned 4 byte integer.
 class ConcreteSingle < BinData::Single
   def val_to_str(val)    [val].pack("V") end
-  def read_val(io)       readbytes(io, 4).unpack("V")[0] end
+  def read_val(io)       io.readbytes(4).unpack("V")[0] end
   def sensible_default() 0 end
 
   def in_read?()         @in_read end
@@ -22,7 +23,7 @@ describe BinData::Single do
   it "should conform to rule 2 for returning a value" do
     io = StringIO.new([42].pack("V"))
     data = ConcreteSingle.new(:value => 5)
-    data.do_read(io)
+    data.do_read(BinData::IO.new(io))
     data.should be_in_read
     data.value.should == 42
   end
@@ -159,7 +160,7 @@ describe BinData::Single, "with :value" do
 
   it "should change during reading" do
     io = StringIO.new([56].pack("V"))
-    @data.do_read(io)
+    @data.do_read(BinData::IO.new(io))
     @data.value.should == 56
     @data.done_read
   end

data/spec/string_spec.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require File.expand_path(File.dirname(__FILE__)) + '/spec_common'
+require 'bindata/io'
 require 'bindata/string'
 
 describe BinData::String, "with mutually exclusive parameters" do
@@ -146,7 +147,7 @@ describe BinData::String, "with :read_length and :value" do
   it "should return read value before calling done_read" do
     io = StringIO.new("ABCDEFGHIJKLMNOPQRST")
 
-    @str.do_read(io)
+    @str.do_read(BinData::IO.new(io))
     @str.value.should == "ABCDE"
 
     @str.done_read

data/spec/struct_spec.rb

@@ -254,3 +254,28 @@ describe BinData::Struct, "with an endian defined" do
     io.read.should == expected
   end
 end
+
+describe BinData::Struct, "with bit fields" do
+  before(:each) do
+    @params = { :fields => [ [:bit1le, :a], [:bit2le, :b] ] }
+    @obj = BinData::Struct.new(@params)
+    @obj.a = 1
+    @obj.b = 2
+  end
+
+  it "should return num_bytes" do
+    @obj.num_bytes.should == 1
+  end
+
+  it "should write" do
+    @obj.to_s.should == [0b0000_0101].pack("C")
+  end
+
+  it "should read" do
+    str = [0b0000_0110].pack("C")
+    @obj.read(str)
+    @obj.a.should == 0
+    @obj.b.should == 3
+  end
+end
+

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: bindata
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
-date: 2008-06-02 00:00:00 +08:00
+  version: 0.9.1
+date: 2008-06-15 00:00:00 +08:00
 summary: A declarative way to read and write binary file formats
 require_paths: 
 - lib
@@ -37,6 +37,7 @@ files:
 - README
 - examples/gzip.rb
 - spec/registry_spec.rb
+- spec/bits_spec.rb
 - spec/sanitize_spec.rb
 - spec/array_spec.rb
 - spec/float_spec.rb
@@ -51,11 +52,13 @@ files:
 - spec/base_spec.rb
 - spec/single_value_spec.rb
 - spec/int_spec.rb
+- spec/io_spec.rb
 - spec/stringz_spec.rb
 - lib/bindata.rb
 - lib/bindata
 - lib/bindata/lazy.rb
 - lib/bindata/sanitize.rb
+- lib/bindata/io.rb
 - lib/bindata/string.rb
 - lib/bindata/int.rb
 - lib/bindata/multi_value.rb
@@ -68,6 +71,7 @@ files:
 - lib/bindata/single.rb
 - lib/bindata/base.rb
 - lib/bindata/array.rb
+- lib/bindata/bits.rb
 - lib/bindata/float.rb
 test_files: []