Merge pull request #5 from Armael/master

Make river compatible with the latest syndic API

Author: kayceesrk

.merlin

@@ -3,6 +3,7 @@ S lib
 B _build/lib
 
 PKG lwt
+PKG ptime.clock.os
 PKG syndic
 PKG cohttp
 PKG cow

_oasis

@@ -16,7 +16,7 @@ Library "river"
   Findlibname:      river
   InternalModules:  Ri_http, Ri_feeds, Ri_posts, Ri_utils
   Modules:          River
-  BuildDepends:     lwt, syndic, netstring, cohttp.lwt
+  BuildDepends:     lwt, syndic, netstring, cohttp.lwt, ptime.clock.os
 
 Executable "ocl-planet"
   Path:             examples/

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 8663c3ab8656a06dd380f152cf431435)
+# DO NOT EDIT (digest: 4199c91b63001772b6357e13b2e1221e)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -19,22 +19,26 @@ true: annot, bin_annot
 <lib/*.ml{,i,y}>: pkg_cohttp.lwt
 <lib/*.ml{,i,y}>: pkg_lwt
 <lib/*.ml{,i,y}>: pkg_netstring
+<lib/*.ml{,i,y}>: pkg_ptime.clock.os
 <lib/*.ml{,i,y}>: pkg_syndic
 # Executable ocl-planet
 <examples/ocl_planet.{native,byte}>: pkg_cohttp.lwt
 <examples/ocl_planet.{native,byte}>: pkg_lwt
 <examples/ocl_planet.{native,byte}>: pkg_netstring
+<examples/ocl_planet.{native,byte}>: pkg_ptime.clock.os
 <examples/ocl_planet.{native,byte}>: pkg_syndic
 <examples/ocl_planet.{native,byte}>: use_river
 # Executable write-atom
 <examples/write_atom.{native,byte}>: pkg_cohttp.lwt
 <examples/write_atom.{native,byte}>: pkg_lwt
 <examples/write_atom.{native,byte}>: pkg_netstring
+<examples/write_atom.{native,byte}>: pkg_ptime.clock.os
 <examples/write_atom.{native,byte}>: pkg_syndic
 <examples/write_atom.{native,byte}>: use_river
 <examples/*.ml{,i,y}>: pkg_cohttp.lwt
 <examples/*.ml{,i,y}>: pkg_lwt
 <examples/*.ml{,i,y}>: pkg_netstring
+<examples/*.ml{,i,y}>: pkg_ptime.clock.os
 <examples/*.ml{,i,y}>: pkg_syndic
 <examples/*.ml{,i,y}>: use_river
 # OASIS_STOP

examples/write_atom.ml

@@ -25,10 +25,10 @@ let main () =
   let entries = mk_entries posts in
   let feed =
     let authors = [ author "OCaml Labs" ] in
-    let id = "http://ocaml.io/blogs/atom.xml" in
-    let links = [ link ~rel:Self @@ Uri.of_string id ] in
+    let id = Uri.of_string "http://ocaml.io/blogs/atom.xml" in
+    let links = [ link ~rel:Self id ] in
     let title : text_construct = Text "OCaml Labs: Real World Functional Programming" in
-    let updated = CalendarLib.Calendar.now () in
+    let updated = Ptime_clock.now () in
     feed ~authors ~links ~id ~title ~updated entries in
   let out_channel = open_out out_file in
   output feed (`Channel out_channel);

lib/META

@@ -1,8 +1,8 @@
 # OASIS_START
-# DO NOT EDIT (digest: 9272c232c186df381ec324edec953109)
+# DO NOT EDIT (digest: f1a4ef818c8cdcff4a535ce0c7cc752f)
 version = "0.1.3"
 description = "A RSS/Atom feed aggregator"
-requires = "lwt syndic netstring cohttp.lwt"
+requires = "lwt syndic netstring cohttp.lwt ptime.clock.os"
 archive(byte) = "river.cma"
 archive(byte, plugin) = "river.cma"
 archive(native) = "river.cmxa"

lib/ri_http.ml

@@ -76,7 +76,7 @@ let cache_secs = 3600. (* 1h *)
 
 let get ?(cache_secs=cache_secs) url =
   let md5 = Digest.to_hex(Digest.string url) in
-  let fn = Filename.concat Filename.temp_dir_name ("ocamlorg-" ^ md5) in
+  let fn = Filename.concat (Filename.get_temp_dir_name ()) ("ocamlorg-" ^ md5) in
   eprintf "Downloading %s ... %!" url;
   let get_from_cache () =
     let fh = open_in fn in

lib/ri_posts.ml

@@ -237,18 +237,18 @@ let mk_entry post : entry =
   let contributors = [ author ~uri:(Uri.of_string post.contributor.url)
                               post.contributor.name ] in
   let links = match post.link with
-              | Some l -> [ link Syndic.Atom.Alternate l ]
+              | Some l -> [ link ~rel:Syndic.Atom.Alternate l ]
               | None -> [] in
   (* TODO: include source *)
   let id = match post.link with
-           | Some l -> Uri.to_string l
-           | None -> Digest.to_hex (Digest.string (post.title)) in
+           | Some l -> l
+           | None -> Uri.of_string (Digest.to_hex (Digest.string (post.title))) in
   let authors = (author ~email:post.email post.author, []) in
   let title : text_construct = Text post.title in
   let updated = match post.date with
                   (* Atom entry requires a date but RSS2 does not. So if a date
                    * is not available, just capture the current date. *)
-                  | None -> CalendarLib.Calendar.now ()
+                  | None -> Ptime_clock.now ()
                   | Some d -> d in
   entry ~content ~contributors ~links ~id ~authors ~title ~updated ()