bindata 2.2.0 → 2.3.0

data/test/int_test.rb

@@ -139,7 +139,6 @@ module AllIntegers
 
   def create_mapping_of_class_to_nbits(endian, signed)
     base = signed ? "Int" : "Uint"
-    signed_sym = signed ? :signed : :unsigned
     endian_str = (endian == :little) ? "le" : "be"
 
     result = {}

data/test/io_test.rb

@@ -134,6 +134,55 @@ describe BinData::IO::Read, "#with_buffer" do
     end
     io.offset.must_equal(10)
   end
+
+  it "restricts large -ve seeks" do
+    io.readbytes(2)
+    io.with_buffer(10) do
+      io.seekbytes(-1)
+      io.offset.must_equal(2)
+    end
+  end
+end
+
+describe BinData::IO::Write, "writing to non seekable stream" do
+  before do
+    @rd, @wr = IO::pipe
+    @io = BinData::IO::Write.new(@wr)
+  end
+
+  after do
+    @rd.close
+    @wr.close
+  end
+
+  it "writes data" do
+    @io.writebytes("1234567890")
+    @rd.read(10).must_equal "1234567890"
+  end
+
+  it "has correct offset" do
+    @io.writebytes("1234567890")
+    @io.offset.must_equal 10
+  end
+
+  it "does not seek backwards" do
+    @io.writebytes("1234567890")
+    lambda {
+      @io.seekbytes(-5)
+    }.must_raise IOError
+  end
+
+  it "does not seek forwards" do
+    lambda {
+      @io.seekbytes(5)
+    }.must_raise IOError
+  end
+
+  it "#num_bytes_remaining raises IOError" do
+    lambda {
+      @io.num_bytes_remaining
+    }.must_raise IOError
+  end
 end
 
 describe BinData::IO::Write, "when writing" do
@@ -205,6 +254,21 @@ describe BinData::IO::Write, "#with_buffer" do
 
     stream.value.must_equal "abc\0\0de\0\0\0"
   end
+
+  it "restricts large seeks" do
+    io.with_buffer(10) do
+      io.seekbytes(15)
+    end
+    io.offset.must_equal(10)
+  end
+
+  it "restricts large -ve seeks" do
+    io.writebytes("12")
+    io.with_buffer(10) do
+      io.seekbytes(-1)
+      io.offset.must_equal(2)
+    end
+  end
 end
 
 describe BinData::IO::Read, "reading bits in big endian" do

data/test/offset_test.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
+require 'bindata/offset'
 
 describe BinData::Base, "offsets" do
   class ThreeByteReader < BinData::Base

data/test/record_test.rb

@@ -91,6 +91,24 @@ describe BinData::Record, "when defining with errors" do
       end
     }.must_raise_on_line ArgumentError, 2, "unknown value for endian 'a bad value' in BadEndianRecord"
   end
+
+  it "fails when endian is after a field" do
+    lambda {
+      class BadEndianPosRecord < BinData::Record
+        string :a
+        endian :little
+      end
+    }.must_raise_on_line SyntaxError, 3, "endian must be called before defining fields in BadEndianPosRecord"
+  end
+
+  it "fails when search_prefix is after a field" do
+    lambda {
+      class BadSearchPrefixPosRecord < BinData::Record
+        string :a
+        search_prefix :pre
+      end
+    }.must_raise_on_line SyntaxError, 3, "search_prefix must be called before defining fields in BadSearchPrefixPosRecord"
+  end
 end
 
 describe BinData::Record, "with anonymous fields" do
@@ -532,7 +550,7 @@ describe BinData::Record, "defined recursively" do
   end
 
   it "can be created" do
-    obj = RecursiveRecord.new
+    RecursiveRecord.new
   end
 
   it "reads" do

data/test/skip_test.rb

@@ -2,7 +2,16 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
-describe BinData::Skip do
+describe BinData::Skip, "when instantiating" do
+  describe "with no mandatory parameters supplied" do
+    it "raises an error" do
+      args = {}
+      lambda { BinData::Skip.new(args) }.must_raise ArgumentError
+    end
+  end
+end
+
+describe BinData::Skip, "with :length" do
   let(:obj) { BinData::Skip.new(:length => 5) }
   let(:io) { StringIO.new("abcdefghij") }
 
@@ -26,3 +35,53 @@ describe BinData::Skip do
     obj.to_binary_s.must_equal_binary "\000" * 5
   end
 end
+
+describe BinData::Skip, "with :to_abs_offset" do
+  BinData::Struct.new(:fields => [ [:skip, :f, { :to_abs_offset => 5 } ] ])
+
+  let(:skip_obj) { [:skip, :f, { :to_abs_offset => 5 } ] }
+  let(:io) { StringIO.new("abcdefghij") }
+
+  it "reads skipping forward" do
+    fields = [ skip_obj ]
+    obj = BinData::Struct.new(:fields => fields)
+    obj.read(io)
+    io.pos.must_equal 5
+  end
+
+  it "reads skipping in place" do
+    fields = [ [:string, :a, { :read_length => 5 }], skip_obj ]
+    obj = BinData::Struct.new(:fields => fields)
+    obj.read(io)
+    io.pos.must_equal 5
+  end
+
+  it "does not read skipping backwards" do
+    fields = [ [:string, :a, { :read_length => 10 }], skip_obj ]
+    obj = BinData::Struct.new(:fields => fields)
+
+    lambda {
+      obj.read(io)
+    }.must_raise BinData::ValidityError
+  end
+
+  it "writes skipping forward" do
+    fields = [ skip_obj ]
+    obj = BinData::Struct.new(:fields => fields)
+    obj.to_binary_s.must_equal "\000\000\000\000\000"
+  end
+
+  it "reads skipping in place" do
+    fields = [ [:string, :a, { :value => "abcde" }], skip_obj ]
+    obj = BinData::Struct.new(:fields => fields)
+    obj.to_binary_s.must_equal "abcde"
+  end
+
+  it "does not write skipping backwards" do
+    fields = [ [:string, :a, { :value => "abcdefghij" }], skip_obj ]
+    obj = BinData::Struct.new(:fields => fields)
+    lambda {
+      obj.to_binary_s
+    }.must_raise BinData::ValidityError
+  end
+end

data/test/string_test.rb

@@ -295,19 +295,6 @@ describe BinData::String, "with Ruby 1.9 encodings" do
   end
 end
 
-class Object
-  def must_warn(msg, &block)
-    result = ""
-    callable = proc { |str|
-      result = str
-    }
-    self.stub(:warn, callable) do
-      block.call
-    end
-    result.must_equal msg
-  end
-end
-
 describe BinData::String, "warnings" do
   it "warns if has :asserted_value but no :length" do
     obj = BinData::String.new(:asserted_value => "ABC")

data/test/struct_test.rb

@@ -81,6 +81,10 @@ describe BinData::Struct, "with hidden fields" do
     obj.field_names.must_equal [:a, :d]
   end
 
+  it "shows all fields when requested" do
+    obj.field_names(true).must_equal [:a, :b, :c, :d]
+  end
+
   it "accesses hidden fields directly" do
     obj.b.must_equal 5
     obj.c = 15
@@ -136,6 +140,10 @@ describe BinData::Struct, "with multiple fields" do
     obj[:a].must_equal 1
   end
 
+  it "handles not existing elements" do
+    obj[:does_not_exist].must_be_nil
+  end
+
   it "writes elements dynamically" do
     obj[:a] = 2
     obj.a.must_equal 2
@@ -154,6 +162,7 @@ describe BinData::Struct, "with multiple fields" do
 
   it "returns a snapshot" do
     snap = obj.snapshot
+    assert snap.respond_to?(:a)
     snap.a.must_equal 1
     snap.b.must_equal 2
     snap.must_equal({ :a => 1, :b => 2 })
@@ -421,7 +430,7 @@ end
 
 describe BinData::Struct, "with dynamically named types" do
   it "instantiates" do
-    dyn = BinData::Struct.new(:name => :my_struct, :fields => [[:int8, :a, {:initial_value => 3}]])
+    _ = BinData::Struct.new(:name => :my_struct, :fields => [[:int8, :a, {:initial_value => 3}]])
 
     obj = BinData::Struct.new(:fields => [[:my_struct, :v]])
 

data/test/test_helper.rb

@@ -47,4 +47,15 @@ module Kernel
 
     (err_line - ref_line).must_equal line
   end
+
+  def must_warn(msg, &block)
+    result = ""
+    callable = proc { |str|
+      result = str
+    }
+    self.stub(:warn, callable) do
+      block.call
+    end
+    result.must_equal msg
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bindata
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Dion Mendel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-30 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -91,6 +91,7 @@ files:
 - lib/bindata/buffer.rb
 - lib/bindata/choice.rb
 - lib/bindata/count_bytes_remaining.rb
+- lib/bindata/delayed_io.rb
 - lib/bindata/dsl.rb
 - lib/bindata/float.rb
 - lib/bindata/framework.rb
@@ -121,6 +122,7 @@ files:
 - test/buffer_test.rb
 - test/choice_test.rb
 - test/count_bytes_remaining_test.rb
+- test/delayed_io_test.rb
 - test/float_test.rb
 - test/int_test.rb
 - test/io_test.rb