Allow only to pass scope to associations

Closes rails-api#483
ello · Jan 3, 2014 · 5fa4002 · 5fa4002
1 parent 60fc550
commit 5fa4002
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 29 deletions.
diff --git a/lib/active_model/array_serializer.rb b/lib/active_model/array_serializer.rb
@@ -14,25 +14,26 @@ class << self
 
     def initialize(object, options={})
       @object          = object
+      @scope           = options[:scope]
       @root            = options.fetch(:root, self.class._root)
       @meta_key        = options[:meta_key] || :meta
       @meta            = options[@meta_key]
       @each_serializer = options[:each_serializer]
-      @options         = options.merge(root: nil)
+      @resource_name   = options[:resource_name]
     end
-    attr_accessor :object, :root, :meta_key, :meta, :options
+    attr_accessor :object, :scope, :root, :meta_key, :meta
 
     def json_key
       if root.nil?
-        @options[:resource_name]
+        @resource_name
       else
         root
       end
     end
 
     def serializer_for(item)
       serializer_class = @each_serializer || Serializer.serializer_for(item) || DefaultSerializer
-      serializer_class.new(item, @options)
+      serializer_class.new(item, scope: scope)
     end
 
     def serializable_object

diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
@@ -102,14 +102,14 @@ def associate(klass, *attrs)
     end
 
     def initialize(object, options={})
-      @object   = object
-      @scope    = options[:scope]
-      @root     = options.fetch(:root, self.class._root)
-      @meta_key = options[:meta_key] || :meta
-      @meta     = options[@meta_key]
-      @options  = options.reject{|k,v| [:scope, :root, :meta_key, :meta].include?(k) }
+      @object        = object
+      @scope         = options[:scope]
+      @root          = options.fetch(:root, self.class._root)
+      @meta_key      = options[:meta_key] || :meta
+      @meta          = options[@meta_key]
+      @wrap_in_array = options[:_wrap_in_array]
     end
-    attr_accessor :object, :scope, :meta_key, :meta, :root, :options
+    attr_accessor :object, :scope, :root, :meta_key, :meta
 
     def json_key
       if root == true || root.nil?
@@ -186,7 +186,7 @@ def serializable_object(options={})
       return nil if object.nil?
       hash = attributes
       hash.merge! associations
-      @options[:_wrap_in_array] ? [hash] : hash
+      @wrap_in_array ? [hash] : hash
     end
     alias_method :serializable_hash, :serializable_object
   end

diff --git a/test/unit/active_model/serializer/options_test.rb b/test/unit/active_model/serializer/options_test.rb