Merge branch 'master' into less-object-allocations

Author: Asmod4n

lib/webmachine/decision/fsm.rb

@@ -38,7 +38,7 @@ def run
             raise InvalidResource, t('fsm_broke', :state => state, :result => result.inspect)
           end
         end
-      rescue Exception => e
+      rescue => e
         Webmachine.render_error(500, request, response, :message => e.message)
       ensure
         trace_response(response)
@@ -51,7 +51,7 @@ def handle_exceptions
       rescue MalformedRequest => e
         Webmachine.render_error(400, request, response, :message => e.message)
         400
-      rescue Exception => e
+      rescue => e
         resource.handle_exception(e)
         500
       end

lib/webmachine/translation.rb

@@ -1,3 +1,4 @@
+require 'set'
 require 'i18n'
 I18n.enforce_available_locales = true if I18n.respond_to?(:enforce_available_locales)
 I18n.config.load_path << File.expand_path("../locale/en.yml", __FILE__)

spec/webmachine/decision/fsm_spec.rb

@@ -6,7 +6,7 @@
   subject { described_class.new(resource, request, response) }
 
   describe 'handling of exceptions from decision methods' do
-    let(:exception) { Exception.new }
+    let(:exception) { RuntimeError.new }
 
     before do
       allow(subject).to receive(Webmachine::Decision::Flow::START) { raise exception }
@@ -24,7 +24,7 @@
   end
 
   describe 'handling of exceptions from resource.handle_exception' do
-    let(:exception) { Exception.new('an error message') }
+    let(:exception) { RuntimeError.new('an error message') }
 
     before do
       allow(subject).to receive(Webmachine::Decision::Flow::START) { raise }
@@ -50,7 +50,7 @@
   end
 
   describe 'handling of exceptions from resource.finish_request' do
-    let(:exception) { Exception.new }
+    let(:exception) { RuntimeError.new }
 
     before do
       allow(resource).to receive(:finish_request) { raise exception }