cbor 0.5.6.2 → 0.5.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95c5af13f98f6a6442e2a2b9c27ed4bdef1c5813
-  data.tar.gz: 220ff8d73a25a32486e70a3ae863516193771661
+  metadata.gz: fbd9f75a0950815388c8f87da0acab19c6227e5a
+  data.tar.gz: 0d7d54f3811162926eff2af8d1a56a36ceaac85f
 SHA512:
-  metadata.gz: e9ff567a84e861e9dea28e28465b14f5ce0bea61ebd5a964c57abb53dea6e7841d26e2396a98a8e97c0250336465b221f8b0f44709254b97d776859e904cb471
-  data.tar.gz: 43bbd8691a9120b91385b1f0089fb3ee92d282b8ec2e63c617be1063e588849e2f84c57ad9425352c2263bf7d7cbe4fee4461b38957078784b2f0995b874cbd7
+  metadata.gz: a51ccc3cf050a569b3be7a80bdc848b04cd80b9a31338c485e0fce3277c1c7d2b37c21eebcbd054b11c8c911c81937c634bdd1acd3c7f82a1e15b9438957b8a1
+  data.tar.gz: 8c3a923d73a8539b576a8e63c8c5e7bf1b11f88b26386880e57af55a19c75b39bb18aa46ced3bd3583f2ea99032d210046731fbcc143d01fbc04b5711cb3dc7d

data/.gitignore

@@ -3,7 +3,7 @@
 *.gem
 *.class
 .bundle
-Gemfile*
+Gemfile.lock
 pkg
 test/debug.log
 *~

data/.travis.yml

@@ -2,4 +2,12 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+#  - rbx-19mode
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: rbx-19mode            # Rubinius issue #2742
 script: "bundle exec rake spec"
+
+notifications:
+  irc: "irc.freenode.org#coap"

data/ChangeLog

@@ -1,3 +1,8 @@
+2014-02-09  Carsten Bormann  <cabo@tzi.org>
+
+	* 0.5.6.4: Add more checking for bare indefinite breaks and
+	non-strings inside indefinite strings.
+
 2013-08-17  Carsten Bormann  <cabo@tzi.org>
 
 	* First version of CBOR variant of this code.

data/Gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org/'
+
+gemspec
+
+group :test do
+  gem "rake"
+  gem 'rake-compiler'
+  gem 'rspec'
+  gem 'json'
+  gem 'yard'
+end

data/README.rdoc

@@ -4,13 +4,21 @@ This is an initial Ruby implementation of the CBOR encoding, based on
 the (polished) high-performance msgpack-ruby code.
 
 Documentation will follow, but generally, if you replace MessagePack
-and msgpack with CBOR and cbor in the below, you will be on the right
-track.
+and msgpack with CBOR and cbor in the text cited from MessagePack
+below, you will be on the right track.  For a starter:
+
+    require 'cbor'
+    s = [1, 2, 33.5, 4].to_cbor  #=> "\x84\x01\x02\xF9P0\x04"
+    CBOR.decode(s)  #=> [1, 2, 33.5, 4]
+
+Use RubyGems to install:
+
+    gem install cbor
 
 CBOR is an object representation format defined by the IETF[http://ietf.org].
-The specification[http://tools.ietf.org/html/draft-bormann-cbor]
+The specification[http://tools.ietf.org/html/rfc7049]
 has recently been approved as an IETF Standards-Track specification
-and will be an RFC in a couple of months, after the RFC editor has done their work.
+and has been published as RFC 7049.
 
 This is all based on wonderful work by frsyuki, and I have no idea how
 to acknowledge him appropriately.  This gem is not intended to fork or
@@ -25,12 +33,13 @@ Todos:
   percent slower than msgpack-ruby.
 
 * Properly document things, in particular the classes CBOR::Simple and
-  CBOR::Tagged.  If you check out the source, you can +rake doc+ to
+  CBOR::Tagged.  If you check out the source, you can +rake+ +doc+ to
   get some documentation in the directory +doc+ (see +index.html+ there).
 
-* So far, this has been tested on MRI (1.9.3 and 2.0.0).  To do:
-  * Check this code out with Rubinius.
-  * Publish the pure-ruby version and make it work the same way on JRuby.
+* Cover more rubies.
+  * \[✔✔✔] tested on MRI (1.9.3, 2.0.0, 2.1.0-preview1).
+  * \[(✔)] tested on Rubinius 2.1.1.  Mostly works, but runs into a few Rubinius bugs, which have since been fixed on the Rubinius side.  Need to retest on the next release.
+  * \[_] Publish the pure-ruby version and make it work the same way on JRuby.
 
 * Find and implement good ways to offer CBOR's indefinite length
   ("streaming") capability at the Ruby API level.
@@ -47,7 +56,7 @@ Author::    Carsten Bormann <cabo@tzi.org>
 Copyright:: Copyright (c) 2013 Carsten Bormann
 License::   Apache License, Version 2.0
 
-{<img src="https://travis-ci.org/cabo/cbor-ruby.png?branch=master" />}[https://travis-ci.org/cabo/cbor-ruby]
+{<img src="https://travis-ci.org/cabo/cbor-ruby.png?branch=master" />}[https://travis-ci.org/cabo/cbor-ruby] {<img src="https://badge.fury.io/rb/cbor.png" alt="Gem Version" />}[http://badge.fury.io/rb/cbor]
 
 For the original, see below.
 

data/ext/cbor/unpacker.c

@@ -583,6 +583,8 @@ int msgpack_unpacker_read(msgpack_unpacker_t* uk, size_t target_stack_depth)
         /* PRIMITIVE_OBJECT_COMPLETE */
 
         if(msgpack_unpacker_stack_is_empty(uk)) {
+            if (r == PRIMITIVE_BREAK)
+              return PRIMITIVE_INVALID_BYTE;
             return PRIMITIVE_OBJECT_COMPLETE;
         }
 
@@ -627,6 +629,8 @@ int msgpack_unpacker_read(msgpack_unpacker_t* uk, size_t target_stack_depth)
                 object_complete_string(uk, top->object, top->count); /* use count as textflag */
                 goto done;
               }
+              if (!RB_TYPE_P(uk->last_object, T_STRING))
+                return PRIMITIVE_INVALID_BYTE;
 #ifdef COMPAT_HAVE_ENCODING     /* XXX */
               if (ENCODING_GET(top->object) != ENCODING_GET(uk->last_object))
                 return PRIMITIVE_INVALID_BYTE;

data/lib/cbor/version.rb

@@ -1,3 +1,3 @@
 module CBOR
-	VERSION = "0.5.6.2"
+	VERSION = "0.5.6.4"
 end

data/spec/format_spec.rb

@@ -342,13 +342,31 @@ describe MessagePack do
     end
   end
 
+  it "(_ not-a-string)" do
+    lambda {
+      check_decode "\x5f\x00\xff", "".b
+    }.should raise_error(MessagePack::MalformedFormatError)
+  end
+
+  it "bare break" do
+    lambda {
+      check_decode "\xff", "".b
+    }.should raise_error(MessagePack::MalformedFormatError)
+    lambda {
+      check_decode "\x82\xff\x00\x00", "".b
+    }.should raise_error(MessagePack::MalformedFormatError)
+    lambda {
+      check_decode "\x82\x9f\xff\xff", "".b
+    }.should raise_error(MessagePack::MalformedFormatError)
+  end
+
   it "Time" do
     check_decode "\xc1\x19\x12\x67", Time.at(4711)
     check 6, Time.at(Time.now.to_i)
   end
 
   it "URI" do
-    check_decode "\xd8\x20\x78\x13http://www.ietf.org", CBOR::Tagged.new(32, "http://www.ietf.org")
+    # check_decode "\xd8\x20\x78\x13http://www.ietf.org", CBOR::Tagged.new(32, "http://www.ietf.org")
     require 'uri'
     check_decode "\xd8\x20\x78\x13http://www.ietf.org", URI.parse("http://www.ietf.org")
     # This doesn't work yet if 'uri' is not required before 'cbor':

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor
 version: !ruby/object:Gem::Version
-  version: 0.5.6.2
+  version: 0.5.6.4
 platform: ruby
 authors:
 - Carsten Bormann, standing on the tall shoulders of Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-27 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler