protobuf 2.6.1 → 2.6.2

data/lib/protobuf/rpc/service_filters.rb

@@ -240,7 +240,12 @@ module Protobuf
             begin
               yield
             rescue *rescue_filters.keys => ex
-              call_or_send(rescue_filters[ex.class], ex)
+              callable = rescue_filters.fetch(ex.class) {
+                mapped_klass = rescue_filters.keys.detect { |child_klass| ex.class < child_klass }
+                rescue_filters[mapped_klass]
+              }
+
+              call_or_send(callable, ex)
             end
           end
         end

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.6.1'
+  VERSION = '2.6.2'
   PROTOC_VERSION = '2.4.1'
 end

data/spec/lib/protobuf/rpc/service_filters_spec.rb

@@ -390,6 +390,11 @@ describe Protobuf::Rpc::ServiceFilters do
           raise CustomError3, 'Filter 3 failed'
         end
 
+        def filter_with_runtime_error
+          @called << :filter_with_runtime_error
+          raise RuntimeError, 'Filter with runtime error failed'
+        end
+
         def custom_error_occurred(ex)
           @ex_class = ex.class
           @called << :custom_error_occurred
@@ -455,6 +460,25 @@ describe Protobuf::Rpc::ServiceFilters do
         }.to_not raise_error(CustomError1)
       end
     end
+
+    context 'when thrown exception inherits from a mapped exception' do
+      before do
+        FilterTest.rescue_from(StandardError) do |service, ex|
+          service.ex_class = ex.class
+          service.called << :standard_error_rescue_handler
+        end
+      end
+      before { FilterTest.before_filter(:filter_with_runtime_error) }
+
+      it 'rescues with the given callable' do
+        expect {
+          subject.should_not_receive(:endpoint)
+          subject.__send__(:run_filters, :endpoint)
+          subject.called.should eq([ :filter_with_runtime_error, :standard_error_rescue_handler ])
+          subject.ex_class.should eq RuntimeError
+        }.to_not raise_error
+      end
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000Z
+date: 2013-01-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152629720 !ruby/object:Gem::Requirement
+  requirement: &2153024900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152629720
+  version_requirements: *2153024900
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &2152628820 !ruby/object:Gem::Requirement
+  requirement: &2153023280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152628820
+  version_requirements: *2153023280
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2152627320 !ruby/object:Gem::Requirement
+  requirement: &2153022060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152627320
+  version_requirements: *2153022060
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2152625600 !ruby/object:Gem::Requirement
+  requirement: &2152961820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152625600
+  version_requirements: *2152961820
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2152623460 !ruby/object:Gem::Requirement
+  requirement: &2152961020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152623460
+  version_requirements: *2152961020
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
-  requirement: &2152622480 !ruby/object:Gem::Requirement
+  requirement: &2152956240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152622480
+  version_requirements: *2152956240
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2152621580 !ruby/object:Gem::Requirement
+  requirement: &2152955300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152621580
+  version_requirements: *2152955300
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  requirement: &2152617660 !ruby/object:Gem::Requirement
+  requirement: &2152906140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152617660
+  version_requirements: *2152906140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152616840 !ruby/object:Gem::Requirement
+  requirement: &2152902920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152616840
+  version_requirements: *2152902920
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &2152614840 !ruby/object:Gem::Requirement
+  requirement: &2152901620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152614840
+  version_requirements: *2152901620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152613220 !ruby/object:Gem::Requirement
+  requirement: &2152900280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152613220
+  version_requirements: *2152900280
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152612260 !ruby/object:Gem::Requirement
+  requirement: &2152897720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152612260
+  version_requirements: *2152897720
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152610200 !ruby/object:Gem::Requirement
+  requirement: &2152894840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,7 +154,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152610200
+  version_requirements: *2152894840
 description: Google Protocol Buffers v2.4.1 Serialization and RPC implementation for
   Ruby.
 email:
@@ -434,7 +434,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2126101120124710975
+      hash: 2241403009128539915
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -443,7 +443,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2126101120124710975
+      hash: 2241403009128539915
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15