cbor-canonical 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6373c6f0c54a80637fe4ad443a4a59fed8c26eb3
-  data.tar.gz: 930c8fe482a53f761603af7ecb7153377ecdc07a
+  metadata.gz: ab062f791bce0e81297faecdc9ce7b1c262691de
+  data.tar.gz: 6366480206eba1c826dafbeec27127d18e9d5bda
 SHA512:
-  metadata.gz: 08242d8d1c8d57c1ef12470e41cd08ad359567fd529a8fe16488bbae540d898d0fc5b3bed58de8b34cd406e0701d9393254accb48821586e0a60150e1277d9ad
-  data.tar.gz: 8ac5a29219b1624e059cfadcafcfda7b2179a3dbbb1e99247764b7859a7704b6aadc5d284ee527decec61cc49a81ad5aee8be87d0ea4f49df228be146172ecd9
+  metadata.gz: b1be468685e551d3f557a08f85f6afd3dd2e5fe7a866df7744c0186a20d733309795c2f937d8682eeabb33286fb110c9742b87f5fc31d34c345727f1cbd8d57b
+  data.tar.gz: c88d13767f70598fffb1fbdec87cf64f94b685bf0f0c53ea299aea0d5a4f49454e7c2f696c04db51a933da372900e1e9eac21ec715702433af39137b30c1e5e6

data/cbor-canonical.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cbor-canonical"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
   s.summary = "CBOR (Concise Binary Object Representation) canonical encoding"
   s.description = %q{cbor-canonical implements canonical encoding for CBOR, RFC 7049 Section 3.9}
   s.author = "Carsten Bormann"

data/lib/cbor-canonical.rb

@@ -24,8 +24,11 @@ module CBOR
 
     module Hash_Canonical_CBOR
       def cbor_pre_canonicalize
-        Hash[map {|k, v| cc = k.to_canonical_cbor
-                         [cc.size, cc, k, v]}.
+        Hash[map {|k, v| 
+                  k = k.cbor_pre_canonicalize
+                  v = v.cbor_pre_canonicalize
+                  cc = k.to_cbor # already canonical
+                  [cc.size, cc, k, v]}.
              sort.map{|s, cc, k, v| [k, v]}]
       end
     end

data/test/test-canonical.rb

@@ -3,6 +3,7 @@ require 'cbor-canonical'
 [[1], [false], [10.3], [10.5], [Float::NAN],
  [{a: 1, b: [1, 2]}],
  [{aa: 1, b: 2}, {b: 2, aa: 1}],
+ [{aa: 1, b: {mm: 2, m: 3}}, {b: {m: 3, mm: 2}, aa: 1}],
  [CBOR::Tagged.new(4711, {aa: 1, b: 2}),
   CBOR::Tagged.new(4711, {b: 2, aa: 1})],
 ].each do |ex1, ex2, ex3|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cbor-canonical
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Carsten Bormann