bit-struct 0.13.5 → 0.17

data/test/test-vector.rb

@@ -1,7 +1,7 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'bit-struct'
 
-class Test_Vector < Test::Unit::TestCase
+class Test_Vector < Minitest::Test
   class Packet < BitStruct
     unsigned :stuff, 32, "whatever"
 
@@ -9,20 +9,20 @@ class Test_Vector < Test::Unit::TestCase
       unsigned :x,  16
       signed   :y,  32
     end
-    
+
     unsigned :other, 16, "other stuff"
   end
-  
+
   attr_reader :pkt
 
   def setup
     @pkt = Packet.new
   end
-  
+
   def test_length
     assert_equal(Packet.round_byte_length, pkt.length)
   end
-  
+
   def test_writers
     assert_equal(pkt.v[2].x, 0)
     v = pkt.v

data/test/test.rb

@@ -1,9 +1,7 @@
-#!/usr/bin/env ruby
-
-require 'test/unit'
+require 'minitest/autorun'
 require 'bit-struct'
 
-class Test_BitStruct < Test::Unit::TestCase
+class Test_BitStruct < Minitest::Test
 
   class T1 < BitStruct
     unsigned    :foo, 8
@@ -12,18 +10,18 @@ class Test_BitStruct < Test::Unit::TestCase
   class T2 < BitStruct
     unsigned    :bar, 8
   end
-  
+
   class Rest < BitStruct
     unsigned    :zap, 8
     rest        :body, T2
   end
-  
+
   class NestedPart < BitStruct
     unsigned :x,    5
     unsigned :y,    3, :default => 2
     char     :s,  5*8
   end
-  
+
   class Container < BitStruct
     nest    :n1,  NestedPart, :default => NestedPart.new(:x=>1, :s=>"deflt")
     nest    :n2,  NestedPart
@@ -68,7 +66,7 @@ class Test_BitStruct < Test::Unit::TestCase
     float       next_name, 64,  :format => "%10.5f"
 
     octets      next_name, 32,  :default => "192.168.1.123"
-    
+
     hex_octets  next_name, 48,  :default => "ab:cd:ef:01:23:45"
 
     unsigned    next_name, 1
@@ -78,14 +76,14 @@ class Test_BitStruct < Test::Unit::TestCase
     signed      next_name, 7,   :fixed => 1000 # unaligned!
 
     char        next_name, 24
-    
+
     rest        :bs_body
-    
+
     INITIAL_VALUES = {
       f1 => 1234,
       f2 => 5678
     }
-    
+
     INITIAL_VALUES.each do |f, v|
       initial_value.send "#{f}=", v
     end
@@ -108,11 +106,11 @@ class Test_BitStruct < Test::Unit::TestCase
     unsigned    next_name, 8
 
     unsigned    next_name, 1
-    
+
     rest        :bs1_body
 
   end
-  
+
   def setup
     srand(767343)
     @bs = BS.new
@@ -129,7 +127,7 @@ class Test_BitStruct < Test::Unit::TestCase
       bs.fields.each do |field|
         iv = initial_values && initial_values[field.name]
         iv ||= field.default
-        
+
         if iv
           case field
           when BitStruct::FloatField
@@ -143,21 +141,21 @@ class Test_BitStruct < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_init_with_value
     randomize(@bs_1)
 
     b = BS_1.new(@bs_1)
     assert_equal(@bs_1, b, "Initialize with argument failed.")
-    
+
     c = BS_1.new(b)
     assert_equal(@bs_1, c, "Initialize with argument failed.")
-    
+
     b1 = BS_1.new("")
     b2 = BS_1.new(nil)
     assert_equal(b1, b2, "Initialize with short argument failed.")
   end
-  
+
   def test_init_with_hash
     randomize(@bs_1)
 
@@ -169,25 +167,25 @@ class Test_BitStruct < Test::Unit::TestCase
     b = BS_1.new(h)
     assert_equal(@bs_1, b, "Initialize with argument failed.")
   end
-  
+
   def test_join
     assert_equal(@bs+@bs_1, BitStruct.join(@bs,@bs_1))
     assert_equal(@bs+@bs_1, [@bs,@bs_1].join(""))
   end
-  
+
   def test_parse
     orig = @testers
     orig.each do |bs|
       randomize(bs)
     end
-    
+
     data = BitStruct.join(orig)
     round_trip = BitStruct.parse(data, orig.map{|bs|bs.class})
     orig.zip(round_trip) do |bs1, bs2|
       assert_equal(bs1, bs2)
     end
   end
-  
+
   def test_closed
     assert_raises(BitStruct::ClosedClassError) do
       BS.class_eval do
@@ -195,7 +193,7 @@ class Test_BitStruct < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_rest
     len0 = @bs_1.length
 
@@ -206,16 +204,16 @@ class Test_BitStruct < Test::Unit::TestCase
     @bs_1.bs1_body = "b"*60
     assert_equal("b"*60, @bs_1.bs1_body)
     assert_equal(len0+60, @bs_1.length)
-    
+
     @bs_1.bs1_body = "c"*40
     assert_equal("c"*40, @bs_1.bs1_body)
     assert_equal(len0+40, @bs_1.length)
-    
+
     @bs_1.bs1_body = ""
     assert_equal("", @bs_1.bs1_body)
     assert_equal(len0, @bs_1.length)
   end
-  
+
   def test_rest_with_class
     r = Rest.new
     t2 = T2.new
@@ -223,38 +221,44 @@ class Test_BitStruct < Test::Unit::TestCase
     r.body = t2
     assert_equal(123, r.body.bar)
   end
-  
+
+  def test_rest_with_class_constructed
+    r = Rest.new(['0011'].pack('H*'))
+    assert_equal(0x00, r.zap)
+    assert_equal(0x11, r.body.bar)
+  end
+
   def test_nest
     cont = Container.new
     n1 = cont.n1
-    
+
     assert_equal(1, n1.x)
     assert_equal(2, n1.y)
     assert_equal("deflt", n1.s)
-    
+
     n1.sub(/./, " ")
 
     assert_equal(1, n1.x)
     assert_equal(2, n1.y)
     assert_equal("deflt", n1.s)
-    
+
     n1 = cont.n1
     n2 = cont.n2
-    
+
     assert_equal(0, n2.x)
     assert_equal(2, n2.y)
     assert_equal("\0"*5, n2.s)
-    
+
     n = NestedPart.new(:x=>4, :y=>1, :s=>"qwert")
     cont.n1 = n
 
     assert_equal(4, cont.n1.x)
     assert_equal(1, cont.n1.y)
     assert_equal("qwert", cont.n1.s)
-    
+
     assert_raises(ArgumentError) {cont.n2 = Container.new}
   end
-  
+
   def test_overflow
     ov = Overflow.new
     empty = ov.dup
@@ -289,21 +293,21 @@ class Test_BitStruct < Test::Unit::TestCase
 
     repeat_access_test(@bs_1, 10)
   end
-  
+
   def test_initial_value
     bs = @bs
     bs.class::INITIAL_VALUES.each do |f,v|
       assert_equal(v, bs.send(f), "In #{f} of a #{bs.class}")
     end
   end
-  
+
   def test_inherited_initial_value
     bs = @bs_1
     bs.class::INITIAL_VALUES.each do |f,v|
       assert_equal(v, bs.send(f), "In #{f} of a #{bs.class}")
     end
   end
-  
+
   def test_to_h
     h = @bs_1.to_h(:convert_keys => :to_s)
     field_names = @bs_1.fields.map{|f|f.name.to_s}
@@ -312,7 +316,28 @@ class Test_BitStruct < Test::Unit::TestCase
       assert_equal(@bs_1.send(name), h[name])
     end
   end
-  
+
+  def test_to_a_exclude_rest
+    include_rest = false
+    a = @bs_1.to_a(include_rest)
+    field_names = @bs_1.fields.map{|f|f.name.to_s}
+    assert_equal(a.size, field_names.size)
+    field_names.each_with_index do |name, i|
+      assert_equal(@bs_1.send(name), a[i])
+    end
+  end
+
+  def test_to_a
+    include_rest = true
+    a = @bs_1.to_a(include_rest)
+    field_names = @bs_1.fields.map{|f|f.name.to_s}
+    field_names << @bs_1.rest_field.name
+    assert_equal(a.size, field_names.size)
+    field_names.each_with_index do |name, i|
+      assert_equal(@bs_1.send(name), a[i])
+    end
+  end
+
   def test_format_option
     formatted_fields = @bs.fields.select {|f|f.format}
     formatted_fields.each do |f|
@@ -320,18 +345,18 @@ class Test_BitStruct < Test::Unit::TestCase
       assert_equal(f.format % val, f.inspect_in_object(@bs, {}))
     end
   end
-  
+
   def test_yaml
     assert_equal(@bs_1, YAML.load(@bs_1.to_yaml))
   end
-  
+
   def test_field_by_name
     name = :f007
     f = @bs.field_by_name(name)
     assert(f)
     assert_equal(f.name, name)
   end
-  
+
   #--------
   def repeat_access_test(bs, n)
     last_set_value = {}
@@ -352,7 +377,7 @@ class Test_BitStruct < Test::Unit::TestCase
               begin
                 assert_equal(lsv2, bs.send(f2.name))
               rescue Test::Unit::AssertionFailedError => ex
-                msg = 
+                msg =
                   "In #{f2.inspect} after setting #{field.inspect} to" +
                   " #{last_set_value[field].inspect}"
                 raise ex, msg + "\n" + ex.message, ex.backtrace
@@ -367,7 +392,7 @@ class Test_BitStruct < Test::Unit::TestCase
 
     assert_equal(start_length, finish_length, "Length differs after test!")
   end
-  
+
   def randomize(bs)
     bs.fields.each do |f|
       randomize_field(bs, f)
@@ -413,13 +438,13 @@ class Test_BitStruct < Test::Unit::TestCase
       value = s * (field.length/8)
       bs.send "#{field.name}=", value
       last_set_value = value
-    
+
     when BitStruct::TextField
       s = (rand(64)+32).chr
       value = s * rand(field.length*2/8)
       bs.send "#{field.name}=", value
       last_set_value = s * [field.length/8, value.length].min
-    
+
     when BitStruct::FloatField
       value = rand(2**30)
       bs.send "#{field.name}=", value
@@ -427,7 +452,7 @@ class Test_BitStruct < Test::Unit::TestCase
 
     else raise
     end
-    
+
     return last_set_value
   end
 end

metadata

@@ -1,44 +1,29 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bit-struct
-version: !ruby/object:Gem::Version 
-  version: 0.13.5
+version: !ruby/object:Gem::Version
+  version: '0.17'
 platform: ruby
-authors: 
+authors:
 - Joel VanderWerf
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2009-07-21 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bones
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.5.1
-    version: 
-description: |
-  Library for packed binary data stored in ruby Strings. Useful for accessing fields in network packets and binary files.
-
+date: 2021-04-20 00:00:00.000000000 Z
+dependencies: []
+description: Library for packed binary data stored in ruby Strings. Useful for accessing
+  fields in network packets and binary files.
 email: vjoel@users.sourceforge.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
-- README.txt
-files: 
-- .gitignore
+- README.md
+- LICENSE
+files:
 - History.txt
-- README.txt
+- LICENSE
+- README.md
 - Rakefile
-- TODO
 - examples/ara-player-data.rb
 - examples/bignum.rb
 - examples/bits.rb
@@ -63,6 +48,7 @@ files:
 - lib/bit-struct.rb
 - lib/bit-struct/bit-struct.rb
 - lib/bit-struct/char-field.rb
+- lib/bit-struct/field.rb
 - lib/bit-struct/fields.rb
 - lib/bit-struct/float-field.rb
 - lib/bit-struct/hex-octet-field.rb
@@ -75,52 +61,40 @@ files:
 - lib/bit-struct/vector-field.rb
 - lib/bit-struct/vector.rb
 - lib/bit-struct/yaml.rb
-- tasks/ann.rake
-- tasks/bones.rake
-- tasks/gem.rake
-- tasks/git.rake
-- tasks/notes.rake
-- tasks/post_load.rake
-- tasks/rdoc.rake
-- tasks/rubyforge.rake
-- tasks/setup.rb
-- tasks/spec.rake
-- tasks/svn.rake
-- tasks/test.rake
-- tasks/zentest.rake
 - test/test-endian.rb
 - test/test-vector.rb
 - test/test.rb
-has_rdoc: true
-homepage: http://rubyforge.org/projects/bit-struct/
-licenses: []
-
-post_install_message: 
-rdoc_options: 
-- --main
-- README.txt
-require_paths: 
+homepage: https://github.com/vjoel/bit-struct
+licenses:
+- Ruby
+metadata: {}
+post_install_message:
+rdoc_options:
+- "--quiet"
+- "--line-numbers"
+- "--inline-source"
+- "--title"
+- BitStruct
+- "--main"
+- README.md
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+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'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: bit-struct
-rubygems_version: 1.3.5
-signing_key: 
-specification_version: 3
+rubygems_version: 3.2.15
+signing_key:
+specification_version: 4
 summary: Library for packed binary data stored in ruby Strings
-test_files: 
+test_files:
 - test/test-endian.rb
-- test/test.rb
 - test/test-vector.rb
+- test/test.rb