Skip to content

Commit

Permalink
Pass adapter options through calls to render.
Browse files Browse the repository at this point in the history
  • Loading branch information
drn committed Aug 30, 2016
1 parent bc7a0b0 commit 41595fc
Show file tree
Hide file tree
Showing 5 changed files with 108 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
### 1.5.1 (Next)

* ...
* [#63](https://github.com/ruby-grape/grape-active_model_serializers/pull/63): Pass adapter options through render - [@drn](https://github.com/drn).

### 1.5.0 (August 24, 2016)

Expand Down
6 changes: 4 additions & 2 deletions lib/grape-active_model_serializers/endpoint_extension.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ def serialization_scope
end
end

def render(resources, meta = {})
env['ams_meta'] = meta
def render(resources, extra_options = {})
extra_options.symbolize_keys!
env['ams_meta'] = extra_options.slice(:meta, :meta_key)
env['ams_adapter_options'] = extra_options.except(:meta, :meta_key)
resources
end

Expand Down
7 changes: 6 additions & 1 deletion lib/grape-active_model_serializers/options_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ def options
options[:scope] = endpoint unless options.key?(:scope)
options.merge!(default_root_options) unless options.key?(:root)
options.merge!(meta_options)
options.merge!(adapter_options)
options
)
end
Expand Down Expand Up @@ -58,11 +59,15 @@ def meta_options
options = {}
ams_meta = env['ams_meta'] || {}
meta = ams_meta[:meta]
meta_key = ams_meta[:meta_key]
meta_key = ams_meta[:meta_key] || 'meta'
options[:meta] = meta if meta
options[:meta_key] = meta_key if meta && meta_key
options
end

def adapter_options
env['ams_adapter_options'] || {}
end
end
end
end
97 changes: 97 additions & 0 deletions spec/grape/active_model_serializers/options_builder_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
require 'spec_helper'

describe Grape::ActiveModelSerializers::OptionsBuilder do
let(:resolver) { described_class.new(resource, env) }
let(:resource) { User.new }
let(:env) { { 'api.endpoint' => UsersApi.endpoints.first } }

context '#options' do
let(:options) { resolver.options }

context 'meta options' do
let(:env) { super().merge('ams_meta' => meta_options) }
let(:meta_options) {
{
meta: meta,
meta_key: meta_key
}
}
let(:meta) { { sample: 'metadata' } }
let(:meta_key) { 'specified_key' }

context 'meta option set' do
context 'meta_key set' do
it 'includes meta' do
expect(options[:meta]).to eq(meta)
end

it 'includes meta_key' do
expect(options[:meta_key]).to eq(meta_key)
end
end

context 'meta_key unset' do
let(:meta_key) { nil }

it 'includes meta' do
expect(options[:meta]).to eq(meta)
end

it 'defaults meta_key to meta' do
expect(options[:meta_key]).to eq('meta')
end
end
end

context 'meta option unset' do
let(:meta) { nil }

context 'meta_key set' do
it 'does not include meta' do
expect(options.keys).not_to include(:meta)
end

it 'does not include meta_key' do
expect(options.keys).not_to include(:meta_key)
end
end

context 'meta_key unset' do
let(:meta_key) { nil }

it 'does not include meta' do
expect(options.keys).not_to include(:meta)
end

it 'does not include meta_key' do
expect(options.keys).not_to include(:meta_key)
end
end
end
end

context 'adapter options' do
let(:env) { super().merge('ams_adapter_options' => adapter_options) }
let(:adapter_options) { {} }

context 'adapter' do
let(:adapter_options) { { adapter: adapter } }
let(:adapter) { :attributes }

it 'includes adapter as top-level option' do
expect(options[:adapter]).to eq(adapter)
end
end

context 'serializer' do
let(:adapter_options) { { serializer: serializer } }
let(:serializer) { V2::UserSerializer }

it 'includes serializer as top-level option' do
expect(options[:serializer]).to eq(serializer)
end
end
end
end

end
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'pry'
require 'spec_helper'

# asserts serializer resolution order:
Expand Down

0 comments on commit 41595fc

Please sign in to comment.