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
This commit is contained in:
Paul Henry 2014-06-13 16:32:07 -07:00 committed by Paul Henry
parent 045ba2a48c
commit 76263865a7
3 changed files with 2 additions and 4 deletions

View File

@ -1,6 +1,5 @@
require 'active_model/default_serializer'
require 'active_model/serializable'
require 'active_model/serializer'
module ActiveModel
class ArraySerializer

View File

@ -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

View File

@ -1,5 +1,4 @@
require 'active_model/default_serializer'
require 'active_model/serializer'
module ActiveModel
class Serializer