protobuf 2.0.0.rc2 → 2.0.0.rc3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (46) hide show
  1. data/.gitignore +1 -0
  2. data/ext/ruby_generator/Makefile +10 -0
  3. data/ext/ruby_generator/RubyGenerator.cpp +85 -70
  4. data/ext/ruby_generator/RubyGenerator.h +23 -4
  5. data/lib/protobuf.rb +33 -26
  6. data/lib/protobuf/cli.rb +18 -13
  7. data/lib/protobuf/enum.rb +39 -34
  8. data/lib/protobuf/enum_value.rb +29 -0
  9. data/lib/protobuf/field/base_field.rb +34 -5
  10. data/lib/protobuf/field/enum_field.rb +6 -14
  11. data/lib/protobuf/field/extension_fields.rb +13 -5
  12. data/lib/protobuf/field/field_array.rb +17 -7
  13. data/lib/protobuf/field/varint_field.rb +4 -6
  14. data/lib/protobuf/message.rb +44 -148
  15. data/lib/protobuf/rpc/server.rb +2 -2
  16. data/lib/protobuf/version.rb +1 -1
  17. data/spec/benchmark/tasks.rb +7 -8
  18. data/spec/functional/evented_server_spec.rb +9 -9
  19. data/spec/functional/socket_server_spec.rb +8 -8
  20. data/spec/functional/zmq_server_spec.rb +8 -8
  21. data/spec/lib/protobuf/cli_spec.rb +30 -11
  22. data/spec/lib/protobuf/enum_spec.rb +90 -0
  23. data/spec/lib/protobuf/enum_value_spec.rb +13 -0
  24. data/spec/lib/protobuf/message/encoder_spec.rb +1 -1
  25. data/spec/lib/protobuf/message_spec.rb +50 -0
  26. data/spec/lib/protobuf/rpc/client_spec.rb +23 -23
  27. data/spec/lib/protobuf/rpc/servers/evented_server_spec.rb +1 -1
  28. data/spec/lib/protobuf/rpc/servers/socket_server_spec.rb +1 -1
  29. data/spec/lib/protobuf/rpc/service_spec.rb +18 -18
  30. data/spec/lib/protobuf_spec.rb +62 -0
  31. data/spec/spec_helper.rb +12 -1
  32. data/spec/support/all.rb +0 -1
  33. data/spec/support/server.rb +1 -1
  34. data/spec/support/test/enum.pb.rb +32 -0
  35. data/spec/support/test/enum.proto +12 -0
  36. data/spec/support/test/resource.pb.rb +52 -0
  37. data/spec/{proto/test.proto → support/test/resource.proto} +2 -2
  38. data/spec/support/test/resource_service.rb +14 -0
  39. metadata +51 -48
  40. data/ext/Makefile +0 -11
  41. data/spec/lib/protobuf/message/enum_spec.rb +0 -13
  42. data/spec/lib/protobuf/message/message_spec.rb +0 -67
  43. data/spec/proto/test.pb.rb +0 -54
  44. data/spec/proto/test_service.rb +0 -30
  45. data/spec/proto/test_service_impl.rb +0 -18
  46. data/spec/support/silent_constants.rb +0 -44
@@ -1,4 +1,4 @@
1
- package spec.proto;
1
+ package test;
2
2
 
3
3
  enum StatusType {
4
4
  PENDING = 0;
@@ -26,6 +26,6 @@ message Nested {
26
26
  optional StatusType status = 4;
27
27
  }
28
28
 
29
- service TestService {
29
+ service ResourceService {
30
30
  rpc Find (ResourceFindRequest) returns (Resource);
31
31
  }
@@ -0,0 +1,14 @@
1
+ require ::File.expand_path('../resource.pb', __FILE__)
2
+
3
+ module Test
4
+ class ResourceService
5
+
6
+ # request -> Test::ResourceFindRequest
7
+ # response -> Test::Resource
8
+ def find
9
+ response.name = request.name
10
+ response.status = request.active ? 1 : 0
11
+ end
12
+
13
+ end
14
+ end
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.0.0.rc2
4
+ version: 2.0.0.rc3
5
5
  prerelease: 6
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: 2012-10-01 00:00:00.000000000Z
13
+ date: 2012-10-04 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: activesupport
17
- requirement: &2152624820 !ruby/object:Gem::Requirement
17
+ requirement: &2153942300 !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: *2152624820
25
+ version_requirements: *2153942300
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: ffi
28
- requirement: &2152624040 !ruby/object:Gem::Requirement
28
+ requirement: &2153941880 !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: *2152624040
36
+ version_requirements: *2153941880
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: multi_json
39
- requirement: &2152622960 !ruby/object:Gem::Requirement
39
+ requirement: &2153941460 !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: *2152622960
47
+ version_requirements: *2153941460
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: thor
50
- requirement: &2152622180 !ruby/object:Gem::Requirement
50
+ requirement: &2153941040 !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: *2152622180
58
+ version_requirements: *2153941040
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: eventmachine
61
- requirement: &2152621360 !ruby/object:Gem::Requirement
61
+ requirement: &2153940620 !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: *2152621360
69
+ version_requirements: *2153940620
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: ffi-rzmq
72
- requirement: &2152619940 !ruby/object:Gem::Requirement
72
+ requirement: &2153940200 !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: *2152619940
80
+ version_requirements: *2153940200
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: perftools.rb
83
- requirement: &2152618420 !ruby/object:Gem::Requirement
83
+ requirement: &2153939780 !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: *2152618420
91
+ version_requirements: *2153939780
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: pry
94
- requirement: &2152617440 !ruby/object:Gem::Requirement
94
+ requirement: &2153939360 !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: *2152617440
102
+ version_requirements: *2153939360
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: pry-nav
105
- requirement: &2152616260 !ruby/object:Gem::Requirement
105
+ requirement: &2153938940 !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: *2152616260
113
+ version_requirements: *2153938940
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: rake
116
- requirement: &2152609200 !ruby/object:Gem::Requirement
116
+ requirement: &2153938520 !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: *2152609200
124
+ version_requirements: *2153938520
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: rake-compiler
127
- requirement: &2152606820 !ruby/object:Gem::Requirement
127
+ requirement: &2153938100 !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: *2152606820
135
+ version_requirements: *2153938100
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: rspec
138
- requirement: &2152605700 !ruby/object:Gem::Requirement
138
+ requirement: &2153937680 !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: *2152605700
146
+ version_requirements: *2153937680
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: simplecov
149
- requirement: &2152603620 !ruby/object:Gem::Requirement
149
+ requirement: &2153953620 !ruby/object:Gem::Requirement
150
150
  none: false
151
151
  requirements:
152
152
  - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
154
154
  version: '0'
155
155
  type: :development
156
156
  prerelease: false
157
- version_requirements: *2152603620
157
+ version_requirements: *2153953620
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: yard
160
- requirement: &2152596160 !ruby/object:Gem::Requirement
160
+ requirement: &2153953200 !ruby/object:Gem::Requirement
161
161
  none: false
162
162
  requirements:
163
163
  - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
165
165
  version: '0'
166
166
  type: :development
167
167
  prerelease: false
168
- version_requirements: *2152596160
168
+ version_requirements: *2153953200
169
169
  description: ! 'Ruby implementation for Protocol Buffers. Works with other protobuf
170
170
  rpc implementations (e.g. Java, Python, C++).
171
171
 
@@ -197,7 +197,6 @@ files:
197
197
  - examples/addressbook.proto
198
198
  - examples/reading_a_message.rb
199
199
  - examples/writing_a_message.rb
200
- - ext/Makefile
201
200
  - ext/protobuf-2.4.1/src/google/protobuf/compiler/code_generator.h
202
201
  - ext/protobuf-2.4.1/src/google/protobuf/compiler/command_line_interface.h
203
202
  - ext/protobuf-2.4.1/src/google/protobuf/compiler/cpp/cpp_enum.h
@@ -283,15 +282,18 @@ files:
283
282
  - ext/protobuf-2.4.1/src/google/protobuf/wire_format.h
284
283
  - ext/protobuf-2.4.1/src/google/protobuf/wire_format_lite.h
285
284
  - ext/protobuf-2.4.1/src/google/protobuf/wire_format_lite_inl.h
285
+ - ext/ruby_generator/Makefile
286
286
  - ext/ruby_generator/RubyGenerator.cpp
287
287
  - ext/ruby_generator/RubyGenerator.h
288
288
  - ext/ruby_generator/extconf.rb
289
+ - ext/ruby_generator/protoc-ruby
289
290
  - lib/protobuf.rb
290
291
  - lib/protobuf/cli.rb
291
292
  - lib/protobuf/common/exceptions.rb
292
293
  - lib/protobuf/common/logger.rb
293
294
  - lib/protobuf/common/wire_type.rb
294
295
  - lib/protobuf/enum.rb
296
+ - lib/protobuf/enum_value.rb
295
297
  - lib/protobuf/evented.rb
296
298
  - lib/protobuf/ext/eventmachine.rb
297
299
  - lib/protobuf/field.rb
@@ -363,9 +365,10 @@ files:
363
365
  - spec/functional/zmq_server_spec.rb
364
366
  - spec/lib/protobuf/cli_spec.rb
365
367
  - spec/lib/protobuf/common/logger_spec.rb
368
+ - spec/lib/protobuf/enum_spec.rb
369
+ - spec/lib/protobuf/enum_value_spec.rb
366
370
  - spec/lib/protobuf/message/encoder_spec.rb
367
- - spec/lib/protobuf/message/enum_spec.rb
368
- - spec/lib/protobuf/message/message_spec.rb
371
+ - spec/lib/protobuf/message_spec.rb
369
372
  - spec/lib/protobuf/rpc/client_spec.rb
370
373
  - spec/lib/protobuf/rpc/connector_spec.rb
371
374
  - spec/lib/protobuf/rpc/connectors/base_spec.rb
@@ -379,14 +382,15 @@ files:
379
382
  - spec/lib/protobuf/rpc/servers/zmq/util_spec.rb
380
383
  - spec/lib/protobuf/rpc/servers/zmq/worker_spec.rb
381
384
  - spec/lib/protobuf/rpc/service_spec.rb
382
- - spec/proto/test.pb.rb
383
- - spec/proto/test.proto
384
- - spec/proto/test_service.rb
385
- - spec/proto/test_service_impl.rb
385
+ - spec/lib/protobuf_spec.rb
386
386
  - spec/spec_helper.rb
387
387
  - spec/support/all.rb
388
388
  - spec/support/server.rb
389
- - spec/support/silent_constants.rb
389
+ - spec/support/test/enum.pb.rb
390
+ - spec/support/test/enum.proto
391
+ - spec/support/test/resource.pb.rb
392
+ - spec/support/test/resource.proto
393
+ - spec/support/test/resource_service.rb
390
394
  - spec/support/test_app_file.rb
391
395
  - spec/support/tolerance_matcher.rb
392
396
  - test/data/data.bin
@@ -444,9 +448,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
444
448
  - - ! '>='
445
449
  - !ruby/object:Gem::Version
446
450
  version: '0'
447
- segments:
448
- - 0
449
- hash: -2728139943989483754
450
451
  required_rubygems_version: !ruby/object:Gem::Requirement
451
452
  none: false
452
453
  requirements:
@@ -468,9 +469,10 @@ test_files:
468
469
  - spec/functional/zmq_server_spec.rb
469
470
  - spec/lib/protobuf/cli_spec.rb
470
471
  - spec/lib/protobuf/common/logger_spec.rb
472
+ - spec/lib/protobuf/enum_spec.rb
473
+ - spec/lib/protobuf/enum_value_spec.rb
471
474
  - spec/lib/protobuf/message/encoder_spec.rb
472
- - spec/lib/protobuf/message/enum_spec.rb
473
- - spec/lib/protobuf/message/message_spec.rb
475
+ - spec/lib/protobuf/message_spec.rb
474
476
  - spec/lib/protobuf/rpc/client_spec.rb
475
477
  - spec/lib/protobuf/rpc/connector_spec.rb
476
478
  - spec/lib/protobuf/rpc/connectors/base_spec.rb
@@ -484,14 +486,15 @@ test_files:
484
486
  - spec/lib/protobuf/rpc/servers/zmq/util_spec.rb
485
487
  - spec/lib/protobuf/rpc/servers/zmq/worker_spec.rb
486
488
  - spec/lib/protobuf/rpc/service_spec.rb
487
- - spec/proto/test.pb.rb
488
- - spec/proto/test.proto
489
- - spec/proto/test_service.rb
490
- - spec/proto/test_service_impl.rb
489
+ - spec/lib/protobuf_spec.rb
491
490
  - spec/spec_helper.rb
492
491
  - spec/support/all.rb
493
492
  - spec/support/server.rb
494
- - spec/support/silent_constants.rb
493
+ - spec/support/test/enum.pb.rb
494
+ - spec/support/test/enum.proto
495
+ - spec/support/test/resource.pb.rb
496
+ - spec/support/test/resource.proto
497
+ - spec/support/test/resource_service.rb
495
498
  - spec/support/test_app_file.rb
496
499
  - spec/support/tolerance_matcher.rb
497
500
  - test/data/data.bin
data/ext/Makefile DELETED
@@ -1,11 +0,0 @@
1
- all: \
2
- RubyGenerator.h \
3
- RubyGenerator.cpp \
4
- main.cpp
5
- g++ -Wall -I/code/src/utilities/protobuf-2.4.1/src -lprotoc -lprotobuf -lpthread -o protoc-ruby RubyGenerator.cpp main.cpp
6
-
7
- test:
8
- rm -rf test/out/*
9
- ./protoc-ruby --proto_path=defs --ruby_out=out defs/atlas/util.proto defs/atlas/newman/*.proto
10
-
11
- .PHONY: all test
@@ -1,13 +0,0 @@
1
- require 'spec_helper'
2
- require 'spec/proto/test.pb'
3
-
4
- describe Protobuf::Enum do
5
- context 'when coercing from enum' do
6
- subject { Spec::Proto::StatusType::PENDING }
7
- it { should eq(0) }
8
- end
9
-
10
- context 'when coercing from integer' do
11
- it { 0.should eq(Spec::Proto::StatusType::PENDING) }
12
- end
13
- end
@@ -1,67 +0,0 @@
1
- require 'spec_helper'
2
- require 'spec/proto/test.pb'
3
-
4
- describe Protobuf::Message do
5
-
6
- context 'when converting to json' do
7
-
8
- it "should be jsonable" do
9
- msg = Spec::Proto::ResourceFindRequest.new
10
- msg.should respond_to(:to_json)
11
- msg.name = 'Jeff'
12
- msg.active = false
13
- msg.to_json.should == '{"name":"Jeff","active":false}'
14
- end
15
-
16
- it 'should generate nested messages into nested json objects' do
17
- date_created = Time.now.to_i
18
-
19
- nested = Spec::Proto::Nested.new
20
- nested.name = 'NESTED'
21
- nested.resource = Spec::Proto::Resource.new.tap do |r|
22
- r.name = 'RESOURCE SINGLE'
23
- r.date_created = date_created
24
- r.status = Spec::Proto::StatusType::PENDING
25
- end
26
- 2.times do |i|
27
- nested.multiple_resources << Spec::Proto::Resource.new.tap do |r|
28
- r.name = 'RESOURCE MULTIPLE %d' % i
29
- r.date_created = date_created
30
- r.status = Spec::Proto::StatusType::PENDING
31
- end
32
- end
33
- nested.status = Spec::Proto::StatusType::ENABLED
34
-
35
- nested.to_json.should == %Q{{"name":"NESTED","resource":{"name":"RESOURCE SINGLE","date_created":#{date_created},"status":0,"repeated_enum":[]},"multiple_resources":[{"name":"RESOURCE MULTIPLE 0","date_created":#{date_created},"status":0,"repeated_enum":[]},{"name":"RESOURCE MULTIPLE 1","date_created":#{date_created},"status":0,"repeated_enum":[]}],"status":1}}
36
- end
37
-
38
-
39
- end
40
-
41
- context 'when converting to a hash' do
42
-
43
- context 'when message has repeated enum field' do
44
-
45
- it 'provides an array of integers' do
46
- resource = Spec::Proto::Resource.new :repeated_enum => [
47
- Spec::Proto::StatusType::PENDING,
48
- Spec::Proto::StatusType::ENABLED,
49
- Spec::Proto::StatusType::ENABLED,
50
- Spec::Proto::StatusType::DISABLED,
51
- Spec::Proto::StatusType::DELETED
52
- ]
53
-
54
- resource.to_hash[:repeated_enum].should == [
55
- Spec::Proto::StatusType::PENDING.value,
56
- Spec::Proto::StatusType::ENABLED.value,
57
- Spec::Proto::StatusType::ENABLED.value,
58
- Spec::Proto::StatusType::DISABLED.value,
59
- Spec::Proto::StatusType::DELETED.value
60
- ]
61
- end
62
-
63
- end
64
-
65
- end
66
-
67
- end
@@ -1,54 +0,0 @@
1
- ##
2
- # This file is auto-generated. DO NOT EDIT!
3
- #
4
- require 'protobuf/message'
5
- require 'protobuf/rpc/service'
6
-
7
- module Spec
8
- module Proto
9
- ##
10
- # Enum Classes
11
- #
12
- class StatusType < ::Protobuf::Enum; end
13
-
14
- ##
15
- # Message Classes
16
- #
17
- class ResourceFindRequest < ::Protobuf::Message; end
18
- class Resource < ::Protobuf::Message; end
19
- class Nested < ::Protobuf::Message; end
20
-
21
- ##
22
- # Enum Values
23
- #
24
- ::Spec::Proto::StatusType.define :PENDING, 0
25
- ::Spec::Proto::StatusType.define :ENABLED, 1
26
- ::Spec::Proto::StatusType.define :DISABLED, 2
27
- ::Spec::Proto::StatusType.define :DELETED, 3
28
-
29
-
30
- ##
31
- # Message Fields
32
- #
33
- ::Spec::Proto::ResourceFindRequest.required(::Protobuf::Field::StringField, :name, 1)
34
- ::Spec::Proto::ResourceFindRequest.optional(::Protobuf::Field::BoolField, :active, 2)
35
-
36
- ::Spec::Proto::Resource.required(::Protobuf::Field::StringField, :name, 1)
37
- ::Spec::Proto::Resource.optional(::Protobuf::Field::Int64Field, :date_created, 2)
38
- ::Spec::Proto::Resource.optional(::Spec::Proto::StatusType, :status, 3)
39
- ::Spec::Proto::Resource.repeated(::Spec::Proto::StatusType, :repeated_enum, 4)
40
-
41
- ::Spec::Proto::Nested.optional(::Protobuf::Field::StringField, :name, 1)
42
- ::Spec::Proto::Nested.optional(::Spec::Proto::Resource, :resource, 2)
43
- ::Spec::Proto::Nested.repeated(::Spec::Proto::Resource, :multiple_resources, 3)
44
- ::Spec::Proto::Nested.optional(::Spec::Proto::StatusType, :status, 4)
45
-
46
-
47
- ##
48
- # Services
49
- #
50
- class TestService < ::Protobuf::Rpc::Service
51
- rpc :find, ::Spec::Proto::ResourceFindRequest, ::Spec::Proto::Resource
52
- end
53
- end
54
- end