Skip to content

Commit

Permalink
DRY up the events controller
Browse files Browse the repository at this point in the history
  • Loading branch information
rmehner committed Jan 14, 2011
1 parent 524d70b commit 45035c7
Showing 1 changed file with 24 additions and 35 deletions.
59 changes: 24 additions & 35 deletions app/controllers/events_controller.rb
Original file line number Diff line number Diff line change
@@ -1,51 +1,40 @@
class EventsController < ApplicationController
before_filter :find_tag

def index
tag_name = Tag.find(params[:tag_id]).name
@events = Event.all(:conditions => {
:event_type_id => EventType.find_by_sources_and_names(
Tag.sources_for_tagname(tag_name),
Tag.names_for_tagname(tag_name)
)
},
:order => "id DESC"
)
respond_to do |format|
format.html
format.js
format.json { render :json => @events.to_json }
format.json { render :json => find_events_for_tag(@tag).all.to_json }
end
end

def show

end

def latest
@tag_id = params[:tag_id]
tag_name = Tag.find(@tag_id).name
found_events = Event.all(:conditions => {
:event_type_id => EventType.find_by_sources_and_names(
Tag.sources_for_tagname(tag_name),
Tag.names_for_tagname(tag_name)
)
},
:order => "id DESC",
:limit => 10
)
@events = []
found_events = find_events_for_tag(@tag).limit(10)

events = []
found_events.each do |event|
enriched_event = event.serializable_hash
enriched_event["name"] = event.event_type.name
enriched_event["source"] = event.event_type.source
@events << enriched_event
enriched_event = event.serializable_hash
enriched_event[:name] = event.event_type.name
enriched_event[:source] = event.event_type.source
events << enriched_event
end

respond_to do |format|
format.html
format.js
format.json { render :json => @events.to_json }
format.json { render :json => events.to_json }
end
end

private

def find_tag
@tag = Tag.find(params[:tag_id])
end

def find_events_for_tag(tag)
Event.where(
:event_type_id => EventType.find_by_sources_and_names(
tag.resolved_event_sources,
tag.resolved_event_names
)).order('id DESC')
end

end

0 comments on commit 45035c7

Please sign in to comment.