bindata 0.9.2 → 0.9.3

data/spec/multi_value_spec.rb

@@ -116,8 +116,8 @@ describe BinData::MultiValue, "with multiple fields" do
   end
 
   it "should identify accepted parameters" do
-    BinData::MultiValue.accepted_parameters.should include(:hide)
-    BinData::MultiValue.accepted_parameters.should include(:endian)
+    BinData::MultiValue.internal_parameters.should include(:hide)
+    BinData::MultiValue.internal_parameters.should include(:endian)
   end
 
   it "should clear" do
@@ -286,6 +286,51 @@ describe BinData::MultiValue, "defined recursively" do
     obj.nxt.nxt.val = 7
     obj.to_s.should == "\x00\x05\x01\x00\x06\x01\x00\x07\x00"
   end
+end
+
+describe BinData::MultiValue, "with custom mandatory parameters" do
+  before(:all) do
+    eval <<-END
+      class MandatoryMultiValue < BinData::MultiValue
+        mandatory_parameter :arg1
+
+        uint8 :a, :value => :arg1
+      end
+    END
+  end
+
+  it "should raise error if mandatory parameter is not supplied" do
+    lambda { MandatoryMultiValue.new }.should raise_error(ArgumentError)
+  end
 
+  it "should use mandatory parameter" do
+    obj = MandatoryMultiValue.new(:arg1 => 5)
+    obj.a.should == 5
+  end
 end
 
+describe BinData::MultiValue, "with custom default parameters" do
+  before(:all) do
+    eval <<-END
+      class DefaultMultiValue < BinData::MultiValue
+        default_parameter :arg1 => 5
+
+        uint8 :a, :value => :arg1
+      end
+    END
+  end
+
+  it "should not raise error if default parameter is not supplied" do
+    lambda { DefaultMultiValue.new }.should_not raise_error(ArgumentError)
+  end
+
+  it "should use default parameter" do
+    obj = DefaultMultiValue.new
+    obj.a.should == 5
+  end
+
+  it "should be able to override default parameter" do
+    obj = DefaultMultiValue.new(:arg1 => 7)
+    obj.a.should == 7
+  end
+end

data/spec/sanitize_spec.rb

@@ -30,35 +30,34 @@ describe BinData::Sanitizer do
 
   it "should raise error on unknown types" do
     lambda {
-      @sanitizer.sanitize(:does_not_exist, {})
+      @sanitizer.lookup_klass(:does_not_exist)
     }.should raise_error(TypeError)
   end
 
   it "should lookup when endian is set" do
     @sanitizer.with_endian(:little) do
-      klass, params = @sanitizer.sanitize(:int16, {})
+      klass = @sanitizer.lookup_klass(:int16)
       klass.should == BinData::Int16le
     end
   end
 
   it "should nest with_endian calls" do
     @sanitizer.with_endian(:little) do
-      klass, params = @sanitizer.sanitize(:int16, {})
+      klass = @sanitizer.lookup_klass(:int16)
       klass.should == BinData::Int16le
 
       @sanitizer.with_endian(:big) do
-        klass, params = @sanitizer.sanitize(:int16, {})
+        klass = @sanitizer.lookup_klass(:int16)
         klass.should == BinData::Int16be
       end
 
-      klass, params = @sanitizer.sanitize(:int16, {})
+      klass = @sanitizer.lookup_klass(:int16)
       klass.should == BinData::Int16le
     end
   end
 
   it "should sanitize parameters" do
-    klass, params = @sanitizer.sanitize(:int8, {:value => 3})
-    klass.should == BinData::Int8
+    params = @sanitizer.sanitize_params(BinData::Int8, {:value => 3})
     params.should have_key(:value)
   end
 end
@@ -66,14 +65,14 @@ end
 describe BinData::SanitizedParameters, "with bad input" do
   before(:each) do
     @mock = mock("dummy class")
-    @mock.stub!(:accepted_parameters).and_return([:a, :b, :c])
+    @mock.stub!(:internal_parameters).and_return([:a, :b, :c])
     @params = {:a => 1, :b => 2, :c => 3, :d => 4, :e => 5}
   end
 
   it "should convert keys to symbols" do
     the_params = {'a' => 1, 'b' => 2, 'e' => 5}
     sanitized = BinData::SanitizedParameters.new(@mock, the_params)
-    sanitized.accepted_parameters.should == ({:a => 1, :b => 2})
+    sanitized.internal_parameters.should == ({:a => 1, :b => 2})
     sanitized.extra_parameters.should == ({:e => 5})
   end
 
@@ -88,13 +87,13 @@ end
 describe BinData::SanitizedParameters do
   before(:each) do
     @mock = mock("dummy class")
-    @mock.stub!(:accepted_parameters).and_return([:a, :b, :c])
+    @mock.stub!(:internal_parameters).and_return([:a, :b, :c])
     @params = {:a => 1, :b => 2, :c => 3, :d => 4, :e => 5}
   end
 
   it "should partition" do
     sanitized = BinData::SanitizedParameters.new(@mock, @params)
-    sanitized.accepted_parameters.should == ({:a => 1, :b => 2, :c => 3})
+    sanitized.internal_parameters.should == ({:a => 1, :b => 2, :c => 3})
     sanitized.extra_parameters.should == ({:d => 4, :e => 5})
   end
 

data/spec/struct_spec.rb

@@ -86,9 +86,9 @@ describe BinData::Struct, "with multiple fields" do
   end
 
   it "should identify accepted parameters" do
-    BinData::Struct.accepted_parameters.should include(:fields)
-    BinData::Struct.accepted_parameters.should include(:hide)
-    BinData::Struct.accepted_parameters.should include(:endian)
+    BinData::Struct.internal_parameters.should include(:fields)
+    BinData::Struct.internal_parameters.should include(:hide)
+    BinData::Struct.internal_parameters.should include(:endian)
   end
 
   it "should return field names" do

metadata

@@ -1,92 +1,100 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: bindata
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
-date: 2008-07-18 00:00:00 +08:00
-summary: A declarative way to read and write binary file formats
-require_paths: 
-- lib
-email: dion@lostrealm.com
-homepage: http://bindata.rubyforge.org
-rubyforge_project: bindata
-description: 
-autorequire: bindata
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.9.3
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Dion Mendel
+autorequire: bindata
+bindir: bin
+cert_chain: []
+
+date: 2008-12-03 00:00:00 +09:00
+default_executable: 
+dependencies: []
+
+description: 
+email: dion@lostrealm.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
-- TODO
 - ChangeLog
-- GPL
 - INSTALL
-- COPYING
 - README
+- GPL
+- TODO
+- COPYING
 - examples/gzip.rb
-- spec/registry_spec.rb
-- spec/bits_spec.rb
+- spec/float_spec.rb
+- spec/single_value_spec.rb
+- spec/base_spec.rb
 - spec/sanitize_spec.rb
+- spec/lazy_spec.rb
+- spec/io_spec.rb
+- spec/choice_spec.rb
 - spec/array_spec.rb
-- spec/float_spec.rb
+- spec/stringz_spec.rb
 - spec/multi_value_spec.rb
-- spec/rest_spec.rb
-- spec/choice_spec.rb
+- spec/int_spec.rb
+- spec/string_spec.rb
 - spec/struct_spec.rb
-- spec/lazy_spec.rb
 - spec/spec_common.rb
 - spec/single_spec.rb
-- spec/string_spec.rb
-- spec/base_spec.rb
-- spec/single_value_spec.rb
-- spec/int_spec.rb
-- spec/io_spec.rb
-- spec/stringz_spec.rb
-- lib/bindata.rb
+- spec/bits_spec.rb
+- spec/registry_spec.rb
+- spec/rest_spec.rb
 - lib/bindata
-- lib/bindata/lazy.rb
-- lib/bindata/sanitize.rb
-- lib/bindata/io.rb
-- lib/bindata/string.rb
+- lib/bindata/params.rb
+- lib/bindata/single.rb
 - lib/bindata/int.rb
-- lib/bindata/multi_value.rb
-- lib/bindata/stringz.rb
-- lib/bindata/rest.rb
-- lib/bindata/single_value.rb
-- lib/bindata/registry.rb
 - lib/bindata/choice.rb
+- lib/bindata/registry.rb
+- lib/bindata/single_value.rb
 - lib/bindata/struct.rb
-- lib/bindata/single.rb
+- lib/bindata/stringz.rb
+- lib/bindata/multi_value.rb
+- lib/bindata/bits.rb
+- lib/bindata/rest.rb
 - lib/bindata/base.rb
 - lib/bindata/array.rb
-- lib/bindata/bits.rb
+- lib/bindata/lazy.rb
+- lib/bindata/string.rb
 - lib/bindata/float.rb
-test_files: []
-
+- lib/bindata/sanitize.rb
+- lib/bindata/io.rb
+- lib/bindata.rb
+has_rdoc: true
+homepage: http://bindata.rubyforge.org
+post_install_message: 
 rdoc_options: 
 - README
 - lib/bindata
 - -m
 - README
-extra_rdoc_files: []
-
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: bindata
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 2
+summary: A declarative way to read and write binary file formats
+test_files: []