binaryparse 0.2.0 → 0.2.2

data/examples/voter.rb

@@ -52,12 +52,16 @@ File.open("voter1.txt", "wb") do |vinfo|
   vinfo.print "Hurley                             Susan                                                                                                                                                                                                                                                                                                                                                                                                                                     82                                                        "
 end
 
-File.open("voter1.txt") do |vinfo|
+start = Time.new
+count = 0
+File.open("v.txt") do |vinfo|
   until vinfo.eof
     voter = Voter.new(vinfo)
-    
+    count += 1
     # You might want to do something more interesting here...
-    puts voter.last_name
-    puts voter.first_name
+    #puts voter.last_name
+    #puts voter.first_name
   end
-end
+end
+stop = Time.new
+puts "Processed #{count} records in #{stop - start} seconds"

data/lib/blocker.rb

@@ -19,7 +19,7 @@ module BinaryBlocker
     def klasses
       @klasses ||= {}
     end
-
+    
     # To simplify naming of classes and laying out fields in your structures
     # they can be registered:
     #
@@ -28,7 +28,7 @@ module BinaryBlocker
       @klasses ||= {}
       @klasses[sym] = klass
     end
-
+    
     # Handy helper method that returns the size of a given pack/unpack format
     # string
     def sizeof_format(format)
@@ -53,7 +53,7 @@ module BinaryBlocker
       
       length
     end
-
+    
     def pack_symbols
       { 
         :int8   => 'c', 
@@ -66,7 +66,7 @@ module BinaryBlocker
         :uint64 => 'Q'
       }
     end
-
+    
     # As we have to process some fields to determine what type they are
     # (that is we sometimes start and half to backup), this routine takes
     # any io (that can be repositioned) and yields to a block -- if the 
@@ -97,7 +97,7 @@ module BinaryBlocker
   # It also supports either a string or io parameter which will be used to 
   # initialize the class
   class Encoder
-    
+  
     # Parameters: (io | buf, options_hash)
     #
     # Options (lambda):
@@ -130,7 +130,7 @@ module BinaryBlocker
       io.write(result) if io
       result
     end
-
+    
     # This routine takes an io and will parse the stream 
     # on success it returns the object, on failure it 
     # returns a nil
@@ -148,19 +148,19 @@ module BinaryBlocker
         self.value || self.valid?
       end
     end
-
+    
     def key_value?
       @opts[:key]
     end
-        
+    
     protected
-
+    
     # Override valid? to allow check constraints on a particular 
     # record type, on failure 
     def valid?
       true
     end
-      
+    
     def value
       v = @value
       if @get_filter
@@ -197,7 +197,7 @@ module BinaryBlocker
       if data.respond_to? :to_str
         raise "Unable to parse block" unless deblock(StringIO.new(data))
       elsif data.respond_to? :read
-        raise "Unable to parse block" unless deblock(data)        
+        raise "Unable to parse block" unless deblock(data)
       end
     end
     
@@ -208,7 +208,7 @@ module BinaryBlocker
         valid?
       end && result
     end
-
+    
     def internal_block(value) 
       value
     end
@@ -217,7 +217,7 @@ module BinaryBlocker
       ''
     end    
   end
-
+  
   # All Encoders that store multiple items subclass from 
   # here. 
   class GroupEncoder < Encoder
@@ -237,7 +237,7 @@ module BinaryBlocker
       def lookup=(l)
         @lookup=l
       end
-
+      
       def klasses
         @klasses
       end
@@ -245,7 +245,7 @@ module BinaryBlocker
       def klasses=(k)
         @klasses = k
       end
-            
+      
       def inherited(obj)
         obj.instance_eval do
           self.klasses = self.klasses || BinaryBlocker.klasses.clone
@@ -254,7 +254,7 @@ module BinaryBlocker
         end
         super
       end
-
+      
       # One and only one (this is the easiest :-)
       def has_one(sym, klass, *opts) 
         klass = self.klasses[klass] if self.klasses[klass]
@@ -278,7 +278,7 @@ module BinaryBlocker
         self.lookup[sym] = self.attributes.size 
         self.attributes << lambda { OneOfEncoder.new(klasses, *opts) }
       end
-
+      
       def has_counted_array(sym, count_type, klasses, *opts)
         klasses = include_klasses(klasses, *opts)
         self.lookup[sym] = self.attributes.size 
@@ -290,13 +290,13 @@ module BinaryBlocker
         self.lookup[sym] = self.attributes.size 
         self.attributes << lambda { FixedArrayEncoder.new(count, klasses, *opts) }
       end
-
+      
       def has_bit_field(sym, type, bit_info, *opts)
         self.lookup[sym] = self.attributes.size
         self.attributes << lambda { BitFieldEncoder.new(type, bit_info, *opts) }
       end
-          
-       def has_list_of(sym, klasses, *opts)
+      
+      def has_list_of(sym, klasses, *opts)
         klasses = include_klasses(klasses, *opts)
         self.lookup[sym] = self.attributes.size 
         self.attributes << lambda { ListOfEncoder.new(klasses, *opts) }
@@ -315,7 +315,19 @@ module BinaryBlocker
     def initialize(*opts)
       @lookup = self.class.lookup.clone
       @value = self.class.attributes.map { |a| a.call }
-      super      
+      super
+
+      opts.each do |o|
+        if o.respond_to? :to_hash
+          o.keys.each do |key|
+            if pos = @lookup[key.to_sym]
+              unless @value[pos].key_value?
+                @value[pos].value = o[key]
+              end
+            end
+          end
+        end
+      end                
     end 
     
     def block
@@ -345,7 +357,7 @@ module BinaryBlocker
       end
       super
     end
-
+    
     def value
       self
     end
@@ -358,14 +370,14 @@ module BinaryBlocker
       @value.all? { |a| a.valid? }
     end
   end  
-    
+  
   class SimpleEncoder < Encoder
-    
+  
     def self.register(sym, fmt, *opts)
       klass = Class.new(SimpleEncoder)
       klass.send(:define_method,:initialize) do |*opts|
         initialize_options(*opts)
-      
+        
         @format = fmt
         @length = BinaryBlocker.sizeof_format(@format)
         
@@ -474,7 +486,7 @@ module BinaryBlocker
   end
   BinaryBlocker.register_klass(:utf16_string, FixedUTF16StringEncoder)
   BinaryBlocker.register_klass(:utf16, FixedUTF16StringEncoder)
-
+  
   class PackedNumberEncoder < SimpleEncoder
     def initialize(*opts)
       initialize_options(*opts)
@@ -502,7 +514,7 @@ module BinaryBlocker
     end    
   end
   BinaryBlocker.register_klass(:packed, PackedNumberEncoder)
-
+  
   class PackedDateEncoder < PackedNumberEncoder
     def initialize_options(*opts)
       super
@@ -565,7 +577,7 @@ module BinaryBlocker
         Time.local(year, month, day, hour, min, sec)
       end
     end    
-        
+    
     def valid?
       case @value
       when Time : true
@@ -580,7 +592,7 @@ module BinaryBlocker
   BinaryBlocker.register_klass(:datetime, PackedDateTimeEncoder)
   
   class OneOfEncoder < Encoder
-    
+  
     def inspect
       "OneOf #{@classes.join(',')} -> #{@obj.class} -> #{@obj.inspect}" 
     end
@@ -620,12 +632,12 @@ module BinaryBlocker
         super
       end
     end
-
+    
     def valid?
       @obj && @obj.valid?
     end
   end
-   
+  
   class FixedArrayEncoder < GroupEncoder
     def initialize(count, classes, *opts)
       initialize_options(*opts)
@@ -648,7 +660,7 @@ module BinaryBlocker
         @value = result
       end 
     end
-        
+    
     def [](offset)
       raise RangeError.new("Access (#{offset}) out of range (#{@count})") unless (0...@count) === offset
       @value[offset]
@@ -659,7 +671,7 @@ module BinaryBlocker
       @value[offset] = val
     end
   end
-
+  
   class ListOfEncoder < GroupEncoder
     def initialize(classes, *opts)
       initialize_options(*opts)
@@ -684,7 +696,7 @@ module BinaryBlocker
       end 
       @value = result
     end
-        
+    
     def [](offset)
       raise RangeError.new("Access (#{offset}) out of range (#{@value.size})") unless (0...@value.size) === offset
       @value[offset]
@@ -708,7 +720,7 @@ module BinaryBlocker
     end
     alias length size
   end
- 
+  
   class CountedArrayEncoder < GroupEncoder
     def initialize(count_type, classes, *opts)
       # this is dynamic now, but we init to zero for the range checking
@@ -736,7 +748,7 @@ module BinaryBlocker
       end 
       @value = result
     end
-        
+    
     def [](offset)
       raise RangeError.new("Access (#{offset}) out of range (#{@count})") unless (0...@count) === offset
       @value[offset]
@@ -757,7 +769,7 @@ module BinaryBlocker
     end
     alias length size
   end
-
+  
   class BitFieldEncoder < Encoder
     def initialize(type, bit_info, *opts)
       @type = BinaryBlocker.pack_symbols[type] || type
@@ -782,7 +794,7 @@ module BinaryBlocker
       initialize_options(*opts)
       initialize_data(*opts)
     end
-   
+    
     def internal_block(val)
       [val.raw_value || 0].pack(@type)
     end
@@ -792,7 +804,7 @@ module BinaryBlocker
       result = buffer.unpack(@type)
       result.first
     end
-
+    
     def value
       self
     end
@@ -820,9 +832,9 @@ module BinaryBlocker
         # which seemed wrong, not sure why
       end
     end
-        
+    
   end
-        
+  
   class Blocker < GroupEncoder
     def inspect
       "Blocker: #{@value.inspect} (index: #{@lookup})"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: binaryparse
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2006-09-30 00:00:00 -04:00
+  version: 0.2.2
+date: 2006-11-03 00:00:00 -05:00
 summary: Binaryparse is a simple Ruby DSL to parse semi-complicated binary structures. This includes structures dynamic in length, which cannot be handled by DL::Struct or BitStructEx.
 require_paths: 
 - lib
@@ -29,12 +29,15 @@ post_install_message:
 authors: 
 - Patrick Hurley
 files: 
-- test/test_blocker.rb
-- lib/buffered_io.rb
-- lib/blocker.rb
+- examples
+- lib
+- test
 - examples/cmasqls.rb
-- examples/voter.rb
 - examples/readme.txt
+- examples/voter.rb
+- lib/blocker.rb
+- lib/buffered_io.rb
+- test/test_blocker.rb
 test_files: []
 
 rdoc_options: []