binaryparse 0.1.4 → 0.1.5

data/binaryparse.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |s|
   s.name = "binaryparse"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
   s.author = "Patrick Hurley"
   s.email = "phurley@gmail.com"
   s.homepage = "http://binaryparse.rubyforge.org/"

data/lib/blocker.rb

@@ -144,10 +144,14 @@ module BinaryBlocker
         if @post_deblock
           self.value = @post_deblock.call(self.value)
         end
-        self.value
+        self.value || self.valid?
       end
     end
-    
+
+    def key_value?
+      @opts[:key]
+    end
+        
     protected
 
     # Override valid? to allow check constraints on a particular 
@@ -315,6 +319,7 @@ module BinaryBlocker
         sym = sym.to_s
         if sym[-1] == ?=
           if pos = @lookup[sym[0..-2].to_sym]
+            raise NoMethodError.new("undefined method `#{sym}''") if @value[pos].key_value?
             return @value[pos].value = args.first
           end
         end
@@ -479,13 +484,23 @@ module BinaryBlocker
       buffer = io.read(@bytes)
       result = buffer.unpack(@format)
       year, month, day = result.first.unpack("A4A2A2").map { |v| v.to_i }
-      if year.zero?
+      if month.zero?
         nil
       else
         Date.civil(year, month, day)
       end
     end    
-        
+    
+    def valid?
+      case @value
+      when Date : true
+      when Time : true
+      when nil  : true
+      else 
+        false
+      end        
+    end
+    
   end
   BinaryBlocker.register_klass(:date, PackedDateEncoder)
   
@@ -507,13 +522,22 @@ module BinaryBlocker
       buffer = io.read(@bytes)
       result = buffer.unpack(@format)
       year, month, day, hour, min, sec = result.first.unpack("A4A2A2A2A2A2").map { |v| v.to_i }
-      if year.zero?
+      if month.zero?
         nil
       else
         Time.local(year, month, day, hour, min, sec)
       end
     end    
         
+    def valid?
+      case @value
+      when Time : true
+      when nil  : true
+      else 
+        false
+      end        
+    end
+    
   end
   BinaryBlocker.register_klass(:time, PackedDateTimeEncoder)
   BinaryBlocker.register_klass(:datetime, PackedDateTimeEncoder)

data/test/test_blocker.rb

@@ -24,20 +24,14 @@ class TestBlocker < Test::Unit::TestCase
 
   def test_simple_valid
     bb = BBTest2.new
-    bb.foo = 32
     bb.bar = 24
 
-    assert_equal(32, bb.foo)
     assert_equal(24, bb.bar)
-    assert(!bb.valid?)
-
-    bb.foo = 42
     assert(bb.valid?)
   end
 
   def test_round_trip
     bb = BBTest2.new
-    bb.foo = 42 
     bb.bar = 21
     buf = bb.block 
 
@@ -53,9 +47,9 @@ class TestBlocker < Test::Unit::TestCase
 
   def test_failed_deblock
     bb = BBTest2.new
-    bb.foo = 43
     bb.bar = 21
     buf = bb.block
+    buf[0] = 0
 
     bb2 = BBTest2.new
     status = bb2.deblock(StringIO.new(buf))
@@ -65,7 +59,6 @@ class TestBlocker < Test::Unit::TestCase
       BBTest2.new(StringIO.new(buf))
     end
     
-    bb.foo = 42
     io = StringIO.new(bb.block)
     assert(bb2.deblock(io))
     
@@ -88,7 +81,6 @@ class TestBlocker < Test::Unit::TestCase
 
   def test_has_one_of
     bs1 = BBSub1.new
-    bs1.foo = 42
     buf = bs1.block
     bb = BBTest3.new(StringIO.new(buf))
     assert(bb)
@@ -96,7 +88,6 @@ class TestBlocker < Test::Unit::TestCase
     assert_equal(42, bb.foo.foo)
     
     bs2 = BBSub2.new
-    bs2.bar = 21
     io = StringIO.new(bs2.block)
     bb = BBTest3.new(io)
     assert(bb)
@@ -120,9 +111,7 @@ class TestBlocker < Test::Unit::TestCase
   
   def test_fixed_array
     bs1 = BBSub1.new
-    bs1.foo = 42
     bs2 = BBSub2.new
-    bs2.bar = 21
     
     buf = bs1.block + bs2.block + bs1.block
     bb = BBTest4.new(buf)
@@ -139,11 +128,8 @@ class TestBlocker < Test::Unit::TestCase
     fa = BBTest4.new
     assert(fa)
     fa.fooboo[0] = BBSub1.new
-    fa.fooboo[0].foo = 42
     fa.fooboo[1] = BBSub2.new
-    fa.fooboo[1].bar = 21
     fa.fooboo[2] = BBSub1.new
-    fa.fooboo[2].foo = 42
     assert_equal(42, fa.fooboo[0].foo)
     assert_equal(21, fa.fooboo[1].bar)
     assert_equal(42, fa.fooboo[2].foo)
@@ -167,9 +153,7 @@ class TestBlocker < Test::Unit::TestCase
   
   def test_counted_array
     bb1 = BBSub1.new
-    bb1.foo = 42
     bb2 = BBSub2.new
-    bb2.bar = 21
     
     fa = BBTest5.new
     assert(fa)
@@ -430,4 +414,29 @@ class TestBlocker < Test::Unit::TestCase
     assert_equal('troaeipo', b2.str)
   end
 
+  class BBDateRecord < BinaryBlocker::Blocker
+    has_one :date, :date
+  end
+  
+  def test_null_dates
+    t = BBDateRecord.new
+    assert(buf = t.block)
+
+    t2 = BBDateRecord.new(buf)
+    assert(t2)
+    assert_nil(t2.date)
+  end
+
+  class BBTimeRecord < BinaryBlocker::Blocker
+    has_one :t, :time
+  end
+  
+  def test_null_times
+    t = BBTimeRecord.new
+    assert(buf = t.block)
+
+    t2 = BBTimeRecord.new(buf)
+    assert(t2)
+    assert_nil(t2.t)
+  end
 end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: binaryparse
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 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: 
@@ -29,7 +29,6 @@ post_install_message:
 authors: 
 - Patrick Hurley
 files: 
-- binaryparse-0.1.4.gem
 - binaryparse.gemspec
 - examples
 - lib