lib/grepg/parser.rb in grepg-0.0.2 vs lib/grepg/parser.rb in grepg-0.0.3
- old
+ new
@@ -36,41 +36,41 @@
def get_all_topics(user)
GrepPage::API.sheets(user)
end
def filter_topics(topics, topic_name = '')
- sheet = topics.select{|topic| topic[:name].downcase == topic_name.downcase}.first
- sheet = topics.select{|topic| topic[:name].downcase[topic_name.downcase]}.first unless sheet
+ sheet = topics.find{|topic| topic[:name].downcase == topic_name.downcase}
+ sheet = topics.find{|topic| topic[:name].downcase[topic_name.downcase]} unless sheet
sheet
end
def get_cheats(user, sheet_id)
GrepPage::API.cheats(user, sheet_id)
end
def filter_cheats(cheats, search_term)
cheats.select do |cheat|
- (cheat[:description].downcase[@search_term.downcase] ||
- cheat[:command].downcase[@search_term.downcase]) != nil
+ (cheat[:description].downcase[search_term.downcase] ||
+ cheat[:command].downcase[search_term.downcase]) != nil
end
end
def run!
headers = ["User: #{@user}", "Topic: #{@topic}"]
headers << "Search-Term: #{@search_term}" if @search_term
puts headers.join(", ")
begin
topics = get_all_topics(@user)
- rescue RestClient::ResourceNotFound => ex
+ rescue RestClient::ResourceNotFound
puts "That username does not exist"
exit 1
end
topic = filter_topics(topics, @topic)
if topic.nil? || topic.empty?
puts "Can't find that topic. Choose one of the following"
- puts topics.map{|topic| topic[:name]}
+ puts topics.map{|t| t[:name]}
exit 1
end
cheats = get_cheats(@user, topic[:id])
cheats = filter_cheats(cheats, @search_term) if @search_term