cbor 0.5.8.0 → 0.5.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f05161e936a40f076ec1389e1c2e0b3c780603b4
-  data.tar.gz: 73ee9389cd9fdd7c826caef32f8730340c29a019
+  metadata.gz: 3f05745e0a68a5a628790baf2d44945a4ce57bae
+  data.tar.gz: 3eff2fd87b1d8ceba13dda6ad6809a4f2b8253be
 SHA512:
-  metadata.gz: dc63dfca2f83dfba9fabaffed1b9142df775dbd05c47f541b5127428545dc1c5700148326662e57b1a0f5572af56367cf0a522d91bc52cea8d621730542942f8
-  data.tar.gz: ca747d537cdd17c53f060819c45c22309859295a958d919a086e52496ef7a484f641e0e5f67c0da45bdb24e8013a4ce06cdb8a1a30d6e449e22614f445a206ff
+  metadata.gz: d3b24e6deceaf7061b8302c586f85f9c58eef81fdd92a376ccdcc6de410742ee9947990af2116e6948b8adb82703540d9c8cc3698eb7f7bb26c86373fdce9950
+  data.tar.gz: 1837146a082f666d20d377ad82c52bde5d7c05e24296a967f5184d123e7ca05cc7f3045cf51ee4c603514f0a72caf7a7366ba317998d440bf915d5431c0553cc

data/.travis.yml

@@ -2,12 +2,19 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-#  - rbx-19mode
-  - 2.1.0
+  - 2.1
   - ruby-head
+  - rbx-2
+  - 1.8.7
 matrix:
   allow_failures:
-    - rvm: rbx-19mode            # Rubinius issue #2742
+    - rvm: ruby-head
+    - rvm: rbx-2
+    - rvm: 1.8.7
+
+gemfile:
+  - Gemfile
+
 script: "bundle exec rake spec"
 
 notifications:

data/ChangeLog

@@ -1,3 +1,13 @@
+2014-12-13  Carsten Bormann  <cabo@tzi.org>
+
+	* 0.5.9.0: Upstream fixes; prepare for Ruby 2.2 (use GC-able
+	symbols for :keys_as_symbols, use rb_integer_pack if available)
+
+2014-12-12  Carsten Bormann  <cabo@tzi.org>
+
+	* 0.5.8.0: Upstream fixes (including {symbolize_keys: true} as an
+	alternative for :keys_as_symbols); README updates.
+
 2014-02-09  Carsten Bormann  <cabo@tzi.org>
 
 	* 0.5.6.4: Add more checking for bare indefinite breaks and

data/README.rdoc

@@ -17,7 +17,7 @@ Use RubyGems to install:
 
 CBOR is an object representation format defined by the IETF[http://ietf.org].
 The specification[http://tools.ietf.org/html/rfc7049]
-has recently been approved as an IETF Standards-Track specification
+is an IETF Standards-Track specification
 and has been published as RFC 7049.
 
 This is all based on wonderful work by frsyuki, and I have no idea how
@@ -37,9 +37,9 @@ Todos:
   get some documentation in the directory +doc+ (see +index.html+ there).
 
 * Cover more rubies.
-  * \[✔✔✔] tested on MRI (1.9.3, 2.0.0, 2.1.0, head).
+  * \[✔✔✔✔] tested on MRI (1.9.3, 2.0.0, 2.1.5, 2.2 head).
   * (\[✔] There now also is some basic MRI 1.8.7 compatibility, however 1.8.7 does not support differentiation between byte and text strings.)
-  * \[(✔)] 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.
+  * \[✔] tested on Rubinius 2.4.1.
   * \[_] 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

data/Rakefile

@@ -52,6 +52,9 @@ else
   end
 end
 
+CLEAN.include('lib/cbor/*.jar')
+CLEAN.include('lib/cbor/cbor.*')
+
 task :default => :build
 
 

data/cbor.gemspec

@@ -10,7 +10,6 @@ Gem::Specification.new do |s|
   s.email = "cabo@tzi.org"
   s.license = "Apache 2.0"
   s.homepage = "http://cbor.io/"
-#  s.rubyforge_project = "msgpack"
   s.has_rdoc = false
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec}/*`.split("\n")

data/ext/cbor/buffer.h

@@ -454,6 +454,7 @@ static inline VALUE msgpack_buffer_read_top_as_string(msgpack_buffer_t* b, size_
 
     VALUE result;
     if (as_symbol) {
+#ifndef HAVE_RB_STR_INTERN
 #ifndef HAVE_RB_INTERN_STR
       /* MRI 1.8 doesn't have rb_intern_str or rb_intern2, hack it... */
       char *tmp = xmalloc(length+1);
@@ -464,6 +465,10 @@ static inline VALUE msgpack_buffer_read_top_as_string(msgpack_buffer_t* b, size_
 #else
       result = ID2SYM(rb_intern2(b->read_buffer, length));
       /* FIXME: This is stuck at ASCII encoding */
+#endif
+#else
+      /* enable GC-able symbols here: */
+      result = rb_str_intern(rb_str_new(b->read_buffer, length));
 #endif
       /* todo: rb_check_id_cstr(const char *ptr, long len, rb_encoding *enc) */
     } else {

data/ext/cbor/compat.h

@@ -105,6 +105,9 @@
 #  endif
 #endif
 
+
+#ifndef HAVE_RB_INTEGER_UNPACK
+
 /* More MRI 1.8 */
 #ifndef RBIGNUM_LEN
   #define RBIGNUM_LEN(b)        (RBIGNUM(b)->len)
@@ -122,6 +125,8 @@
 #define rb_big_new(len, sign) rb_funcall(INT2FIX(1),rb_intern("<<"),1,INT2FIX(len > 0 ? ((len) * SIZEOF_BDIGITS * 8) - 1 : 0));
 #endif
 
+#endif
+
 #ifndef RB_TYPE_P
   #define RB_TYPE_P(obj, type) (TYPE(obj) == (type))
 #endif

data/ext/cbor/extconf.rb

@@ -5,6 +5,9 @@ have_header("st.h")
 have_func("rb_str_replace", ["ruby.h"])
 have_func("rb_big_new", ["ruby.h"])
 have_func("rb_intern_str", ["ruby.h"])
+have_func("rb_sym2str", ["ruby.h"])
+have_func("rb_str_intern", ["ruby.h"])
+have_func("rb_integer_unpack", ["ruby.h"])
 
 $CFLAGS << %[ -I.. -Wall -O3 -g -std=c99]
 #$CFLAGS << %[ -DDISABLE_RMEM]

data/ext/cbor/packer.h

@@ -80,7 +80,7 @@ static inline void cbor_encoder_write_head(msgpack_packer_t* pk, unsigned int ib
 {
     if (n < 24) {
         msgpack_buffer_ensure_writable(PACKER_BUFFER_(pk), 1);
-        msgpack_buffer_write_1(PACKER_BUFFER_(pk), ib + n);
+        msgpack_buffer_write_1(PACKER_BUFFER_(pk), ib + (int)n);
     } else if (n < 256) {
         msgpack_buffer_ensure_writable(PACKER_BUFFER_(pk), 3);
         msgpack_buffer_write_2(PACKER_BUFFER_(pk), ib + 24, n);
@@ -216,6 +216,10 @@ static inline void msgpack_packer_write_string_value(msgpack_packer_t* pk, VALUE
 
 static inline void msgpack_packer_write_symbol_value(msgpack_packer_t* pk, VALUE v)
 {
+#ifdef HAVE_RB_SYM2STR
+    /* rb_sym2str is added since MRI 2.2.0 */
+    msgpack_packer_write_string_value(pk, rb_sym2str(v));
+#else
     const char* name = rb_id2name(SYM2ID(v));
     /* actual return type of strlen is size_t */
     unsigned long len = strlen(name);
@@ -225,6 +229,7 @@ static inline void msgpack_packer_write_symbol_value(msgpack_packer_t* pk, VALUE
     }
     cbor_encoder_write_head(pk, IB_TEXT, len);
     msgpack_buffer_append(PACKER_BUFFER_(pk), name, len);
+#endif
 }
 
 static inline void msgpack_packer_write_fixnum_value(msgpack_packer_t* pk, VALUE v)
@@ -244,7 +249,26 @@ static inline void msgpack_packer_write_bignum_value(msgpack_packer_t* pk, VALUE
     v = rb_funcall(v, rb_intern("~"), 0);  /* should be rb_big_neg(), but that is static. */
     ib = IB_NEGATIVE;
   }
-  len = RBIGNUM_LEN(v);         /* This API is broken in Rubinius 2.1.1, #2742 */
+
+
+#ifdef HAVE_RB_INTEGER_UNPACK
+  len = rb_absint_size(v, NULL);
+
+  if (len > SIZEOF_LONG_LONG) {                  /* i.e., need real bignum */
+    msgpack_buffer_ensure_writable(PACKER_BUFFER_(pk), 1);
+    msgpack_buffer_write_1(PACKER_BUFFER_(pk), IB_BIGNUM + IB_NEGFLAG_AS_BIT(ib));
+    cbor_encoder_write_head(pk, IB_BYTES, len);
+    msgpack_buffer_ensure_writable(PACKER_BUFFER_(pk), len);
+
+    char buf[len];              /* XXX */
+    if (rb_integer_pack(v, buf, len, 1, 0, INTEGER_PACK_BIG_ENDIAN) != 1)
+      rb_raise(rb_eRangeError, "cbor rb_integer_pack() error");
+
+    msgpack_buffer_append(PACKER_BUFFER_(pk), buf, len);
+
+#else
+
+  len = RBIGNUM_LEN(v);
   if (len > SIZEOF_LONG_LONG/SIZEOF_BDIGITS) {
     msgpack_buffer_ensure_writable(PACKER_BUFFER_(pk), 1);
     msgpack_buffer_write_1(PACKER_BUFFER_(pk), IB_BIGNUM + IB_NEGFLAG_AS_BIT(ib));
@@ -296,6 +320,7 @@ static inline void msgpack_packer_write_bignum_value(msgpack_packer_t* pk, VALUE
     }
 #endif
     }
+#endif
   } else {
     cbor_encoder_write_head(pk, ib, rb_big2ull(v));
   }

data/ext/cbor/sysdep.h

@@ -121,6 +121,8 @@
 /* TODO default impl for _msgpack_bsp32 */
 #endif
 
+#ifndef HAVE_RB_INTEGER_UNPACK
+
 #if SIZEOF_BDIGITS == 2
 #define NTOHBDIGIT _msgpack_be16
 #elif SIZEOF_BDIGITS == 4
@@ -133,3 +135,5 @@
 
 #endif
 
+#endif
+

data/ext/cbor/unpacker.c

@@ -422,7 +422,7 @@ static int read_primitive(msgpack_unpacker_t* uk)
               union {
                 uint32_t u32;
                 float f;
-              } castbuf = { val };
+              } castbuf = { (uint32_t)val };
               return object_complete(uk, rb_float_new(castbuf.f));
             }
         case AI_8:  // double
@@ -476,6 +476,7 @@ int msgpack_unpacker_read_container_header(msgpack_unpacker_t* uk, uint64_t* res
         return PRIMITIVE_UNEXPECTED_TYPE; /* including INDEF! */
     }
 
+    reset_head_byte(uk);
     return 0;
 }
 
@@ -514,11 +515,19 @@ static VALUE msgpack_unpacker_process_tag(uint64_t tag, VALUE v) {
 #endif
     {
       char *sp = RSTRING_PTR(v);
-      int slen = RSTRING_LEN(v);
+      size_t slen = RSTRING_LEN(v);
       while (slen && *sp == 0) {
         slen--;
         sp++;
       }
+
+#ifdef HAVE_RB_INTEGER_UNPACK
+
+      res = rb_integer_unpack(sp, slen, 1, 0, INTEGER_PACK_BIG_ENDIAN);
+      /* (const void *words, size_t numwords, size_t wordsize, size_t nails, int flags); */
+
+#else
+
 #ifndef CANT_DO_BIGNUMS_FAST_ON_THIS_PLATFORM
       int ndig = (slen + SIZEOF_BDIGITS - 1)/SIZEOF_BDIGITS;
       res = rb_big_new(ndig, 1);
@@ -554,6 +563,7 @@ static VALUE msgpack_unpacker_process_tag(uint64_t tag, VALUE v) {
         res = rb_cstr2inum(hex, 16);
         xfree(hex);
       }
+#endif
 #endif
       if (tag == TAG_BIGNUM)    /* non-negative */
 #ifndef CANT_DO_BIGNUMS_FAST_ON_THIS_PLATFORM
@@ -626,7 +636,7 @@ int msgpack_unpacker_read(msgpack_unpacker_t* uk, size_t target_stack_depth)
               continue;
             case STACK_TYPE_STRING_INDEF:
               if (r == PRIMITIVE_BREAK) {
-                object_complete_string(uk, top->object, top->count); /* use count as textflag */
+                object_complete_string(uk, top->object, (int)top->count); /* use count as textflag */
                 goto done;
               }
               if (!RB_TYPE_P(uk->last_object, T_STRING))

data/lib/cbor/version.rb

@@ -1,3 +1,3 @@
 module CBOR
-	VERSION = "0.5.8.0"
+	VERSION = "0.5.9.0"
 end

data/spec/format_spec.rb

@@ -231,6 +231,17 @@ describe MessagePack do
     match obj, "\xA0"
   end
 
+  it "very simple bignums" do
+    CBOR.decode("\xc2\x40").should == 0
+    CBOR.decode("\xc2\x41\x00").should == 0
+    CBOR.decode("\xc2\x41a").should == 97
+    CBOR.decode("\xc2\x42aa").should == 24929
+    CBOR.decode("\xc3\x40").should == ~0
+    CBOR.decode("\xc3\x41\x00").should == ~0
+    CBOR.decode("\xc3\x41a").should == ~97
+    CBOR.decode("\xc3\x42aa").should == ~24929
+  end
+
   it "0x982173487123985791827359872948752345" do
     check_bn(0x982173487123985791827359872948752345, 0xc2)
     check_bn(-0x982173487123985791827359872948752345, 0xc3)

data/spec/spec_helper.rb

@@ -1,8 +1,23 @@
+require 'rubygems'              # for 1.8
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+  config.mock_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+end
+
+
 class String
   if ''.respond_to? :encode
     def encode_as_utf8
       encode(Encoding::UTF_8)
     end
+    def force_as_utf8
+      force_encoding(Encoding::UTF_8)
+    end
     unless String.instance_methods.include?(:b)
       def b
         dup.force_encoding(Encoding::BINARY)
@@ -12,10 +27,18 @@ class String
     def encode_as_utf8
       self                      # MRI 1.8
     end
+    def force_as_utf8
+      self                      # MRI 1.8
+    end
     def b
       self
     end
   end
+  unless ''.respond_to? :clear
+    def clear
+      replace('')
+    end
+  end
   def hexbytes(sep = '')
     bytes.map{|x| "%02x" % x}.join(sep)
   end

data/spec/unpacker_spec.rb

@@ -24,11 +24,33 @@ describe Unpacker do
     }.should raise_error(MessagePack::TypeError)
   end
 
+  it 'read_array_header converts an array to value sequence' do
+    packer.write_array_header(2)
+    packer.write("e")
+    packer.write(1)
+    unpacker = Unpacker.new
+    unpacker.feed(packer.to_s)
+    unpacker.read_array_header.should == 2
+    unpacker.read.should == "e"
+    unpacker.read.should == 1
+  end
+
   it 'read_map_header succeeds' do
     unpacker.feed("\xa1")
     unpacker.read_map_header.should == 1
   end
 
+  it 'read_map_header converts an map to key-value sequence' do
+    packer.write_map_header(1)
+    packer.write("k")
+    packer.write("v")
+    unpacker = Unpacker.new
+    unpacker.feed(packer.to_s)
+    unpacker.read_map_header.should == 1
+    unpacker.read.should == "k"
+    unpacker.read.should == "v"
+  end
+
   it 'read_map_header fails' do
     unpacker.feed("\x81")
     lambda {
@@ -144,14 +166,14 @@ describe Unpacker do
   end
 
   it 'frozen short strings' do
-    raw = sample_object.to_cbor.to_s.force_encoding('UTF-8')
+    raw = sample_object.to_cbor.to_s.force_as_utf8
     lambda {
       unpacker.feed_each(raw.freeze) { }
     }.should_not raise_error
   end
 
   it 'frozen long strings' do
-    raw = (sample_object.to_cbor.to_s * 10240).force_encoding('UTF-8')
+    raw = (sample_object.to_cbor.to_s * 10240).force_as_utf8
     lambda {
       unpacker.feed_each(raw.freeze) { }
     }.should_not raise_error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor
 version: !ruby/object:Gem::Version
-  version: 0.5.8.0
+  version: 0.5.9.0
 platform: ruby
 authors:
 - Carsten Bormann, standing on the tall shoulders of Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: CBOR, Concise Binary Object Representation.