protobuf 2.0.2 → 2.0.3

Sign up to get free protection for your applications and to get access to all the features.
@@ -34,6 +34,7 @@ module Protobuf
34
34
  option :print_deprecation_warnings, :type => :boolean, :default => true, :desc => 'Cause use of deprecated fields to be printed or ignored.'
35
35
 
36
36
  def start(app_file)
37
+ puts 'RUNNING FROM LOCAL'
37
38
  debug_say 'Configuring the rpc_server process'
38
39
  @start_aborted = false
39
40
 
@@ -158,7 +159,7 @@ module Protobuf
158
159
  { :host => options.host,
159
160
  :port => options.port,
160
161
  :backlog => options.backlog,
161
- :threshold => options.threshold,
162
+ :treshold => options.threshold,
162
163
  :threads => options.threads }
163
164
  end
164
165
 
@@ -167,9 +168,6 @@ module Protobuf
167
168
 
168
169
  ::Protobuf::Logger.error { message }
169
170
  if exception
170
- $stderr.puts "[#{exception.class.name}] #{exception.message}"
171
- $stderr.puts exception.backtrace.join("\n")
172
-
173
171
  ::Protobuf::Logger.error { "[#{exception.class.name}] #{exception.message}" }
174
172
  ::Protobuf::Logger.debug { exception.backtrace.join("\n") }
175
173
  end
@@ -29,7 +29,7 @@ module Protobuf
29
29
 
30
30
  def replace(val)
31
31
  raise TypeError unless val.is_a?(Array)
32
- val = val.map {|v| normalize(v)}
32
+ val = val.map { |v| normalize(v)}
33
33
  super(val)
34
34
  end
35
35
 
@@ -54,8 +54,8 @@ module Protobuf
54
54
  raise TypeError unless @field.acceptable?(value)
55
55
  if @field.is_a?(::Protobuf::Field::EnumField)
56
56
  @field.type.fetch(value)
57
- elsif @field.is_a?(::Protobuf::Field::MessageField) && value.is_a?(Hash)
58
- @field.type.new(value)
57
+ elsif @field.is_a?(::Protobuf::Field::MessageField) && value.respond_to?(:to_hash)
58
+ @field.type.new(value.to_hash)
59
59
  else
60
60
  value
61
61
  end
@@ -3,11 +3,13 @@ require 'protobuf/field/base_field'
3
3
  module Protobuf
4
4
  module Field
5
5
  class MessageField < BaseField
6
+ RAISE_TYPE = lambda { |field, val| raise TypeError, "Expected value of type '#{field.type}', but got '#{val.class}'" }
7
+
6
8
  ##
7
9
  # Public Instance Methods
8
10
  #
9
11
  def acceptable?(val)
10
- raise TypeError unless val.instance_of?(type) || val.instance_of?(Hash)
12
+ RAISE_TYPE.call(self, val) unless val.instance_of?(type) || val.respond_to?(:to_hash)
11
13
  true
12
14
  end
13
15
 
@@ -33,15 +35,15 @@ module Protobuf
33
35
  field = self
34
36
  @message_class.class_eval do
35
37
  define_method("#{field.name}=") do |val|
36
- case val
37
- when nil then
38
+ case
39
+ when val.nil? then
38
40
  @values.delete(field.name)
39
- when Hash then
40
- @values[field.name] = field.type.new(val)
41
- when field.type then
41
+ when val.is_a?(field.type) then
42
42
  @values[field.name] = val
43
+ when val.respond_to?(:to_hash) then
44
+ @values[field.name] = field.type.new(val.to_hash)
43
45
  else
44
- raise TypeError, "Expected value of type '#{field.type}', but got '#{val.class}'"
46
+ RAISE_TYPE.call(field, val)
45
47
  end
46
48
  end
47
49
  end
@@ -112,6 +112,7 @@ module Protobuf
112
112
  # Constructor
113
113
  #
114
114
  def initialize(values={})
115
+ values = values.to_hash
115
116
  @values = {}
116
117
 
117
118
  values.each { |name, val| self[name] = val}
@@ -1,4 +1,4 @@
1
1
  module Protobuf
2
- VERSION = '2.0.2'
2
+ VERSION = '2.0.3'
3
3
  PROTOC_VERSION = '2.4.1'
4
4
  end
@@ -23,7 +23,7 @@ describe ::Protobuf::CLI do
23
23
 
24
24
  it 'sends the host option to the runner' do
25
25
  ::Protobuf::Rpc::SocketRunner.should_receive(:run) do |options|
26
- options[:host].should eq '123.123.123.123'
26
+ options.host.should eq '123.123.123.123'
27
27
  end
28
28
  described_class.start(args)
29
29
  end
@@ -34,18 +34,7 @@ describe ::Protobuf::CLI do
34
34
 
35
35
  it 'sends the port option to the runner' do
36
36
  ::Protobuf::Rpc::SocketRunner.should_receive(:run) do |options|
37
- options[:port].should eq 12345
38
- end
39
- described_class.start(args)
40
- end
41
- end
42
-
43
- context 'threads option' do
44
- let(:test_args) { [ '--threads=500' ] }
45
-
46
- it 'sends the threads option to the runner' do
47
- ::Protobuf::Rpc::SocketRunner.should_receive(:run) do |options|
48
- options[:threads].should eq 500
37
+ options.port.should eq 12345
49
38
  end
50
39
  described_class.start(args)
51
40
  end
@@ -56,7 +45,7 @@ describe ::Protobuf::CLI do
56
45
 
57
46
  it 'sends the backlog option to the runner' do
58
47
  ::Protobuf::Rpc::SocketRunner.should_receive(:run) do |options|
59
- options[:backlog].should eq 500
48
+ options.backlog.should eq 500
60
49
  end
61
50
  described_class.start(args)
62
51
  end
@@ -67,7 +56,7 @@ describe ::Protobuf::CLI do
67
56
 
68
57
  it 'sends the backlog option to the runner' do
69
58
  ::Protobuf::Rpc::SocketRunner.should_receive(:run) do |options|
70
- options[:threshold].should eq 500
59
+ options.threshold.should eq 500
71
60
  end
72
61
  described_class.start(args)
73
62
  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.2
4
+ version: 2.0.3
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: 2012-10-30 00:00:00.000000000Z
13
+ date: 2012-10-30 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: activesupport
17
- requirement: &2152193880 !ruby/object:Gem::Requirement
17
+ requirement: !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
22
22
  version: '0'
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *2152193880
25
+ version_requirements: !ruby/object:Gem::Requirement
26
+ none: false
27
+ requirements:
28
+ - - ! '>='
29
+ - !ruby/object:Gem::Version
30
+ version: '0'
26
31
  - !ruby/object:Gem::Dependency
27
32
  name: ffi
28
- requirement: &2152192420 !ruby/object:Gem::Requirement
33
+ requirement: !ruby/object:Gem::Requirement
29
34
  none: false
30
35
  requirements:
31
36
  - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
33
38
  version: '0'
34
39
  type: :runtime
35
40
  prerelease: false
36
- version_requirements: *2152192420
41
+ version_requirements: !ruby/object:Gem::Requirement
42
+ none: false
43
+ requirements:
44
+ - - ! '>='
45
+ - !ruby/object:Gem::Version
46
+ version: '0'
37
47
  - !ruby/object:Gem::Dependency
38
48
  name: multi_json
39
- requirement: &2152191460 !ruby/object:Gem::Requirement
49
+ requirement: !ruby/object:Gem::Requirement
40
50
  none: false
41
51
  requirements:
42
52
  - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
44
54
  version: '0'
45
55
  type: :runtime
46
56
  prerelease: false
47
- version_requirements: *2152191460
57
+ version_requirements: !ruby/object:Gem::Requirement
58
+ none: false
59
+ requirements:
60
+ - - ! '>='
61
+ - !ruby/object:Gem::Version
62
+ version: '0'
48
63
  - !ruby/object:Gem::Dependency
49
64
  name: thor
50
- requirement: &2152190100 !ruby/object:Gem::Requirement
65
+ requirement: !ruby/object:Gem::Requirement
51
66
  none: false
52
67
  requirements:
53
68
  - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
55
70
  version: '0'
56
71
  type: :runtime
57
72
  prerelease: false
58
- version_requirements: *2152190100
73
+ version_requirements: !ruby/object:Gem::Requirement
74
+ none: false
75
+ requirements:
76
+ - - ! '>='
77
+ - !ruby/object:Gem::Version
78
+ version: '0'
59
79
  - !ruby/object:Gem::Dependency
60
80
  name: eventmachine
61
- requirement: &2152188060 !ruby/object:Gem::Requirement
81
+ requirement: !ruby/object:Gem::Requirement
62
82
  none: false
63
83
  requirements:
64
84
  - - ! '>='
@@ -66,10 +86,15 @@ dependencies:
66
86
  version: '0'
67
87
  type: :development
68
88
  prerelease: false
69
- version_requirements: *2152188060
89
+ version_requirements: !ruby/object:Gem::Requirement
90
+ none: false
91
+ requirements:
92
+ - - ! '>='
93
+ - !ruby/object:Gem::Version
94
+ version: '0'
70
95
  - !ruby/object:Gem::Dependency
71
96
  name: ffi-rzmq
72
- requirement: &2152185020 !ruby/object:Gem::Requirement
97
+ requirement: !ruby/object:Gem::Requirement
73
98
  none: false
74
99
  requirements:
75
100
  - - ! '>='
@@ -77,10 +102,15 @@ dependencies:
77
102
  version: '0'
78
103
  type: :development
79
104
  prerelease: false
80
- version_requirements: *2152185020
105
+ version_requirements: !ruby/object:Gem::Requirement
106
+ none: false
107
+ requirements:
108
+ - - ! '>='
109
+ - !ruby/object:Gem::Version
110
+ version: '0'
81
111
  - !ruby/object:Gem::Dependency
82
112
  name: perftools.rb
83
- requirement: &2152184280 !ruby/object:Gem::Requirement
113
+ requirement: !ruby/object:Gem::Requirement
84
114
  none: false
85
115
  requirements:
86
116
  - - ! '>='
@@ -88,10 +118,15 @@ dependencies:
88
118
  version: '0'
89
119
  type: :development
90
120
  prerelease: false
91
- version_requirements: *2152184280
121
+ version_requirements: !ruby/object:Gem::Requirement
122
+ none: false
123
+ requirements:
124
+ - - ! '>='
125
+ - !ruby/object:Gem::Version
126
+ version: '0'
92
127
  - !ruby/object:Gem::Dependency
93
128
  name: pry
94
- requirement: &2152170760 !ruby/object:Gem::Requirement
129
+ requirement: !ruby/object:Gem::Requirement
95
130
  none: false
96
131
  requirements:
97
132
  - - ! '>='
@@ -99,10 +134,15 @@ dependencies:
99
134
  version: '0'
100
135
  type: :development
101
136
  prerelease: false
102
- version_requirements: *2152170760
137
+ version_requirements: !ruby/object:Gem::Requirement
138
+ none: false
139
+ requirements:
140
+ - - ! '>='
141
+ - !ruby/object:Gem::Version
142
+ version: '0'
103
143
  - !ruby/object:Gem::Dependency
104
144
  name: pry-nav
105
- requirement: &2152169580 !ruby/object:Gem::Requirement
145
+ requirement: !ruby/object:Gem::Requirement
106
146
  none: false
107
147
  requirements:
108
148
  - - ! '>='
@@ -110,10 +150,15 @@ dependencies:
110
150
  version: '0'
111
151
  type: :development
112
152
  prerelease: false
113
- version_requirements: *2152169580
153
+ version_requirements: !ruby/object:Gem::Requirement
154
+ none: false
155
+ requirements:
156
+ - - ! '>='
157
+ - !ruby/object:Gem::Version
158
+ version: '0'
114
159
  - !ruby/object:Gem::Dependency
115
160
  name: rake
116
- requirement: &2152125460 !ruby/object:Gem::Requirement
161
+ requirement: !ruby/object:Gem::Requirement
117
162
  none: false
118
163
  requirements:
119
164
  - - ! '>='
@@ -121,10 +166,15 @@ dependencies:
121
166
  version: '0'
122
167
  type: :development
123
168
  prerelease: false
124
- version_requirements: *2152125460
169
+ version_requirements: !ruby/object:Gem::Requirement
170
+ none: false
171
+ requirements:
172
+ - - ! '>='
173
+ - !ruby/object:Gem::Version
174
+ version: '0'
125
175
  - !ruby/object:Gem::Dependency
126
176
  name: rake-compiler
127
- requirement: &2152124780 !ruby/object:Gem::Requirement
177
+ requirement: !ruby/object:Gem::Requirement
128
178
  none: false
129
179
  requirements:
130
180
  - - ! '>='
@@ -132,10 +182,15 @@ dependencies:
132
182
  version: '0'
133
183
  type: :development
134
184
  prerelease: false
135
- version_requirements: *2152124780
185
+ version_requirements: !ruby/object:Gem::Requirement
186
+ none: false
187
+ requirements:
188
+ - - ! '>='
189
+ - !ruby/object:Gem::Version
190
+ version: '0'
136
191
  - !ruby/object:Gem::Dependency
137
192
  name: rspec
138
- requirement: &2152123460 !ruby/object:Gem::Requirement
193
+ requirement: !ruby/object:Gem::Requirement
139
194
  none: false
140
195
  requirements:
141
196
  - - ! '>='
@@ -143,10 +198,15 @@ dependencies:
143
198
  version: '0'
144
199
  type: :development
145
200
  prerelease: false
146
- version_requirements: *2152123460
201
+ version_requirements: !ruby/object:Gem::Requirement
202
+ none: false
203
+ requirements:
204
+ - - ! '>='
205
+ - !ruby/object:Gem::Version
206
+ version: '0'
147
207
  - !ruby/object:Gem::Dependency
148
208
  name: simplecov
149
- requirement: &2152122160 !ruby/object:Gem::Requirement
209
+ requirement: !ruby/object:Gem::Requirement
150
210
  none: false
151
211
  requirements:
152
212
  - - ! '>='
@@ -154,10 +214,15 @@ dependencies:
154
214
  version: '0'
155
215
  type: :development
156
216
  prerelease: false
157
- version_requirements: *2152122160
217
+ version_requirements: !ruby/object:Gem::Requirement
218
+ none: false
219
+ requirements:
220
+ - - ! '>='
221
+ - !ruby/object:Gem::Version
222
+ version: '0'
158
223
  - !ruby/object:Gem::Dependency
159
224
  name: yard
160
- requirement: &2152120740 !ruby/object:Gem::Requirement
225
+ requirement: !ruby/object:Gem::Requirement
161
226
  none: false
162
227
  requirements:
163
228
  - - ! '>='
@@ -165,7 +230,12 @@ dependencies:
165
230
  version: '0'
166
231
  type: :development
167
232
  prerelease: false
168
- version_requirements: *2152120740
233
+ version_requirements: !ruby/object:Gem::Requirement
234
+ none: false
235
+ requirements:
236
+ - - ! '>='
237
+ - !ruby/object:Gem::Version
238
+ version: '0'
169
239
  description: Google Protocol Buffers v2.4.1 Serialization and RPC implementation for
170
240
  Ruby.
171
241
  email:
@@ -444,7 +514,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
444
514
  version: '0'
445
515
  segments:
446
516
  - 0
447
- hash: 3071159189546677600
517
+ hash: -107413867811287521
448
518
  required_rubygems_version: !ruby/object:Gem::Requirement
449
519
  none: false
450
520
  requirements:
@@ -453,91 +523,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
453
523
  version: '0'
454
524
  segments:
455
525
  - 0
456
- hash: 3071159189546677600
526
+ hash: -107413867811287521
457
527
  requirements: []
458
528
  rubyforge_project:
459
- rubygems_version: 1.8.15
529
+ rubygems_version: 1.8.24
460
530
  signing_key:
461
531
  specification_version: 3
462
532
  summary: Google Protocol Buffers v2.4.1 Serialization and RPC implementation for Ruby.
463
- test_files:
464
- - spec/benchmark/tasks.rb
465
- - spec/functional/embedded_service_spec.rb
466
- - spec/functional/evented_server_spec.rb
467
- - spec/functional/socket_server_spec.rb
468
- - spec/functional/zmq_server_spec.rb
469
- - spec/lib/protobuf/cli_spec.rb
470
- - spec/lib/protobuf/enum_spec.rb
471
- - spec/lib/protobuf/enum_value_spec.rb
472
- - spec/lib/protobuf/logger_spec.rb
473
- - spec/lib/protobuf/message/encoder_spec.rb
474
- - spec/lib/protobuf/message_spec.rb
475
- - spec/lib/protobuf/rpc/client_spec.rb
476
- - spec/lib/protobuf/rpc/connector_spec.rb
477
- - spec/lib/protobuf/rpc/connectors/base_spec.rb
478
- - spec/lib/protobuf/rpc/connectors/common_spec.rb
479
- - spec/lib/protobuf/rpc/connectors/socket_spec.rb
480
- - spec/lib/protobuf/rpc/connectors/zmq_spec.rb
481
- - spec/lib/protobuf/rpc/servers/evented_server_spec.rb
482
- - spec/lib/protobuf/rpc/servers/socket_server_spec.rb
483
- - spec/lib/protobuf/rpc/servers/zmq/broker_spec.rb
484
- - spec/lib/protobuf/rpc/servers/zmq/server_spec.rb
485
- - spec/lib/protobuf/rpc/servers/zmq/util_spec.rb
486
- - spec/lib/protobuf/rpc/servers/zmq/worker_spec.rb
487
- - spec/lib/protobuf/rpc/service_dispatcher_spec.rb
488
- - spec/lib/protobuf/rpc/service_spec.rb
489
- - spec/lib/protobuf_spec.rb
490
- - spec/spec_helper.rb
491
- - spec/support/all.rb
492
- - spec/support/server.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
498
- - spec/support/test_app_file.rb
499
- - spec/support/tolerance_matcher.rb
500
- - test/data/data.bin
501
- - test/data/data_source.py
502
- - test/data/types.bin
503
- - test/data/types_source.py
504
- - test/data/unk.png
505
- - test/proto/addressbook.pb.rb
506
- - test/proto/addressbook.proto
507
- - test/proto/addressbook_base.pb.rb
508
- - test/proto/addressbook_base.proto
509
- - test/proto/addressbook_ext.pb.rb
510
- - test/proto/addressbook_ext.proto
511
- - test/proto/collision.pb.rb
512
- - test/proto/collision.proto
513
- - test/proto/ext_collision.pb.rb
514
- - test/proto/ext_collision.proto
515
- - test/proto/ext_range.pb.rb
516
- - test/proto/ext_range.proto
517
- - test/proto/float_default.proto
518
- - test/proto/lowercase.pb.rb
519
- - test/proto/lowercase.proto
520
- - test/proto/merge.pb.rb
521
- - test/proto/merge.proto
522
- - test/proto/nested.pb.rb
523
- - test/proto/nested.proto
524
- - test/proto/optional_field.pb.rb
525
- - test/proto/optional_field.proto
526
- - test/proto/packed.pb.rb
527
- - test/proto/packed.proto
528
- - test/proto/rpc.proto
529
- - test/proto/types.pb.rb
530
- - test/proto/types.proto
531
- - test/test_addressbook.rb
532
- - test/test_enum_value.rb
533
- - test/test_extension.rb
534
- - test/test_lowercase.rb
535
- - test/test_message.rb
536
- - test/test_optional_field.rb
537
- - test/test_packed_field.rb
538
- - test/test_parse.rb
539
- - test/test_repeated_types.rb
540
- - test/test_serialize.rb
541
- - test/test_standard_message.rb
542
- - test/test_types.rb
533
+ test_files: []
543
534
  has_rdoc: