cbor-simple 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5176aa2287fb35f0248f05a044ce06847472cdb
-  data.tar.gz: 1a43f30a6df490a04aceb0abb4f0231baa891a39
+  metadata.gz: 697f956fd9e4ec493cbefa2c2b9fed9343b1da3e
+  data.tar.gz: a3d4282de9bed819127ad272abd2e7169e702a83
 SHA512:
-  metadata.gz: 4925ff04985be8f75d08ccb04ce6a5cabe062c3c5f39d7731eddd91d7954d3199fbaa5fd3836ac1bfc3acc461b14a61ef2841beb115b23874673a485015be363
-  data.tar.gz: 8fa857cddc5ae25cb7acfcbb72b7248c844edadb4a893336e5566e449926202eff7c77913767da03a0922403e5f8ebdc8f07f3890a10ee9a1eea76c9866d3238
+  metadata.gz: fc7a528ba7ba544efd22d52b4c603cd9b4d3ae2dfacecdeb0490e02fd5f891fbf168660bdfe344a0499ed620df0d39a5acd1a23c22d9294d7ab6e76f64957fdf
+  data.tar.gz: f96d73d5f705a43f66814326cbb3b87392a80a385a99456f214ba9e1ce30eed1856770761c105823493855917e1ae2a4f065a0a50f90a9fecaa455af28031694

data/README.md

@@ -16,16 +16,16 @@ CBOR.load("\x18\x2a")   # => 42
 You can add custom tags like this:
 
 ```ruby
-CBOR.register_tag 0 do |l|
-  Time.iso8601(l.load())
+CBOR.register_tag 0 do |raw|
+  Time.iso8601(raw)
 end
 ```
 
 And add classes for dumping:
 
 ```ruby
-CBOR.register_class Time, 0 do |d, val|
-  d.dump(val.iso8601(6))
+CBOR.register_class Time, 0 do |val|
+  val.iso8601(6)
 end
 ```
 
@@ -33,7 +33,7 @@ Custom tags can also be given as second parameter to `load`, however this should
 
 ```ruby
 # Invert values tagged with 0x26 (nonstandard!)
-CBOR.load("\xd8\x26\xf5", {0x26 => -> (l) { !l.load }})  # => false
+CBOR.load("\xd8\x26\xf5", {0x26 => -> (raw) { !raw }})  # => false
 ```
 
 Currently supported classes:

data/lib/cbor/dumper.rb

@@ -35,7 +35,7 @@ class CBOR::Dumper
       dump_uint(Major::MAP, val.count) + val.map{|k, v| dump(k.to_s) + dump(v)}.join
     else
       if h = @@registered_classes[val.class]
-        dump_uint(Major::TAG, h[:tag]) + h[:block].call(self, val)
+        dump_uint(Major::TAG, h[:tag]) + dump(h[:block].call(val))
       else
         raise CBOR::CborError.new("dumping not supported for objects of type #{val.class} (#{val.inspect})")
       end

data/lib/cbor/loader.rb

@@ -40,9 +40,9 @@ class CBOR::Loader
     when Major::TAG
       tag = get_uint(typeInt)
       if block = @@registered_tags[tag]
-        block.call(self)
+        block.call(load)
       elsif block = @local_tags[tag]
-        block.call(self)
+        block.call(load)
       else
         raise CBOR::CborError.new("Unknown tag #{tag}")
       end

data/lib/cbor/version.rb

@@ -1,3 +1,3 @@
 module CBOR
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/lib/cbor.rb

@@ -36,33 +36,33 @@ module CBOR
   end
 end
 
-CBOR.register_class Time, CBOR::Consts::Tag::DATETIME do |d, val|
-  d.dump(val.iso8601(6))
+CBOR.register_class Time, CBOR::Consts::Tag::DATETIME do |val|
+  val.iso8601(6)
 end
 
-CBOR.register_tag CBOR::Consts::Tag::DATETIME do |l|
-  Time.iso8601(l.load)
+CBOR.register_tag CBOR::Consts::Tag::DATETIME do |raw|
+  Time.iso8601(raw)
 end
 
-CBOR.register_class BigDecimal, CBOR::Consts::Tag::DECIMAL do |d, val|
+CBOR.register_class BigDecimal, CBOR::Consts::Tag::DECIMAL do |val|
   sign, significant_digits, base, exponent = val.split
   raise CBOR::CborError.new("NaN while sending BigDecimal #{val.inspect}") if sign == 0
   val = sign * significant_digits.to_i(base)
-  d.dump([exponent - significant_digits.size, val])
+  [exponent - significant_digits.size, val]
 end
 
-CBOR.register_tag CBOR::Consts::Tag::DECIMAL do |l|
-  arr = l.load
+CBOR.register_tag CBOR::Consts::Tag::DECIMAL do |raw|
+  arr = raw
   raise CBOR::CborError.new("invalid decimal") if arr.length != 2
   BigDecimal.new(arr[1]) * (BigDecimal.new(10) ** arr[0])
 end
 
 if defined? UUIDTools::UUID
-  CBOR.register_class UUIDTools::UUID, CBOR::Consts::Tag::UUID do |d, val|
-    d.dump val.raw.b
+  CBOR.register_class UUIDTools::UUID, CBOR::Consts::Tag::UUID do |val|
+    val.raw.b
   end
 
-  CBOR.register_tag CBOR::Consts::Tag::UUID do |l|
-    UUIDTools::UUID.parse_raw(l.load)
+  CBOR.register_tag CBOR::Consts::Tag::UUID do |raw|
+    UUIDTools::UUID.parse_raw(raw)
   end
 end

data/test/load_test.rb

@@ -14,6 +14,6 @@ class TestLoad < Minitest::Test
   end
 
   def test_loading_local_tags
-    assert_equal false, CBOR.load("\xd8\x26\xf5", {0x26 => -> (l) { !l.load }})
+    assert_equal false, CBOR.load("\xd8\x26\xf5", {0x26 => -> (raw) { !raw }})
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cbor-simple
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Lucas Clemente