diff --git a/README.md b/README.md index 6ae5b27..30b9ddf 100644 --- a/README.md +++ b/README.md @@ -109,6 +109,16 @@ get "/homes" end ``` +### Support for `default_serializer_options` + +```ruby + helper do + def default_serializer_options + {only: params[:only], except: params[:except]} + end + end +``` + ### current_user One of the nice features of ActiveModel::Serializers is that it diff --git a/grape-active_model_serializers.gemspec b/grape-active_model_serializers.gemspec index fc2b060..0ab28a8 100644 --- a/grape-active_model_serializers.gemspec +++ b/grape-active_model_serializers.gemspec @@ -22,5 +22,5 @@ Gem::Specification.new do |gem| gem.add_development_dependency "rspec" gem.add_development_dependency "rack-test" gem.add_development_dependency "rake" - gem.add_development_dependency 'guard-rspec' + gem.add_development_dependency "guard-rspec" end diff --git a/lib/grape-active_model_serializers/formatter.rb b/lib/grape-active_model_serializers/formatter.rb index 87f2b11..1db63bb 100644 --- a/lib/grape-active_model_serializers/formatter.rb +++ b/lib/grape-active_model_serializers/formatter.rb @@ -56,7 +56,7 @@ def meta_key=(key) end def build_options_from_endpoint(endpoint) - endpoint.namespace_options.merge(endpoint.route_options) + [endpoint.default_serializer_options || {}, endpoint.namespace_options, endpoint.route_options].reduce(:merge) end # array root is the innermost namespace name ('space') if there is one, diff --git a/spec/grape-active_model_serializers/endpoint_extension_spec.rb b/spec/grape-active_model_serializers/endpoint_extension_spec.rb index e296dd3..0052e7f 100644 --- a/spec/grape-active_model_serializers/endpoint_extension_spec.rb +++ b/spec/grape-active_model_serializers/endpoint_extension_spec.rb @@ -7,12 +7,12 @@ let(:serializer) { Grape::Formatter::ActiveModelSerializers } let(:user) do - Object.new do - def name - 'sven' - end - end - end + Object.new do + def name + 'sven' + end + end + end let(:users) { [user, user] } diff --git a/spec/grape-active_model_serializers/formatter_spec.rb b/spec/grape-active_model_serializers/formatter_spec.rb index 0529e9d..bed4a93 100644 --- a/spec/grape-active_model_serializers/formatter_spec.rb +++ b/spec/grape-active_model_serializers/formatter_spec.rb @@ -41,6 +41,10 @@ def endpoint.current_user @current_user ||= User.new(first_name: 'Current user') end + + def endpoint.default_serializer_options + { only: :only, except: :except } + end end subject { described_class.fetch_serializer(user, env) } @@ -48,7 +52,12 @@ def endpoint.current_user it { should be_a UserSerializer } it 'should have correct scope set' do - expect(subject.scope).to eq(endpoint.current_user) + expect(subject.scope.current_user).to eq(endpoint.current_user) + end + + it 'should read default serializer options' do + expect(subject.instance_variable_get('@only')).to eq([:only]) + expect(subject.instance_variable_get('@except')).to eq([:except]) end end end