protobuf 2.6.3-java → 2.6.4-java

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 rvm:
   - "1.9.2"
   - "1.9.3"
-  - jruby-19mode
-  - ruby-head
-  - jruby-head
 script: NO_COMPILE_TEST_PROTOS=1 bundle exec rake spec
+before_install:
+ - sudo apt-get install -qq libzmq-dev

data/README.md

@@ -1,10 +1,11 @@
 # protobuf
 
+[![Gem Version](https://badge.fury.io/rb/protobuf.png)](http://badge.fury.io/rb/protobuf)
 [![Build Status](https://secure.travis-ci.org/localshred/protobuf.png?branch=master)](https://travis-ci.org/localshred/protobuf)
 
 ***IMPORTANT: Those upgrading from version 1.4.2 to 2.X should read the [UPGRADING.md](https://github.com/localshred/protobuf/blob/master/UPGRADING.md) notes***
 
-Protobuf is an implementation of [Google's protocol buffers][google-pb] in ruby. We currently support version 2.4.0. It's a gem for managing 3 things:
+Protobuf is an implementation of [Google's protocol buffers][google-pb] in ruby. We currently support version 2.4.1 with support for the new 2.5 coming shortly after it becomes final. It's a gem for managing 3 things:
 
 1. Generating ruby classes from `.proto` files.
 2. Provide an RPC mechanism for calling remote services.

data/ext/ruby_generator/RubyGenerator.cpp

@@ -114,7 +114,7 @@ void RubyGenerator::PrintMessage(const Descriptor* descriptor, bool print_fields
   map<string,string> data;
   data["class_name"] = descriptor->name();
 
-  if (print_fields) {
+  if (print_fields && (descriptor->field_count() > 0 || descriptor->extension_count() > 0)) {
     printer_->Print(data, "class $class_name$");
     PrintNewLine();
     printer_->Indent();

data/ext/ruby_generator/RubyGenerator.h

@@ -118,7 +118,6 @@ class LIBPROTOC_EXPORT RubyGenerator : public CodeGenerator {
 				}
 				else if (c == 95) { // underscore char
 					segment_end = true;
-					continue;
 				}
 				else if (segment_end) {
 					if (c >= 97 && c <= 122) { // a-z chars

data/lib/protobuf/enum.rb

@@ -7,7 +7,7 @@ module Protobuf
       enum_value = ::Protobuf::EnumValue.new(self, name, value)
       const_set(name, enum_value)
       @values ||= {}
-      @names ||= []
+      @names ||= {}
       @values[name] = enum_value
       @names[value] = name
     end

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.6.3'
+  VERSION = '2.6.4'
   PROTOC_VERSION = '2.4.1'
 end

data/spec/lib/protobuf/cli_spec.rb

@@ -121,16 +121,23 @@ describe ::Protobuf::CLI do
       context 'when not given' do
         let(:test_args) { [] }
 
-        it 'sets the deprecation warning flag to true when no ENV is present and no command line option' do
-          described_class.start(args)
-          ::Protobuf.print_deprecation_warnings?.should be_true
+        context 'when no ENV is present and no command line option' do
+          before { ENV.delete("PB_IGNORE_DEPRECATIONS") }
+
+          it 'sets the deprecation warning flag to true' do
+            described_class.start(args)
+            ::Protobuf.print_deprecation_warnings?.should be_true
+          end
         end
 
-        it 'sets the deprecation warning flag to false if ENV["PB_IGNORE_DEPRECATIONS"] is present' do
-          ENV["PB_IGNORE_DEPRECATIONS"] = "1"
-          described_class.start(args)
-          ::Protobuf.print_deprecation_warnings?.should be_false
-          ENV.delete("PB_IGNORE_DEPRECATIONS")
+        context 'if ENV["PB_IGNORE_DEPRECATIONS"] is present' do
+          before { ENV["PB_IGNORE_DEPRECATIONS"] = "1" }
+          after { ENV.delete("PB_IGNORE_DEPRECATIONS") }
+
+          it 'sets the deprecation warning flag to false ' do
+            described_class.start(args)
+            ::Protobuf.print_deprecation_warnings?.should be_false
+          end
         end
       end
 

data/spec/lib/protobuf/enum_spec.rb

@@ -2,9 +2,10 @@ require 'spec_helper'
 
 describe Protobuf::Enum do
   let(:name) { :THREE }
-  let(:tag) { 3 }
+  let(:tag)  { 3 }
 
   before(:all) do
+    Test::EnumTestType.define(:MINUS_ONE, -1)
     Test::EnumTestType.define(name, tag)
   end
 
@@ -47,7 +48,7 @@ describe Protobuf::Enum do
 
   describe '.enum_by_value' do
     it 'gets the EnumValue corresponding to the given value (tag)' do
-      Test::EnumTestType.enum_by_value(tag).should eq Test::EnumTestType::THREE
+      Test::EnumTestType.enum_by_value(tag).should eq Test::EnumTestType.const_get(name)
     end
   end
 
@@ -82,6 +83,7 @@ describe Protobuf::Enum do
   describe '.values' do
     it 'provides a hash of defined EnumValues' do
       Test::EnumTestType.values.should eq({
+        :MINUS_ONE => Test::EnumTestType::MINUS_ONE,
         :ONE   => Test::EnumTestType::ONE,
         :TWO   => Test::EnumTestType::TWO,
         :THREE => Test::EnumTestType::THREE

data/spec/spec_helper.rb

@@ -18,6 +18,9 @@ if ENV["DEBUG"]
   ::Protobuf::Logger.configure(:file => debug_log, :level => ::Logger::DEBUG)
 end
 
+# Get rid of the deprecation env var if present (messes with specs).
+ENV.delete("PB_IGNORE_DEPRECATIONS")
+
 ::RSpec.configure do |c|
   c.include(::Sander6::CustomMatchers)
   c.mock_with :rspec

metadata

@@ -2,7 +2,7 @@
 name: protobuf
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 2.6.3
+  version: 2.6.4
 platform: java
 authors:
 - BJ Neilsen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000Z
+date: 2013-01-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport