From 76263865a7d350bb7440720f90942eda5ac7637b Mon Sep 17 00:00:00 2001 From: Paul Henry Date: Fri, 13 Jun 2014 16:32:07 -0700 Subject: [PATCH] fix uninitialized instance variable warning Ruby warns that `@only` and `@except` are not initialized because if they are not passed in, they are never assigned. Remove circular require in array_serializer --- lib/active_model/array_serializer.rb | 1 - lib/active_model/serializer.rb | 4 ++-- lib/active_model/serializer/associations.rb | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/active_model/array_serializer.rb b/lib/active_model/array_serializer.rb index b3e67aa5..8a42e18a 100644 --- a/lib/active_model/array_serializer.rb +++ b/lib/active_model/array_serializer.rb @@ -1,6 +1,5 @@ require 'active_model/default_serializer' require 'active_model/serializable' -require 'active_model/serializer' module ActiveModel class ArraySerializer diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb index 36431068..bd1a3ac5 100644 --- a/lib/active_model/serializer.rb +++ b/lib/active_model/serializer.rb @@ -113,8 +113,8 @@ end @meta_key = options[:meta_key] || :meta @meta = options[@meta_key] @wrap_in_array = options[:_wrap_in_array] - @only = Array(options[:only]) if options[:only] - @except = Array(options[:except]) if options[:except] + @only = options[:only] ? Array(options[:only]) : nil + @except = options[:except] ? Array(options[:except]) : nil @key_format = options[:key_format] end attr_accessor :object, :scope, :root, :meta_key, :meta, :key_format diff --git a/lib/active_model/serializer/associations.rb b/lib/active_model/serializer/associations.rb index 7f414b9c..3b6e86b2 100644 --- a/lib/active_model/serializer/associations.rb +++ b/lib/active_model/serializer/associations.rb @@ -1,5 +1,4 @@ require 'active_model/default_serializer' -require 'active_model/serializer' module ActiveModel class Serializer