protobuf 2.6.1 → 2.6.2

Sign up to get free protection for your applications and to get access to all the features.
@@ -240,7 +240,12 @@ module Protobuf
240
240
  begin
241
241
  yield
242
242
  rescue *rescue_filters.keys => ex
243
- call_or_send(rescue_filters[ex.class], ex)
243
+ callable = rescue_filters.fetch(ex.class) {
244
+ mapped_klass = rescue_filters.keys.detect { |child_klass| ex.class < child_klass }
245
+ rescue_filters[mapped_klass]
246
+ }
247
+
248
+ call_or_send(callable, ex)
244
249
  end
245
250
  end
246
251
  end
@@ -1,4 +1,4 @@
1
1
  module Protobuf
2
- VERSION = '2.6.1'
2
+ VERSION = '2.6.2'
3
3
  PROTOC_VERSION = '2.4.1'
4
4
  end
@@ -390,6 +390,11 @@ describe Protobuf::Rpc::ServiceFilters do
390
390
  raise CustomError3, 'Filter 3 failed'
391
391
  end
392
392
 
393
+ def filter_with_runtime_error
394
+ @called << :filter_with_runtime_error
395
+ raise RuntimeError, 'Filter with runtime error failed'
396
+ end
397
+
393
398
  def custom_error_occurred(ex)
394
399
  @ex_class = ex.class
395
400
  @called << :custom_error_occurred
@@ -455,6 +460,25 @@ describe Protobuf::Rpc::ServiceFilters do
455
460
  }.to_not raise_error(CustomError1)
456
461
  end
457
462
  end
463
+
464
+ context 'when thrown exception inherits from a mapped exception' do
465
+ before do
466
+ FilterTest.rescue_from(StandardError) do |service, ex|
467
+ service.ex_class = ex.class
468
+ service.called << :standard_error_rescue_handler
469
+ end
470
+ end
471
+ before { FilterTest.before_filter(:filter_with_runtime_error) }
472
+
473
+ it 'rescues with the given callable' do
474
+ expect {
475
+ subject.should_not_receive(:endpoint)
476
+ subject.__send__(:run_filters, :endpoint)
477
+ subject.called.should eq([ :filter_with_runtime_error, :standard_error_rescue_handler ])
478
+ subject.ex_class.should eq RuntimeError
479
+ }.to_not raise_error
480
+ end
481
+ end
458
482
  end
459
483
 
460
484
  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.6.1
4
+ version: 2.6.2
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-03 00:00:00.000000000Z
13
+ date: 2013-01-10 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: activesupport
17
- requirement: &2152629720 !ruby/object:Gem::Requirement
17
+ requirement: &2153024900 !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: *2152629720
25
+ version_requirements: *2153024900
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: ffi
28
- requirement: &2152628820 !ruby/object:Gem::Requirement
28
+ requirement: &2153023280 !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: *2152628820
36
+ version_requirements: *2153023280
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: multi_json
39
- requirement: &2152627320 !ruby/object:Gem::Requirement
39
+ requirement: &2153022060 !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: *2152627320
47
+ version_requirements: *2153022060
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: thor
50
- requirement: &2152625600 !ruby/object:Gem::Requirement
50
+ requirement: &2152961820 !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: *2152625600
58
+ version_requirements: *2152961820
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: eventmachine
61
- requirement: &2152623460 !ruby/object:Gem::Requirement
61
+ requirement: &2152961020 !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: *2152623460
69
+ version_requirements: *2152961020
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: ffi-rzmq
72
- requirement: &2152622480 !ruby/object:Gem::Requirement
72
+ requirement: &2152956240 !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: *2152622480
80
+ version_requirements: *2152956240
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: pry
83
- requirement: &2152621580 !ruby/object:Gem::Requirement
83
+ requirement: &2152955300 !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: *2152621580
91
+ version_requirements: *2152955300
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: pry-nav
94
- requirement: &2152617660 !ruby/object:Gem::Requirement
94
+ requirement: &2152906140 !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: *2152617660
102
+ version_requirements: *2152906140
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: rake
105
- requirement: &2152616840 !ruby/object:Gem::Requirement
105
+ requirement: &2152902920 !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: *2152616840
113
+ version_requirements: *2152902920
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: rake-compiler
116
- requirement: &2152614840 !ruby/object:Gem::Requirement
116
+ requirement: &2152901620 !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: *2152614840
124
+ version_requirements: *2152901620
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: rspec
127
- requirement: &2152613220 !ruby/object:Gem::Requirement
127
+ requirement: &2152900280 !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: *2152613220
135
+ version_requirements: *2152900280
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: simplecov
138
- requirement: &2152612260 !ruby/object:Gem::Requirement
138
+ requirement: &2152897720 !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: *2152612260
146
+ version_requirements: *2152897720
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: yard
149
- requirement: &2152610200 !ruby/object:Gem::Requirement
149
+ requirement: &2152894840 !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: *2152610200
157
+ version_requirements: *2152894840
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: 2126101120124710975
437
+ hash: 2241403009128539915
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: 2126101120124710975
446
+ hash: 2241403009128539915
447
447
  requirements: []
448
448
  rubyforge_project:
449
449
  rubygems_version: 1.8.15