binaryparse 0.1.3 → 0.1.4

data/binaryparse.gemspec

@@ -2,12 +2,13 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |s|
   s.name = "binaryparse"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
   s.author = "Patrick Hurley"
   s.email = "phurley@gmail.com"
   s.homepage = "http://binaryparse.rubyforge.org/"
   s.platform = Gem::Platform::RUBY
   s.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."
+  s.description = "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."
   s.files = Dir["**/*"]
   s.autorequire = "binaryparse"
 end

data/lib/blocker.rb

@@ -6,6 +6,9 @@
 # (BinaryBlocker::PackedNumberEncoder) and date fields 
 # (BinaryBlocker::PackedDateEncoder) 
 
+# Todo
+# Allow nil/blanks by default
+
 require 'uconv'
 require 'date'
 require 'time'
@@ -172,7 +175,7 @@ module BinaryBlocker
       opts = opts.find { |o| o.respond_to? :to_hash }
       if opts
         @opts = @opts.merge(opts)
-        @value = @opts[:default]
+        @value = @opts[:default] || @opts[:key] || @value
         @pre_block = @opts[:pre_block]
         @pre_deblock = @opts[:pre_deblock]
         
@@ -352,7 +355,7 @@ module BinaryBlocker
     
     def internal_block(val)
       if val.nil?
-        [val.to_i].pack(@format)
+        [0].pack(@format)
       else
         [val].pack(@format)
       end
@@ -388,6 +391,7 @@ module BinaryBlocker
   
   class FixedStringEncoder < SimpleEncoder
     def initialize(*opts)
+      @value = ''
       initialize_options(*opts)
       
       @length = @opts[:length].to_i
@@ -446,7 +450,7 @@ module BinaryBlocker
     end
     
     def internal_block(val)
-      ["%0#{@length}d" % val].pack(@format)
+      ["%0#{@length}d" % val.to_i].pack(@format)
     end
     
     def internal_deblock(io)
@@ -464,14 +468,22 @@ module BinaryBlocker
     end
     
     def internal_block(val)
-      super val.year * 10000 + val.month * 100 + val.mday
+      if val
+        super val.year * 10000 + val.month * 100 + val.mday
+      else
+        super 0
+      end 
     end
     
     def internal_deblock(io)
       buffer = io.read(@bytes)
       result = buffer.unpack(@format)
       year, month, day = result.first.unpack("A4A2A2").map { |v| v.to_i }
-      Date.civil(year, month, day)
+      if year.zero?
+        nil
+      else
+        Date.civil(year, month, day)
+      end
     end    
         
   end
@@ -484,14 +496,22 @@ module BinaryBlocker
     end
     
     def internal_block(val)
-      super sprintf("%04d%02d%02d%02d%02d%02d", val.year, val.month, val.mday, val.hour, val.min, val.sec).to_i
+      if val
+        super sprintf("%04d%02d%02d%02d%02d%02d", val.year, val.month, val.mday, val.hour, val.min, val.sec).to_i
+      else
+        super 0
+      end
     end
     
     def internal_deblock(io)
       buffer = io.read(@bytes)
       result = buffer.unpack(@format)
       year, month, day, hour, min, sec = result.first.unpack("A4A2A2A2A2A2").map { |v| v.to_i }
-      Time.local(year, month, day, hour, min, sec)
+      if year.zero?
+        nil
+      else
+        Time.local(year, month, day, hour, min, sec)
+      end
     end    
         
   end
@@ -699,7 +719,7 @@ module BinaryBlocker
     end
    
     def internal_block(val)
-      [val.raw_value].pack(@type)
+      [val.raw_value || 0].pack(@type)
     end
     
     def internal_deblock(io)

data/test/test_blocker.rb

@@ -374,12 +374,9 @@ class TestBlocker < Test::Unit::TestCase
     b.footer = 67
     
     ia = ItemA.new
-    ia.iid = 1
-    ia.name = 'widget A'
     assert_equal(1, ia.iid)
     
     ib = ItemB.new
-    ib.iid = 2
     ib.name = 'widget B'
     
     b.items << ia << ib << ia << ib << ib << ib

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: binaryparse
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
-date: 2006-09-06 00:00:00 -04:00
+  version: 0.1.4
+date: 2006-09-13 00:00:00 -04: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
 email: phurley@gmail.com
 homepage: http://binaryparse.rubyforge.org/
 rubyforge_project: 
-description: 
+description: 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.
 autorequire: binaryparse
 default_executable: 
 bindir: bin
@@ -29,12 +29,12 @@ post_install_message:
 authors: 
 - Patrick Hurley
 files: 
+- binaryparse-0.1.4.gem
 - binaryparse.gemspec
 - examples
 - lib
 - test
 - examples/cmasqls.rb
-- examples/pms_input_2_test.rb
 - examples/readme.txt
 - lib/blocker.rb
 - lib/buffered_io.rb

data/examples/pms_input_2_test.rb

@@ -1,70 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-require 'blocker'
-require 'stringio'
-
-class PMS_UserArea < BinaryBlocker::Blocker
-  has_one :filler, :uint8
-end    
-    
-class PMS_ItemMaintenance < BinaryBlocker::Blocker
-  has_one :record_code, :int8, :key=> 0x13       
-  has_one :sku, :string, :length => 8   
-  has_one :update_code, :int16
-  has_one :dept, :packed, :length => 6
-  has_one :classs, :packed, :length => 6
-  has_one :retail_price, :packed, :length => 12
-  has_one :secondary_price, :packed, :length => 12
-  has_one :lowest_price, :packed, :length => 12
-  has_one :lowest_price_date, :date
-  has_one :item_status_flag, :uint16
-  has_one :description, :utf16, :length => 40
-  has_fixed_array :user_area, 13, [PMS_UserArea]                           
-end
-
-class PmsInputTest < Test::Unit::TestCase
-
-  def write_the_block(fobj,obj)
-    fobj.write(obj.block)
-  end    
-
-  def test_create_item
-
-    item = PMS_ItemMaintenance.new
-    item.record_code = 0x13
-    item.sku = "50000001"
-    item.update_code = 0
-    item.dept = 300
-    item.classs = 20
-    item.retail_price = 599
-    item.secondary_price = 499
-    item.lowest_price = 399
-    item.lowest_price_date = Date.new(2006,05,13)
-    item.item_status_flag = 0
-    item.description = "I made this up!"
-    (0..12).each {|i| 
-              item.user_area[i] = PMS_UserArea.new
-              item.user_area[i].filler = i 
-        }
-
-    filename = "testitem"
-    File.delete(filename) if File.exist?(filename)
-    f = File.new(filename,  "wb+")
-     (0..5).each do |i|
-          item.sku = (50000000 + i).to_s
-          write_the_block(f,item)
-      end          
-    f.close     
-
-
-    File.open(filename, "rb") do |fhndl|
-      until fhndl.eof?
-       start = fhndl.pos
-       rec = PMS_ItemMaintenance.new(fhndl)
-       puts "#{rec.class}: #{start}-#{fhndl.pos}"  
-       p rec.sku + " " + rec.description
-      end    
-    end
-  end
-      
-end