bindata 0.11.0 → 0.11.1

data/spec/registry_spec.rb

@@ -6,12 +6,10 @@ require 'bindata/int'
 require 'bindata/registry'
 
 describe BinData::Registry do
-  before(:all) do
-    A = Class.new
-    B = Class.new
-    C = Class.new
-    D = Class.new
-  end
+  A = Class.new
+  B = Class.new
+  C = Class.new
+  D = Class.new
 
   before(:each) do
     @r = BinData::Registry.new
@@ -58,6 +56,7 @@ describe BinData::Registry do
     @r.underscore_name('A::B::C').should == 'c'
   end
 
+=begin
   it "should lookup integers with endian" do
     @r.register("Int24be", A)
     @r.register("Int24le", B)
@@ -105,4 +104,5 @@ describe BinData::Registry do
     @r.lookup("bit802le")
     BinData.const_defined?(:Bit802le).should be_true
   end
+=end
 end

data/spec/system_spec.rb

@@ -5,12 +5,8 @@ require File.expand_path(File.join(File.dirname(__FILE__), "example"))
 require 'bindata'
 
 describe "lambdas with index" do
-  before(:all) do
-    eval <<-END
-      class NestedLambdaWithIndex < BinData::Record
-        uint8 :a, :value => lambda { index * 10 }
-      end
-    END
+  class NestedLambdaWithIndex < BinData::Record
+    uint8 :a, :value => lambda { index * 10 }
   end
 
   it "should use index of containing array" do
@@ -65,27 +61,23 @@ describe "lambdas with parent" do
 end
 
 describe BinData::Record, "with choice field" do
-  before(:all) do
-    eval <<-END
-      class TupleRecord < BinData::Record
-        uint8 :a, :value => 3
-        uint8 :b, :value => 5
-      end
-
-      class RecordWithChoiceField < BinData::Record
-        choice :x, :choices => [[:tuple_record]], :selection => 0
-      end
-
-      class RecordWithNestedChoiceField < BinData::Record
-        choice :x, :choices => [
-                      [:choice, {
-                          :choices => [[:tuple_record]],
-                          :selection => 0}
-                      ]
-                   ],
-                   :selection => 0
-      end
-    END
+  class TupleRecord < BinData::Record
+    uint8 :a, :value => 3
+    uint8 :b, :value => 5
+  end
+
+  class RecordWithChoiceField < BinData::Record
+    choice :x, :choices => [[:tuple_record]], :selection => 0
+  end
+
+  class RecordWithNestedChoiceField < BinData::Record
+    choice :x, :choices => [
+                  [:choice, {
+                      :choices => [[:tuple_record]],
+                      :selection => 0}
+                  ]
+               ],
+               :selection => 0
   end
 
   it "should treat choice object transparently " do
@@ -216,13 +208,9 @@ describe "Tracing"  do
 end
 
 describe "Forward referencing with Single" do
-  before(:all) do
-    eval <<-END
-      class FRSingle < BinData::Record
-        uint8  :len, :value => lambda { data.length }
-        string :data, :read_length => :len
-      end
-    END
+  class FRSingle < BinData::Record
+    uint8  :len, :value => lambda { data.length }
+    string :data, :read_length => :len
   end
 
   it "should initialise" do
@@ -244,13 +232,9 @@ describe "Forward referencing with Single" do
 end
 
 describe "Forward referencing with Array" do
-  before(:all) do
-    eval <<-END
-      class FRArray < BinData::Record
-        uint8  :len, :value => lambda { data.length }
-        array :data, :type => :uint8, :initial_length => :len
-      end
-    END
+  class FRArray < BinData::Record
+    uint8  :len, :value => lambda { data.length }
+    array :data, :type => :uint8, :initial_length => :len
   end
 
   it "should initialise" do
@@ -272,16 +256,12 @@ describe "Forward referencing with Array" do
 end
 
 describe "Evaluating custom parameters" do
-  before(:all) do
-    eval <<-END
-      class CustomParameterRecord < BinData::Record
-        mandatory_parameter :zz
+  class CustomParameterRecord < BinData::Record
+    mandatory_parameter :zz
 
-        uint8 :a, :value => :zz
-        uint8 :b, :value => :a
-        uint8 :c, :custom => :b
-      end
-    END
+    uint8 :a, :value => :zz
+    uint8 :b, :value => :a
+    uint8 :c, :custom => :b
   end
 
   it "should recursively evaluate parameter" do
@@ -291,12 +271,8 @@ describe "Evaluating custom parameters" do
 end
 
 describe BinData::Record, "with custom sized integers" do
-  before(:all) do
-    eval <<-END
-      class CustomIntRecord < BinData::Record
-        int40be :a
-      end
-    END
+  class CustomIntRecord < BinData::Record
+    int40be :a
   end
 
   it "should read as expected" do

data/spec/wrapper_spec.rb

@@ -2,30 +2,23 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_common"))
 require 'bindata'
-require 'bindata/wrapper'
 
 describe BinData::Wrapper, "with errors" do
   it "should not wrap more than one type" do
     lambda {
-      eval <<-END
-        class WrappedMultipleTypes < BinData::Wrapper
-          uint8
-          uint8
-        end
-      END
+      class WrappedMultipleTypes < BinData::Wrapper
+        uint8
+        uint8
+      end
     }.should raise_error(SyntaxError)
   end
 end
 
 describe BinData::Wrapper, "around a Primitive" do
-  before(:all) do
-    eval <<-END
-      class WrappedPrimitive < BinData::Wrapper
-        default_parameter :a => 3
+  class WrappedPrimitive < BinData::Wrapper
+    default_parameter :a => 3
 
-        uint8 :initial_value => :a
-      end
-    END
+    uint8 :initial_value => :a
   end
 
   it "should access custom parameter" do
@@ -46,14 +39,10 @@ describe BinData::Wrapper, "around a Primitive" do
 end
 
 describe BinData::Wrapper, "around an Array" do
-  before(:all) do
-    eval <<-END
-      class WrappedIntArray < BinData::Wrapper
-        endian :big
-        default_parameter :initial_element_value => 0
-        array :type => [:uint16, {:initial_value => :initial_element_value}]
-      end
-    END
+  class WrappedIntArray < BinData::Wrapper
+    endian :big
+    default_parameter :initial_element_value => 0
+    array :type => [:uint16, {:initial_value => :initial_element_value}]
   end
 
   it "should forward parameters" do
@@ -68,13 +57,9 @@ describe BinData::Wrapper, "around an Array" do
 end
 
 describe BinData::Wrapper, "around a Choice" do
-  before(:all) do
-    eval <<-END
-      class WrappedChoice < BinData::Wrapper
-        endian :big
-        choice :choices => { 'a' => :uint8, 'b' => :uint16 }
-      end
-    END
+  class WrappedChoice < BinData::Wrapper
+    endian :big
+    choice :choices => { 'a' => :uint8, 'b' => :uint16 }
   end
 
   it "should forward parameters" do
@@ -82,3 +67,17 @@ describe BinData::Wrapper, "around a Choice" do
     obj.num_bytes.should == 2
   end
 end
+
+describe BinData::Wrapper, "inside a struct" do
+  class WrappedUint32le < BinData::Wrapper
+    uint32le
+  end
+
+  it "should handle onlyif" do
+    field1 = [:wrapped_uint32le, :a, {:onlyif => false, :value => 1 }]
+    field2 = [:wrapped_uint32le, :b, {:onlyif => true, :value => 2 }]
+
+    obj = BinData::Struct.new(:fields => [field1, field2])
+    obj.should == {'b' => 2}
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bindata
 version: !ruby/object:Gem::Version 
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors: 
 - Dion Mendel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-28 00:00:00 +08:00
+date: 2009-08-29 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -23,6 +23,7 @@ extra_rdoc_files:
 - README
 files: 
 - INSTALL
+- TUTORIAL
 - TODO
 - GPL
 - Rakefile