Only rescue LoadError if message matches

shioyama · Aug 5, 2017 · 43cac6e · 43cac6e
1 parent 1e1e6b3
commit 43cac6e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/lib/mobility.rb b/lib/mobility.rb
@@ -51,15 +51,17 @@ class VersionNotSupportedError < ArgumentError; end
     require "mobility/active_model"
     require "mobility/active_record"
     Loaded::ActiveRecord = true
-  rescue LoadError
+  rescue LoadError => e
+    raise unless e.message =~ /active_record/
     Loaded::ActiveRecord = false
   end
 
   begin
     require "rails"
     Loaded::Rails = true
     require "rails/generators/mobility/generators"
-  rescue LoadError
+  rescue LoadError => e
+    raise unless e.message =~ /rails/
     Loaded::Rails = false
   end
 
@@ -72,7 +74,8 @@ class VersionNotSupportedError < ArgumentError; end
     require "sequel/plugins/dirty"
     require "mobility/sequel"
     Loaded::Sequel = true
-  rescue LoadError
+  rescue LoadError => e
+    raise unless e.message =~ /sequel/
     Loaded::Sequel = false
   end
 

diff --git a/lib/mobility/backend/orm_delegator.rb b/lib/mobility/backend/orm_delegator.rb
@@ -32,8 +32,9 @@ def for(model_class)
 
       def require_backend(orm, backend)
         begin
-          require "mobility/backends/#{orm}/#{backend}"
-        rescue LoadError
+          require (path = "mobility/backends/#{orm}/#{backend}")
+        rescue LoadError => e
+          raise unless e.message =~ /#{path}/
         end
       end
     end