cbor-dcbor 0.0.2 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d528326aea2cd21dde7091d75c18bd1dfdf106485d556b353cdaec7778c5d94e
-  data.tar.gz: 62a6fa5fc20d1a6e3c9f91382aa68b2167c996fb47e93b4570d791d310706af0
+  metadata.gz: 18a9a98628bd3c72dcec7eb19d97e1fe660d195987d5669fdbabd538762726d8
+  data.tar.gz: eaef07ea3210bc702d2fc326f7b4e9de052c8a9b535d907a2898cc9a459e1a4a
 SHA512:
-  metadata.gz: 659dcaf464132729ca8969582794f22c5e146265580f7718448711145c704f7443601db6a5581d220e1686e2f1f37d1c7b8c25ed93cdc52101f566cfb421d93d
-  data.tar.gz: fe8a1b43b95ea3c51de2be67c1d25232441c42d021177a3b873207c9c805c123d365dd727c387a8130d71113417264e14486249fa6be2313a4e710863c5ddba6
+  metadata.gz: c146002bc34feea3773f92913aa490bdf230ef9a67e8c042242629ac7bd85fa65d5699caa8473982222b473b9e7ae69e98042b1183d8407ea636684154ddc3ee
+  data.tar.gz: e398441cbafc63cef594d26bbd92c5c81ddc89a99cf7e18ddc97cb7fec5b90853c1504e866739e56285c88643048254c688558b0d8e04e833ce7ea0ba7ba5e75

data/cbor-dcbor.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cbor-dcbor"
-  s.version = "0.0.2"
+  s.version = "0.1.2"
   s.summary = "CBOR (Concise Binary Object Representation) \"dCBOR\" encoding"
   s.description = %q{cbor-dcbor implements "dCBOR" encoding for CBOR, RFC 8949}
   s.author = "Carsten Bormann"

data/lib/cbor-dcbor.rb

@@ -3,7 +3,9 @@
 require "cbor" unless defined? CBOR
 
 module CBOR
-  module Dcbor
+  module Dcbor                  # Gordian dCBOR
+
+    # Not yet implemented: exclusions
 
     module Object_Dcbor_CBOR
       def cbor_prepare_dcbor
@@ -15,28 +17,12 @@ module CBOR
     end
     Object.send(:include, Object_Dcbor_CBOR)
 
-    module Integer_Dcbor_CBOR
-      def cbor_prepare_dcbor
-        zigzag, tagnum = if self < 0
-                           [-1-self, 3]
-                         else
-                           [self, 2]
-                         end
-        bytes = zigzag.digits(256)
-        if bytes.size + 2 < self.to_cbor.size
-          CBOR::Tagged.new(tagnum, bytes.pack("C*").reverse!)
-        else
-          self
-        end
-      end
-    end
-    Integer.send(:include, Integer_Dcbor_CBOR)
+    DCBOR_PROFILE_1_INTEGER_RANGE = (-2**63 .. 2**64-1)
 
     module Float_Dcbor_CBOR
       def cbor_prepare_dcbor
-        int = self.to_i
-        if int == self && int.to_dcbor.size <= self.to_cbor.size
-          int.cbor_prepare_dcbor
+        if finite? && (int = self.to_i) == self && DCBOR_PROFILE_1_INTEGER_RANGE.include?(int)
+          int
         else
           self
         end
@@ -69,5 +55,17 @@ module CBOR
       end
     end
     CBOR::Tagged.send(:include, Tagged_Dcbor_CBOR)
+
+    module String_Dcbor_CBOR
+      def from_dcbor
+        ret = CBOR.decode(self)
+        if ret.to_dcbor != self
+          raise ArgumentError, "dCBOR deterministic reencoding mismatch", caller
+        end
+        ret
+      end
+    end
+    String.send(:include, String_Dcbor_CBOR)
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor-dcbor
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.2
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-08 00:00:00.000000000 Z
+date: 2023-08-16 00:00:00.000000000 Z
 dependencies: []
 description: cbor-dcbor implements "dCBOR" encoding for CBOR, RFC 8949
 email: cabo@tzi.org
@@ -38,7 +38,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: CBOR (Concise Binary Object Representation) "dCBOR" encoding