cbor-simple 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af9d5b18c0c35804fde6fbe2b30bf29c542f4d9f
-  data.tar.gz: 133747207ab7977ea78f6383327d8894c124f660
+  metadata.gz: f3a68bca39409726a05b7a9c64efbadbe31fb15e
+  data.tar.gz: abba5f6d6d2d1ea43ae13aa50fb95be5faa9a160
 SHA512:
-  metadata.gz: 81375d05ad1bc174721e82a667e7b783398b94594648809cde34230e8be9506f1f4895e5b356451c7afe16ddf5fe34c487aac95bbec5391acce45f911b93fa1b
-  data.tar.gz: dca56d151da2678c106f588683c5647ad0b75ac4f3af158ac7f8b7adc0c95b1da145ca74c795d44b6b0613ebededf00570e6f5b34507854aac4457913e58d48f
+  metadata.gz: dc2d6f407d1fe7344daa380db3a4a025fd51a21f7a7d3f24368fbd14353f797158f6a6e202c2570bfb7b0d4db1f18650382430481e5e0b49753f72cb01f1cdb6
+  data.tar.gz: 504fcb85b408fe528290640a4d8c54233eee7e0b3a7367ffb4405d42613953dae73f779bf385a1597fd932517ab6e4cfa8c98292d9b00435c4b35f63e64ba05d

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
-  Time.iso8601(load())
+CBOR.register_tag 0 do |l|
+  Time.iso8601(l.load())
 end
 ```
 
 And add classes for dumping:
 
 ```ruby
-CBOR.register_class Time, 0 do |obj|
-  dump(obj.iso8601(6))
+CBOR.register_class Time, 0 do |d, val|
+  d.dump(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 => ->{ !load }})  # => false
+CBOR.load("\xd8\x26\xf5", {0x26 => -> (l) { !l.load }})  # => 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]) + instance_exec(val, &h[:block])
+        dump_uint(Major::TAG, h[:tag]) + h[:block].call(self, 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]
-        instance_exec(&block)
+        block.call(self)
       elsif block = @local_tags[tag]
-        instance_exec(&block)
+        block.call(self)
       else
         raise CBOR::CborError.new("Unknown tag #{tag}")
       end

data/lib/cbor/version.rb

@@ -1,3 +1,3 @@
 module CBOR
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/lib/cbor.rb

@@ -36,33 +36,33 @@ module CBOR
   end
 end
 
-CBOR.register_class Time, CBOR::Consts::Tag::DATETIME do |val|
-  dump(val.iso8601(6))
+CBOR.register_class Time, CBOR::Consts::Tag::DATETIME do |d, val|
+  d.dump(val.iso8601(6))
 end
 
-CBOR.register_tag CBOR::Consts::Tag::DATETIME do
-  Time.iso8601(load)
+CBOR.register_tag CBOR::Consts::Tag::DATETIME do |l|
+  Time.iso8601(l.load)
 end
 
-CBOR.register_class BigDecimal, CBOR::Consts::Tag::DECIMAL do |val|
+CBOR.register_class BigDecimal, CBOR::Consts::Tag::DECIMAL do |d, 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)
-  dump([exponent - significant_digits.size, val])
+  d.dump([exponent - significant_digits.size, val])
 end
 
-CBOR.register_tag CBOR::Consts::Tag::DECIMAL do
-  arr = load
+CBOR.register_tag CBOR::Consts::Tag::DECIMAL do |l|
+  arr = l.load
   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 |val|
-    dump val.raw.b
+  CBOR.register_class UUIDTools::UUID, CBOR::Consts::Tag::UUID do |d, val|
+    d.dump val.raw.b
   end
 
-  CBOR.register_tag CBOR::Consts::Tag::UUID do
-    UUIDTools::UUID.parse_raw(load)
+  CBOR.register_tag CBOR::Consts::Tag::UUID do |l|
+    UUIDTools::UUID.parse_raw(l.load)
   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 => ->{ !load }})
+    assert_equal false, CBOR.load("\xd8\x26\xf5", {0x26 => -> (l) { !l.load }})
   end
 end

metadata

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