Skip to content

Commit

Permalink
Rename 'filter' method 'filterer'
Browse files Browse the repository at this point in the history
  • Loading branch information
olliebennett committed May 31, 2019
1 parent 41a0d3c commit 9fec998
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions lib/filterer/active_record.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module ActiveRecord
extend ActiveSupport::Concern

class_methods do
def filter(params = {}, opts = {})
delegate_to_filterer(:filter, params, opts)
def filterer(params = {}, opts = {})
delegate_to_filterer(:filterer, params, opts)
end

def filterer_chain(params = {}, opts = {})
Expand Down
2 changes: 1 addition & 1 deletion lib/filterer/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def sort_option(key, string_or_proc = nil, opts = {})

# Public API
# @return [ActiveRecord::Association]
def filter(params = {}, opts = {})
def filterer(params = {}, opts = {})
new(params, opts).results
end

Expand Down
12 changes: 6 additions & 6 deletions spec/lib/filterer/base_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -179,17 +179,17 @@ class PaginationFiltererInherit < PaginationFiltererB

it 'applies default filters' do
expect_any_instance_of(FakeQuery).to receive(:where).with(foo: 'bar').and_return(FakeQuery.new)
filterer = DefaultFiltersFilterer.filter({}, foo: 'bar')
filterer = DefaultFiltersFilterer.filterer({}, foo: 'bar')
end

it 'allows returning nil from default filters' do
expect_any_instance_of(FakeQuery).to receive(:where).with(bar: 'baz').and_return(FakeQuery.new)
filterer = DefaultFiltersFilterer.filter({}).where(bar: 'baz')
filterer = DefaultFiltersFilterer.filterer({}).where(bar: 'baz')
end

it 'passes parameters to the correct methods' do
expect_any_instance_of(SmokeTestFilterer).to receive(:param_foo).with('bar').and_return(FakeQuery.new)
SmokeTestFilterer.filter(foo: 'bar')
SmokeTestFilterer.filterer(foo: 'bar')
end

it 'does not pass blank parameters' do
Expand All @@ -198,7 +198,7 @@ class PaginationFiltererInherit < PaginationFiltererB
end

it 'allows returning nil from a param_* method' do
expect(ReturnNilFilterer.filter(foo: 'bar')).to eq([])
expect(ReturnNilFilterer.filterer(foo: 'bar')).to eq([])
end

describe 'sorting' do
Expand Down Expand Up @@ -376,12 +376,12 @@ def starting_query
describe 'options' do
it 'skips ordering' do
expect_any_instance_of(DefaultParamsFilterer).to_not receive(:ordered_results)
filterer = DefaultParamsFilterer.filter({}, skip_ordering: true)
filterer = DefaultParamsFilterer.filterer({}, skip_ordering: true)
end

it 'skips pagination' do
expect_any_instance_of(DefaultParamsFilterer).to_not receive(:paginate_results)
filterer = DefaultParamsFilterer.filter({}, skip_pagination: true)
filterer = DefaultParamsFilterer.filterer({}, skip_pagination: true)
end

it 'provides a helper method to skip both' do
Expand Down

0 comments on commit 9fec998

Please sign in to comment.