cbor-packed 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ec7bd11d45d35c418a0fe98aa43c369b3384b2b43cb94486fd6e3463eae3232
-  data.tar.gz: 88efc5decfeeedb1c049df0e5a9ba126c35bdf8a661218e29db3eb836c39f9c6
+  metadata.gz: aac07ac277ddc9d142fcfd1d2b6b6b07279522354e3f72b4cbec52466e94b6c3
+  data.tar.gz: 7963b3afd7a8e205b65b5e4fb4a69496aa358e29aac1c1cc126fa4b14db38b20
 SHA512:
-  metadata.gz: 1b6add7d575ff6ab3f239c9cf8f4f434ec8cc3c7d02e717c58b8c79a2007dd6d033ec10739c8bbac788e73d292f37501a002730303a8f58479a7131243fd04ac
-  data.tar.gz: efd9b83c4da71f11354398048e6421770583b2fef0e22b4e3ac1f964ba2d5f4d2d69b2cb1e6441058062313940d6fee492f6dd7579dd0e25202734229a33058b
+  metadata.gz: 2e25f214b1944aa20817ee2e4fc9640c7d2c8f698bb22fb9e207aa22d2ba7adb78a32fb8b2ef51e8b7d8c981e3d0b29b8aca97f932ca54cc70ad14268756f797
+  data.tar.gz: 1200e4a27c0e2063ed4073406a0e55f4a12eb0efec213b5e26b069924a4a699a450e180c80302cba144883e5cafad31b6fab11a3b8e7e3ce6e2b2c87003ee2d2

data/cbor-packed.gemspec

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

data/lib/cbor-packed.rb

@@ -9,6 +9,8 @@ module CBOR
   PACKED_TAG = 51
   REF_TAG = 6
 
+  REF_SIZE = [*Array.new(16, 1), *Array.new(48, 2), *Array.new(512-48, 3)]
+
   class Packer
     def self.from_item(item)
       count = Hash.new(0)
@@ -29,8 +31,16 @@ module CBOR
       # pp better_count
 
       # now: take the best out???; re-visit that reducing by n; re-sort and filter???
-      # sort by descending number of references we'll get -- the higher reference counts go first
-      match_array = better_count.sort_by {|a| -a[1]}.map {|a| a[0]}
+
+      # sort by descending number of references we'll get
+      # -- the higher reference counts go first
+      # then filter out the entries that actually improve
+
+      match_array = []
+
+      better_count.sort_by {|a| -a[1]}.each {|a|
+        match_array << a[0] if (REF_SIZE[match_array.size] || 4) < a[2]
+      }
       # pp match_array
 
       # XXX the below needs to be done with arrays and (hard!) maps as well
@@ -145,8 +155,12 @@ module CBOR
     def unsimple(sv)
       @simple_array[sv]
     end
-    def untag(tv)
-      @tagged_array[(i << 1) ^ (i >> 63)]
+    def untag(i)
+      # @tagged_array[(i << 1) ^ (i >> 63)]
+      ix = (i << 1) ^ (i >> 63)
+      ret = @tagged_array[ix]
+      # warn "** UNTAG i=#{i} ix=#{ix} ret=#{ret}"
+      ret
     end
     def unprefix(n)
       @prefix_array[n]
@@ -193,7 +207,16 @@ module CBOR
     module String_Packed_CBOR
       def packed_merge(other, unpacker)
         # add checks
-        to_unpacked_cbor1(unpacker) + other.to_unpacked_cbor1(unpacker)
+        lhs = to_unpacked_cbor1(unpacker)
+        rhs = other.to_unpacked_cbor1(unpacker)
+        begin
+          lhs + rhs
+        rescue => detail
+          warn "** lhs = #{lhs.inspect}"
+          warn "** rhs = #{rhs.inspect}"
+          warn "** error: #{detail}"
+          lhs + rhs.to_s
+        end
       end
     end
     String.send(:include, String_Packed_CBOR)
@@ -211,7 +234,7 @@ module CBOR
       end
       def to_packed_cbor1(packer = Packer.from_item(self))
         if c = packer.has(self)
-          c.to_unpacked_cbor1(unpacker)
+          c.to_packed_cbor1(packer)
         else
           # TODO: Find useful prefixes
           map {|x| x.to_packed_cbor1(packer)}
@@ -238,7 +261,7 @@ module CBOR
       end
       def to_packed_cbor1(packer = Packer.from_item(self))
         if c = packer.has(self)
-          c.to_unpacked_cbor1(unpacker)
+          c.to_packed_cbor1(packer)
         else
           # TODO: Find useful prefixes
           Hash[map {|k, v| [k.to_packed_cbor1(packer), v.to_packed_cbor1(packer)]}]
@@ -271,10 +294,14 @@ module CBOR
       def to_unpacked_cbor1(unpacker)
         case tag
         when REF_TAG
-          if Integer === value
-            unpacker(untag(value))
+          # warn "** REF_TAG1 value #{value.class.inspect} #{value.inspect}"
+          unpacked_value = value.to_unpacked_cbor1(unpacker)
+          # warn "** REF_TAG2 value #{unpacked_value.class.inspect} #{unpacked_value.inspect}"
+          if Integer === unpacked_value
+            # warn "** I REF_TAG value #{value.class.inspect} #{value.inspect}"
+            unpacker.untag(unpacked_value)
           else
-            unpacker.unprefix(0).packed_merge value, unpacker
+            unpacker.unprefix(0).packed_merge unpacked_value, unpacker
           end
         when 225...256
           unpacker.unprefix(tag-(256-32)).packed_merge value, unpacker

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor-packed
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2022-03-30 00:00:00.000000000 Z
 dependencies: []
 description: cbor-packed implements packed encoding for CBOR, RFC 7049 Section 3.9
 email: cabo@tzi.org
@@ -40,7 +40,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: CBOR (Concise Binary Object Representation) packer