mastofe

commit: cff0b03cbb032e271a896ce6932af9353ea32507
parent: 2f21f4cc018806de70d58327daf1bf5529dfc5bd
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue,  8 Nov 2016 19:09:22 +0100

Fix for thread resolve service and process feed service url method

Diffstat:
M
app/services/fetch_atom_service.rb
5
+++++
M
app/services/process_feed_service.rb
3
+--

2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/app/services/fetch_atom_service.rb b/app/services/fetch_atom_service.rb
@@ -3,6 +3,11 @@ class FetchAtomService < BaseService
     response = http_client.head(url)
 
     Rails.logger.debug "Remote status HEAD request returned code #{response.code}"
+
+    response = http_client.get(url) if response.code == 405
+
+    Rails.logger.debug "Remote status GET request returned code #{response.code}"
+
     return nil if response.code != 200
 
     if response.mime_type == 'application/atom+xml'
diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
@@ -175,8 +175,7 @@ class ProcessFeedService < BaseService
 
     def url(xml = @xml)
       link = xml.at_xpath('./xmlns:link[@rel="alternate"]')
-      link['href'] unless link.nil?
-      nil
+      link.nil? ? nil : link['href']
     end
 
     def content(xml = @xml)