bindata 1.4.2 → 1.4.3

data/ChangeLog

@@ -1,5 +1,12 @@
 = BinData Changelog
 
+== Version 1.4.3 (2011-10-01)
+
+* Exceptions no longer ignored inside lambdas when reading until eof 
+  in an array (thanks John Labovitz).
+* Fixed interaction bug between choices and records (reported by
+  Refrigerator Johnny).
+
 == Version 1.4.2 (2011-08-06)
 
 * =~ now works for strings.

data/lib/bindata.rb

@@ -32,5 +32,5 @@ require 'bindata/deprecated'
 #
 # Copyright (c) 2007 - 2011 Dion Mendel.
 module BinData
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

data/lib/bindata/array.rb

@@ -277,7 +277,7 @@ module BinData
         element = append_new_element
         begin
           element.do_read(io)
-        rescue
+        rescue EOFError, IOError
           elements.pop
           break
         end

data/lib/bindata/struct.rb

@@ -237,6 +237,12 @@ module BinData
       @field_names.index(base_field_name(key))
     end
 
+    def each_pair
+      @field_names.compact.each do |name|
+        yield [name, find_obj_for_name(name)]
+      end
+    end
+
     #---------------
     private
 

data/manual.md

@@ -40,7 +40,7 @@ manipulating.
 It supports all the common datatypes that are found in structured binary
 data. Support for dependent and variable length fields is built in. 
 
-Last updated: 2011-08-06
+Last updated: 2011-10-01
 
 ## License
 

data/spec/array_spec.rb

@@ -278,6 +278,12 @@ describe BinData::Array, "with :read_until" do
       subject.read "\x00\x01\x00\x02\x03"
       subject.should == [1, 2]
     end
+
+    it "should report exceptions" do
+      array_type = [:string, {:read_length => lambda { unknown_variable }}]
+      subject = BinData::Array.new(:type => array_type, :read_until => :eof)
+      lambda { subject.read "\x00\x01\x00\x02\x03" }.should raise_error
+    end
   end
 end
 

data/spec/system_spec.rb

@@ -342,6 +342,21 @@ describe BinData::Record, "with custom sized integers" do
   end
 end
 
+describe BinData::Record, "with choice field" do
+  class ChoiceFieldRecord < BinData::Record
+    int8 :a
+    choice :b, :selection => :a do
+      struct 1, :fields => [[:int8, :v]]
+    end
+  end
+
+  it "should assign" do
+    subject = BinData::Array.new(:type => :choice_field_record)
+    obj = ChoiceFieldRecord.new(:a => 1, :b => {:v => 3})
+    subject.assign([obj])
+  end
+end
+
 describe BinData::Primitive, "representing a string" do
   class PascalStringPrimitive < BinData::Primitive
     uint8  :len,  :value => lambda { data.length }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bindata
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 1
   - 4
-  - 2
-  version: 1.4.2
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - Dion Mendel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-06 00:00:00 +08:00
+date: 2011-10-01 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency