rstruct 0.1.0 → 0.1.1

data/README.rdoc

@@ -9,7 +9,7 @@ once, and use them in many ways as you see fit. Kind-of like... C structs in
 system/API header files.
 
 The structure declaration syntax emulates C structures syntax, although Rstruct
-is not intended to be able to parse C structures from C header files. (howewver
+is not intended to be able to parse C structures from C header files. (however
 an addon could conceivably be built to do so with minimal fuss)
 
 Multiple approaches to parsing and building are supported and more can be added
@@ -21,10 +21,10 @@ as well as buffers.
 Rstruct was written because the authors wanted something comparable to C
 structures without having a strong need for extra 'magic' in parsing or
 building structures. While there exist numerous options in this space, they
-all seem to have suffered from a combination of performance and interface issues
-which limit their potential (and in some cases, spotty maintenance). Having, 
-tried pretty much all of these alternatives (and even contributed to a few) 
-in previous projects, the author still decided to write rstruct.
+all seem to have suffered from a combination of performance and interface 
+issues which limit their potential (and in some cases, spotty maintenance). 
+Having, tried pretty much all of these alternatives (and even contributed to a
+few) in previous projects, the author still decided to write rstruct.
 
 That said, the author does not claim Rstruct to be superior to any others, it's
 just another approach. There are several other excellent binary structure
@@ -58,7 +58,8 @@ Here is a trivial example defining and packing a raw structure
   # => "\x00\x00\x00A\x00\x00\x00B\x00\x00\x00C" # on a big endian machine
 
 
-Here is a fully functional Rstruct parser example using Apple's FAT file structure.
+Here is a fully functional Rstruct parser example using Apple's FAT file
+structure.
 
   # To compare the structs to their C counterparts, see:
   #   http://fxr.watson.org/fxr/source/EXTERNAL_HEADERS/mach-o/fat.h?v=xnu-1228
@@ -100,7 +101,7 @@ Here is a fully functional Rstruct parser example using Apple's FAT file structu
 
     fat_arch = get_type(:fat_arch)
     (head.nfat_arch).times do |i|
-      arch = fat_arch.read(f) # note, it reads to a seperate object on each arch
+      arch = fat_arch.read(f) # note, it reads to a new object on each arch
       puts "  Architecture #{i}:"
       puts "  " << dump(arch).join("\n  ")
       puts
@@ -128,7 +129,8 @@ Here is a fully functional Rstruct parser example using Apple's FAT file structu
       align = 0x0000000c
 
 
-Please refer to rdoc, the samples/ directory, and unit tests for more information.
+Please refer to rdoc, the samples/ directory, and unit tests for more
+information.
 
 == Copyright
 

data/Rakefile

@@ -45,6 +45,6 @@ Rake::RDocTask.new do |rdoc|
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "rstruct #{version}"
-  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('README*', 'TODO*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/TODO.rdoc

@@ -0,0 +1,10 @@
+== TODO
+
+* DOCUMENTATION!
+* add a type for unions
+* really no good reason why we can't support variable length data
+* add types for odd byte-alignment values like 24-bit, 12-bit, 48-bit, etc.
+* add a type for handling bitfields
+* add instance helpers for resolving enums forward and back
+
+

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/rstruct/base_types/array_type.rb

@@ -0,0 +1,42 @@
+require 'rstruct/registry'
+require 'rstruct/field'
+require 'rstruct/base_types'
+
+module Rstruct
+  class ArrayContainer < Array
+    include ContainerMixins
+  end
+
+  class ArrayType < ContainerType
+    attr_reader :count
+
+    def initialize(name, typ, count, opts={}, &block)
+      opts = opts.dup
+      lkupreg = (opts.delete(:fields_from) || opts.delete(:register) || Rstruct.default_registry)
+      super(name, opts.merge(:register => false), &block)
+      @count = count
+      unless @rtype = lkupreg[typ]
+        raise(InvalidTypeError, "invalid array type #{typ.inspect}")
+      end
+    end
+
+    def typ
+      self
+    end
+
+    def fields
+      @fields ||= Array.new(self.count){|i| Field.new(i, @rtype, nil, nil) }.freeze
+    end
+
+    def instance(*values)
+      vals = values.flatten
+      ary = ArrayContainer.new(self.count){|f| vals.shift }
+      ary.rstruct_type = self
+      return ary
+    end
+
+    def offset_of(idx)
+      rtype.sizeof * idx
+    end
+  end
+end

data/lib/rstruct/base_types/container_type.rb

@@ -30,19 +30,19 @@ module Rstruct
       vals = (pvals.respond_to?(:values) ? pvals.values : pvals)
       vals ||= self.values
 
-      opos = dst.pos
+      opos = dst.pos if dst.respond_to?(:pos)
       typ.fields.each_with_index do |f, i|
         fldval = vals[i]
         if fldval.respond_to?(:write)
           fldval.write(dst, fldval)
         else
-          dst.write(f.typ.pack_value(fldval, self))
+          dst.write(f.typ.pack_value((fldval || 0), self))
         end
       end
       if dst.is_a?(StringIO) and pvals.nil?
         dst.pos = opos
         return(dst.read)
-      else
+      elsif opos and dst.respond_to?(:pos)
         return dst.pos - opos
       end
     end
@@ -81,22 +81,36 @@ module Rstruct
     end
 
     def field_names
-      @field_names ||= self.fields.map{|f| f.name }
+      self.fields.map{|f| f.name }
     end
 
     def field_types 
-      @field_types ||= self.fields.map{|f| f.typ }
+      self.fields.map{|f| f.typ }
     end
 
     def read(raw, obj=nil)
       raw = StringIO.new(raw) if raw.is_a?(String)
       obj = self.instance()
       fields.each do |f|
-        obj[f.name] = f.read(raw, obj)
+        obj[f.name] = f.typ.read(raw, obj)
       end
       return obj
     end
 
+    def claim_value(vals, obj=nil)
+      if @claim_cb
+        @claim_cb.call(vals, obj)
+      else
+        # create our struct container
+        s = instance()
+
+        # iterate through the fields assigning values in the
+        # container and pass it along with values to each
+        # field's claim_value method.
+        self.fields.do {|f| s[f.name] = f.typ.claim_value(vals,s) }
+        return s
+      end
+    end
   end
 
 end

data/lib/rstruct/base_types/packed_type.rb

@@ -61,10 +61,10 @@ module Rstruct
 
   class PackedType < Type
     include Packable
-    attr_reader :size, :format
+    attr_reader :sizeof, :format
 
     def initialize(name, size, format, opts={}, &block)
-      @size = size
+      @sizeof = size
       @format = format
       @groupable = true
       super(name, opts, &block)

data/lib/rstruct/base_types/type.rb

@@ -39,7 +39,7 @@ module Rstruct
     end
 
     def sizeof
-      self.size
+      raise(NotImplementedError, "sizeof not implemented in #{self.class}")
     end
 
     private

data/lib/rstruct/base_types.rb

@@ -3,3 +3,4 @@ require 'rstruct/registry'
 require 'rstruct/base_types/type.rb'
 require 'rstruct/base_types/packed_type.rb'
 require 'rstruct/base_types/container_type.rb'
+require 'rstruct/base_types/array_type.rb'

data/lib/rstruct/field.rb

@@ -1,11 +1,10 @@
 module Rstruct
   class Field
-    attr_reader :name, :typ_name, :typ, :args, :block
+    attr_reader :name, :typ, :args, :block
 
-    def initialize(name, typ, typ_name, args, block)
+    def initialize(name, typ, args, block)
       @name=name
       @typ=typ
-      @typ_name = typ_name || typ
       @args=args
       @block=block
     end

data/lib/rstruct/struct_builder.rb

@@ -1,5 +1,6 @@
 require 'rstruct/registry'
 require 'rstruct/field'
+require 'rstruct/base_types/array_type'
 
 module Rstruct
 
@@ -13,7 +14,11 @@ module Rstruct
     end
 
     def field(name, typ, typ_name, *args, &block)
-      @__fields << Field.new(name,typ,typ_name,args,block)
+      @__fields << Field.new(name,typ,args,block)
+    end
+
+    def array(name, typ, count, opts={}, &block)
+      @__fields << ArrayType.new(name, typ, count, opts, &block)
     end
 
     def method_missing(typ_arg, *args, &block)

data/lib/rstruct/structure.rb

@@ -40,20 +40,13 @@ module Rstruct
       return s
     end
 
-    def claim_value(vals, obj=nil)
-      if @claim_cb
-        @claim_cb.call(vals, obj)
-      else
-        # create our struct container
-        s = instance()
-
-        # iterate through the fields assigning values in the
-        # container and pass it along with values to each
-        # field's claim_value method.
-        self.fields.do {|f| s[f.name] = f.typ.claim_value(vals,s) }
-
-        return s
+    def offset_of(fld)
+      o = 0
+      self.fields.each do |f|
+        return o if f.name == fld
+        o += f.sizeof
       end
+      raise(InvalidTypeError, "Invalid type: #{fld}")
     end
   end
 end

data/lib/rstruct/types.rb

@@ -1,7 +1,7 @@
 require 'rstruct/base_types'
 
 module Rstruct
-  Char = PackedType.new(:char, 1, "A", :alias => [:char, :char_t])
+  Char = PackedType.new(:char, 1, "a", :alias => [:char, :char_t])
 
   Byte = PackedType.new(:byte, 1, "c", :alias => [:BYTE, :signed_byte])
 

data/lib/rstruct.rb

@@ -41,7 +41,7 @@ module Rstruct
     end
 
     def typedef(p, t, opts={})
-      reg = opts[:registry] || default_registry
+      reg = opts[:register] || default_registry
       reg.typedef(p,t,opts)
     end
 

data/samples/pe.rb

@@ -0,0 +1,262 @@
+$: << File.join(File.dirname(__FILE__), '..', 'lib')
+require 'rstruct'
+
+module Pe
+  extend Rstruct::ClassMethods
+
+  PE_REGISTRY = Rstruct::Registry.new(:portable_executable)
+
+  def self.registry
+    PE_REGISTRY
+  end
+
+  typedef :uint16le, :WORD, :register => registry()
+  typedef :uint32le, :LONG, :register => registry()
+  typedef :uint32le, :DWORD, :register => registry()
+
+  IMAGE_DOS_HEADER = struct(:IMAGE_DOS_HEADER, :register => registry()) {
+     WORD :magic    # magic number
+     WORD :cblp     # bytes on last page of file
+     WORD :cp       # pages in file
+     WORD :crlc     # relocations
+     WORD :cparhdr  # size of header in paragraphs
+     WORD :minalloc # minimum extra paragraphs needed
+     WORD :maxalloc # maxumum extra paragraphs needed
+     WORD :ss       # Initial (relative) SS value
+     WORD :sp       # Initial SP value
+     WORD :csum     # Checksum
+     WORD :ip       # Initial IP value
+     WORD :cs       # Initial (relative) CS value
+     WORD :lfarlc   # File address of relocation table
+     WORD :ovno     # overlay number
+     array :res1, :uint16le, 4
+     WORD :oemid    # OEM identifier
+     WORD :oeminfo  # OEM information; oem specific
+     array :res2, :uint16le, 10
+     LONG :lfanew   # File address of new exe header (PE header)
+  }
+
+
+
+  IMAGE_FILE_MACHINE_TYPES = {
+    0 => :UNKNOWN,
+    0x014C => :I386,
+    0x8664 => :AMD64,
+    0x01C0 => :ARM,
+    0x0162 => :R3000,
+    0x0166 => :R4000,
+    0x0168 => :R10000,
+    0x0169 => :WCEMIPSV2,
+    0x0184 => :ALPHA,
+    0x01A2 => :SH3,
+    0x01A3 => :SH3DSP,
+    0x01A4 => :SH3E,
+    0x01A6 => :SH4,
+    0x01A8 => :SH5,
+    0x01C2 => :THUMB,
+    0x01D3 => :AM33,
+    0x01F0 => :POWERPC,
+    0x01F1 => :POWERPCFP,
+    0x0200 => :IA64,
+    0x0266 => :MIPS16,
+    0x0284 => :ALPHA64,
+    0x0366 => :MIPSFPU,
+    0x0466 => :MIPSFPU16,
+    0x0520 => :TRICORE,
+    0x0CEF => :CEF,
+    0x0EBC => :EBC,
+    0x9041 => :M32R,
+    0xC0EE => :CEE,
+  }
+
+  IMAGE_FILE_CHARACTERISTICS_FLAGS = {
+    :RELOCS_STRIPPED          => 0x0001,
+    :EXECUTABLE_IMAGE         => 0x0002,
+    :LINE_NUMS_STRIPPED       => 0x0004,
+    :LOCAL_SYMS_STRIPPED      => 0x0008,
+    :AGGRESIVE_WS_TRIM        => 0x0010,
+    :LARGE_ADDRESS_AWARE      => 0x0020,
+    :BYTES_REVERSED_LO        => 0x0080,
+    :MACHINE_32BIT            => 0x0100,
+    :DEBUG_STRIPPED           => 0x0200,
+    :REMOVABLE_RUN_FROM_SWAP  => 0x0400,
+    :NET_RUN_FROM_SWAP        => 0x0800,
+    :SYSTEM                   => 0x1000,
+    :DLL                      => 0x2000,
+    :UNIPROC_SYSTEM_ONLY      => 0x4000,
+    :BYTES_REVERSED_HI        => 0x8000,
+  }
+
+  IMAGE_FILE_HEADER = struct(:IMAGE_FILE_HEADER, :register => registry()) {
+    WORD  :Machine
+    WORD  :NumberOfSections
+    DWORD :TimeDateStamp
+    DWORD :PointerToSymbolTable
+    DWORD :NumberOfSymbols
+    WORD  :SizeOfOptionalHeader
+    WORD  :Characteristics
+  }
+
+  IMAGE_DATA_DIRECTORY = struct(:IMAGE_DATA_DIRECTORY, :register => registry()) {
+    DWORD :VirtualAddress
+    DWORD :Size
+  }
+
+  IMAGE_NUMBEROF_DIRECTORY_ENTRIES = 16
+
+  IMAGE_NT_OPTIONAL_HDR_MAGIC = {
+    0x10b => :HDR32,
+    0x20b => :HDR64,
+    0x107 => :ROM,
+  }
+
+  IMAGE_NT_OPTIONAL_HDR_SUBSYSTEMS = [
+    :UNKNOWN,
+    :NATIVE,
+    :WINDOWS_GUI,
+    :WINDOWS_CONSOLE,
+    nil,
+    :OS2_CONSOLE,
+    nil,
+    :POSIX_CONSOLE,
+    :NATIVE_WIN9X_DRIVER,
+    :WINDOWS_CE_GUI,
+    :EFI_APPLICATION,
+    :EFI_BOOT_SERVICE_DRIVER,
+    :EFI_RUNTIME_DRIVER,
+    :EFI_ROM,
+    :XBOX,
+    nil,
+    :WINDOWS_BOOT_APPLICATION,
+  ]
+
+  IMAGE_DLL_CHARACTERISTICS_FLAGS = {
+    :DYNAMIC_BASE    => 0x0080,
+    :FORCE_INTEGRITY => 0x0080,
+    :NX_COMPAT       => 0x0100,
+    :NO_ISOLATION    => 0x0200,
+    :NO_SEH          => 0x0400,
+    :NO_BIND         => 0x0800,
+    :WDM_DRIVER      => 0x2000,
+    :TERM_SVR_AWARE  => 0x8000,
+  }
+
+  IMAGE_OPTIONAL_HEADER = struct(:IMAGE_OPTIONAL_HEADER, :register => registry()) {
+    WORD  :Magic
+    BYTE  :MajorLinkerVersion
+    BYTE  :MinorLinkerVersion
+    DWORD :SizeOfCode
+    DWORD :SizeOfInitializedData
+    DWORD :SizeOfUninitializedData
+    DWORD :AddressOfEntryPoint
+    DWORD :BaseOfCode
+    DWORD :BaseOfData
+    DWORD :ImageBase
+    DWORD :SectionAlignment
+    DWORD :FileAlignment
+    WORD  :MajorOperatingSystemVersion
+    WORD  :MinorOperatingSystemVersion
+    WORD  :MajorImageVersion
+    WORD  :MinorImageVersion
+    WORD  :MajorSubsystemVersion
+    WORD  :MinorSubsystemVersion
+    DWORD :Win32VersionValue
+    DWORD :SizeOfImage
+    DWORD :SizeOfHeaders
+    DWORD :CheckSum
+    WORD  :Subsystem
+    WORD  :DllCharacteristics
+    DWORD :SizeOfStackReserve
+    DWORD :SizeOfStackCommit
+    DWORD :SizeOfHeapReserve
+    DWORD :SizeOfHeapCommit
+    DWORD :LoaderFlags
+    DWORD :NumberOfRvaAndSizes
+
+    IMAGE_DATA_DIRECTORY :DDExportTable
+    IMAGE_DATA_DIRECTORY :DDImportTable
+    IMAGE_DATA_DIRECTORY :DDResourceTable
+    IMAGE_DATA_DIRECTORY :DDExceptionTable
+    IMAGE_DATA_DIRECTORY :DDCertificatTable
+    IMAGE_DATA_DIRECTORY :DDBaseRelocationTable
+    IMAGE_DATA_DIRECTORY :DDDebuggingInformation
+    IMAGE_DATA_DIRECTORY :DDArchSpecificData
+    IMAGE_DATA_DIRECTORY :DDGlobalPointerRegisterRVA
+    IMAGE_DATA_DIRECTORY :DDTlsTable
+    IMAGE_DATA_DIRECTORY :DDLoadConfigurationTable
+    IMAGE_DATA_DIRECTORY :DDBoundImportTable
+    IMAGE_DATA_DIRECTORY :DDImportAddressTable
+    IMAGE_DATA_DIRECTORY :DDDelayImportDescriptor
+    IMAGE_DATA_DIRECTORY :DDClrHeader
+    IMAGE_DATA_DIRECTORY :DDReserved
+  }
+
+  IMAGE_NT_HEADERS = struct(:IMAGE_NT_HEADERS, :register => registry()) {
+    DWORD                 :Signature
+    IMAGE_FILE_HEADER     :FileHeader
+    IMAGE_OPTIONAL_HEADER :OptionalHeader
+  }
+
+  IMAGE_SIZEOF_SHORT_NAME = 8
+
+  IMAGE_SECTION_HEADER = struct(:IMAGE_SECTION_HEADER, :register => registry()) {
+    array :Name, :char, 8
+    DWORD :PhysicalAddress
+    DWORD :VirtualAddress
+    DWORD :SizeOfRawData
+    DWORD :PointerToRawData
+    DWORD :PointerToRelocations
+    DWORD :PointerToLinenumbers
+    WORD  :NumberOfRelocations
+    WORD  :NumberOfLinenumbers
+    DWORD :Characteristics
+  }
+
+  def self.parse_header(*args)
+    Headers.new(*args)
+  end
+
+  class Headers
+    attr_reader :dos, :stub, :coff, :sections, :file_data
+
+    def initialize(input, param = {})
+      input = StringIO.new(input) if input.is_a?(String)
+      @dos      = IMAGE_DOS_HEADER.read(input)
+      @stub     = input.read(@dos.lfanew - IMAGE_DOS_HEADER.sizeof)
+      @coff     = IMAGE_NT_HEADERS.read(input)
+      @sections = Array.new(@coff.FileHeader.NumberOfSections) do 
+       IMAGE_SECTION_HEADER.read(input)
+      end
+    end
+
+    # Returns a Time object representation of the 
+    # PE header timestamp.
+    def timestamp
+      Time.at(coff.FileHeader.TimeDateStamp)
+    end
+
+    # Returns the size of the PE file based on header
+    # information. Specifically, the last section's 
+    # PointerToRawData is added to its SizeOfRawData
+    # which should be equal to the file size.
+    def file_size
+      lseg = self.sections.last
+      lseg.PointerToRawData + lseg.SizeOfRawData
+    end
+
+    def repack(io=nil)
+      io ||= StringIO.new
+      self.dos.write(io)
+      io.write(self.stub)
+      self.coff.write(io)
+      self.sections.each{ |s| s.write(io) }
+      io.string if io.is_a?(StringIO)
+    end
+
+    # the checksum value from the parsed header
+    def checksum
+      coff.OptionalHeader.CheckSum
+    end
+
+  end
+end

data/spec/array_spec.rb

@@ -0,0 +1,24 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'type_behaviors'
+
+describe Rstruct::ArrayType do
+  context "a basic character array" do
+    before(:each) do
+      @struct = Rstruct.struct(:array_test, :register => false) {
+        array :test_array, :char, 8
+      }
+      
+      @pack_format = "aaaaaaaa"
+
+      @instance = @struct.instance
+
+      @rawdata = "ABCDEFGH"
+      @populate = lambda { @rawdata.bytes.each_with_index{|b,i| @instance.test_array[i] = b.chr} }
+      @verify_unpack = lambda {|ret| @rawdata.bytes.each_with_index{|b,i| ret.test_array[i].should == b.chr } }
+    end
+
+    it_should_behave_like "a packable type"
+    it_should_behave_like "a groupable type"
+  end
+end
+

data/spec/structure_spec.rb

@@ -1,6 +1,50 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'type_behaviors'
 
+# Applies to structures
+shared_examples_for "a structure" do
+
+  it "should return a value instance with a reference back to itself" do
+    s = @struct.instance()
+    s.rstruct_type.should == @struct
+  end
+
+  context "struct instance" do
+    it "should expose the same fields as the struct they belong to" do
+      @struct.field_names.each do |name| 
+        name = name.to_s if RUBY_VERSION < '1.9'
+        @instance.members.should include(name)
+      end
+    end
+
+    it "should allow struct field values to be set and retrieved with accessors" do
+      @values.each do |k,v| 
+        @instance.__send__(k).should be_nil
+        @instance.__send__("#{k}=", v).should == v
+        @instance.__send__(k).should == v
+      end
+    end
+
+    it "should allow field values to be set with arguments to instance creation" do
+      s=@struct.instance(@values)
+      s.rstruct_type.should == @struct
+      @values.each { |k,v| s.__send__(k).should == v }
+    end
+
+    it "should yield itself to a block on instance creation" do
+      i=@struct.instance do |s|
+        @values.each do |k,v| 
+          s.__send__(k).should be_nil
+          s.__send__("#{k}=", v).should == v
+          s.__send__(k).should == v
+        end
+      end
+
+      @values.each { |k,v| i.__send__(k).should == v }
+    end
+  end
+end
+
 describe Rstruct::Structure do
   context "initialization" do
     it "requires a block" do
@@ -208,6 +252,16 @@ describe Rstruct::Structure do
     it_should_behave_like "a structure"
     it_should_behave_like "a packable type"
     it_should_behave_like "a groupable type"
+
+    it "should return the correct offset for fields" do
+      @struct.offset_of(:magic).should == 0
+      @struct.offset_of(:cputype).should == 4
+      @struct.offset_of(:cpusubtype).should == 8
+      @struct.offset_of(:filetype).should == 12
+      @struct.offset_of(:ncmds).should == 16
+      @struct.offset_of(:sizeofcmds).should == 20
+      @struct.offset_of(:flags).should == 24
+    end
   end
 
   context "a simple fixed-length nested struct" do
@@ -278,7 +332,7 @@ describe Rstruct::Structure do
         double_inner_values.each {|k,v| @instance.inner.double_inner[k] = v}
       end
 
-      @pack_format = "NNccAA"
+      @pack_format = "NNccaa"
       @rawdata = "\xde\xad\xbe\xef\xfa\xce\xfe\xeb\x01\x02\x41\x42"
 
       @verify_unpack = lambda do |ret|

data/spec/type_behaviors.rb

@@ -7,23 +7,23 @@ shared_examples_for "a packable type" do
     it "should write raw data and return a string when no output is specified" do
       @populate.call()
       ret = @instance.write()
-      ret.should == @rawdata
+      ret.bytes.to_a.should == @rawdata.bytes.to_a
     end
 
     it "should write raw data to a string object correctly" do
       s = "test"
       @populate.call()
       ret = @instance.write(s)
-      ret.should == @rawdata
-      s.should == "test" << @rawdata
+      ret.bytes.to_a.should == @rawdata.bytes.to_a
+      s.bytes.to_a.should == "test#{@rawdata}".bytes.to_a
     end
 
     it "should write raw data to a StringIO object correctly" do
       sio = StringIO.new
       @populate.call()
       ret = @instance.write(sio)
-      ret.should == @rawdata
-      sio.string.should == @rawdata
+      ret.bytes.to_a.should == @rawdata.bytes.to_a
+      sio.string.bytes.to_a.should == @rawdata.bytes.to_a
     end
 
     it "should write raw data to a File IO object correctly" do
@@ -34,7 +34,7 @@ shared_examples_for "a packable type" do
         ret = @instance.write(tempf)
         ret.should == @rawdata.size
         tempf.rewind
-        tempf.read.should == "test" << @rawdata
+        tempf.read.bytes.to_a.should == "test#{@rawdata}".bytes.to_a
       ensure
         tempf.close if tempf
       end
@@ -81,7 +81,7 @@ shared_examples_for "a packable type" do
         else
           @values.each {|k,v| ret.__send__(k).should == v }
         end
-        fio.read().should == testend
+        fio.read().bytes.to_a.should == testend.bytes.to_a
       ensure
         fio.close if fio
       end
@@ -96,7 +96,7 @@ shared_examples_for "a packable type" do
         @values.each {|k,v| ret.__send__(k).should == v }
       end
       repacked = ret.write()
-      repacked.should == @rawdata
+      repacked.bytes.to_a.should == @rawdata.bytes.to_a
     end
 
   end
@@ -115,44 +115,4 @@ shared_examples_for "a groupable type" do
   end
 end
 
-# Applies to structures
-shared_examples_for "a structure" do
-
-  it "should return a value instance with a reference back to itself" do
-    s = @struct.instance()
-    s.rstruct_type.should == @struct
-  end
-
-  context "struct instance" do
-    it "should expose the same fields as the struct they belong to" do
-      @struct.field_names.each {|name| @instance.members.should include(name.to_s) }
-    end
-
-    it "should allow struct field values to be set and retrieved with accessors" do
-      @values.each do |k,v| 
-        @instance.__send__(k).should be_nil
-        @instance.__send__("#{k}=", v).should == v
-        @instance.__send__(k).should == v
-      end
-    end
-
-    it "should allow field values to be set with arguments to instance creation" do
-      s=@struct.instance(@values)
-      s.rstruct_type.should == @struct
-      @values.each { |k,v| s.__send__(k).should == v }
-    end
-
-    it "should yield itself to a block on instance creation" do
-      i=@struct.instance do |s|
-        @values.each do |k,v| 
-          s.__send__(k).should be_nil
-          s.__send__("#{k}=", v).should == v
-          s.__send__(k).should == v
-        end
-      end
-
-      @values.each { |k,v| i.__send__(k).should == v }
-    end
-  end
-end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Eric Monti
@@ -14,10 +14,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-30 00:00:00 -05:00
+date: 2011-08-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
@@ -27,11 +29,11 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  prerelease: false
   type: :development
-  name: rspec
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
@@ -41,11 +43,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  prerelease: false
   type: :development
-  name: bundler
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
@@ -55,11 +57,11 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  prerelease: false
   type: :development
-  name: jeweler
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
@@ -67,9 +69,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   type: :development
-  name: rcov
   version_requirements: *id004
 description: A library for working with Ruby binary structures in a way similar to c-structs
 email: esmonti@gmail.com
@@ -87,9 +87,11 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
+- TODO.rdoc
 - VERSION
 - lib/rstruct.rb
 - lib/rstruct/base_types.rb
+- lib/rstruct/base_types/array_type.rb
 - lib/rstruct/base_types/container_type.rb
 - lib/rstruct/base_types/packed_type.rb
 - lib/rstruct/base_types/type.rb
@@ -99,6 +101,8 @@ files:
 - lib/rstruct/structure.rb
 - lib/rstruct/types.rb
 - samples/fatparse.rb
+- samples/pe.rb
+- spec/array_spec.rb
 - spec/registry_behaviors.rb
 - spec/registry_spec.rb
 - spec/rstruct_spec.rb
@@ -136,6 +140,7 @@ signing_key:
 specification_version: 3
 summary: A library for working with Ruby binary structures in a way similar to c-structs
 test_files: 
+- spec/array_spec.rb
 - spec/registry_behaviors.rb
 - spec/registry_spec.rb
 - spec/rstruct_spec.rb