Refactor Observer.observed_class

rails · Apr 25, 2012 · 9072a08 · 9072a08
1 parent cd556c9
commit 9072a08
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/activemodel/lib/active_model/observing.rb b/activemodel/lib/active_model/observing.rb
@@ -5,6 +5,7 @@
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/enumerable'
 require 'active_support/deprecation'
+require 'active_support/core_ext/object/try'
 require 'active_support/descendants_tracker'
 
 module ActiveModel
@@ -212,11 +213,7 @@ def observed_classes
       # The class observed by default is inferred from the observer's class name:
       #   assert_equal Person, PersonObserver.observed_class
       def observed_class
-        if observed_class_name = name[/(.*)Observer/, 1]
+        name[/(.*)Observer/, 1].try :constantize
-          observed_class_name.constantize
-        else
-          nil
-        end
       end
     end