Begin working on image replacemenent.

diff --git a/src/LWN/URI.hs b/src/LWN/URI.hs
index 0d01e1900852c71dce82e7f75c754fb717be9b76..5b8d8fab993363c320956595f2f9e0f1cd6c7449 100644 (file)
--- a/src/LWN/URI.hs
+++ b/src/LWN/URI.hs
@@ -4,15 +4,11 @@ where
 import Data.Maybe (fromJust)
 import Data.String.Utils (split)
 import Network.URI (
-  URI,
+  URI(..),
   parseAbsoluteURI,
   parseURIReference,
-  uriAuthority,
-  uriPath,
-  uriPort,
-  uriQuery,
+  relativeTo,
   uriRegName,
-  uriScheme
   )
 import Test.HUnit (Assertion, assertEqual)
 import Test.Framework (Test, testGroup)
@@ -120,6 +116,32 @@ filename url =
     parse_result = parseURIReference url
 
 
+
+make_absolute_uri :: URI -> Maybe URI
+make_absolute_uri relative_uri =
+  relativeTo relative_uri base_uri
+  where
+    base_uri = URI { uriScheme = "https://",
+                     uriAuthority = "lwn.net",
+                     uriPath = "/",
+                     uriQuery = "",
+                     uriFragment = "" }
+
+
+make_absolute_url :: URL -> Maybe URL
+make_absolute_url relative_url =    
+  case parse_result of
+    Nothing -> Nothing
+    Just relative_uri ->
+      let abs_result = make_absolute_uri relative_uri in
+      case abs_result of
+        Nothing -> Nothing
+        Just abs_uri -> show abs_uri
+  where
+    parse_result = parseURIReference url
+
+
+
 -- | A List of LWN URLs to use during testing.
 lwn_urls :: [URL]
 lwn_urls = [ proto ++ www ++ "lwn.net" ++ path ++ bigpage ++ query |
@@ -172,6 +194,23 @@ test_relative_filename_parsed =
     actual_result = fromJust $ filename url
 
 
+test_empty_url_conversion :: Assertion
+test_empty_url_conversion =
+  assertEqual "'' converted to lwn.net" expected actual
+  where
+    expected = "https://lwn.net/"
+    actual = fromJust $ make_absolute_url ""
+
+
+test_normal_url_conversion :: Assertion
+test_normal_url_conversion =
+  assertEqual "Image URL is made absolute" expected actual
+  where
+    url = "/images/2012/lcj-coughlan-lattimer-sm.jpg"
+    expected = "https://lwn.net/images/2012/lcj-coughlan-lattimer-sm.jpg"
+    actual = fromJust $ make_absolute_url url
+
+
 uri_tests :: Test
 uri_tests =
   testGroup "URI Tests" [
@@ -184,4 +223,8 @@ uri_tests =
     testGroup "Filename Parsing" [
       testCase "Bare filename parsed" test_bare_filename_parsed,
       testCase "Absolute filename parsed" test_absolute_filename_parsed,
-      testCase "Relative filename parsed" test_relative_filename_parsed ] ]
+      testCase "Relative filename parsed" test_relative_filename_parsed ],
+
+    testGroup "Relative -> Absolute Conversion" [
+      testCase "Empty URL converted to lwn.net" test_empty_url_conversion,
+      testCase "Normal URL made absolute" test_normal_url_conversion ]]