sjs/grape-active_model_serializers
1
0
Fork 0
mirror of https://github.com/samsonjs/grape-active_model_serializers.git synced 2026-04-05 10:35:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify meta assignment to a single hash.

Browse source
This commit is contained in:
dB 2015-01-13 17:06:03 -05:00
parent 5bba714457
commit 19bb6b50f7
4 changed files with 7 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/grape-active_model_serializers/endpoint_extension.rb
View file

@ -36,8 +36,7 @@ module Grape
end
def render(resources, meta = {})
Formatter::ActiveModelSerializers.meta = meta[:meta]
Formatter::ActiveModelSerializers.meta_key = meta[:meta_key]
Formatter::ActiveModelSerializers.meta = meta
resources
end

12
lib/grape-active_model_serializers/formatter.rb
View file

@ -28,7 +28,7 @@ module Grape
def other_options
options = {}
meta = Formatter::ActiveModelSerializers.meta.delete(:meta)
meta_key = Formatter::ActiveModelSerializers.meta_key.delete(:meta_key)
meta_key = Formatter::ActiveModelSerializers.meta.delete(:meta_key)
options[:meta_key] = meta_key if meta && meta_key
options[meta_key || :meta] = meta if meta
options
@ -39,15 +39,7 @@ module Grape
end
def meta=(value)
@meta = value ? { meta: value } : nil
end
def meta_key
@meta_key || {}
end
def meta_key=(key)
@meta_key = key ? { meta_key: key } : nil
@meta = value
end
def build_options_from_endpoint(endpoint)

5
spec/grape-active_model_serializers/endpoint_extension_spec.rb
View file

@ -25,15 +25,14 @@ describe 'Grape::EndpointExtension' do
let(:meta_full) { { meta: meta_content } }
context 'supplying meta' do
it 'passes through the Resource and uses given meta settings' do
expect(serializer).to receive(:meta=).with(meta_content)
expect(serializer).to receive(:meta=).with(meta_full)
expect(subject.render(users, meta_full)).to eq(users)
end
end
context 'supplying meta and key' do
let(:meta_key) { { meta_key: :custom_key_name } }
it 'passes through the Resource and uses given meta settings' do
expect(serializer).to receive(:meta=).with(meta_content)
expect(serializer).to receive(:meta_key=).with(meta_key[:meta_key])
expect(serializer).to receive(:meta=).with(meta_full.merge(meta_key))
expect(subject.render(users, meta_full.merge(meta_key))).to eq(users)
end
end

18
spec/grape-active_model_serializers/formatter_spec.rb
View file

@ -5,8 +5,6 @@ describe Grape::Formatter::ActiveModelSerializers do
subject { Grape::Formatter::ActiveModelSerializers }
it { should respond_to(:meta) }
it { should respond_to(:meta=) }
it { should respond_to(:meta_key) }
it { should respond_to(:meta_key=) }
context '#meta' do
it 'will silently accept falsy input but return empty Hash' do
@ -15,20 +13,8 @@ describe Grape::Formatter::ActiveModelSerializers do
end
it 'will wrap valid input in the meta: {} wrapper' do
subject.meta = { total: 2 }
expect(subject.meta).to eq(meta: { total: 2 })
end
end
context '#meta_key' do
it 'will silently accept falsy input but return empty Hash' do
subject.meta_key = nil
expect(subject.meta_key).to eq({})
end
it 'will wrap valid input in the meta_key: {} wrapper' do
subject.meta_key = :custom_key_name
expect(subject.meta_key).to eq(meta_key: :custom_key_name)
subject.meta = { meta: { total: 2 } }
expect(subject.meta).to eq({ meta: { total: 2 } })
end
end