Merge pull request #135 from bf4/active_record_friendly_exceptions

Make makara error base class that inherits active record error class

lib/makara.rb

@@ -12,6 +12,7 @@ module Makara
   autoload :Proxy,              'makara/proxy'
 
   module Errors
+    autoload :MakaraError,                'makara/errors/makara_error'
     autoload :AllConnectionsBlacklisted,  'makara/errors/all_connections_blacklisted'
     autoload :BlacklistConnection,        'makara/errors/blacklist_connection'
     autoload :NoConnectionsAvailable,     'makara/errors/no_connections_available'

lib/makara/error_handler.rb

@@ -11,7 +11,7 @@ def handle(connection)
 
     rescue Exception => e
 
-      if e.class.name =~ /^Makara::/
+      if e.is_a?(Makara::Errors::MakaraError)
         harshly(e)
       else
         gracefully(connection, e)

lib/makara/errors/all_connections_blacklisted.rb

@@ -1,6 +1,6 @@
 module Makara
   module Errors
-    class AllConnectionsBlacklisted < StandardError
+    class AllConnectionsBlacklisted < MakaraError
 
       def initialize(pool, errors)
         errors = [*errors]

lib/makara/errors/blacklist_connection.rb

@@ -1,6 +1,6 @@
 module Makara
   module Errors
-    class BlacklistConnection < ::StandardError
+    class BlacklistConnection < MakaraError
 
       attr_reader :original_error
 

lib/makara/errors/makara_error.rb

@@ -0,0 +1,7 @@
+module Makara
+  module Errors
+    class MakaraError < ::ActiveRecord::ActiveRecordError
+
+    end
+  end
+end

lib/makara/errors/no_connections_available.rb

@@ -1,6 +1,6 @@
 module Makara
   module Errors
-    class NoConnectionsAvailable < ::StandardError
+    class NoConnectionsAvailable < MakaraError
 
       attr_reader :role