bindata 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc513e5824615b4b143e4a733bd6e8290bdfa831ab111267475a167f31125bb1
-  data.tar.gz: 93b4a5203a1d641dd1af806b769f92f8daf50644e9815d01fa2dbfec9f30bc8e
+  metadata.gz: 8a4db841bf592779a772cd1965118786c6004bb5460a51d5f4154207970f2016
+  data.tar.gz: dfebc39f1f2a3089d491050da6a58997401ac194f1cc3ef5602ff82a6a6554bb
 SHA512:
-  metadata.gz: 88c701264083edfa92d193c33d394f7cb4bdc2f12722089ff27bb296bad28665f8e28a63158c98a8a45a189c68ce4792c027615ac0c9f1c61cacee1e02e817cc
-  data.tar.gz: dd1f06f1b17cbc005ca5399d86b62cfe420787d8a2f820d24f589f30dd58af99ed539eb5d5873f90b3877f986093a3bc5f176dcb7aaaeea176381809272b20ff
+  metadata.gz: 9c0ef8d9c2bbbc39eee0c63c591097431b8cd428f5f3cfa03fedc15158f22fc05b6efab56bbad5990f967f45400af07a9c205da1c5953873dff9dcdc6ac24237
+  data.tar.gz: 03bcde0becfa611a100cb43c5d7982bfd3d156a264e817b9c01b1f4522fff7379a4279f25fa9f92d64535d411c597894adb7ba4004cc923c721721899cc9b99a

data/.travis.yml

@@ -1,9 +1,11 @@
 language: ruby
 rvm:
-  - 2.0
-  - 2.1.10
   - 2.2
   - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
   - jruby
   - ruby-head
 

data/ChangeLog.rdoc

@@ -1,5 +1,11 @@
 = BinData Changelog
 
+== Version 2.4.5 (2020-02-21)
+
+* Small typo fixes to examples.
+* Fix encoding issue for ruby 2.7.  Thanks to Aaron Patterson.
+* Quieter test output.
+
 == Version 2.4.4 (2018-10-03)
 
 * Display a hint when endian is omitted.  Requested by Tails.

data/bindata.gemspec

@@ -9,16 +9,14 @@ Gem::Specification.new do |s|
   s.author = 'Dion Mendel'
   s.email = 'bindata@dm9.info'
   s.homepage = 'http://github.com/dmendel/bindata'
-  s.rubyforge_project = 'bindata'
   s.require_path = 'lib'
-  s.has_rdoc = true
   s.extra_rdoc_files = ['NEWS.rdoc']
   s.rdoc_options << '--main' << 'NEWS.rdoc'
   s.files = `git ls-files`.split("\n")
   s.license = 'Ruby'
 
   s.add_development_dependency('rake')
-  s.add_development_dependency('minitest', "> 5.0.0")
+  s.add_development_dependency('minitest', "> 5.0.0", "< 5.12.0")
   s.add_development_dependency('coveralls')
   s.description = <<-END.gsub(/^ +/, "")
     BinData is a declarative way to read and write binary file formats.

data/examples/tcp_ip.rb

@@ -14,7 +14,7 @@ class MacAddr < BinData::Primitive
   array :octets, type: :uint8, initial_length: 6
 
   def set(val)
-    self.octets = val.split(/\./).collect(&:to_i)
+    self.octets = val.split(/:/).collect(&:to_i)
   end
 
   def get
@@ -23,7 +23,7 @@ class MacAddr < BinData::Primitive
 end
 
 # Present IP addresses in a human readable way
-class IPAddr < BinData::Primitive
+class IP_Addr < BinData::Primitive
   array :octets, type: :uint8, initial_length: 4
 
   def set(val)

data/lib/bindata/base.rb

@@ -172,8 +172,7 @@ module BinData
     def to_binary_s(&block)
       io = BinData::IO.create_string_io
       write(io, &block)
-      io.rewind
-      io.read
+      io.string
     end
 
     # Returns the hexadecimal string representation of this data object.

data/lib/bindata/version.rb

@@ -1,3 +1,3 @@
 module BinData
-  VERSION = "2.4.4"
+  VERSION = "2.4.5"
 end

data/test/buffer_test.rb

@@ -52,6 +52,25 @@ describe BinData::Buffer, "subclassed with a single type" do
     obj.to_binary_s.must_equal_binary "\000\003\000\000\000"
   end
 
+  it "returns binary encoded data" do
+    obj = IntBuffer.new(3)
+    obj.to_binary_s.encoding.must_equal Encoding::ASCII_8BIT
+  end
+
+  it "returns binary encoded data despite Encoding.default_internal" do
+    w, $-w = $-w, false
+    before_enc = Encoding.default_internal
+
+    begin
+      Encoding.default_internal = Encoding::UTF_8
+      obj = IntBuffer.new(3)
+      obj.to_binary_s.encoding.must_equal Encoding::ASCII_8BIT
+    ensure
+      Encoding.default_internal = before_enc
+      $-w = w
+    end
+  end
+
   it "has total num_bytes" do
     obj = IntBuffer.new
     assert obj.clear?

data/test/offset_test.rb

@@ -74,9 +74,15 @@ describe BinData::Base, "offsets" do
     end
 
     it "adjust offset when incorrect" do
-      io.seek(2)
-      obj = TenByteOffsetBase.create(adjust_offset: 13)
-      obj.read(io).snapshot.must_equal data[2 + 13, 3]
+      w, $-w = $-w, false
+
+      begin
+        io.seek(2)
+        obj = TenByteOffsetBase.create(adjust_offset: 13)
+        obj.read(io).snapshot.must_equal data[2 + 13, 3]
+      ensure
+        $-w = w
+      end
     end
 
     it "succeeds when offset is correct" do

data/test/registry_test.rb

@@ -36,10 +36,16 @@ describe BinData::Registry do
   end
 
   it "allows overriding of registered classes" do
-    r.register('A', A)
-    r.register('A', B)
+    w, $-w = $-w, false
 
-    r.lookup('a').must_equal B
+    begin
+      r.register('A', A)
+      r.register('A', B)
+
+      r.lookup('a').must_equal B
+    ensure
+      $-w = w
+    end
   end
 
   it "converts CamelCase to underscores" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bindata
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - Dion Mendel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2020-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -31,6 +31,9 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.12.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -164,8 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: bindata
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A declarative way to read and write binary file formats