commit 64ff28274c7f42c2ab638581cb93e4cbc26791d8 · anil.recoil.org/ocaml-jsonfeed

+4 -29

lib/attachment.ml

···

       4
       4
        
         ---------------------------------------------------------------------------*)

     

       5
       5
        
       

     

       6
       6
        
       module Unknown = struct

     

       7
       7
       -
         type t = (string * Jsont.json) list

     

       7
       7
       +
         type t = Jsont.json

     

       8
       8
        
       

     

       9
       9
       -
         let empty = []

     

       10
       10
       -
         let is_empty = function [] -> true | _ -> false

     

       9
       9
       +
         let empty = Jsont.Object ([], Jsont.Meta.none)

     

       10
       10
       +
         let is_empty = function Jsont.Object ([], _) -> true | _ -> false

     

       11
       11
        
       end

     

       12
       12
        
       

     

       13
       13
        
       type t = {

     
···

       64
       64
        
       let jsont =

     

       65
       65
        
         let kind = "Attachment" in

     

       66
       66
        
         let doc = "An attachment object" in

     

       67
       67
       -
         let unknown_mems :

     

       68
       68
       -
             (Unknown.t, Jsont.json, Jsont.mem list) Jsont.Object.Mems.map =

     

       69
       69
       -
           let open Jsont.Object.Mems in

     

       70
       70
       -
           let dec_empty () = [] in

     

       71
       71
       -
           let dec_add _meta (name : string) value acc =

     

       72
       72
       -
             ((name, Jsont.Meta.none), value) :: acc

     

       73
       73
       -
           in

     

       74
       74
       -
           let dec_finish _meta mems =

     

       75
       75
       -
             List.rev_map (fun ((name, _meta), value) -> (name, value)) mems

     

       76
       76
       -
           in

     

       77
       77
       -
           let enc =

     

       78
       78
       -
             {

     

       79
       79
       -
               enc =

     

       80
       80
       -
                 (fun (type acc)

     

       81
       81
       -
                   (f : Jsont.Meta.t -> string -> Jsont.json -> acc -> acc)

     

       82
       82
       -
                   unknown

     

       83
       83
       -
                   (acc : acc)

     

       84
       84
       -
                 ->

     

       85
       85
       -
                   List.fold_left

     

       86
       86
       -
                     (fun acc (name, value) -> f Jsont.Meta.none name value acc)

     

       87
       87
       -
                     acc unknown);

     

       88
       88
       -
             }

     

       89
       89
       -
           in

     

       90
       90
       -
           map ~kind:"Unknown members" Jsont.json ~dec_empty ~dec_add ~dec_finish ~enc

     

       91
       91
       -
         in

     

       92
       67
        
         let create_obj url mime_type title size_in_bytes duration_in_seconds unknown =

     

       93
       68
        
           create ~url ~mime_type ?title ?size_in_bytes ?duration_in_seconds ~unknown

     

       94
       69
        
             ()

     
···

       100
       75
        
         |> Jsont.Object.opt_mem "size_in_bytes" Jsont.int64 ~enc:size_in_bytes

     

       101
       76
        
         |> Jsont.Object.opt_mem "duration_in_seconds" Jsont.int

     

       102
       77
        
              ~enc:duration_in_seconds

     

       103
       103
       -
         |> Jsont.Object.keep_unknown unknown_mems ~enc:unknown

     

       78
       78
       +
         |> Jsont.Object.keep_unknown Jsont.json_mems ~enc:unknown

     

       104
       79
        
         |> Jsont.Object.finish

+3 -3

lib/attachment.mli

···

       18
       18
        
       (** {1 Unknown Fields} *)

     

       19
       19
        
       

     

       20
       20
        
       module Unknown : sig

     

       21
       21
       -
         type t = (string * Jsont.json) list

     

       22
       22
       -
         (** Unknown/unrecognized JSON object members. Useful for preserving fields

     

       23
       23
       -
             from custom extensions or future spec versions. *)

     

       21
       21
       +
         type t = Jsont.json

     

       22
       22
       +
         (** Unknown/unrecognized JSON object members as a generic JSON object.

     

       23
       23
       +
             Useful for preserving fields from custom extensions or future spec versions. *)

     

       24
       24
        
       

     

       25
       25
        
         val empty : t

     

       26
       26
        
         (** [empty] is the empty list of unknown fields. *)

+4 -30

lib/author.ml

···

       4
       4
        
         ---------------------------------------------------------------------------*)

     

       5
       5
        
       

     

       6
       6
        
       module Unknown = struct

     

       7
       7
       -
         type t = (string * Jsont.json) list

     

       7
       7
       +
         type t = Jsont.json

     

       8
       8
        
       

     

       9
       9
       -
         let empty = []

     

       10
       10
       -
         let is_empty = function [] -> true | _ -> false

     

       9
       9
       +
         let empty = Jsont.Object ([], Jsont.Meta.none)

     

       10
       10
       +
         let is_empty = function Jsont.Object ([], _) -> true | _ -> false

     

       11
       11
        
       end

     

       12
       12
        
       

     

       13
       13
        
       type t = {

     
···

       44
       44
        
       let jsont =

     

       45
       45
        
         let kind = "Author" in

     

       46
       46
        
         let doc = "An author object with at least one field set" in

     

       47
       47
       -
         (* Custom mems map for Unknown.t that strips metadata from names *)

     

       48
       48
       -
         let unknown_mems :

     

       49
       49
       -
             (Unknown.t, Jsont.json, Jsont.mem list) Jsont.Object.Mems.map =

     

       50
       50
       -
           let open Jsont.Object.Mems in

     

       51
       51
       -
           let dec_empty () = [] in

     

       52
       52
       -
           let dec_add _meta (name : string) value acc =

     

       53
       53
       -
             ((name, Jsont.Meta.none), value) :: acc

     

       54
       54
       -
           in

     

       55
       55
       -
           let dec_finish _meta mems =

     

       56
       56
       -
             List.rev_map (fun ((name, _meta), value) -> (name, value)) mems

     

       57
       57
       -
           in

     

       58
       58
       -
           let enc =

     

       59
       59
       -
             {

     

       60
       60
       -
               enc =

     

       61
       61
       -
                 (fun (type acc)

     

       62
       62
       -
                   (f : Jsont.Meta.t -> string -> Jsont.json -> acc -> acc)

     

       63
       63
       -
                   unknown

     

       64
       64
       -
                   (acc : acc)

     

       65
       65
       -
                 ->

     

       66
       66
       -
                   List.fold_left

     

       67
       67
       -
                     (fun acc (name, value) -> f Jsont.Meta.none name value acc)

     

       68
       68
       -
                     acc unknown);

     

       69
       69
       -
             }

     

       70
       70
       -
           in

     

       71
       71
       -
           map ~kind:"Unknown members" Jsont.json ~dec_empty ~dec_add ~dec_finish ~enc

     

       72
       72
       -
         in

     

       73
       47
        
         (* Constructor that matches the jsont object map pattern *)

     

       74
       48
        
         let create_obj name url avatar unknown =

     

       75
       49
        
           create ?name ?url ?avatar ~unknown ()

     
···

       78
       52
        
         |> Jsont.Object.opt_mem "name" Jsont.string ~enc:name

     

       79
       53
        
         |> Jsont.Object.opt_mem "url" Jsont.string ~enc:url

     

       80
       54
        
         |> Jsont.Object.opt_mem "avatar" Jsont.string ~enc:avatar

     

       81
       81
       -
         |> Jsont.Object.keep_unknown unknown_mems ~enc:unknown

     

       55
       55
       +
         |> Jsont.Object.keep_unknown Jsont.json_mems ~enc:unknown

     

       82
       56
        
         |> Jsont.Object.finish

+3 -3

lib/author.mli

···

       17
       17
        
       (** {1 Unknown Fields} *)

     

       18
       18
        
       

     

       19
       19
        
       module Unknown : sig

     

       20
       20
       -
         type t = (string * Jsont.json) list

     

       21
       21
       -
         (** Unknown/unrecognized JSON object members. Useful for preserving fields

     

       22
       22
       -
             from custom extensions or future spec versions. *)

     

       20
       20
       +
         type t = Jsont.json

     

       21
       21
       +
         (** Unknown/unrecognized JSON object members as a generic JSON object.

     

       22
       22
       +
             Useful for preserving fields from custom extensions or future spec versions. *)

     

       23
       23
        
       

     

       24
       24
        
         val empty : t

     

       25
       25
        
         (** [empty] is the empty list of unknown fields. *)

+4 -29

lib/hub.ml

···

       4
       4
        
         ---------------------------------------------------------------------------*)

     

       5
       5
        
       

     

       6
       6
        
       module Unknown = struct

     

       7
       7
       -
         type t = (string * Jsont.json) list

     

       7
       7
       +
         type t = Jsont.json

     

       8
       8
        
       

     

       9
       9
       -
         let empty = []

     

       10
       10
       -
         let is_empty = function [] -> true | _ -> false

     

       9
       9
       +
         let empty = Jsont.Object ([], Jsont.Meta.none)

     

       10
       10
       +
         let is_empty = function Jsont.Object ([], _) -> true | _ -> false

     

       11
       11
        
       end

     

       12
       12
        
       

     

       13
       13
        
       type t = { type_ : string; url : string; unknown : Unknown.t }

     
···

       22
       22
        
       let jsont =

     

       23
       23
        
         let kind = "Hub" in

     

       24
       24
        
         let doc = "A hub endpoint" in

     

       25
       25
       -
         let unknown_mems :

     

       26
       26
       -
             (Unknown.t, Jsont.json, Jsont.mem list) Jsont.Object.Mems.map =

     

       27
       27
       -
           let open Jsont.Object.Mems in

     

       28
       28
       -
           let dec_empty () = [] in

     

       29
       29
       -
           let dec_add _meta (name : string) value acc =

     

       30
       30
       -
             ((name, Jsont.Meta.none), value) :: acc

     

       31
       31
       -
           in

     

       32
       32
       -
           let dec_finish _meta mems =

     

       33
       33
       -
             List.rev_map (fun ((name, _meta), value) -> (name, value)) mems

     

       34
       34
       -
           in

     

       35
       35
       -
           let enc =

     

       36
       36
       -
             {

     

       37
       37
       -
               enc =

     

       38
       38
       -
                 (fun (type acc)

     

       39
       39
       -
                   (f : Jsont.Meta.t -> string -> Jsont.json -> acc -> acc)

     

       40
       40
       -
                   unknown

     

       41
       41
       -
                   (acc : acc)

     

       42
       42
       -
                 ->

     

       43
       43
       -
                   List.fold_left

     

       44
       44
       -
                     (fun acc (name, value) -> f Jsont.Meta.none name value acc)

     

       45
       45
       -
                     acc unknown);

     

       46
       46
       -
             }

     

       47
       47
       -
           in

     

       48
       48
       -
           map ~kind:"Unknown members" Jsont.json ~dec_empty ~dec_add ~dec_finish ~enc

     

       49
       49
       -
         in

     

       50
       25
        
         let create_obj type_ url unknown = create ~type_ ~url ~unknown () in

     

       51
       26
        
         Jsont.Object.map ~kind ~doc create_obj

     

       52
       27
        
         |> Jsont.Object.mem "type" Jsont.string ~enc:type_

     

       53
       28
        
         |> Jsont.Object.mem "url" Jsont.string ~enc:url

     

       54
       54
       -
         |> Jsont.Object.keep_unknown unknown_mems ~enc:unknown

     

       29
       29
       +
         |> Jsont.Object.keep_unknown Jsont.json_mems ~enc:unknown

     

       55
       30
        
         |> Jsont.Object.finish

+3 -3

lib/hub.mli

···

       17
       17
        
       (** {1 Unknown Fields} *)

     

       18
       18
        
       

     

       19
       19
        
       module Unknown : sig

     

       20
       20
       -
         type t = (string * Jsont.json) list

     

       21
       21
       -
         (** Unknown/unrecognized JSON object members. Useful for preserving fields

     

       22
       22
       -
             from custom extensions or future spec versions. *)

     

       20
       20
       +
         type t = Jsont.json

     

       21
       21
       +
         (** Unknown/unrecognized JSON object members as a generic JSON object.

     

       22
       22
       +
             Useful for preserving fields from custom extensions or future spec versions. *)

     

       23
       23
        
       

     

       24
       24
        
         val empty : t

     

       25
       25
        
         (** [empty] is the empty list of unknown fields. *)

+4 -30

lib/item.ml

···

       4
       4
        
         ---------------------------------------------------------------------------*)

     

       5
       5
        
       

     

       6
       6
        
       module Unknown = struct

     

       7
       7
       -
         type t = (string * Jsont.json) list

     

       7
       7
       +
         type t = Jsont.json

     

       8
       8
        
       

     

       9
       9
       -
         let empty = []

     

       10
       10
       -
         let is_empty = function [] -> true | _ -> false

     

       9
       9
       +
         let empty = Jsont.Object ([], Jsont.Meta.none)

     

       10
       10
       +
         let is_empty = function Jsont.Object ([], _) -> true | _ -> false

     

       11
       11
        
       end

     

       12
       12
        
       

     

       13
       13
        
       type content = [ `Html of string | `Text of string | `Both of string * string ]

     
···

       166
       166
        
         let enc_references t = t.references in

     

       167
       167
        
         let enc_unknown t = t.unknown in

     

       168
       168
        
       

     

       169
       169
       -
         let unknown_mems :

     

       170
       170
       -
             (Unknown.t, Jsont.json, Jsont.mem list) Jsont.Object.Mems.map =

     

       171
       171
       -
           let open Jsont.Object.Mems in

     

       172
       172
       -
           let dec_empty () = [] in

     

       173
       173
       -
           let dec_add _meta (name : string) value acc =

     

       174
       174
       -
             ((name, Jsont.Meta.none), value) :: acc

     

       175
       175
       -
           in

     

       176
       176
       -
           let dec_finish _meta mems =

     

       177
       177
       -
             List.rev_map (fun ((name, _meta), value) -> (name, value)) mems

     

       178
       178
       -
           in

     

       179
       179
       -
           let enc =

     

       180
       180
       -
             {

     

       181
       181
       -
               enc =

     

       182
       182
       -
                 (fun (type acc)

     

       183
       183
       -
                   (f : Jsont.Meta.t -> string -> Jsont.json -> acc -> acc)

     

       184
       184
       -
                   unknown

     

       185
       185
       -
                   (acc : acc)

     

       186
       186
       -
                 ->

     

       187
       187
       -
                   List.fold_left

     

       188
       188
       -
                     (fun acc (name, value) -> f Jsont.Meta.none name value acc)

     

       189
       189
       -
                     acc unknown);

     

       190
       190
       -
             }

     

       191
       191
       -
           in

     

       192
       192
       -
           map ~kind:"Unknown members" Jsont.json ~dec_empty ~dec_add ~dec_finish ~enc

     

       193
       193
       -
         in

     

       194
       194
       -
       

     

       195
       169
        
         Jsont.Object.map ~kind ~doc make_from_json

     

       196
       170
        
         |> Jsont.Object.mem "id" Jsont.string ~enc:enc_id

     

       197
       171
        
         |> Jsont.Object.opt_mem "content_html" Jsont.string ~enc:enc_content_html

     
···

       214
       188
        
              (Jsont.list Reference.jsont)

     

       215
       189
        
              ~enc:enc_references

     

       216
       190
        
         |> Jsont.Object.opt_mem "_extensions" Jsont.json_object ~enc:(fun _t -> None)

     

       217
       217
       -
         |> Jsont.Object.keep_unknown unknown_mems ~enc:enc_unknown

     

       191
       191
       +
         |> Jsont.Object.keep_unknown Jsont.json_mems ~enc:enc_unknown

     

       218
       192
        
         |> Jsont.Object.finish

+3 -3

lib/item.mli

···

       27
       27
        
       (** {1 Unknown Fields} *)

     

       28
       28
        
       

     

       29
       29
        
       module Unknown : sig

     

       30
       30
       -
         type t = (string * Jsont.json) list

     

       31
       31
       -
         (** Unknown/unrecognized JSON object members. Useful for preserving fields

     

       32
       32
       -
             from custom extensions or future spec versions. *)

     

       30
       30
       +
         type t = Jsont.json

     

       31
       31
       +
         (** Unknown/unrecognized JSON object members as a generic JSON object.

     

       32
       32
       +
             Useful for preserving fields from custom extensions or future spec versions. *)

     

       33
       33
        
       

     

       34
       34
        
         val empty : t

     

       35
       35
        
         (** [empty] is the empty list of unknown fields. *)

+4 -29

lib/jsonfeed.ml

···

       12
       12
        
       module Item = Item

     

       13
       13
        
       

     

       14
       14
        
       module Unknown = struct

     

       15
       15
       -
         type t = (string * Jsont.json) list

     

       15
       15
       +
         type t = Jsont.json

     

       16
       16
        
       

     

       17
       17
       -
         let empty = []

     

       18
       18
       -
         let is_empty = function [] -> true | _ -> false

     

       17
       17
       +
         let empty = Jsont.Object ([], Jsont.Meta.none)

     

       18
       18
       +
         let is_empty = function Jsont.Object ([], _) -> true | _ -> false

     

       19
       19
        
       end

     

       20
       20
        
       

     

       21
       21
        
       type t = {

     
···

       85
       85
        
       let jsont =

     

       86
       86
        
         let kind = "JSON Feed" in

     

       87
       87
        
         let doc = "A JSON Feed document" in

     

       88
       88
       -
         let unknown_mems :

     

       89
       89
       -
             (Unknown.t, Jsont.json, Jsont.mem list) Jsont.Object.Mems.map =

     

       90
       90
       -
           let open Jsont.Object.Mems in

     

       91
       91
       -
           let dec_empty () = [] in

     

       92
       92
       -
           let dec_add _meta (name : string) value acc =

     

       93
       93
       -
             ((name, Jsont.Meta.none), value) :: acc

     

       94
       94
       -
           in

     

       95
       95
       -
           let dec_finish _meta mems =

     

       96
       96
       -
             List.rev_map (fun ((name, _meta), value) -> (name, value)) mems

     

       97
       97
       -
           in

     

       98
       98
       -
           let enc =

     

       99
       99
       -
             {

     

       100
       100
       -
               enc =

     

       101
       101
       -
                 (fun (type acc)

     

       102
       102
       -
                   (f : Jsont.Meta.t -> string -> Jsont.json -> acc -> acc)

     

       103
       103
       -
                   unknown

     

       104
       104
       -
                   (acc : acc)

     

       105
       105
       -
                 ->

     

       106
       106
       -
                   List.fold_left

     

       107
       107
       -
                     (fun acc (name, value) -> f Jsont.Meta.none name value acc)

     

       108
       108
       -
                     acc unknown);

     

       109
       109
       -
             }

     

       110
       110
       -
           in

     

       111
       111
       -
           map ~kind:"Unknown members" Jsont.json ~dec_empty ~dec_add ~dec_finish ~enc

     

       112
       112
       -
         in

     

       113
       88
        
       

     

       114
       89
        
         (* Helper constructor that sets version automatically *)

     

       115
       90
        
         let make_from_json _version title home_page_url feed_url description

     
···

       149
       124
        
         |> Jsont.Object.opt_mem "expired" Jsont.bool ~enc:expired

     

       150
       125
        
         |> Jsont.Object.opt_mem "hubs" (Jsont.list Hub.jsont) ~enc:hubs

     

       151
       126
        
         |> Jsont.Object.mem "items" (Jsont.list Item.jsont) ~enc:items

     

       152
       152
       -
         |> Jsont.Object.keep_unknown unknown_mems ~enc:unknown

     

       127
       127
       +
         |> Jsont.Object.keep_unknown Jsont.json_mems ~enc:unknown

     

       153
       128
        
         |> Jsont.Object.finish

     

       154
       129
        
       

     

       155
       130
        
       (* Encoding and Decoding *)

+3 -3

lib/jsonfeed.mli

···

       17
       17
        
           optional fields. *)

     

       18
       18
        
       

     

       19
       19
        
       module Unknown : sig

     

       20
       20
       -
         type t = (string * Jsont.json) list

     

       21
       21
       -
         (** Unknown or unrecognized JSON object members. Useful for preserving fields

     

       22
       22
       -
             from custom extensions or future spec versions. *)

     

       20
       20
       +
         type t = Jsont.json

     

       21
       21
       +
         (** Unknown or unrecognized JSON object members as a generic JSON object.

     

       22
       22
       +
             Useful for preserving fields from custom extensions or future spec versions. *)

     

       23
       23
        
       

     

       24
       24
        
         val empty : t

     

       25
       25
        
         (** [empty] is the empty list of unknown fields. *)

+4 -29

lib/reference.ml

···

       4
       4
        
         ---------------------------------------------------------------------------*)

     

       5
       5
        
       

     

       6
       6
        
       module Unknown = struct

     

       7
       7
       -
         type t = (string * Jsont.json) list

     

       7
       7
       +
         type t = Jsont.json

     

       8
       8
        
       

     

       9
       9
       -
         let empty = []

     

       10
       10
       -
         let is_empty = function [] -> true | _ -> false

     

       9
       9
       +
         let empty = Jsont.Object ([], Jsont.Meta.none)

     

       10
       10
       +
         let is_empty = function Jsont.Object ([], _) -> true | _ -> false

     

       11
       11
        
       end

     

       12
       12
        
       

     

       13
       13
        
       type t = {

     
···

       34
       34
        
       let jsont =

     

       35
       35
        
         let kind = "Reference" in

     

       36
       36
        
         let doc = "A reference to a cited source" in

     

       37
       37
       -
         let unknown_mems :

     

       38
       38
       -
             (Unknown.t, Jsont.json, Jsont.mem list) Jsont.Object.Mems.map =

     

       39
       39
       -
           let open Jsont.Object.Mems in

     

       40
       40
       -
           let dec_empty () = [] in

     

       41
       41
       -
           let dec_add _meta (name : string) value acc =

     

       42
       42
       -
             ((name, Jsont.Meta.none), value) :: acc

     

       43
       43
       -
           in

     

       44
       44
       -
           let dec_finish _meta mems =

     

       45
       45
       -
             List.rev_map (fun ((name, _meta), value) -> (name, value)) mems

     

       46
       46
       -
           in

     

       47
       47
       -
           let enc =

     

       48
       48
       -
             {

     

       49
       49
       -
               enc =

     

       50
       50
       -
                 (fun (type acc)

     

       51
       51
       -
                   (f : Jsont.Meta.t -> string -> Jsont.json -> acc -> acc)

     

       52
       52
       -
                   unknown

     

       53
       53
       -
                   (acc : acc)

     

       54
       54
       -
                 ->

     

       55
       55
       -
                   List.fold_left

     

       56
       56
       -
                     (fun acc (name, value) -> f Jsont.Meta.none name value acc)

     

       57
       57
       -
                     acc unknown);

     

       58
       58
       -
             }

     

       59
       59
       -
           in

     

       60
       60
       -
           map ~kind:"Unknown members" Jsont.json ~dec_empty ~dec_add ~dec_finish ~enc

     

       61
       61
       -
         in

     

       62
       37
        
         let create_obj url doi cito unknown = create ~url ?doi ?cito ~unknown () in

     

       63
       38
        
         Jsont.Object.map ~kind ~doc create_obj

     

       64
       39
        
         |> Jsont.Object.mem "url" Jsont.string ~enc:url

     

       65
       40
        
         |> Jsont.Object.opt_mem "doi" Jsont.string ~enc:doi

     

       66
       41
        
         |> Jsont.Object.opt_mem "cito" (Jsont.list Cito.jsont) ~enc:cito

     

       67
       67
       -
         |> Jsont.Object.keep_unknown unknown_mems ~enc:unknown

     

       42
       42
       +
         |> Jsont.Object.keep_unknown Jsont.json_mems ~enc:unknown

     

       68
       43
        
         |> Jsont.Object.finish

+3 -3

lib/reference.mli

···

       19
       19
        
       (** {1 Unknown Fields} *)

     

       20
       20
        
       

     

       21
       21
        
       module Unknown : sig

     

       22
       22
       -
         type t = (string * Jsont.json) list

     

       23
       23
       -
         (** Unknown/unrecognized JSON object members. Useful for preserving fields

     

       24
       24
       -
             from custom extensions or future spec versions. *)

     

       22
       22
       +
         type t = Jsont.json

     

       23
       23
       +
         (** Unknown/unrecognized JSON object members as a generic JSON object.

     

       24
       24
       +
             Useful for preserving fields from custom extensions or future spec versions. *)

     

       25
       25
        
       

     

       26
       26
        
         val empty : t

     

       27
       27
        
         (** [empty] is the empty list of unknown fields. *)