cute-hex 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f30c8697a0a889c6584b6dde7034f7dd9cbcd51f
-  data.tar.gz: 0592fc41e13230948a121b693d37bd854f8218aa
+  metadata.gz: 43dd3d37f8a059ac06a6d5dcf9cef50fe132276c
+  data.tar.gz: 001bf8c19902d02b13efa4d3f925b4b0c7a1a893
 SHA512:
-  metadata.gz: e2e7491db5fdf5fc7b43a7e0aa451fdf52d41811fa78086662db88868b4d7658784385af493da2ecf845b131b7976ff949f323748d8f25e09146a8fc0f8947e9
-  data.tar.gz: f32fbdc7b6d23f10669839f62eebb74a26d403e64756d3f8d2fd86af017fad2207eb070b3119969417dd24547440a46d1c49f093a8142ee58deef85017bbd39f
+  metadata.gz: 0d68b37009779644326f1355e21be21267e6e7171e457943abf419fe2dc7a3d83b47e2ba134488d85047f65d35a8e22ecbeb139714869454507106200409ca77
+  data.tar.gz: 2809a8c9109c2d5bb847cc4895bae992012581930eb1ee9a10150bd6cec43070394e2ea3c654aa8cc641c014447ab4bb26bd9e25a824b2771f664b6f26597af4

data/lib/cute-hex/core.rb

@@ -1,34 +1,37 @@
 module CuteHex
   def self.hex_print _x, **opts
-    slicer = opts[:style] == :data ? @@config.slicer : :nibble
+    slicer = opts[:style] == :data ? (opts[:slicer] || @@config.slicer) : :nibble
 
     if _x.is_a? Array
-      return _x.collect{ |e| stylify(e, slicer, opts[:style]) }
+      return _x.collect{ |e| stylify(e, slicer, opts) }
     else
-      return stylify(_x, slicer, opts[:style])
+      return stylify(_x, slicer, opts)
     end
   end
 
   singleton_class.send(:alias_method, :x, :hex_print)
 
 private
-  def self.stylify _x, _slicer, _style
-    return (_style == :data ? '' : '[')   \
-         + to_hex_string(_x, _slicer)            \
-         + (_style == :data ? '' : ']')
+  def self.stylify _x, _slicer, _opts
+    return (_opts[:style] == :data ? '' : '[')   \
+         + to_hex_string(_x, _slicer, _opts)     \
+         + (_opts[:style] == :data ? '' : ']')
   end
 
-  def self.to_hex_string _x, _slicer
-    format = '%'                                                               \
-           + (_slicer == :data ? (@@config.pad_zeros ? '0' : '') : '0')        \
-           + (@@config.word_size / 4).to_s                                     \
+  def self.to_hex_string _x, _slicer, _opts
+    word_size = _opts[:word_size] || @@config.word_size
+    pad_zeros = _opts[:pad_zeros] == nil ? @@config.pad_zeros : _opts[:pad_zeros]
+
+    format = '%'                                                      \
+           + (_opts[:style] == :data ? (pad_zeros ? '0' : '') : '0')  \
+           + (word_size / 4).to_s                                     \
            + 'X'
 
     slice_by = case _slicer
                when :byte then 2
                when :nibble then 4
-               when :half_word then @@config.word_size / 2 / 4
-               else @@config.word_size / 4
+               when :half_word then word_size / 2 / 4
+               else word_size / 4
                end
 
     s = sprintf(format, _x).split('')

data/lib/cute-hex/version.rb

@@ -1,3 +1,3 @@
 module CuteHex
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cute-hex
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Gloria Budiman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport