bindata 1.6.0 → 1.8.0

data/test/lazy_test.rb

@@ -73,16 +73,16 @@ end
 
 describe BinData::LazyEvaluator, "with one parent" do
   subject {
-    parent_methods = {:m1 => 'Pm1', :com => 'PmC', :mm => 3}
-    parent_params  = {:p1 => 'Pp1', :com => 'PpC'}
+    parent_methods = {:m1 => 'Pm1', :com1 => 'PmC', :mm => 3}
+    parent_params  = {:p1 => 'Pp1', :com1 => 'PpC'}
     parent_obj = MockBinDataObject.new(parent_methods, parent_params)
 
     def parent_obj.echo(a1, a2)
       [a1, a2]
     end
 
-    methods = {:m1 => 'm1', :com => 'mC'}
-    params  = {:p1 => 'p1', :com => 'pC'}
+    methods = {:m1 => 'm1', :com1 => 'mC'}
+    params  = {:p1 => 'p1', :com1 => 'pC'}
     MockBinDataObject.new(methods, params, parent_obj)
   }
 
@@ -119,7 +119,7 @@ describe BinData::LazyEvaluator, "with one parent" do
   end
 
   it "resolves parameters in preference to methods in the parent" do
-    lazy_eval(lambda { com }).must_equal 'PpC'
+    lazy_eval(lambda { com1 }).must_equal 'PpC'
   end
 
   it "has a parent" do
@@ -133,8 +133,8 @@ end
 
 describe BinData::LazyEvaluator, "with nested parents" do
   subject {
-    pparent_methods = {:m1 => 'PPm1', :m2 => 'PPm2', :com => 'PPmC'}
-    pparent_params  = {:p1 => 'PPp1', :p2 => 'PPp2', :com => 'PPpC'}
+    pparent_methods = {:m1 => 'PPm1', :m2 => 'PPm2', :com1 => 'PPmC'}
+    pparent_params  = {:p1 => 'PPp1', :p2 => 'PPp2', :com1 => 'PPpC'}
     pparent_obj = MockBinDataObject.new(pparent_methods, pparent_params)
 
     def pparent_obj.echo(arg)
@@ -145,16 +145,16 @@ describe BinData::LazyEvaluator, "with nested parents" do
       ["PP2", arg]
     end
 
-    parent_methods = {:m1 => 'Pm1', :com => 'PmC', :sym1 => :m2, :sym2 => lambda { m2 }}
-    parent_params  = {:p1 => 'Pp1', :com => 'PpC'}
+    parent_methods = {:m1 => 'Pm1', :com1 => 'PmC', :sym1 => :m2, :sym2 => lambda { m2 }}
+    parent_params  = {:p1 => 'Pp1', :com1 => 'PpC'}
     parent_obj = MockBinDataObject.new(parent_methods, parent_params, pparent_obj)
 
     def parent_obj.echo(arg)
       ["P", arg]
     end
 
-    methods = {:m1 => 'm1', :com => 'mC'}
-    params  = {:p1 => 'p1', :com => 'pC'}
+    methods = {:m1 => 'm1', :com1 => 'mC'}
+    params  = {:p1 => 'p1', :com1 => 'pC'}
     MockBinDataObject.new(methods, params, parent_obj)
   }
 
@@ -198,7 +198,7 @@ describe BinData::LazyEvaluator, "with nested parents" do
   end
 
   it "resolves parameters in preference to methods in the parent" do
-    lazy_eval(lambda { com }).must_equal 'PpC'
+    lazy_eval(lambda { com1 }).must_equal 'PpC'
   end
 
   it "resolves methods in the parent explicitly" do

data/test/primitive_test.rb

@@ -188,3 +188,23 @@ describe BinData::Primitive, "subclassed with default parameter" do
     a.to_binary_s.must_equal "\000\005"
   end
 end
+
+describe BinData::Primitive, "with mutating #get and #set" do
+  class MutatingPrimitive < BinData::Primitive
+    uint16le :a
+    def get; self.a; end
+    def set(v); self.a = v.abs; end
+  end
+
+  it "#assign applies mutator" do
+    obj = MutatingPrimitive.new
+    obj.assign(-50)
+    obj.snapshot.must_equal 50
+  end
+
+  it "#to_binary_s applies mutator" do
+    obj = MutatingPrimitive.new
+    obj.assign(-50)
+    obj.to_binary_s.must_equal "\062\000"
+  end
+end

data/test/registry_test.rb

@@ -102,3 +102,26 @@ describe BinData::Registry, "with numerics" do
     r.lookup("bit3le", :little).to_s.must_equal "BinData::Bit3le"
   end
 end
+
+describe BinData::Registry, "with endian specific types" do
+  let(:r) { BinData::Registry.new }
+
+  before do
+    r.register('a_le', A)
+    r.register('b_be', B)
+  end
+  
+  it "lookup little endian types" do
+    r.lookup('a', :little).must_equal A
+  end
+
+  it "lookup big endian types" do
+    r.lookup('b', :big).must_equal B
+  end
+
+  it "does not lookup types with non existent endian" do
+    lambda {
+      r.lookup('a', :big)
+    }.must_raise BinData::UnRegisteredTypeError
+  end
+end

data/test/virtual_test.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.join(File.dirname(__FILE__), "common"))
+
+describe BinData::Virtual do
+  let(:stream) { StringIO.new "abcdefghij" }
+
+  it "must not read from any stream" do
+    BinData::Virtual.read(stream)
+    stream.pos.must_equal 0
+  end
+
+  it "must not write to a stream" do
+    obj = BinData::Virtual.new
+    obj.to_binary_s.must_equal ""
+  end
+
+  it "occupies no space" do
+    obj = BinData::Virtual.new
+    obj.num_bytes.must_equal 0
+  end
+
+  it "asserts on #read" do
+    data = []
+    obj = BinData::Virtual.new(:assert => lambda { data << 1 })
+
+    obj.read ""
+    data.must_equal [1]
+  end
+
+  it "asserts on #assign" do
+    data = []
+    obj = BinData::Virtual.new(:assert => lambda { data << 1 })
+
+    obj.assign("foo")
+    data.must_equal [1]
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bindata
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 55
   prerelease: 
   segments: 
   - 1
-  - 6
+  - 8
   - 0
-  version: 1.6.0
+  version: 1.8.0
 platform: ruby
 authors: 
 - Dion Mendel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-02 00:00:00 +08:00
+date: 2014-01-06 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,6 +109,7 @@ extra_rdoc_files:
 - NEWS.rdoc
 files: 
 - .gitignore
+- .travis.yml
 - BSDL
 - COPYING
 - ChangeLog.rdoc
@@ -125,12 +126,14 @@ files:
 - examples/ip_address.rb
 - examples/list.rb
 - examples/nbt.rb
+- examples/tcp_ip.rb
 - lib/bindata.rb
 - lib/bindata/alignment.rb
 - lib/bindata/array.rb
 - lib/bindata/base.rb
 - lib/bindata/base_primitive.rb
 - lib/bindata/bits.rb
+- lib/bindata/buffer.rb
 - lib/bindata/choice.rb
 - lib/bindata/count_bytes_remaining.rb
 - lib/bindata/deprecated.rb
@@ -162,6 +165,7 @@ files:
 - test/base_primitive_test.rb
 - test/base_test.rb
 - test/bits_test.rb
+- test/buffer_test.rb
 - test/choice_test.rb
 - test/common.rb
 - test/count_bytes_remaining_test.rb
@@ -181,6 +185,7 @@ files:
 - test/stringz_test.rb
 - test/struct_test.rb
 - test/system_test.rb
+- test/virtual_test.rb
 has_rdoc: true
 homepage: http://github.com/dmendel/bindata
 licenses: