bindata 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a82037bfb06f2af645803e71fcaaf50ec475845a
-  data.tar.gz: 2b111c9173a7fb320fd5f98575e864da786dae0b
+  metadata.gz: 188ceccd3a9ac4c5e72aec6006b61dae5f71ebf0
+  data.tar.gz: 2f8c6791099daf588f429ab964b6a2d3b1e3bfde
 SHA512:
-  metadata.gz: 44f161193a8242656fe81684dc419f1936abcb64232928abcd2ab32288c767ccdd2b4dfc7a7168a93af073b02c87c8a3e2fb6a638bc275dc121e67644c77f09a
-  data.tar.gz: 7258cad731fab07ddf5414733d950aefe7b0f78bdf08f886e8d4dcd18710f1c9eb716c22bdcb9128e18695c47334ff1b72dd734bea9997b17d3cb5da3cc7b4ab
+  metadata.gz: 76fcb053c1c818b111555dc8d1c46cc84e955c883272a8c23ccc7effafc98591d9892c33640f62354feb94c0613368bd6fd95d542d9d7e3507184b644af5d91f
+  data.tar.gz: 88c93e8224c0734a4e217fb9d41c335fdfc8c3a3b994576ab2403ffed7d8d09d5dfb394857e0457617e671d33110a0ab3873675c858a8b70c187beb32ba9da64

data/ChangeLog.rdoc

@@ -1,5 +1,10 @@
 = BinData Changelog
 
+== Version 2.3.3 (2016-09-07)
+
+* Fix bug #80.  Thanks to Michael Petter.
+* Add Buffer#raw_num_bytes.
+
 == Version 2.3.2 (2016-09-02)
 
 * IO#num_bytes_remaining now works inside Buffers.

data/lib/bindata/buffer.rb

@@ -26,6 +26,7 @@ module BinData
   #   obj = MyBuffer.read("\001\000\002\000\000\000\000\000")
   #   obj.num1 #=> 1
   #   obj.num1 #=> 2
+  #   obj.raw_num_bytes #=> 4
   #   obj.num_bytes #=> 8
   #
   #
@@ -62,6 +63,11 @@ module BinData
       @type = get_parameter(:type).instantiate(nil, self)
     end
 
+    # The number of bytes used, ignoring the padding imposed by the buffer.
+    def raw_num_bytes
+      @type.num_bytes
+    end
+
     def clear?
       @type.clear?
     end

data/lib/bindata/registry.rb

@@ -59,9 +59,15 @@ module BinData
       if not is_registered?(name)
         search_prefix = [""].concat(Array(hints[:search_prefix]))
         search_prefix.each do |prefix|
-          n = name_with_endian(name_with_prefix(name, prefix), hints[:endian])
-          if is_registered?(n)
-            name = n
+          nwp = name_with_prefix(name, prefix)
+          if is_registered?(nwp)
+            name = nwp
+            break
+          end
+
+          nwe = name_with_endian(nwp, hints[:endian])
+          if is_registered?(nwe)
+            name = nwe
             break
           end
         end

data/lib/bindata/version.rb

@@ -1,3 +1,3 @@
 module BinData
-  VERSION = "2.3.2"
+  VERSION = "2.3.3"
 end

data/test/buffer_test.rb

@@ -57,6 +57,12 @@ describe BinData::Buffer, "subclassed with a single type" do
     assert obj.clear?
     obj.num_bytes.must_equal 5
   end
+
+  it "has raw_num_bytes" do
+    obj = IntBuffer.new
+    assert obj.clear?
+    obj.raw_num_bytes.must_equal 2
+  end
 end
 
 describe BinData::Buffer, "subclassed with multiple types" do
@@ -79,6 +85,11 @@ describe BinData::Buffer, "subclassed with multiple types" do
     obj.num_bytes.must_equal 5
   end
 
+  it "has raw_num_bytes" do
+    obj = TupleBuffer.new
+    obj.raw_num_bytes.must_equal 4
+  end
+
   it "reads data" do
     obj = TupleBuffer.read "\001\002\003\004\005"
     obj.a.must_equal 0x0102

data/test/registry_test.rb

@@ -132,6 +132,13 @@ describe BinData::Registry, "with endian specific types" do
       r.lookup('a', {:endian => :big})
     }.must_raise BinData::UnRegisteredTypeError
   end
+
+  it "lookup prefers exact type" do
+    r.register('c', C)
+    r.register('c_le', D)
+
+    r.lookup('c', {:endian => :little}).must_equal C
+  end
 end
 
 describe BinData::Registry, "with search_prefix" do
@@ -146,6 +153,10 @@ describe BinData::Registry, "with search_prefix" do
     r.lookup('f', {:search_prefix => :a}).must_equal A
   end
 
+  it "lookup single search_prefix with endian" do
+    r.lookup('f', {:search_prefix => :a, :endian => :little}).must_equal A
+  end
+
   it "lookup multiple search_prefix" do
     r.lookup('f', {:search_prefix => [:x, :a]}).must_equal A
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bindata
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Dion Mendel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake