ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-22 22:06:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #570 from letuboy/patch-1

Browse Source 
fix uninitialized instance variable warning
This commit is contained in:
Steve Klabnik 2014-08-02 17:17:38 -04:00
commit b9d216debd
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/active_model/array_serializer.rb
View File

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

4
lib/active_model/serializer.rb
View File

@ -113,8 +113,8 @@ end
@meta_key = options[:meta_key] || :meta @meta_key = options[:meta_key] || :meta
@meta = options[@meta_key] @meta = options[@meta_key]
@wrap_in_array = options[:_wrap_in_array] @wrap_in_array = options[:_wrap_in_array]
@only = Array(options[:only]) if options[:only] @only = options[:only] ? Array(options[:only]) : nil
@except = Array(options[:except]) if options[:except] @except = options[:except] ? Array(options[:except]) : nil
@key_format = options[:key_format] @key_format = options[:key_format]
end end
attr_accessor :object, :scope, :root, :meta_key, :meta, :key_format attr_accessor :object, :scope, :root, :meta_key, :meta, :key_format

1
lib/active_model/serializer/associations.rb
View File

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