msgpack-jruby 1.3.0-java → 1.3.1-java

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
 .bundle
 pkg/*
-/benchmark
+/benchmark
+/lib/ext/msgpack_jruby.jar

data/.rspec

@@ -1,3 +1,4 @@
+-Ilib
 --color
 --format doc
-
+spec

data/.rvmrc

@@ -1 +1,3 @@
-rvm --create use jruby-1.7.1@msgpack-jruby
+rvm jruby-1.6.7 gemset create msgpack-jruby
+rvm jruby-1.7.2 gemset create msgpack-jruby
+rvm use jruby-1.7.2@msgpack-jruby

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-1.7.0
+  - jruby-head
+jdk:
+  - openjdk7
+  - oraclejdk7
+  - openjdk6
+bundler_args: --without development

data/Gemfile

@@ -1,9 +1,11 @@
 source :rubygems
 
-gem 'jruby-openssl'
+gemspec
 
-group :test do
-  gem 'rspec'
+gem 'rake'
+
+group :development do
+  gem 'jruby-openssl'
   gem 'viiite'
   gem 'ffi-ncurses'
   gem 'bson'
@@ -11,3 +13,7 @@ group :test do
   gem 'json'
   gem 'msgpack', :platforms => :mri
 end
+
+group :test do
+  gem 'rspec'
+end

data/Gemfile.lock

@@ -1,3 +1,8 @@
+PATH
+  remote: .
+  specs:
+    msgpack-jruby (1.3.1-java)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -24,6 +29,7 @@ GEM
     msgpack (0.4.6)
     myrrha (1.2.1)
     quickl (0.4.1)
+    rake (10.0.2)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -48,5 +54,7 @@ DEPENDENCIES
   jruby-openssl
   json
   msgpack
+  msgpack-jruby!
+  rake
   rspec
   viiite

data/README.mdown

@@ -0,0 +1,26 @@
+# MessagePack for JRuby
+
+A MessagePack implementation for JRuby, built on top of the MessagePack Java libraries. Faster and easier to use than using the C MessagePack gem in JRuby.
+
+## Installation
+
+    gem install msgpack-jruby
+
+or with Bundler
+
+    gem 'msgpack-jruby', :require => 'msgpack'
+
+## Extra features
+
+* Decode keys as symbols by passing `:symbolize_keys => true` to `#unpack`.
+* Decode strings with their right encoding by passing `:encoding => Encoding::UTF_8` to `#unpack`.
+
+## Copyright
+
+Copyright 2012 Theo Hultberg
+
+_Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License You may obtain a copy of the License at_
+
+[http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
+
+_Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License._

data/Rakefile

@@ -1,9 +1,16 @@
 $: << 'lib'
 
 require 'bundler/setup'
+require 'rspec/core/rake_task'
 require 'msgpack/version'
 
 
+task :default => :spec
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :spec => :package
+
 task :clean do
   rm Dir['ext/java/**/*.class']
 end

data/ext/java/org/msgpack/jruby/MessagePackLibrary.java

@@ -89,6 +89,7 @@ public class MessagePackLibrary implements Library {
     private RubyObjectUnpacker rubyObjectUnpacker;
     private MessagePackBufferUnpacker bufferUnpacker;
     private MessagePackUnpacker streamUnpacker;
+    private UnpackerIterator unpackerIterator;
     private IRubyObject stream;
     private IRubyObject data;
     private RubyObjectUnpacker.CompiledOptions options;
@@ -165,6 +166,7 @@ public class MessagePackLibrary implements Library {
       byte[] bytes = data.asString().getBytes();
       if (bufferUnpacker == null) {
         bufferUnpacker = new MessagePackBufferUnpacker(msgPack);
+        unpackerIterator = bufferUnpacker.iterator();
       }
       bufferUnpacker.feed(bytes);
       return ctx.getRuntime().getNil();
@@ -188,7 +190,8 @@ public class MessagePackLibrary implements Library {
         return ctx.getRuntime().getNil();
       }
       if (block.isGiven()) {
-        for (Value value : localUnpacker) {
+        while (unpackerIterator.hasNext()) {
+          Value value = unpackerIterator.next();
           IRubyObject rubyObject = rubyObjectUnpacker.valueToRubyObject(ctx.getRuntime(), value, options);
           block.yield(ctx, rubyObject);
         }
@@ -235,7 +238,8 @@ public class MessagePackLibrary implements Library {
       } else {
         streamUnpacker = new MessagePackUnpacker(msgPack, new IOInputStream(stream));
       }
+      unpackerIterator = streamUnpacker.iterator();
       return getStream(ctx);
     }
   }
-}
+}

data/lib/msgpack/version.rb

@@ -1,3 +1,3 @@
 module MessagePack
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/spec/msgpack/unpacker_spec.rb

@@ -1,8 +1,8 @@
 # encoding: ascii-8bit
 
-require_relative '../spec_helper'
 require 'stringio'
 require 'tempfile'
+require 'spec_helper'
 
 
 describe ::MessagePack::Unpacker do
@@ -130,6 +130,17 @@ describe ::MessagePack::Unpacker do
       end
       objects.should == [{'foo' => 'bar'}, {'hello' => {'world' => [1, 2, 3]}}, {'x' => 'y'}]
     end
+
+    it 'handles chunked data' do
+      objects = []
+      buffer = buffer1 + buffer2 + buffer3
+      buffer.chars.each do |ch|
+        subject.feed_each(ch) do |obj|
+          objects << obj
+        end
+      end
+      objects.should == [{'foo' => 'bar'}, {'hello' => {'world' => [1, 2, 3]}}, {'x' => 'y'}]
+    end
   end
   
   describe '#fill' do
@@ -190,8 +201,7 @@ describe ::MessagePack::Unpacker do
       end
     end
 
-    context 'encoding' do
-
+    context 'encoding', :encodings do
       def flatten(struct, results = [])
         case struct
         when Array
@@ -240,6 +250,5 @@ describe ::MessagePack::Unpacker do
         strings.map(&:encoding).uniq.should == [Encoding::UTF_8]
       end
     end
-
   end
 end

data/spec/msgpack_spec.rb

@@ -1,6 +1,6 @@
 # encoding: ascii-8bit
 
-require_relative 'spec_helper'
+require 'spec_helper'
 
 
 describe MessagePack do
@@ -85,5 +85,11 @@ describe MessagePack do
       unpacked = MessagePack.unpack(packed, :symbolize_keys => true)
       unpacked.should == {:hello => 'world', :nested => ['object', {:structure => true}]}
     end
+
+    it 'can unpack strings with a specified encoding', :encodings do
+      packed = MessagePack.pack({'hello' => 'world'})
+      unpacked = MessagePack.unpack(packed, :encoding => Encoding::UTF_8)
+      unpacked['hello'].encoding.should == Encoding::UTF_8
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,10 @@
-$: << File.expand_path('../../lib', __FILE__)
+# encoding: utf-8
 
-require 'msgpack'
+require 'bundler/setup'
+require 'msgpack'
+
+
+RSpec.configure do |c|
+  c.treat_symbols_as_metadata_keys_with_true_values = true
+  c.filter_run_excluding :encodings => !(defined? Encoding)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msgpack-jruby
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease:
 platform: java
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies: []
 description: JRuby compatible MessagePack implementation that does not use FFI
 email:
@@ -18,11 +18,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rvmrc
+- ".gitignore"
+- ".rspec"
+- ".rvmrc"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
+- README.mdown
 - Rakefile
 - ext/.gitignore
 - ext/java/MsgpackJrubyService.java
@@ -31,7 +33,6 @@ files:
 - ext/java/org/msgpack/jruby/RubyObjectUnpacker.java
 - lib/ext/javassist-3.15.0-GA.jar
 - lib/ext/msgpack-0.6.6.jar
-- lib/ext/msgpack_jruby.jar
 - lib/msgpack.rb
 - lib/msgpack/version.rb
 - msgpack-jruby.gemspec
@@ -48,7 +49,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       segments:
       - 0
@@ -58,10 +59,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
+      segments:
+      - 0
       version: !binary |-
         MA==
+      hash: 2
   none: false
 requirements: []
 rubyforge_project: msgpack-jruby