Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions lib/hash_mapper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,17 @@ def self.extended(base)
end
end

def map(from, to, options={}, &filter)
def map(from, to, options={}, &block_filter)
filter = options.delete(:filter) || block_filter
self.maps = self.maps.dup
self.maps << Map.new(from, to, options)
to.filter = filter if block_given? # Useful if just one block given
to.filter = filter if filter # Useful if just one block given
end

def from(path, &filter)
def from(path, filter: nil, &block_filter)
path_map = PathMap.new(path)
path_map.filter = filter if block_given? # Useful if two blocks given
filter ||= block_filter if block_given?
path_map.filter = filter if filter # Useful if two blocks given
path_map
end

Expand Down
15 changes: 14 additions & 1 deletion spec/hash_mapper_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,20 @@ class PersonWithBlockOneWay
it "should accept a block for just one direction" do
expect(PersonWithBlockOneWay.normalize(@from)).to eq(@to)
end
end

describe ':filter' do
let(:mapper) do
Class.new do
extend HashMapper
map from('/names/first'), to('/first_name', filter: ->(s) { s.strip })
end
end

it 'registers filters as callables, too' do
output = mapper.normalize({ names: { first: ' Joe Bloggs ' }})
expect(output[:first_name]).to eq('Joe Bloggs')
end
end

class ProjectMapper
Expand Down Expand Up @@ -634,7 +647,7 @@ def normalize(input, context: , **kargs)
mapper = Class.new do
extend HashMapper

map from('/name'), to('/name', &(->(name, ctx) { "#{ctx[:title]} #{name}" }))
map from('/name'), to('/name', filter: ->(name, ctx) { "#{ctx[:title]} #{name}" })
map from('/age'), to('/age') do |age, ctx|
"#{age} #{ctx[:age_suffix]}"
end
Expand Down