Skip to content

Commit

Permalink
Re-add deprecated DocumentPresenter#render_values until Blacklight 7.x
Browse files Browse the repository at this point in the history
  • Loading branch information
cbeer committed Jul 6, 2016
1 parent 908066f commit 2ba70b9
Show file tree
Hide file tree
Showing 6 changed files with 103 additions and 1 deletion.
8 changes: 7 additions & 1 deletion app/presenters/blacklight/document_presenter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,16 @@ def field_values(field_config, options={})

# @deprecated
def render_field_value(values, field_config = Configuration::NullField.new)
FieldPresenter.new(@controller, @document, field_config, value: values).render
field_value(field_config, value: Array(values))
end
deprecation_deprecate render_field_value: 'Use FieldPresenter instead'

# @deprecated
def render_values(values, field_config = Configuration::NullField.new)
field_value(field_config, value: Array(values))
end
deprecation_deprecate render_values: 'Use FieldPresenter instead'

private

def index_presenter
Expand Down
18 changes: 18 additions & 0 deletions app/presenters/blacklight/index_presenter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,24 @@ def field_value field, options = {}
field_values(field_config, options)
end

# @deprecated
def get_field_values(field_config, options={})
field_values(field_config, options)
end
deprecation_deprecate get_field_values: "replaced by #field_value"

# @deprecated
def render_field_values(values, field_config = Configuration::NullField.new)
field_values(field_config, value: Array(values))
end
deprecation_deprecate render_field_values: "replaced by #field_value"

# @deprecated
def render_values(values, field_config = Configuration::NullField.new)
field_values(field_config, value: Array(values))
end
deprecation_deprecate render_values: "replaced by #field_value"

private

##
Expand Down
18 changes: 18 additions & 0 deletions app/presenters/blacklight/show_presenter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,24 @@ def field_value field, options={}
field_values(field_config(field), options)
end

# @deprecated
def get_field_values(field_config, options={})
field_values(field_config, options)
end
deprecation_deprecate get_field_values: "replaced by #field_value"

# @deprecated
def render_field_values(values, field_config = Configuration::NullField.new)
field_values(field_config, value: Array(values))
end
deprecation_deprecate render_field_values: "replaced by #field_value"

# @deprecated
def render_values(values, field_config = Configuration::NullField.new)
field_values(field_config, value: Array(values))
end
deprecation_deprecate render_values: "replaced by #field_value"

private

##
Expand Down
8 changes: 8 additions & 0 deletions spec/presenters/document_presenter_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -428,4 +428,12 @@ def mock_document_app_helper_url *args
end
end
end

describe '#render_values' do
it 'renders field values as a string' do
expect(subject.render_values('x')).to eq 'x'
expect(subject.render_values(['x', 'y'])).to eq 'x and y'
expect(subject.render_values(['x', 'y', 'z'])).to eq 'x, y, and z'
end
end
end
26 changes: 26 additions & 0 deletions spec/presenters/index_presenter_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -143,5 +143,31 @@
end
end
end

describe 'deprecated methods' do
before do
allow(Deprecation).to receive(:warn)
end

let(:field_config) { config.add_index_field 'qwerty' }

describe '#get_field_values' do
it 'renders values for the given field' do
expect(subject.get_field_values(field_config, value: ['x', 'y'])).to eq 'x and y'
end
end

describe '#render_field_values' do
it 'renders values for the given field' do
expect(subject.render_field_values('x')).to eq 'x'
end
end

describe '#render_values' do
it 'renders values for the given field' do
expect(subject.render_values(['x', 'y', 'z'])).to eq 'x, y, and z'
end
end
end
end

26 changes: 26 additions & 0 deletions spec/presenters/show_presenter_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -283,5 +283,31 @@ def mock_document_app_helper_url *args
end
end
end

describe 'deprecated methods' do
before do
allow(Deprecation).to receive(:warn)
end

let(:field_config) { config.add_index_field 'qwerty' }

describe '#get_field_values' do
it 'renders values for the given field' do
expect(subject.get_field_values(field_config, value: ['x', 'y'])).to eq 'x and y'
end
end

describe '#render_field_values' do
it 'renders values for the given field' do
expect(subject.render_field_values('x')).to eq 'x'
end
end

describe '#render_values' do
it 'renders values for the given field' do
expect(subject.render_values(['x', 'y', 'z'])).to eq 'x, y, and z'
end
end
end
end

0 comments on commit 2ba70b9

Please sign in to comment.