cbor-diag 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6a7e84c48640c916dc125bd166c425200a4679e
-  data.tar.gz: 6f43c9114327e41b07dba14075342b9bcfe74777
+  metadata.gz: 13e320fc5d92c4a1b1b94320c49548de74e047a0
+  data.tar.gz: e897c69215772160e7336baa86b0d37ab76d12c4
 SHA512:
-  metadata.gz: 3ef7f82c470d359dcb9e2d3c5e8392a3a9eeb8001d403db7ee669623609abba6e777014fbfe1ab6b54350f285053da6416ac6c0c415fbe64a031925272c76cc0
-  data.tar.gz: 1dd32b4c87a5ae973c0c431e486a9432b835e92ef44537f93e64b5bab86aaf23b5b5c17d160c6da2c5cd3835d0d5c1b1b3fb4283aa3b05d7317864090fad186a
+  metadata.gz: e681c9c67393f2790fbdcd4e2f53f878fb8b39b58a74b814d897221010609ccd6ef1851fef674f96f61db2b48aa90c1c16d59ff57e761368f45c86c7c4360224
+  data.tar.gz: dbd1bb358112ad7eb5de9737b5e8e98d9b6dd6095db0f4eca96bb3e49167cfd4fa11ad8467488f75e09ed6639df09dff244277a6bd2d7c441f82060038bfa2d2

data/cbor-diag.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cbor-diag"
-  s.version = "0.4.0"
+  s.version = "0.5.0"
   s.summary = "CBOR (Concise Binary Object Representation) diagnostic notation"
   s.description = %q{cbor-diag implements diagnostic notation for CBOR, RFC 7049}
   s.author = "Carsten Bormann"

data/lib/cbor-diagnostic.rb

@@ -77,6 +77,6 @@ end
 
 class CBOR::Tagged
   def cbor_diagnostic(options = {})
-    "#{tag}(#{data.cbor_diagnostic(options)})"
+    "#{tag}(#{value.cbor_diagnostic(options)})"
   end
 end

data/lib/cbor-pretty.rb

@@ -12,11 +12,13 @@ class String
 end
 
 
-class CBOR
+module CBOR
   def self.pretty(s, indent = 0, max_target = 40)
-    new(s).pretty_item_final(indent, max_target)
+    Buffer.new(s).pretty_item_final(indent, max_target)
   end
 
+  class Buffer
+
   def take_and_print(n, prefix = '')
     s = take(n)
     @out << prefix
@@ -85,4 +87,6 @@ class CBOR
     }.join
   end
 
+  end
+
 end

data/lib/cbor-pure.rb

@@ -3,7 +3,7 @@
 require "half.rb"
 
 
-class CBOR
+module CBOR
   class OutOfBytesError < RuntimeError
     def initialize(bytes)
       @bytes = bytes
@@ -28,16 +28,26 @@ class CBOR
   Hash.send(:include, Streaming)
   String.send(:include, Streaming)
 
+  module CoreExt
+    def to_cbor
+      CBOR.encode(self)
+    end
+  end
+  Object.send(:include, CoreExt)
+
   class Break
   end
   BREAK = Break.new.freeze
 
-  Tagged = Struct.new(:tag, :data) do
+  Tagged = Struct.new(:tag, :value) do
     def to_s
-      "#{tag}(#{data})"
+      "#{tag}(#{value})"
     end
     def inspect
-      "#{tag}(#{data.inspect})"
+      "#{tag}(#{value.inspect})"
+    end
+    def data                    # backwards compat to pre-0.5.0
+      value
     end
   end
 
@@ -55,25 +65,27 @@ class CBOR
   end
 
   def self.encode(d)
-    new.add(d).buffer
+    Buffer.new.add(d).buffer
   end
   def self.encode_seq(ds)
-    out = new
+    out = Buffer.new
     ds.each do |d|
       out.add(d)
     end
     out.buffer
   end
   def self.decode(s)
-    new(s).decode_item_final
+    Buffer.new(s).decode_item_final
   end
   def self.decode_with_rest(s)
-    new(s).decode_item_with_rest
+    Buffer.new(s).decode_item_with_rest
   end
   def self.decode_seq(s)
-    new(s).decode_items
+    Buffer.new(s).decode_items
   end
 
+  class Buffer
+
   attr_reader :buffer
   def initialize(s = String.new)
     @buffer = s
@@ -149,7 +161,7 @@ class CBOR
     when nil; head(0xe0, 22)
     when Tagged                 # we don't handle :simple here
       head(0xc0, d.tag)
-      add(d.data)
+      add(d.value)
     when String
       lengths = d.cbor_stream?
       e = d
@@ -301,4 +313,9 @@ class CBOR
     end
     ret
   end
+
+
+  end
+
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-06 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler