GitHub-Mirror/huginn
2
0
Fork 0
mirror of https://github.com/Fishwaldo/huginn.git synced 2025-03-15 19:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'data_output_agent_limits_events_after_ordering'

Browse source
This commit is contained in:
Akinori MUSHA 2016-10-07 19:22:42 +09:00
commit 12cecb8392
2 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/models/agents/data_output_agent.rb
View file

@ -191,6 +191,8 @@ module Agents
end
def latest_events(reload = false)
received_events = received_events().reorder(id: :asc)
events =
if (event_ids = memory[:event_ids]) &&
memory[:events_order] == events_order &&
@ -208,8 +210,7 @@ module Agents
new_events =
if last_event_id = memory[:last_event_id]
received_events.where(Event.arel_table[:id].gt(last_event_id)).
order(id: :asc).to_a
received_events.where(Event.arel_table[:id].gt(last_event_id)).to_a
else
source_ids.flat_map { |source_id|
# dig twice as many events as the number of

42
spec/models/agents/data_output_agent_spec.rb
View file

@ -242,13 +242,53 @@ describe Agents::DataOutputAgent do
})
end
context 'with more events' do
let!(:event4) do
agents(:bob_website_agent).create_event payload: {
'site_title' => 'XKCD',
'url' => 'http://imgs.xkcd.com/comics/comic1.png',
'title' => 'Comic 1',
'date' => '',
'hovertext' => 'Hovertext for Comic 1'
}
end
let!(:event5) do
agents(:bob_website_agent).create_event payload: {
'site_title' => 'XKCD',
'url' => 'http://imgs.xkcd.com/comics/comic2.png',
'title' => 'Comic 2',
'date' => '',
'hovertext' => 'Hovertext for Comic 2'
}
end
let!(:event6) do
agents(:bob_website_agent).create_event payload: {
'site_title' => 'XKCD',
'url' => 'http://imgs.xkcd.com/comics/comic3.png',
'title' => 'Comic 3',
'date' => '',
'hovertext' => 'Hovertext for Comic 3'
}
end
describe 'limiting' do
it 'can select the last `events_to_show` events' do
agent.options['events_to_show'] = 2
content, _status, _content_type = agent.receive_web_request({ 'secret' => 'secret2' }, 'get', 'application/json')
expect(content['items'].map {|i| i["title"] }).to eq(["Comic 3", "Comic 2"])
end
end
end
describe 'ordering' do
before do
agent.options['events_order'] = ['{{hovertext}}']
agent.options['events_list_order'] = ['{{title}}']
end
it 'can reorder the events_to_show last events based on a Liquid expression' do
it 'can reorder the last `events_to_show` events based on a Liquid expression' do
agent.options['events_to_show'] = 2
asc_content, _status, _content_type = agent.receive_web_request({ 'secret' => 'secret2' }, 'get', 'application/json')
expect(asc_content['items'].map {|i| i["title"] }).to eq(["Evolving", "Evolving again"])