Skip to content
This repository has been archived by the owner on Sep 8, 2020. It is now read-only.

Commit

Permalink
Merge pull request #1 from lucisferre/fixes-uri-parsing-exception
Browse files Browse the repository at this point in the history
Provides a fix for URI parsing exceptions InvalidURIError
  • Loading branch information
andrewrjones committed May 3, 2012
2 parents e88399d + ee23fef commit b36446c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions lib/duck_duck_go/zero_click_info.rb
Expand Up @@ -42,14 +42,14 @@ def self.by(result)
abstract = result['Abstract'] unless result['Abstract'].empty?
abstract_text = result['AbstractText'] unless result['AbstractText'].empty?
abstract_source = result['AbstractSource'] unless result['AbstractSource'].empty?
abstract_url = URI.parse(result['AbstractURL']) unless result['AbstractURL'].empty?
image = URI.parse(result['Image']) unless result['Image'].empty?
abstract_url = URI.parse(URI.escape(result['AbstractURL'])) unless result['AbstractURL'].empty?
image = URI.parse(URI.escape(result['Image'])) unless result['Image'].empty?
heading = result['Heading'] unless result['Heading'].empty?
answer = result['Answer'] unless result['Answer'].empty?
answer_type = result['AnswerType'] unless result['AnswerType'].empty?
definition = result['Definition'] unless result['Definition'].empty?
definition_source = result['DefinitionSource'] unless result['DefinitionSource'].empty?
definition_url = URI.parse(result['DefinitionURL']) unless result['DefinitionURL'].empty?
definition_url = URI.parse(URI.escape(result['DefinitionURL'])) unless result['DefinitionURL'].empty?
type = result['Type'] unless result['Type'].empty?

if result['Results']
Expand Down Expand Up @@ -79,4 +79,4 @@ def self.by(result)
end
end

end
end
2 changes: 1 addition & 1 deletion test/tc_zero_click_info.rb
Expand Up @@ -799,7 +799,7 @@ def test_zci_exclusive
"AbstractURL"=>"http://en.wikipedia.org/wiki/Lorem_Ipsum",
"Image"=>"",
"DefinitionURL"=>
"http://www.thefreedictionary.com/_/search.aspx?pid=aff18&word=lorem%2520ipsum",
"http://www.merriam-webster.com/dictionary/lorem ipsum",
"DefinitionSource"=>"TheFreeDictionary",
"AbstractText"=>"",
"Type"=>"E"}
Expand Down

0 comments on commit b36446c

Please sign in to comment.