From 2962f3f64e7c672bfb5a13a8f739b5db073e5473 Mon Sep 17 00:00:00 2001
From: Mateo Murphy <mateo.murphy@gmail.com>
Date: Mon, 2 Feb 2015 17:08:54 -0500
Subject: [PATCH 1/2] Reimplement serialization scope and scope_name

---
 lib/action_controller/serialization.rb | 20 ++++++++++++++++++++
 lib/active_model/serializer.rb         | 16 ++++++++++++----
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/lib/action_controller/serialization.rb b/lib/action_controller/serialization.rb
index 90897a701..11c70fe6d 100644
--- a/lib/action_controller/serialization.rb
+++ b/lib/action_controller/serialization.rb
@@ -8,6 +8,16 @@ module Serialization
 
     ADAPTER_OPTION_KEYS = [:include, :fields, :root, :adapter]
 
+    included do
+      class_attribute :_serialization_scope
+      self._serialization_scope = :current_user
+    end
+
+    def serialization_scope
+      send(_serialization_scope) if _serialization_scope &&
+        respond_to?(_serialization_scope, true)
+    end
+
     def get_serializer(resource)
       @_serializer ||= @_serializer_opts.delete(:serializer)
       @_serializer ||= ActiveModel::Serializer.serializer_for(resource)
@@ -29,6 +39,10 @@ def use_adapter?
           options.partition { |k, _| ADAPTER_OPTION_KEYS.include? k }.map { |h| Hash[h] }
 
         if use_adapter? && (serializer = get_serializer(resource))
+
+          @_serializer_opts[:scope] ||= serialization_scope
+          @_serializer_opts[:scope_name] = _serialization_scope
+
           # omg hax
           object = serializer.new(resource, @_serializer_opts)
           adapter = ActiveModel::Serializer::Adapter.create(object, @_adapter_opts)
@@ -38,5 +52,11 @@ def use_adapter?
         end
       end
     end
+
+    module ClassMethods
+      def serialization_scope(scope)
+        self._serialization_scope = scope
+      end
+    end
   end
 end
diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index b083e40d2..a8a645ef0 100644
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -126,13 +126,21 @@ def self.root_name
       name.demodulize.underscore.sub(/_serializer$/, '') if name
     end
 
-    attr_accessor :object, :root, :meta, :meta_key
+    attr_accessor :object, :root, :meta, :meta_key, :scope
 
     def initialize(object, options = {})
-      @object = object
-      @root   = options[:root] || (self.class._root ? self.class.root_name : false)
-      @meta   = options[:meta]
+      @object   = object
+      @root     = options[:root] || (self.class._root ? self.class.root_name : false)
+      @meta     = options[:meta]
       @meta_key = options[:meta_key]
+      @scope    = options[:scope]
+
+      scope_name = options[:scope_name]
+      if scope_name && !respond_to?(scope_name)
+        self.class.class_eval do
+          define_method scope_name, lambda { scope }
+        end
+      end
     end
 
     def json_key

From 232e3675600513f564437cebdcc03abae237a2c7 Mon Sep 17 00:00:00 2001
From: Mateo Murphy <mateo.murphy@gmail.com>
Date: Thu, 12 Feb 2015 17:48:43 -0500
Subject: [PATCH 2/2] Add serialization_scope_name_test

---
 .../serialization_scope_name_test.rb          | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 test/action_controller/serialization_scope_name_test.rb

diff --git a/test/action_controller/serialization_scope_name_test.rb b/test/action_controller/serialization_scope_name_test.rb
new file mode 100644
index 000000000..f1e81761a
--- /dev/null
+++ b/test/action_controller/serialization_scope_name_test.rb
@@ -0,0 +1,67 @@
+require 'test_helper'
+require 'pathname'
+
+class DefaultScopeNameTest < ActionController::TestCase
+  TestUser = Struct.new(:name, :admin)
+
+  class UserSerializer < ActiveModel::Serializer
+    attributes :admin?
+    def admin?
+      current_user.admin
+    end
+  end
+
+  class UserTestController < ActionController::Base
+    protect_from_forgery
+
+    before_filter { request.format = :json }
+
+    def current_user
+      TestUser.new('Pete', false)
+    end
+
+    def render_new_user
+      render json: TestUser.new('pete', false), serializer: UserSerializer, adapter: :json_api
+    end
+  end
+
+ tests UserTestController
+
+  def test_default_scope_name
+    get :render_new_user
+    assert_equal '{"users":{"admin?":false}}', @response.body
+  end
+end
+
+class SerializationScopeNameTest < ActionController::TestCase
+  TestUser = Struct.new(:name, :admin)
+
+  class AdminUserSerializer < ActiveModel::Serializer
+    attributes :admin?
+    def admin?
+      current_admin.admin
+    end
+  end
+
+  class AdminUserTestController < ActionController::Base
+    protect_from_forgery
+
+    serialization_scope :current_admin
+    before_filter { request.format = :json }
+
+    def current_admin
+      TestUser.new('Bob', true)
+    end
+
+    def render_new_user
+      render json: TestUser.new('pete', false), serializer: AdminUserSerializer, adapter: :json_api
+    end
+  end
+
+  tests AdminUserTestController
+
+  def test_override_scope_name_with_controller
+    get :render_new_user
+    assert_equal '{"admin_users":{"admin?":true}}', @response.body
+  end
+end
\ No newline at end of file