msgpack 0.5.5 → 0.5.6

data/ChangeLog

@@ -1,4 +1,11 @@
 
+2013-09-23 version 0.5.6:
+
+* Fixed "can't modify frozen String" exception in Unpacker with ruby 2.1.0-dev
+* Getting work with Ruby v2.0 on Windows (Thank you @thegreendroid)
+* Fixed EOFError handling in Unpacker
+
+
 2013-05-12 version 0.5.5:
 
 * Fixed SEGV problem in to_msgpack

data/README.rdoc

@@ -17,6 +17,12 @@ Use RubyGems to install:
 
     gem install msgpack
 
+or build msgpack-ruby and install:
+
+    bundle
+    rake
+    gem install --local pkg/msgpack
+
 
 = Use cases
 
@@ -93,10 +99,30 @@ MessagePack for Ruby provides a buffer API so that you can read or write data by
 This {MessagePack::Buffer}[http://ruby.msgpack.org/MessagePack/Buffer.html] is backed with a fixed-length shared memory pool which is very fast for small data (<= 4KB),
 and has zero-copy capability which significantly affects performance to handle large binary data.
 
+= How to build and run tests
+
+Before building msgpack, you need to install bundler and dependencies.
+
+    gem install bundler
+    bundle install
+
+Then, you can run the tasks as follows:
+
+* Build
+
+    bundle exec rake build
+
+* Run tests
+
+    bundle exec rake spec
+
+* Generating docs
+
+    bundle exec rake doc
 
 = Copyright
 
-Author::    FURUHASHI Sadayuki <frsyuki@gmail.com>
-Copyright:: Copyright (c) 2008-2012 FURUHASHI Sadayuki
+Author::    Sadayuki Furuhashi <frsyuki@gmail.com>
+Copyright:: Copyright (c) 2008-2013 Sadayuki Furuhashi
 License::   Apache License, Version 2.0
 

data/Rakefile

@@ -61,8 +61,9 @@ task :default => :build
 ## Ubuntu Ubuntu 10.04.1 LTS
 ##
 #
-### install mingw32 cross compiler
+### install mingw32 cross compiler with w64 support
 # sudo apt-get install gcc-mingw32
+# sudo apt-get install mingw-w64
 #
 ### install rbenv
 # git clone git://github.com/sstephenson/rbenv.git ~/.rbenv

data/ext/msgpack/buffer.c

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby
  *
- * Copyright (C) 2008-2012 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -165,6 +165,8 @@ size_t msgpack_buffer_read_to_string_nonblock(msgpack_buffer_t* b, VALUE string,
 #else
         rb_str_replace(string, s);
 #endif
+        /* here doesn't have to call ENCODING_SET because
+         * encoding of s is always ASCII-8BIT */
         _msgpack_buffer_consumed(b, length);
         return length;
     }
@@ -307,8 +309,8 @@ static inline void _msgpack_buffer_append_reference(msgpack_buffer_t* b, VALUE s
 
     _msgpack_buffer_add_new_chunk(b);
 
-    char* data = RSTRING_PTR(string);
-    size_t length = RSTRING_LEN(string);
+    char* data = RSTRING_PTR(mapped_string);
+    size_t length = RSTRING_LEN(mapped_string);
 
     b->tail.first = (char*) data;
     b->tail.last = (char*) data + length;

data/ext/msgpack/buffer.h

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby
  *
- * Copyright (C) 2008-2012 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -418,11 +418,11 @@ static inline VALUE _msgpack_buffer_refer_head_mapped_string(msgpack_buffer_t* b
     return rb_str_substr(b->head->mapped_string, offset, length);
 }
 
-static inline VALUE msgpack_buffer_read_top_as_string(msgpack_buffer_t* b, size_t length, bool frozen)
+static inline VALUE msgpack_buffer_read_top_as_string(msgpack_buffer_t* b, size_t length, bool will_be_frozen)
 {
 #ifndef DISABLE_BUFFER_READ_REFERENCE_OPTIMIZE
     /* optimize */
-    if(!frozen &&
+    if(!will_be_frozen &&
             b->head->mapped_string != NO_MAPPED_STRING &&
             length >= b->read_reference_threshold) {
         VALUE result = _msgpack_buffer_refer_head_mapped_string(b, length);
@@ -432,9 +432,6 @@ static inline VALUE msgpack_buffer_read_top_as_string(msgpack_buffer_t* b, size_
 #endif
 
     VALUE result = rb_str_new(b->read_buffer, length);
-    if(frozen) {
-        rb_obj_freeze(result);
-    }
     _msgpack_buffer_consumed(b, length);
     return result;
 }

data/ext/msgpack/buffer_class.c

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby
  *
- * Copyright (C) 2008-2012 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

data/ext/msgpack/buffer_class.h

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby
  *
- * Copyright (C) 2008-2012 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

data/ext/msgpack/compat.h

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby
  *
- * Copyright (C) 2008-2012 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

data/ext/msgpack/core_ext.c

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby
  *
- * Copyright (C) 2008-2012 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

data/ext/msgpack/core_ext.h

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby
  *
- * Copyright (C) 2008-2012 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

data/ext/msgpack/packer.c

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby
  *
- * Copyright (C) 2008-2012 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

data/ext/msgpack/packer.h

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby
  *
- * Copyright (C) 2008-2012 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

data/ext/msgpack/packer_class.c

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby
  *
- * Copyright (C) 2008-2012 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

data/ext/msgpack/packer_class.h

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby
  *
- * Copyright (C) 2008-2012 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

data/ext/msgpack/rbinit.c

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby
  *
- * Copyright (C) 2008-2012 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

data/ext/msgpack/rmem.c

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby
  *
- * Copyright (C) 2008-2012 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

data/ext/msgpack/rmem.h

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby
  *
- * Copyright (C) 2008-2012 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

data/ext/msgpack/sysdep.h

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby
  *
- * Copyright (C) 2008-2012 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

data/ext/msgpack/sysdep_endian.h

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby
  *
- * Copyright (C) 2008-2012 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

data/ext/msgpack/sysdep_types.h

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby
  *
- * Copyright (C) 2008-2012 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

data/ext/msgpack/unpacker.c

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby
  *
- * Copyright (C) 2008-2012 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -149,9 +149,8 @@ static inline int object_complete(msgpack_unpacker_t* uk, VALUE object)
 
 static inline int object_complete_string(msgpack_unpacker_t* uk, VALUE str)
 {
-    // TODO ruby 2.0 has String#b method
 #ifdef COMPAT_HAVE_ENCODING
-    //str_modifiable(str);
+    // TODO ruby 2.0 has String#b method
     ENCODING_SET(str, s_enc_utf8);
 #endif
     return object_complete(uk, str);
@@ -257,9 +256,12 @@ static inline int read_raw_body_begin(msgpack_unpacker_t* uk)
     if(length <= msgpack_buffer_top_readable_size(UNPACKER_BUFFER_(uk))) {
         /* don't use zerocopy for hash keys but get a frozen string directly
          * because rb_hash_aset freezes keys and it causes copying */
-        bool frozen = is_reading_map_key(uk);
-        VALUE string = msgpack_buffer_read_top_as_string(UNPACKER_BUFFER_(uk), length, frozen);
+        bool will_freeze = is_reading_map_key(uk);
+        VALUE string = msgpack_buffer_read_top_as_string(UNPACKER_BUFFER_(uk), length, will_freeze);
         object_complete_string(uk, string);
+        if(will_freeze) {
+            rb_obj_freeze(string);
+        }
         uk->reading_raw_remaining = 0;
         return PRIMITIVE_OBJECT_COMPLETE;
     }

data/ext/msgpack/unpacker.h

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby
  *
- * Copyright (C) 2008-2012 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

data/ext/msgpack/unpacker_class.c

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby
  *
- * Copyright (C) 2008-2012 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -260,12 +260,12 @@ static VALUE Unpacker_each(VALUE self)
 #endif
 
     if(msgpack_buffer_has_io(UNPACKER_BUFFER_(uk))) {
-        return Unpacker_each_impl(self);
-    } else {
         /* rescue EOFError only if io is set */
         return rb_rescue2(Unpacker_each_impl, self,
                 Unpacker_rescue_EOFError, self,
                 rb_eEOFError, NULL);
+    } else {
+        return Unpacker_each_impl(self);
     }
 }
 

data/ext/msgpack/unpacker_class.h

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby
  *
- * Copyright (C) 2008-2012 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2013 Sadayuki Furuhashi
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

data/lib/msgpack.rb

@@ -3,7 +3,6 @@ require File.join(here, 'msgpack', 'version')
 begin
   m = /(\d+.\d+)/.match(RUBY_VERSION)
   ver = m[1]
-  ver = '1.9' if ver == '2.0'
   require File.join(here, 'msgpack', ver, 'msgpack')
 rescue LoadError
   require File.join(here, 'msgpack', 'msgpack')

data/lib/msgpack/version.rb

@@ -1,3 +1,3 @@
 module MessagePack
-	VERSION = "0.5.5"
+	VERSION = "0.5.6"
 end

data/msgpack.gemspec

@@ -6,8 +6,9 @@ Gem::Specification.new do |s|
   s.version = MessagePack::VERSION
   s.summary = "MessagePack, a binary-based efficient data interchange format."
   s.description = %q{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.}
-  s.author = "FURUHASHI Sadayuki"
+  s.author = "Sadayuki Furuhashi"
   s.email = "frsyuki@gmail.com"
+  s.license = "Apache 2.0"
   s.homepage = "http://msgpack.org/"
   s.rubyforge_project = "msgpack"
   s.has_rdoc = false

data/spec/unpacker_spec.rb

@@ -138,6 +138,20 @@ describe Unpacker do
     unpacker.buffer.object_id.should == o1
   end
 
+  it 'frozen short strings' do
+    raw = sample_object.to_msgpack.to_s.force_encoding('UTF-8')
+    lambda {
+      unpacker.feed_each(raw.freeze) { }
+    }.should_not raise_error
+  end
+
+  it 'frozen long strings' do
+    raw = (sample_object.to_msgpack.to_s * 10240).force_encoding('UTF-8')
+    lambda {
+      unpacker.feed_each(raw.freeze) { }
+    }.should_not raise_error
+  end
+
   it 'read raises level stack too deep error' do
     512.times { packer.write_array_header(1) }
     packer.write(nil)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: msgpack
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
-- FURUHASHI Sadayuki
+- Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,7 +164,8 @@ files:
 - spec/spec_helper.rb
 - spec/unpacker_spec.rb
 homepage: http://msgpack.org/
-licenses: []
+licenses:
+- Apache 2.0
 post_install_message: 
 rdoc_options: []
 require_paths: