From 3f49f51a88950189d2ef25a1826dbd7fdfe59a72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moura?= <joaomdmoura@gmail.com>
Date: Mon, 22 Jun 2015 17:53:46 -0300
Subject: [PATCH] Renaming Error to NoSerializerError

---
 lib/action_controller/serialization.rb          | 6 +++---
 lib/active_model/serializer.rb                  | 2 +-
 lib/active_model/serializer/array_serializer.rb | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/action_controller/serialization.rb b/lib/action_controller/serialization.rb
index a659c8d74..acafc0fdd 100644
--- a/lib/action_controller/serialization.rb
+++ b/lib/action_controller/serialization.rb
@@ -43,10 +43,10 @@ def use_adapter?
           @_serializer_opts[:scope_name] = _serialization_scope
 
           begin
-            object   = serializer.new(resource, @_serializer_opts)
-          rescue ActiveModel::Serializer::ArraySerializer::Error
+            serialized = serializer.new(resource, @_serializer_opts)
+          rescue ActiveModel::Serializer::ArraySerializer::NoSerializerError
           else
-            resource = ActiveModel::Serializer::Adapter.create(object, @_adapter_opts)
+            resource = ActiveModel::Serializer::Adapter.create(serialized, @_adapter_opts)
           end
         end
 
diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index 8594d14e1..5623a1d8f 100644
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -211,7 +211,7 @@ def each_association(&block)
               association_value,
               options.except(:serializer).merge(serializer_from_options(association_options))
             )
-          rescue ActiveModel::Serializer::ArraySerializer::Error
+          rescue ActiveModel::Serializer::ArraySerializer::NoSerializerError
             # 1. Failure to serialize an element in a collection, e.g. [ {hi: "Steve" } ] will fail
             #    with NoMethodError when the ArraySerializer finds no serializer for the hash { hi: "Steve" },
             #    and tries to call new on that nil.
diff --git a/lib/active_model/serializer/array_serializer.rb b/lib/active_model/serializer/array_serializer.rb
index bd73fd9ea..42c17a322 100644
--- a/lib/active_model/serializer/array_serializer.rb
+++ b/lib/active_model/serializer/array_serializer.rb
@@ -1,7 +1,7 @@
 module ActiveModel
   class Serializer
     class ArraySerializer
-      Error = Class.new(StandardError)
+      NoSerializerError = Class.new(StandardError)
       include Enumerable
       delegate :each, to: :@objects
 
@@ -16,7 +16,7 @@ def initialize(objects, options = {})
           )
 
           if serializer_class.nil?
-            fail Error, "No serializer found for object: #{object.inspect}"
+            fail NoSerializerError, "No serializer found for object: #{object.inspect}"
           else
             serializer_class.new(object, options.except(:serializer))
           end