diff --git a/lib/feed_handler.rb b/lib/feed_handler.rb index 94ba012..103f364 100644 --- a/lib/feed_handler.rb +++ b/lib/feed_handler.rb @@ -42,7 +42,9 @@ class FeedHandler if !valid_url?(address) raise InvalidUrl.new("\"%s\" is not a valid URL" % address) end - open(address, "User-Agent" => "Noosfero/#{Noosfero::VERSION}", &block) + header = {"User-Agent" => "Noosfero/#{Noosfero::VERSION}"} + header.merge!(:proxy => ENV['FEED_HTTP_PROXY']) if ENV['FEED_HTTP_PROXY'] + open(address, header, &block) end return content rescue Exception => ex diff --git a/test/unit/feed_handler_test.rb b/test/unit/feed_handler_test.rb index 0990b3b..969ada0 100644 --- a/test/unit/feed_handler_test.rb +++ b/test/unit/feed_handler_test.rb @@ -141,4 +141,10 @@ class FeedHandlerTest < ActiveSupport::TestCase end end + should 'set proxy when FEED_HTTP_PROXY is setted from env' do + ENV.stubs('[]').with('FEED_HTTP_PROXY').returns('http://127.0.0.1:3128') + handler.expects(:open).with('http://site.org/feed.xml', {"User-Agent" => "Noosfero/#{Noosfero::VERSION}", :proxy => 'http://127.0.0.1:3128'}, anything).returns('bli content') + assert_equal 'bli content', handler.fetch('http://site.org/feed.xml') + end + end -- libgit2 0.21.2