protobuf 2.6.3 → 2.6.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. data/.travis.yml +2 -3
  2. data/README.md +2 -1
  3. data/ext/ruby_generator/RubyGenerator.cpp +1 -1
  4. data/ext/ruby_generator/RubyGenerator.h +0 -1
  5. data/lib/protobuf/enum.rb +1 -1
  6. data/lib/protobuf/version.rb +1 -1
  7. data/spec/lib/protobuf/cli_spec.rb +15 -8
  8. data/spec/lib/protobuf/enum_spec.rb +4 -2
  9. data/spec/spec_helper.rb +3 -0
  10. metadata +30 -30
data/.travis.yml CHANGED
@@ -2,7 +2,6 @@ language: ruby
2
2
  rvm:
3
3
  - "1.9.2"
4
4
  - "1.9.3"
5
- - jruby-19mode
6
- - ruby-head
7
- - jruby-head
8
5
  script: NO_COMPILE_TEST_PROTOS=1 bundle exec rake spec
6
+ before_install:
7
+ - sudo apt-get install -qq libzmq-dev
data/README.md CHANGED
@@ -1,10 +1,11 @@
1
1
  # protobuf
2
2
 
3
+ [![Gem Version](https://badge.fury.io/rb/protobuf.png)](http://badge.fury.io/rb/protobuf)
3
4
  [![Build Status](https://secure.travis-ci.org/localshred/protobuf.png?branch=master)](https://travis-ci.org/localshred/protobuf)
4
5
 
5
6
  ***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***
6
7
 
7
- 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:
8
+ 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:
8
9
 
9
10
  1. Generating ruby classes from `.proto` files.
10
11
  2. Provide an RPC mechanism for calling remote services.
data/ext/ruby_generator/RubyGenerator.cpp CHANGED
@@ -114,7 +114,7 @@ void RubyGenerator::PrintMessage(const Descriptor* descriptor, bool print_fields
114
114
  map<string,string> data;
115
115
  data["class_name"] = descriptor->name();
116
116
 
117
- if (print_fields) {
117
+ if (print_fields && (descriptor->field_count() > 0 || descriptor->extension_count() > 0)) {
118
118
  printer_->Print(data, "class $class_name$");
119
119
  PrintNewLine();
120
120
  printer_->Indent();
data/ext/ruby_generator/RubyGenerator.h CHANGED
@@ -118,7 +118,6 @@ class LIBPROTOC_EXPORT RubyGenerator : public CodeGenerator {
118
118
  }
119
119
  else if (c == 95) { // underscore char
120
120
  segment_end = true;
121
- continue;
122
121
  }
123
122
  else if (segment_end) {
124
123
  if (c >= 97 && c <= 122) { // a-z chars
data/lib/protobuf/enum.rb CHANGED
@@ -7,7 +7,7 @@ module Protobuf
7
7
  enum_value = ::Protobuf::EnumValue.new(self, name, value)
8
8
  const_set(name, enum_value)
9
9
  @values ||= {}
10
- @names ||= []
10
+ @names ||= {}
11
11
  @values[name] = enum_value
12
12
  @names[value] = name
13
13
  end
data/lib/protobuf/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module Protobuf
2
- VERSION = '2.6.3'
2
+ VERSION = '2.6.4'
3
3
  PROTOC_VERSION = '2.4.1'
4
4
  end
data/spec/lib/protobuf/cli_spec.rb CHANGED
@@ -121,16 +121,23 @@ describe ::Protobuf::CLI do
121
121
  context 'when not given' do
122
122
  let(:test_args) { [] }
123
123
 
124
- it 'sets the deprecation warning flag to true when no ENV is present and no command line option' do
125
- described_class.start(args)
126
- ::Protobuf.print_deprecation_warnings?.should be_true
124
+ context 'when no ENV is present and no command line option' do
125
+ before { ENV.delete("PB_IGNORE_DEPRECATIONS") }
126
+
127
+ it 'sets the deprecation warning flag to true' do
128
+ described_class.start(args)
129
+ ::Protobuf.print_deprecation_warnings?.should be_true
130
+ end
127
131
  end
128
132
 
129
- it 'sets the deprecation warning flag to false if ENV["PB_IGNORE_DEPRECATIONS"] is present' do
130
- ENV["PB_IGNORE_DEPRECATIONS"] = "1"
131
- described_class.start(args)
132
- ::Protobuf.print_deprecation_warnings?.should be_false
133
- ENV.delete("PB_IGNORE_DEPRECATIONS")
133
+ context 'if ENV["PB_IGNORE_DEPRECATIONS"] is present' do
134
+ before { ENV["PB_IGNORE_DEPRECATIONS"] = "1" }
135
+ after { ENV.delete("PB_IGNORE_DEPRECATIONS") }
136
+
137
+ it 'sets the deprecation warning flag to false ' do
138
+ described_class.start(args)
139
+ ::Protobuf.print_deprecation_warnings?.should be_false
140
+ end
134
141
  end
135
142
  end
136
143
 
data/spec/lib/protobuf/enum_spec.rb CHANGED
@@ -2,9 +2,10 @@ require 'spec_helper'
2
2
 
3
3
  describe Protobuf::Enum do
4
4
  let(:name) { :THREE }
5
- let(:tag) { 3 }
5
+ let(:tag) { 3 }
6
6
 
7
7
  before(:all) do
8
+ Test::EnumTestType.define(:MINUS_ONE, -1)
8
9
  Test::EnumTestType.define(name, tag)
9
10
  end
10
11
 
@@ -47,7 +48,7 @@ describe Protobuf::Enum do
47
48
 
48
49
  describe '.enum_by_value' do
49
50
  it 'gets the EnumValue corresponding to the given value (tag)' do
50
- Test::EnumTestType.enum_by_value(tag).should eq Test::EnumTestType::THREE
51
+ Test::EnumTestType.enum_by_value(tag).should eq Test::EnumTestType.const_get(name)
51
52
  end
52
53
  end
53
54
 
@@ -82,6 +83,7 @@ describe Protobuf::Enum do
82
83
  describe '.values' do
83
84
  it 'provides a hash of defined EnumValues' do
84
85
  Test::EnumTestType.values.should eq({
86
+ :MINUS_ONE => Test::EnumTestType::MINUS_ONE,
85
87
  :ONE => Test::EnumTestType::ONE,
86
88
  :TWO => Test::EnumTestType::TWO,
87
89
  :THREE => Test::EnumTestType::THREE
data/spec/spec_helper.rb CHANGED
@@ -18,6 +18,9 @@ if ENV["DEBUG"]
18
18
  ::Protobuf::Logger.configure(:file => debug_log, :level => ::Logger::DEBUG)
19
19
  end
20
20
 
21
+ # Get rid of the deprecation env var if present (messes with specs).
22
+ ENV.delete("PB_IGNORE_DEPRECATIONS")
23
+
21
24
  ::RSpec.configure do |c|
22
25
  c.include(::Sander6::CustomMatchers)
23
26
  c.mock_with :rspec
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: protobuf
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.6.3
4
+ version: 2.6.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,11 +10,11 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-01-15 00:00:00.000000000Z
13
+ date: 2013-01-28 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: activesupport
17
- requirement: &2152561520 !ruby/object:Gem::Requirement
17
+ requirement: &2152199580 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
22
22
  version: '0'
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *2152561520
25
+ version_requirements: *2152199580
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: ffi
28
- requirement: &2152560120 !ruby/object:Gem::Requirement
28
+ requirement: &2152197980 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *2152560120
36
+ version_requirements: *2152197980
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: multi_json
39
- requirement: &2152558500 !ruby/object:Gem::Requirement
39
+ requirement: &2152196700 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
44
44
  version: '0'
45
45
  type: :runtime
46
46
  prerelease: false
47
- version_requirements: *2152558500
47
+ version_requirements: *2152196700
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: thor
50
- requirement: &2152535120 !ruby/object:Gem::Requirement
50
+ requirement: &2152195320 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
55
55
  version: '0'
56
56
  type: :runtime
57
57
  prerelease: false
58
- version_requirements: *2152535120
58
+ version_requirements: *2152195320
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: eventmachine
61
- requirement: &2152533600 !ruby/object:Gem::Requirement
61
+ requirement: &2152191720 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
64
  - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
66
66
  version: '0'
67
67
  type: :development
68
68
  prerelease: false
69
- version_requirements: *2152533600
69
+ version_requirements: *2152191720
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: ffi-rzmq
72
- requirement: &2152530760 !ruby/object:Gem::Requirement
72
+ requirement: &2152188520 !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
75
  - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
77
77
  version: '0'
78
78
  type: :development
79
79
  prerelease: false
80
- version_requirements: *2152530760
80
+ version_requirements: *2152188520
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: pry
83
- requirement: &2152520480 !ruby/object:Gem::Requirement
83
+ requirement: &2152182860 !ruby/object:Gem::Requirement
84
84
  none: false
85
85
  requirements:
86
86
  - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
88
88
  version: '0'
89
89
  type: :development
90
90
  prerelease: false
91
- version_requirements: *2152520480
91
+ version_requirements: *2152182860
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: pry-nav
94
- requirement: &2152518160 !ruby/object:Gem::Requirement
94
+ requirement: &2152179920 !ruby/object:Gem::Requirement
95
95
  none: false
96
96
  requirements:
97
97
  - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
99
99
  version: '0'
100
100
  type: :development
101
101
  prerelease: false
102
- version_requirements: *2152518160
102
+ version_requirements: *2152179920
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: rake
105
- requirement: &2152517020 !ruby/object:Gem::Requirement
105
+ requirement: &2152173700 !ruby/object:Gem::Requirement
106
106
  none: false
107
107
  requirements:
108
108
  - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
110
110
  version: '0'
111
111
  type: :development
112
112
  prerelease: false
113
- version_requirements: *2152517020
113
+ version_requirements: *2152173700
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: rake-compiler
116
- requirement: &2152516040 !ruby/object:Gem::Requirement
116
+ requirement: &2152171280 !ruby/object:Gem::Requirement
117
117
  none: false
118
118
  requirements:
119
119
  - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
121
121
  version: '0'
122
122
  type: :development
123
123
  prerelease: false
124
- version_requirements: *2152516040
124
+ version_requirements: *2152171280
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: rspec
127
- requirement: &2152514440 !ruby/object:Gem::Requirement
127
+ requirement: &2152167280 !ruby/object:Gem::Requirement
128
128
  none: false
129
129
  requirements:
130
130
  - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
132
132
  version: '0'
133
133
  type: :development
134
134
  prerelease: false
135
- version_requirements: *2152514440
135
+ version_requirements: *2152167280
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: simplecov
138
- requirement: &2152491780 !ruby/object:Gem::Requirement
138
+ requirement: &2152145560 !ruby/object:Gem::Requirement
139
139
  none: false
140
140
  requirements:
141
141
  - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
143
143
  version: '0'
144
144
  type: :development
145
145
  prerelease: false
146
- version_requirements: *2152491780
146
+ version_requirements: *2152145560
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: yard
149
- requirement: &2152486420 !ruby/object:Gem::Requirement
149
+ requirement: &2152141620 !ruby/object:Gem::Requirement
150
150
  none: false
151
151
  requirements:
152
152
  - - ! '>='
@@ -154,7 +154,7 @@ dependencies:
154
154
  version: '0'
155
155
  type: :development
156
156
  prerelease: false
157
- version_requirements: *2152486420
157
+ version_requirements: *2152141620
158
158
  description: Google Protocol Buffers v2.4.1 Serialization and RPC implementation for
159
159
  Ruby.
160
160
  email:
@@ -434,7 +434,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
434
434
  version: '0'
435
435
  segments:
436
436
  - 0
437
- hash: 913525931658513391
437
+ hash: -2688900020058151764
438
438
  required_rubygems_version: !ruby/object:Gem::Requirement
439
439
  none: false
440
440
  requirements:
@@ -443,7 +443,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
443
443
  version: '0'
444
444
  segments:
445
445
  - 0
446
- hash: 913525931658513391
446
+ hash: -2688900020058151764
447
447
  requirements: []
448
448
  rubyforge_project:
449
449
  rubygems_version: 1.8.15