msgpack 0.5.8-x86-mingw32 → 0.5.9-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  metadata.gz: 168f0afcffc21c9fc7fa34d194fbb9108ba5373c
-  data.tar.gz: 49c15b833c1229cf9b4ace272f2260baa5adb4bb
 SHA512: 
-  metadata.gz: fbd82ec3dbc2349ec7727ec7457dcb1929a9095d331161fe91e7e4fef31b66e874911f5e68878ccd63d03328cc6fae5b38b9b06ebeb2b4c0ac0b0fe8336c457d
-  data.tar.gz: 04beab2aa8c28ae6aed008f97cfda632dba370b4e7a892c89d80d67e4f3262e81503ba425ae2aa926e085b518afd325d9e2b295bd753c6205503e062a77c62e3
+  metadata.gz: 36c46946487df8c6398f7edc8d51f152a277b55c18c23da7c6fff3648f5858e406031dc331eb1f5594c406b67b047842fdfede1646c44c84530eb06d28876c9b
+  data.tar.gz: f7e48f52f63226041c955a3fd098ee62be7525b90a33d69e90e87e0098e866ed226454270ccfb4410c37a582d1167e0b851e8f3df7485d44dac79df53440a06c
+SHA1: 
+  metadata.gz: 3cb555badb7b839b1d56f93bc7b6401a0c731cbb
+  data.tar.gz: 9911e95d2763588c04f42229cd000a3a5fc5e469

data/.gitignore

@@ -1,5 +1,6 @@
 *.o
 *.so
+*.bundle
 *.gem
 *.class
 .bundle

data/.travis.yml

@@ -0,0 +1,26 @@
+language: ruby
+
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0
+  - 2.1
+  - ruby-head
+  - rbx-2
+  #- jruby-18mode
+  #- jruby-19mode
+
+os:
+  - linux
+  - osx
+
+branches:
+  only:
+    - master
+
+gemfile:
+  - Gemfile
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/ChangeLog

@@ -1,4 +1,10 @@
 
+2014-10-05 version 0.5.9:
+
+* Fixed Unpacker#read_map_header and #read_array_header
+* Added support for Symbol GC added since MRI 2.2.0
+
+
 2013-12-14 version 0.5.8:
 
 * Fixed compatibility with Ruby 2.1.0

data/README.rdoc

@@ -26,6 +26,7 @@ or build msgpack-ruby and install:
 
 = Use cases
 
+* Create REST API returing MessagePack using Rails + [RABL](https://github.com/nesquena/rabl)
 * Store objects efficiently serialized by msgpack on memcached or Redis
   * In fact Redis supports msgpack in EVAL-scripts[http://redis.io/commands/eval]
 * Upload data in efficient format from mobile devices such as smartphones

data/Rakefile

@@ -8,13 +8,6 @@ require 'rspec/core'
 require 'rspec/core/rake_task'
 require 'yard'
 
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = ["-c", "-f progress"]
-  t.rspec_opts << "-Ilib"
-  t.pattern = 'spec/**/*_spec.rb'
-  t.verbose = true
-end
-
 task :spec => :compile
 
 desc 'Run RSpec code examples and measure coverage'
@@ -37,21 +30,37 @@ if RUBY_PLATFORM =~ /java/
 
   Rake::JavaExtensionTask.new('msgpack', spec) do |ext|
     ext.ext_dir = 'ext/java'
-    #jruby_home = RbConfig::CONFIG['prefix']
-    #jars = ["#{jruby_home}/lib/jruby.jar"] + FileList['lib/*.jar']
-    #ext.classpath = jars.map { |x| File.expand_path x }.join ':'
+    ext.lib_dir = File.join(*['lib', 'msgpack', ENV['FAT_DIR']].compact)
+    ext.classpath = Dir['lib/msgpack/java/*.jar'].map { |x| File.expand_path x }.join ':'
+  end
+
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.rspec_opts = ["-c", "-f progress"]
+    t.rspec_opts << "-Ilib"
+    t.pattern = 'spec/{,jruby/}*_spec.rb'
+    t.verbose = true
   end
 
 else
   require 'rake/extensiontask'
 
   Rake::ExtensionTask.new('msgpack', spec) do |ext|
+    ext.ext_dir = 'ext/msgpack'
     ext.cross_compile = true
     ext.lib_dir = File.join(*['lib', 'msgpack', ENV['FAT_DIR']].compact)
     #ext.cross_platform = 'i386-mswin32'
   end
+
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.rspec_opts = ["-c", "-f progress"]
+    t.rspec_opts << "-Ilib"
+    t.pattern = 'spec/{,cruby/}*_spec.rb'
+    t.verbose = true
+  end
 end
 
+CLEAN.include('lib/msgpack/msgpack.*')
+
 task :default => [:spec, :build, :doc]
 
 

data/doclib/msgpack/packer.rb

@@ -1,8 +1,7 @@
 module MessagePack
 
   #
-  # MessagePack::Packer is an interface to serialize objects into an internal buffer,
-  # which is a MessagePack::Buffer.
+  # MessagePack::Packer is a class to serialize objects.
   #
   class Packer
     #
@@ -31,7 +30,7 @@ module MessagePack
     attr_reader :buffer
 
     #
-    # Serializes an object into internal buffer.
+    # Serializes an object into internal buffer, and flushes to io if necessary.
     #
     # If it could not serialize the object, it raises
     # NoMethodError: undefined method `to_msgpack' for #<the_object>.

data/doclib/msgpack/unpacker.rb

@@ -1,8 +1,7 @@
 module MessagePack
 
   #
-  # MessagePack::Unpacker is an interface to deserialize objects from an internal buffer,
-  # which is a MessagePack::Buffer.
+  # MessagePack::Unpacker is a class to deserialize objects.
   #
   class Unpacker
     #
@@ -34,11 +33,16 @@ module MessagePack
     attr_reader :buffer
 
     #
-    # Deserializes an object from internal buffer and returns it.
+    # Deserializes an object from the io or internal buffer and returns it.
     #
-    # If there're not enough buffer, this method raises EOFError.
+    # This method reads data from io into the internal buffer and deserializes an object
+    # from the buffer. It repeats reading data from the io until enough data is available
+    # to deserialize at least one object. After deserializing one object, unused data is
+    # left in the internal buffer.
+    #
+    # If there're not enough data to deserialize one object, this method raises EOFError.
     # If data format is invalid, this method raises MessagePack::MalformedFormatError.
-    # If the stack is too deep, this method raises MessagePack::StackError.
+    # If the object nests too deeply, this method raises MessagePack::StackError.
     #
     # @return [Object] deserialized object
     #
@@ -50,7 +54,7 @@ module MessagePack
     #
     # Deserializes an object and ignores it. This method is faster than _read_.
     #
-    # This method could raise same errors with _read_.
+    # This method could raise the same errors with _read_.
     #
     # @return nil
     #
@@ -62,7 +66,7 @@ module MessagePack
     # Otherwise, if a byte exists but the byte doesn't represent nil value,
     # returns _false_.
     #
-    # If there're not enough buffer, this method raises EOFError.
+    # If there're not enough data, this method raises EOFError.
     #
     # @return [Boolean]
     #
@@ -74,7 +78,7 @@ module MessagePack
     # It converts a serialized array into a stream of elements.
     #
     # If the serialized object is not an array, it raises MessagePack::TypeError.
-    # If there're not enough buffer, this method raises EOFError.
+    # If there're not enough data, this method raises EOFError.
     #
     # @return [Integer] size of the array
     #
@@ -86,7 +90,7 @@ module MessagePack
     # It converts a serialized map into a stream of key-value pairs.
     #
     # If the serialized object is not a map, it raises MessagePack::TypeError.
-    # If there're not enough buffer, this method raises EOFError.
+    # If there're not enough data, this method raises EOFError.
     #
     # @return [Integer] size of the map
     #
@@ -95,7 +99,7 @@ module MessagePack
 
     #
     # Appends data into the internal buffer.
-    # This method calls buffer.append(data).
+    # This method is equivalent to unpacker.buffer.append(data).
     #
     # @param data [String]
     # @return [Unpacker] self
@@ -106,7 +110,7 @@ module MessagePack
     #
     # Repeats to deserialize objects.
     #
-    # It repeats until the internal buffer does not include any complete objects.
+    # It repeats until the io or internal buffer does not include any complete objects.
     #
     # If the an IO is set, it repeats to read data from the IO when the buffer
     # becomes empty until the IO raises EOFError.
@@ -121,7 +125,7 @@ module MessagePack
 
     #
     # Appends data into the internal buffer and repeats to deserialize objects.
-    # This method is equals to feed(data) && each.
+    # This method is equivalent to unpacker.feed(data) && unpacker.each { ... }.
     #
     # @param data [String]
     # @yieldparam object [Object] deserialized object
@@ -131,7 +135,7 @@ module MessagePack
     end
 
     #
-    # Resets deserialization state of the unpacker and clears the internal buffer.
+    # Clears the internal buffer and resets deserialization state of the unpacker.
     #
     # @return nil
     #

data/ext/msgpack/extconf.rb

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

data/ext/msgpack/packer.h

@@ -334,15 +334,20 @@ 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);
+    /* actual return type of strlen is size_t */
     if(len > 0xffffffffUL) {
         // TODO rb_eArgError?
         rb_raise(rb_eArgError, "size of symbol is too long to pack: %lu bytes should be <= %lu", len, 0xffffffffUL);
     }
     msgpack_packer_write_raw_header(pk, (unsigned int)len);
     msgpack_buffer_append(PACKER_BUFFER_(pk), name, len);
+#endif
 }
 
 static inline void msgpack_packer_write_fixnum_value(msgpack_packer_t* pk, VALUE v)

data/ext/msgpack/unpacker.c

@@ -549,6 +549,7 @@ int msgpack_unpacker_read_array_header(msgpack_unpacker_t* uk, uint32_t* result_
         return PRIMITIVE_UNEXPECTED_TYPE;
     }
 
+    reset_head_byte(uk);
     return 0;
 }
 
@@ -576,6 +577,7 @@ int msgpack_unpacker_read_map_header(msgpack_unpacker_t* uk, uint32_t* result_si
         return PRIMITIVE_UNEXPECTED_TYPE;
     }
 
+    reset_head_byte(uk);
     return 0;
 }
 
@@ -609,11 +611,16 @@ int msgpack_unpacker_read(msgpack_unpacker_t* uk, size_t target_stack_depth)
             case STACK_TYPE_MAP_VALUE:
                 if(uk->symbolize_keys && rb_type(top->key) == T_STRING) {
                     /* here uses rb_intern_str instead of rb_intern so that Ruby VM can GC unused symbols */
+#ifdef HAVE_RB_STR_INTERN
+                    /* rb_str_intern is added since MRI 2.2.0 */
+                    rb_hash_aset(top->object, rb_str_intern(top->key), uk->last_object);
+#else
 #ifndef HAVE_RB_INTERN_STR
                     /* MRI 1.8 doesn't have rb_intern_str or rb_intern2 */
                     rb_hash_aset(top->object, ID2SYM(rb_intern(RSTRING_PTR(top->key))), uk->last_object);
 #else
                     rb_hash_aset(top->object, ID2SYM(rb_intern_str(top->key)), uk->last_object);
+#endif
 #endif
                 } else {
                     rb_hash_aset(top->object, top->key, uk->last_object);

data/lib/msgpack/version.rb

@@ -1,3 +1,3 @@
 module MessagePack
-	VERSION = "0.5.8"
+	VERSION = "0.5.9"
 end

data/msgpack.org.md

@@ -0,0 +1,46 @@
+# MessagePack for Ruby
+
+```
+require 'msgpack'
+msg = [1,2,3].to_msgpack  #=> "\x93\x01\x02\x03"
+MessagePack.unpack(msg)   #=> [1,2,3]
+```
+
+## Install
+
+```
+gem install msgpack
+```
+
+## Use cases
+
+* Create REST API returing MessagePack using Rails + [RABL](https://github.com/nesquena/rabl)
+* Store objects efficiently in memcached or Redis
+* Upload data in efficient format from mobile devices. See also MessagePack for [Objective-C](https://github.com/msgpack/msgpack-objectivec) and [Java](https://github.com/msgpack/msgpack-java)
+
+## Links
+
+* [Github](https://github.com/msgpack/msgpack-ruby)
+* [API document](http://ruby.msgpack.org/)
+
+## Streaming API
+
+```
+# serialize a 2-element array [e1, e2]
+pk = MessagePack::Packer.new(io)
+pk.write_array_header(2).write(e1).write(e2).flush
+```
+
+```
+# deserialize objects from an IO
+u = MessagePack::Unpacker.new(io)
+u.each { |obj| ... }
+```
+
+```
+# event-driven deserialization
+def on_read(data)
+  @u ||= MessagePack::Unpacker.new
+  @u.feed_each(data) { |obj| ... }
+end
+```

data/spec/cruby/buffer_packer.rb

@@ -0,0 +1,29 @@
+# encoding: ascii-8bit
+require 'spec_helper'
+
+require 'stringio'
+if defined?(Encoding)
+  Encoding.default_external = 'ASCII-8BIT'
+end
+
+describe Packer do
+  let :packer do
+    Packer.new
+  end
+
+  it 'initialize' do
+    Packer.new
+    Packer.new(nil)
+    Packer.new(StringIO.new)
+    Packer.new({})
+    Packer.new(StringIO.new, {})
+  end
+
+  it 'buffer' do
+    o1 = packer.buffer.object_id
+    packer.buffer << 'frsyuki'
+    packer.buffer.to_s.should == 'frsyuki'
+    packer.buffer.object_id.should == o1
+  end
+end
+

data/spec/cruby/buffer_unpacker.rb

@@ -0,0 +1,19 @@
+# encoding: ascii-8bit
+require 'spec_helper'
+
+describe Unpacker do
+  let :unpacker do
+    Unpacker.new
+  end
+
+  let :packer do
+    Packer.new
+  end
+
+  it 'buffer' do
+    o1 = unpacker.buffer.object_id
+    unpacker.buffer << 'frsyuki'
+    unpacker.buffer.to_s.should == 'frsyuki'
+    unpacker.buffer.object_id.should == o1
+  end
+end

data/spec/packer_spec.rb

@@ -65,13 +65,6 @@ describe Packer do
     io.string.should == "\xc0"
   end
 
-  it 'buffer' do
-    o1 = packer.buffer.object_id
-    packer.buffer << 'frsyuki'
-    packer.buffer.to_s.should == 'frsyuki'
-    packer.buffer.object_id.should == o1
-  end
-
   it 'to_msgpack returns String' do
     nil.to_msgpack.class.should == String
     true.to_msgpack.class.should == String

data/spec/unpacker_spec.rb

@@ -24,11 +24,33 @@ describe Unpacker do
     }.should raise_error(MessagePack::TypeError)
   end
 
+  it 'read_map_header converts an map to key-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("\x81")
     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("\x91")
     lambda {
@@ -53,7 +75,8 @@ describe Unpacker do
     packer.write(4)
     packer.write(5)
 
-    unpacker = Unpacker.new(packer.buffer)
+    unpacker = Unpacker.new
+    unpacker.feed(packer.to_s)
 
     unpacker.read.should == 1
     unpacker.skip
@@ -131,13 +154,6 @@ describe Unpacker do
     unpacker.each.map {|x| x }.should == [1]
   end
 
-  it 'buffer' do
-    o1 = unpacker.buffer.object_id
-    unpacker.buffer << 'frsyuki'
-    unpacker.buffer.to_s.should == 'frsyuki'
-    unpacker.buffer.object_id.should == o1
-  end
-
   it 'frozen short strings' do
     raw = sample_object.to_msgpack.to_s.force_encoding('UTF-8')
     lambda {
@@ -156,7 +172,8 @@ describe Unpacker do
     512.times { packer.write_array_header(1) }
     packer.write(nil)
 
-    unpacker = Unpacker.new(packer.buffer)
+    unpacker = Unpacker.new
+    unpacker.feed(packer.to_s)
     lambda {
       unpacker.read
     }.should raise_error(MessagePack::StackError)
@@ -166,7 +183,8 @@ describe Unpacker do
     512.times { packer.write_array_header(1) }
     packer.write(nil)
 
-    unpacker = Unpacker.new(packer.buffer)
+    unpacker = Unpacker.new
+    unpacker.feed(packer.to_s)
     lambda {
       unpacker.skip
     }.should raise_error(MessagePack::StackError)
@@ -232,8 +250,8 @@ describe Unpacker do
 
   it 'MessagePack.unpack symbolize_keys' do
     symbolized_hash = {:a => 'b', :c => 'd'}
-    MessagePack.load(MessagePack.pack(symbolized_hash), symbolize_keys: true).should == symbolized_hash
-    MessagePack.unpack(MessagePack.pack(symbolized_hash), symbolize_keys: true).should == symbolized_hash
+    MessagePack.load(MessagePack.pack(symbolized_hash), :symbolize_keys => true).should == symbolized_hash
+    MessagePack.unpack(MessagePack.pack(symbolized_hash), :symbolize_keys => true).should == symbolized_hash
   end
 
   it 'Unpacker#unpack symbolize_keys' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: msgpack
 version: !ruby/object:Gem::Version 
-  version: 0.5.8
+  version: 0.5.9
 platform: x86-mingw32
 authors: 
 - Sadayuki Furuhashi
@@ -9,68 +9,68 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-12-14 00:00:00 Z
+date: 2014-10-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "1.0"
-  name: bundler
   prerelease: false
+  type: :development
   requirement: *id001
+  name: bundler
 - !ruby/object:Gem::Dependency 
-  type: :development
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.9.2
-  name: rake
   prerelease: false
+  type: :development
   requirement: *id002
+  name: rake
 - !ruby/object:Gem::Dependency 
-  type: :development
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.8.3
-  name: rake-compiler
   prerelease: false
+  type: :development
   requirement: *id003
+  name: rake-compiler
 - !ruby/object:Gem::Dependency 
-  type: :development
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "2.11"
-  name: rspec
   prerelease: false
+  type: :development
   requirement: *id004
+  name: rspec
 - !ruby/object:Gem::Dependency 
-  type: :development
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "1.7"
-  name: json
   prerelease: false
+  type: :development
   requirement: *id005
+  name: json
 - !ruby/object:Gem::Dependency 
-  type: :development
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.8.2
-  name: yard
   prerelease: false
+  type: :development
   requirement: *id006
+  name: yard
 description: MessagePack is a binary-based efficient object serialization library. It enables to exchange structured objects between many languages like JSON. But unlike JSON, it is very fast and small.
 email: frsyuki@gmail.com
 executables: []
@@ -81,6 +81,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - ChangeLog
 - Gemfile
 - README.rdoc
@@ -114,22 +115,25 @@ files:
 - ext/msgpack/unpacker_class.c
 - ext/msgpack/unpacker_class.h
 - lib/msgpack.rb
+- lib/msgpack/1.8/msgpack.so
+- lib/msgpack/1.9/msgpack.so
+- lib/msgpack/2.0/msgpack.so
 - lib/msgpack/version.rb
 - msgpack.gemspec
-- spec/buffer_io_spec.rb
-- spec/buffer_spec.rb
+- msgpack.org.md
 - spec/cases.json
 - spec/cases.msg
 - spec/cases_compact.msg
 - spec/cases_spec.rb
+- spec/cruby/buffer_io_spec.rb
+- spec/cruby/buffer_packer.rb
+- spec/cruby/buffer_spec.rb
+- spec/cruby/buffer_unpacker.rb
 - spec/format_spec.rb
 - spec/packer_spec.rb
 - spec/random_compat.rb
 - spec/spec_helper.rb
 - spec/unpacker_spec.rb
-- lib/msgpack/1.8/msgpack.so
-- lib/msgpack/1.9/msgpack.so
-- lib/msgpack/2.0/msgpack.so
 homepage: http://msgpack.org/
 licenses: 
 - Apache 2.0
@@ -152,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: msgpack
-rubygems_version: 2.1.11
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: MessagePack, a binary-based efficient data interchange format.