kaitai-struct 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17e1d21f8e7714894c503f0f2c6dade3d0f462c5
-  data.tar.gz: da8b07352f240d0291f148822d7fbeaaf8dbc7b0
+  metadata.gz: fb2b4ae17b2b8d26cecfe15e7e9ec6855be0d6f9
+  data.tar.gz: 9a1b9b1339dacda683de54c419522f093f7694e2
 SHA512:
-  metadata.gz: 34a01006fb075a575e65af5a21118c5f17758a63dc0313d9c49ab0569ed2d14b93587b1d70be985b23d6795946a11ec6399c293bea800ae1c56e2cb6bf03d299
-  data.tar.gz: 323c1c0d0ff960c519ba089b40841ab3f28c4c53a821425d1402ba0f29ef8d91e9b1af4f019b7fa32d6886b86de6eba9045b968e83dd3cf46c1de99e6f1271c1
+  metadata.gz: b93c930991c6978f41f16d74d0c273fba39142df82ef78a51497785b8fdee61e921a01d5e02e75373cde64556649c6e623897170fb5b6da9422e2a23ab54bfdd
+  data.tar.gz: 592c8dff971cd6d44ff65102f900b8a02c7f32982a1fd2576ab9ab68f64a9a4192c7bc98387dfa19b69acd32c43cbea2be7eb0309710bf667d1d42c681d915f6

data/.gitignore

@@ -1 +1 @@
-/test/compiled
+*.gem

data/lib/kaitai/struct/struct.rb

@@ -3,7 +3,7 @@ require 'stringio'
 module Kaitai
 module Struct
 
-VERSION = '0.5'
+VERSION = '0.6'
 
 ##
 # Common base class for all structured generated by Kaitai Struct.
@@ -99,6 +99,7 @@ class Stream
     else
       raise TypeError.new('can be initialized with IO or String only')
     end
+    align_to_byte
   end
 
   ##
@@ -274,6 +275,45 @@ class Stream
     read_bytes(8).unpack('E')[0]
   end
 
+  # ========================================================================
+  # Unaligned bit values
+  # ========================================================================
+
+  def align_to_byte
+    @bits_left = 0
+    @bits = 0
+  end
+
+  def read_bits_int(n)
+    bits_needed = n - @bits_left
+    if bits_needed > 0
+      # 1 bit  => 1 byte
+      # 8 bits => 1 byte
+      # 9 bits => 2 bytes
+      bytes_needed = ((bits_needed - 1) / 8) + 1
+      buf = read_bytes(bytes_needed)
+      buf.each_byte { |byte|
+        @bits <<= 8
+        @bits |= byte
+        @bits_left += 8
+      }
+    end
+
+    # raw mask with required number of 1s, starting from lowest bit
+    mask = (1 << n) - 1
+    # shift mask to align with highest bits available in @bits
+    shift_bits = @bits_left - n
+    mask <<= shift_bits
+    # derive reading result
+    res = (@bits & mask) >> shift_bits
+    # clear top bits that we've just read => AND with 1s
+    @bits_left -= n
+    mask = (1 << @bits_left) - 1
+    @bits &= mask
+
+    res
+  end
+
   # ========================================================================
   # Byte arrays
   # ========================================================================
@@ -306,18 +346,15 @@ class Stream
   # Reads next len bytes from the stream and ensures that they match
   # expected fixed byte array. If they differ, throws a
   # {UnexpectedDataError} runtime exception.
-  # @param len [Fixnum] number of bytes to read
   # @param expected [String] contents to be expected
   # @return [String] read bytes as byte array, which are guaranteed to
   #   equal to expected
   # @raise [UnexpectedDataError]
-  def ensure_fixed_contents(len, expected)
-    buf = @_io.read(len)
-    actual = buf.bytes
-    if actual != expected
-      raise UnexpectedDataError.new(actual, expected)
-    end
-    buf
+  def ensure_fixed_contents(expected)
+    len = expected.bytesize
+    actual = @_io.read(len)
+    raise UnexpectedDataError.new(actual, expected) if actual != expected
+    actual
   end
 
   # ========================================================================
@@ -445,7 +482,7 @@ class Stream
   end
 
   def self.format_hex(arr)
-    arr.map { |x| sprintf('%02X', x) }.join(' ')
+    arr.unpack('H*')[0].gsub(/(..)/, '\1 ').chop
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaitai-struct
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Mikhail Yakshin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2017-02-04 00:00:00.000000000 Z
 dependencies: []
 description: |
   Kaitai Struct is a declarative language used for describe various binary data structures, laid out in files or in memory: i.e. binary file formats, network stream packet formats, etc.
@@ -45,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: 'Kaitai Struct: runtime library for Ruby'