cbor 0.5.6.4 → 0.5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbd9f75a0950815388c8f87da0acab19c6227e5a
-  data.tar.gz: 0d7d54f3811162926eff2af8d1a56a36ceaac85f
+  metadata.gz: f05161e936a40f076ec1389e1c2e0b3c780603b4
+  data.tar.gz: 73ee9389cd9fdd7c826caef32f8730340c29a019
 SHA512:
-  metadata.gz: a51ccc3cf050a569b3be7a80bdc848b04cd80b9a31338c485e0fce3277c1c7d2b37c21eebcbd054b11c8c911c81937c634bdd1acd3c7f82a1e15b9438957b8a1
-  data.tar.gz: 8c3a923d73a8539b576a8e63c8c5e7bf1b11f88b26386880e57af55a19c75b39bb18aa46ced3bd3583f2ea99032d210046731fbcc143d01fbc04b5711cb3dc7d
+  metadata.gz: dc63dfca2f83dfba9fabaffed1b9142df775dbd05c47f541b5127428545dc1c5700148326662e57b1a0f5572af56367cf0a522d91bc52cea8d621730542942f8
+  data.tar.gz: ca747d537cdd17c53f060819c45c22309859295a958d919a086e52496ef7a484f641e0e5f67c0da45bdb24e8013a4ce06cdb8a1a30d6e449e22614f445a206ff

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.9.3
   - 2.0.0
 #  - rbx-19mode
+  - 2.1.0
   - ruby-head
 matrix:
   allow_failures:

data/README.rdoc

@@ -1,6 +1,6 @@
 = CBOR for Ruby
 
-This is an initial Ruby implementation of the CBOR encoding, based on
+This is a Ruby implementation of the CBOR[http://cbor.io] encoding, based on
 the (polished) high-performance msgpack-ruby code.
 
 Documentation will follow, but generally, if you replace MessagePack
@@ -37,12 +37,14 @@ 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-preview1).
+  * \[✔✔✔] tested on MRI (1.9.3, 2.0.0, 2.1.0, 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.
   * \[_] 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.
+  ("streaming") capability at the Ruby API level.  (Decoding is fully
+  supported, just no streaming or indefinite length encoding.)
 
 * Rename some of the internals from msgpack to cbor.  Right now, much
   of the code still uses the name msgpack in its identifiers, to
@@ -53,7 +55,7 @@ Same Apache 2.0 License applies to the changes as to the original.
 For the changes:
 
 Author::    Carsten Bormann <cabo@tzi.org>
-Copyright:: Copyright (c) 2013 Carsten Bormann
+Copyright:: Copyright (c) 2013, 2014 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://badge.fury.io/rb/cbor.png" alt="Gem Version" />}[http://badge.fury.io/rb/cbor]

data/cbor.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.author = "Carsten Bormann, standing on the tall shoulders of Sadayuki Furuhashi"
   s.email = "cabo@tzi.org"
   s.license = "Apache 2.0"
-#  s.homepage = "http://msgpack.org/"
+  s.homepage = "http://cbor.io/"
 #  s.rubyforge_project = "msgpack"
   s.has_rdoc = false
   s.files = `git ls-files`.split("\n")

data/ext/cbor/buffer.h

@@ -454,7 +454,17 @@ static inline VALUE msgpack_buffer_read_top_as_string(msgpack_buffer_t* b, size_
 
     VALUE result;
     if (as_symbol) {
+#ifndef HAVE_RB_INTERN_STR
+      /* MRI 1.8 doesn't have rb_intern_str or rb_intern2, hack it... */
+      char *tmp = xmalloc(length+1);
+      memcpy(tmp, b->read_buffer, length);
+      tmp[length] = 0;
+      result = ID2SYM(rb_intern(tmp));
+      xfree(tmp);
+#else
       result = ID2SYM(rb_intern2(b->read_buffer, length));
+      /* FIXME: This is stuck at ASCII encoding */
+#endif
       /* todo: rb_check_id_cstr(const char *ptr, long len, rb_encoding *enc) */
     } else {
       result = rb_str_new(b->read_buffer, length);

data/ext/cbor/compat.h

@@ -116,10 +116,16 @@
   #define RBIGNUM_DIGITS(b)     (RBIGNUM(b)->digits)
 #endif
 #ifndef HAVE_RB_BIG_NEW
+/* not really worth fixing any more... */
+    #define CANT_DO_BIGNUMS_FAST_ON_THIS_PLATFORM
 /* gross 1.8.7 hack thanks to Mathieu Bouchard <matju@artengine.ca> */
 #define rb_big_new(len, sign) rb_funcall(INT2FIX(1),rb_intern("<<"),1,INT2FIX(len > 0 ? ((len) * SIZEOF_BDIGITS * 8) - 1 : 0));
 #endif
 
+#ifndef RB_TYPE_P
+  #define RB_TYPE_P(obj, type) (TYPE(obj) == (type))
+#endif
+
 /*
  * RSTRING_PTR, RSTRING_LEN
  */

data/ext/cbor/extconf.rb

@@ -4,6 +4,7 @@ have_header("ruby/st.h")
 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"])
 
 $CFLAGS << %[ -I.. -Wall -O3 -g -std=c99]
 #$CFLAGS << %[ -DDISABLE_RMEM]

data/ext/cbor/unpacker_class.c

@@ -87,7 +87,7 @@ static VALUE Unpacker_initialize(int argc, VALUE* argv, VALUE self)
         io = argv[0];
         options = argv[1];
         if(rb_type(options) != T_HASH) {
-            rb_raise(rb_eArgError, "expected Hash but found %s.", rb_obj_classname(io));
+            rb_raise(rb_eArgError, "expected Hash but found %s.", rb_obj_classname(options));
         }
 
     } else {
@@ -97,6 +97,11 @@ static VALUE Unpacker_initialize(int argc, VALUE* argv, VALUE self)
     UNPACKER(self, uk);
     if(io != Qnil || options != Qnil) {
         MessagePack_Buffer_initialize(UNPACKER_BUFFER_(uk), io, options);
+        if (options != Qnil) {
+          VALUE v;
+          v = rb_hash_aref(options, ID2SYM(rb_intern("symbolize_keys")));
+          uk->keys_as_symbols = RTEST(v);
+        }
     }
 
     // TODO options
@@ -305,10 +310,16 @@ VALUE MessagePack_unpack(int argc, VALUE* argv)
     switch(argc) {
     case 2:
       options = argv[1];        /* Experimental! */
-      if (options == ID2SYM(rb_intern("keys_as_symbols")))
+      if (options == ID2SYM(rb_intern("keys_as_symbols"))) /* backward compat */
         keys_as_symbols = true;
-      else
-        rb_raise(rb_eArgError, "unknown option");
+      else if (options != Qnil) {
+        VALUE v;
+        if (!RB_TYPE_P(options, T_HASH)) {
+          rb_raise(rb_eArgError, "expected Hash but found %s.", rb_obj_classname(options));
+        }
+        v = rb_hash_aref(options, ID2SYM(rb_intern("symbolize_keys")));
+        keys_as_symbols = RTEST(v);
+      }
       /* fall through */
     case 1:
         src = argv[0];

data/lib/cbor.rb

@@ -1,9 +1,6 @@
-here = File.expand_path(File.dirname(__FILE__))
-require File.join(here, 'cbor', 'version')
+require "cbor/version"
 begin
-  m = /(\d+.\d+)/.match(RUBY_VERSION)
-  ver = m[1]
-  require File.join(here, 'cbor', ver, 'cbor')
+  require "cbor/#{RUBY_VERSION[/\d+.\d+/]}/cbor"
 rescue LoadError
-  require File.join(here, 'cbor', 'cbor')
+  require "cbor/cbor"
 end

data/lib/cbor/version.rb

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

data/spec/format_spec.rb

@@ -390,11 +390,23 @@ describe MessagePack do
   end
 
   it "Keys as Symbols" do       # Experimental!
-    CBOR.decode(CBOR.encode({a: 1}), :keys_as_symbols).should == {a: 1}
-    CBOR.decode(CBOR.encode({a: 1})).should == {"a" => 1}
+    CBOR.decode(CBOR.encode({:a => 1}), :keys_as_symbols).should == {:a => 1}
+    CBOR.decode(CBOR.encode({:a => 1})).should == {"a" => 1}
     expect { CBOR.decode("\x00", :foobar) }.to raise_error(ArgumentError)
   end
 
+  it 'CBOR.decode symbolize_keys' do
+    symbolized_hash = {:a => 'b', :c => 'd'}
+    CBOR.decode(CBOR.encode(symbolized_hash), :symbolize_keys => true).should == symbolized_hash
+  end
+
+  it 'Unpacker#read symbolize_keys' do
+    unpacker = Unpacker.new(:symbolize_keys => true)
+    symbolized_hash = {:a => 'b', :c => 'd'}
+    unpacker.feed(CBOR.encode(symbolized_hash)).read.should == symbolized_hash
+  end
+
+
 ## FIXME
 #  it "{0=>0, 1=>1, ..., 14=>14}" do
 #    a = (0..14).to_a;

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: cbor
 version: !ruby/object:Gem::Version
-  version: 0.5.6.4
+  version: 0.5.8.0
 platform: ruby
 authors:
 - Carsten Bormann, standing on the tall shoulders of Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-08 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.2
 description: CBOR is a library for the CBOR binary object representation format, based
@@ -102,8 +102,8 @@ extensions:
 - ext/cbor/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - ChangeLog
 - Gemfile
 - README.rdoc
@@ -156,7 +156,7 @@ files:
 - spec/random_compat.rb
 - spec/spec_helper.rb
 - spec/unpacker_spec.rb
-homepage: 
+homepage: http://cbor.io/
 licenses:
 - Apache 2.0
 metadata: {}
@@ -166,17 +166,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: CBOR, Concise Binary Object Representation.
@@ -194,3 +194,4 @@ test_files:
 - spec/random_compat.rb
 - spec/spec_helper.rb
 - spec/unpacker_spec.rb
+has_rdoc: false