Merge branch 'cllns-fix-adapter-error-handling'

hanami · Mar 26, 2016 · 2e1cc5e · 2e1cc5e
2 parents 3e99c56 + d5861d6
commit 2e1cc5e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/lib/hanami/model/config/adapter.rb b/lib/hanami/model/config/adapter.rb
@@ -7,8 +7,8 @@ module Config
       #
       # @since 0.2.0
       class AdapterNotFound < Hanami::Model::Error
-        def initialize(adapter_name)
-          super "Cannot find Hanami::Model adapter #{adapter_name}"
+        def initialize(adapter_name, message)
+          super "Cannot find Hanami::Model adapter '#{adapter_name}' (#{message})"
         end
       end
 
@@ -95,21 +95,18 @@ def load_adapter
           begin
             require "hanami/model/adapters/#{type}_adapter"
           rescue LoadError => e
-            raise LoadError.new("Cannot find Hanami::Model adapter '#{type}' (#{e.message})")
+            raise AdapterNotFound.new(class_name, e.message)
           end
         end
 
         def instantiate_adapter(mapper)
           begin
             klass = Hanami::Utils::Class.load!(class_name, Hanami::Model::Adapters)
             klass.new(mapper, uri, options)
-          rescue NameError
-            raise AdapterNotFound.new(class_name)
           rescue => e
-            raise "Cannot instantiate adapter of #{klass} (#{e.message})"
+            raise Error, e
           end
         end
-
       end
     end
   end

diff --git a/test/model/config/adapter_test.rb b/test/model/config/adapter_test.rb
@@ -37,7 +37,7 @@
       let(:config) { Hanami::Model::Config::Adapter.new(type: :redis, uri: 'redis://not_exist') }
 
       it 'raises an error' do
-        -> { config.build(mapper) }.must_raise(LoadError)
+        -> { config.build(mapper) }.must_raise(Hanami::Model::Error)
       end
     end
 
@@ -46,7 +46,7 @@
 
       it 'raises an error' do
         config.stub(:load_adapter, nil) do
-          -> { config.build(mapper) }.must_raise(Hanami::Model::Config::AdapterNotFound)
+          -> { config.build(mapper) }.must_raise(Hanami::Model::Error)
         end
       end
     end