Merge pull request #62 from SamMarkGoldman/no_active_record

eliminate ActiveRecord as a dependency for errors
tiagopog · Apr 30, 2017 · 1bce9d6 · 1bce9d6
2 parents 656fd02 + ca78ab1
commit 1bce9d6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/jsonapi/utils/response/formatters.rb b/lib/jsonapi/utils/response/formatters.rb
@@ -22,7 +22,7 @@ def jsonapi_format_errors(data)
         private
 
         def active_record_obj?(data)
-          data.is_a?(ActiveRecord::Base)|| data.singleton_class.include?(ActiveModel::Model)
+          defined?(ActiveRecord::Base) && (data.is_a?(ActiveRecord::Base) || data.singleton_class.include?(ActiveModel::Model))
         end
 
         def build_response_document(records, options)