Fixed case where uri.host == nil because url was file:///

Steve Kenworthy
1 parent 47085886
Showing 2 changed files with 6 additions and 1 deletions Show diff stats
app/models/notice.rb
spec/models/notice_spec.rb
@@ -74,7 +74,7 @@ class Notice
  
   def host
     uri = url && URI.parse(url)
-    uri.blank? ? "N/A" : uri.host
+    uri && uri.host || "N/A"
   rescue URI::InvalidURIError
     "N/A"
   end
@@ -89,6 +89,11 @@ describe Notice, type: &#39;model&#39; do
     end
  
     it "returns 'N/A' when url is not valid" do
+      notice = Fabricate.build(:notice, :request => {'url' => "file:///path/to/some/resource/12"})
+      expect(notice.host).to eq 'N/A'
+    end
+
+    it "returns 'N/A' when url is not valid" do
       notice = Fabricate.build(:notice, :request => {'url' => "some string"})
       expect(notice.host).to eq 'N/A'
     end
...	...	@@ -74,7 +74,7 @@ class Notice
74	74
75	75	def host
76	76	uri = url && URI.parse(url)
77		- uri.blank? ? "N/A" : uri.host
	77	+ uri && uri.host \|\| "N/A"
78	78	rescue URI::InvalidURIError
79	79	"N/A"
80	80	end
...	...
...	...	@@ -89,6 +89,11 @@ describe Notice, type: 'model' do
89	89	end
90	90
91	91	it "returns 'N/A' when url is not valid" do
	92	+ notice = Fabricate.build(:notice, :request => {'url' => "file:///path/to/some/resource/12"})
	93	+ expect(notice.host).to eq 'N/A'
	94	+ end
	95	+
	96	+ it "returns 'N/A' when url is not valid" do
92	97	notice = Fabricate.build(:notice, :request => {'url' => "some string"})
93	98	expect(notice.host).to eq 'N/A'
94	99	end
...	...