kaitai-struct 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 023b59d1105bf10850106f5bf1ace310c9d532b7
-  data.tar.gz: 1ad3a5d47c5ce5be18b79bfbcd9910b1f0d9ed7b
+  metadata.gz: 17e1d21f8e7714894c503f0f2c6dade3d0f462c5
+  data.tar.gz: da8b07352f240d0291f148822d7fbeaaf8dbc7b0
 SHA512:
-  metadata.gz: 5d5b1a4726c8c5c010baaca1cb771daf32762b84fd77cf408b91ebadd6e6a865d3fba69b32deb9618a3463e6c68789c2e9ec7cc401524939c729ab519b832457
-  data.tar.gz: 0a3dc2c987d2a327bae5b0ecff06bde62c6039df1180416aad5f4d966fab8d618b0462f29d3f64e7858caee032b7c64f572b6a4579d74eaf461f89830c7f3d54
+  metadata.gz: 34a01006fb075a575e65af5a21118c5f17758a63dc0313d9c49ab0569ed2d14b93587b1d70be985b23d6795946a11ec6399c293bea800ae1c56e2cb6bf03d299
+  data.tar.gz: 323c1c0d0ff960c519ba089b40841ab3f28c4c53a821425d1402ba0f29ef8d91e9b1af4f019b7fa32d6886b86de6eba9045b968e83dd3cf46c1de99e6f1271c1

data/lib/kaitai/struct/struct.rb

@@ -3,7 +3,7 @@ require 'stringio'
 module Kaitai
 module Struct
 
-VERSION = '0.4'
+VERSION = '0.5'
 
 ##
 # Common base class for all structured generated by Kaitai Struct.
@@ -59,7 +59,7 @@ class Struct
 end
 
 ##
-# Kaitai::Stream is an implementation of
+# Kaitai::Struct::Stream is an implementation of
 # {https://github.com/kaitai-io/kaitai_struct/wiki/Kaitai-Struct-stream-API
 # Kaitai Struct stream API} for Ruby. It's implemented as a wrapper
 # for generic IO objects.
@@ -358,31 +358,46 @@ class Stream
 
   ##
   # Performs a XOR processing with given data, XORing every byte of
-  # input with a single given value.
+  # input with a single given value. Uses pure Ruby implementation suggested
+  # by [Thomas Leitner](https://github.com/gettalong), borrowed from
+  # https://github.com/fny/xorcist/blob/master/bin/benchmark
   # @param data [String] data to process
   # @param key [Fixnum] value to XOR with
   # @return [String] processed data
-  def process_xor_one(data, key)
-    data.bytes.map { |x| x ^ key }.pack('C*')
+  def self.process_xor_one(data, key)
+    out = data.dup
+    i = 0
+    max = data.length
+    while i < max
+      out.setbyte(i, data.getbyte(i) ^ key)
+      i += 1
+    end
+    out
   end
 
   ##
   # Performs a XOR processing with given data, XORing every byte of
   # input with a key array, repeating key array many times, if
   # necessary (i.e. if data array is longer than key array).
+  # Uses pure Ruby implementation suggested by
+  # [Thomas Leitner](https://github.com/gettalong), borrowed from
+  # https://github.com/fny/xorcist/blob/master/bin/benchmark
   # @param data [String] data to process
   # @param key [String] array of bytes to XOR with
   # @return [String] processed data
-  def process_xor_many(data, key)
-    kb = key.bytes
-    kl = kb.size
+  def self.process_xor_many(data, key)
+    out = data.dup
+    kl = key.length
     ki = 0
-    data.bytes.map { |x|
-      r = x ^ kb[ki]
+    i = 0
+    max = data.length
+    while i < max
+      out.setbyte(i, data.getbyte(i) ^ key.getbyte(ki))
       ki += 1
       ki = 0 if ki >= kl
-      r
-    }.pack('C*')
+      i += 1
+    end
+    out
   end
 
   ##
@@ -394,7 +409,7 @@ class Stream
   # @param amount [Fixnum] number of bits to shift by
   # @param group_size [Fixnum] number of bytes per group to shift
   # @return [String] copy of source array with requested shift applied
-  def process_rotate_left(data, amount, group_size)
+  def self.process_rotate_left(data, amount, group_size)
     raise NotImplementedError.new("unable to rotate group #{group_size} bytes yet") unless group_size == 1
 
     mask = group_size * 8 - 1
@@ -411,6 +426,15 @@ class Stream
 
   # ========================================================================
 
+  ##
+  # Resolves value using enum: if the value is not found in the map,
+  # we'll just use literal value per se.
+  def self.resolve_enum(enum_map, value)
+    enum_map[value] || value
+  end
+
+  # ========================================================================
+
   private
   SIGN_MASK_16 = (1 << (16 - 1))
   SIGN_MASK_32 = (1 << (32 - 1))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaitai-struct
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Mikhail Yakshin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-11-09 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.