zhexdump 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b2e6bfef9bdafb2b9c55ca2682113a71e008e5e9fc5d2492e0a03f7fbb74abb
-  data.tar.gz: 6c8ffe4c3d33f5c1fbe2c79dd02263f5b57582abb7c12950d54def6e8e942ff3
+  metadata.gz: 87be9581b8556e6969275cb73e07ff353805db106f1f741bb522a941db276919
+  data.tar.gz: 0f75b82fe5bb212b0f4ad29d9aea29f89b62f21de3fabc7496c5eb75a387b1dc
 SHA512:
-  metadata.gz: f6fe0c14cdf444797c7393def5d1949ad319fc93f86075efecc7f083e012d87e210f78530340cb4401919905445c2f7f79581b1fe45f7348c79a367629ae1090
-  data.tar.gz: 4c86d845b5820ac1ab2b51293e290cb3b8877005b80316355ae0e40b234d245f05560c80f3617791a14c47bdcd18e0b16a0c7314e5b811ba7104cb01a9730314
+  metadata.gz: 1fc327641290592b335173fc7385ef73344f0f5f45bad467f25e7edc5a20a130a0f5a4daf54888932c8084fe500823446ed69676c286fa1d48fc199310a92c5c
+  data.tar.gz: 0231db65834152f9a9afce551a689a4a786c6a77863acf981929054db6254e8e96f74df59e4aa5e3a8c8c18f5c289107f819abb0b84405e10cf096140fb9eba3

data/lib/zhexdump/version.rb

@@ -1,3 +1,3 @@
 module ZHexdump
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/zhexdump.rb

@@ -19,7 +19,15 @@ module ZHexdump
     r
   end
 
+  @defaults = {}
+
   class << self
+    attr_accessor :defaults
+
+    def _get_param(h, key, default)
+      h[key] || defaults[key] || default
+    end
+
     def dump data, h = {}
       offset      = h.fetch(:offset, 0)
       dedup       = h.fetch(:dedup, true)
@@ -30,13 +38,13 @@ module ZHexdump
         offset = 0
       end
 
-      add           = h[:add]    || 0
-      size          = h[:size]   || (data.size-offset)
-      tail          = h[:tail]   || "\n"
-      width         = h[:width]  || 0x10                 # row width, in bytes
-      output        = h[:output] || $>
-      indent        = h[:indent] || 0
-      offset_format = h[:offset_format] || "%08x: "
+      add           = _get_param(h, :add, 0)
+      size          = _get_param(h, :size, data.size-offset)
+      tail          = _get_param(h, :tail, "\n")
+      width         = _get_param(h, :width, 16)
+      output        = _get_param(h, :output, $stdout)
+      indent        = _get_param(h, :indent, 0)
+      offset_format = _get_param(h, :offset_format, "%08x: ")
 
       indent = ' ' * indent
       size = data.size-offset if size+offset > data.size
@@ -47,8 +55,9 @@ module ZHexdump
         width.times do |i|
           hex << ' ' if i%8==0 && i>0
           if c = ((size > 0) && data[offset+i])
-            hex << "%02x " % c.ord
-            ascii << ((32..126).include?(c.ord) ? c : '.')
+            ord = c.ord
+            hex << "%02x " % ord
+            ascii << (ord == 0 ? ' ' : ((32..126).include?(ord) ? c : '.'))
           else
             hex << '   '
             ascii << ' '
@@ -57,7 +66,7 @@ module ZHexdump
         end
 
         if dedup && hex == prevhex
-          row = "*"
+          row = indent + "*"
           yield(row, offset+add, ascii) if block_given?
           unless prevdup
             output << "\n" if offset > start

data/spec/hexdump_spec.rb

@@ -1,3 +1,4 @@
+#coding: binary
 require 'spec_helper'
 require 'stringio'
 
@@ -53,6 +54,17 @@ describe ZHexdump do
     s.should == "00000002: 6f 62 61                                          |oba             |\n"
   end
 
+  it "respects :indent" do
+    data = 'foobar' + "\x00"*100
+    s = ''
+    ZHexdump.dump data, :output => s, :indent => 2
+    a = s.split("\n")
+    a[0].should == "  00000000: 66 6f 6f 62 61 72 00 00  00 00 00 00 00 00 00 00  |foobar          |"
+    a[1].should == "  00000010: 00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |                |"
+    a[2].should == "  *"
+    a[3].should == "  00000060: 00 00 00 00 00 00 00 00  00 00                    |                |"
+  end
+
   it "adds :add to offset shown" do
     data = 'foo'*100
     s = ''

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ require File.join(File.dirname(__FILE__), '../lib/zhexdump.rb')
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   #config.filter_run :focus
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zhexdump
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrey "Zed" Zaikin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-14 00:00:00.000000000 Z
+date: 2024-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: A highly flexible hexdump implementation.