Move Invercargill-Json into its own repo

MANIFEST.usm

@@ -10,19 +10,10 @@
     "vapi:invercargill.vapi": "as-expected",
     "gir:invercargill-1.0.gir": "as-expected",
     "typelib:invercargill-1.0.typelib": "as-expected",
-    "pc:invercargill.pc": "as-expected",
-
-    "lib:libinvercargill-json.so": "as-expected",
-    "inc:invercargill-json.h": "as-expected",
-    "vapi:invercargill-json.vapi": "as-expected",
-    "gir:invercargill_json-1.0.gir": "as-expected",
-    "typelib:invercargill_json-1.0.typelib": "as-expected",
-    "pc:invercargill-json.pc": "as-expected"
+    "pc:invercargill.pc": "as-expected"
   },
   "depends": {
     "runtime": [
-      "lib:libinvercargill.so",
-      "lib:libinvercargill-json.so",
       "lib:libglib-2.0.so.0",
       "lib:libgobject-2.0.so.0",
       "lib:libgee-0.8.so.2",
@@ -53,6 +44,7 @@
   },
   "execs": {
     "build": "scripts/build.sh",
-    "install": "scripts/install.sh"
+    "install": "scripts/install.sh",
+    "post_install": "scripts/post-install.sh"
   }
 }

scripts/post-install.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+ldconfig

src/json/Array.vala

@@ -1,58 +0,0 @@
-using Invercargill;
-
-namespace InvercargillJson {
-
-    public class JsonArray : IndexedCollection<JsonElement>, Elements, JsonElements {
-
-        private Json.Array array;
-
-        internal Json.Array json_glib_object { get { return array; } }
-
-        public JsonArray() {
-            array = new Json.Array();
-        }
-
-        internal JsonArray.from_existing(Json.Array array) {
-            this.array = array;
-        }
-
-        public override Tracker<Element> get_tracker() {
-            var i = 0;
-            return new LambdaTracker<Element>(
-                () => {
-                    return i < array.get_length();
-                },
-                () => {
-                    return new JsonElement.from_node(array.get_element(i++));
-                });
-        }
-
-        public new override JsonElement @get(int index) {
-            return new JsonElement.from_node(array.get_element(index));
-        }
-        public override int index_of(PredicateDelegate<Element> predicate) {
-            return with_positions().first_or_default(i => predicate(i.item))?.position ?? -1;
-        }
-        public override void remove(int index) {
-            array.remove_element(index);
-        }
-        public new override void @set(int index, JsonElement item) {
-            assert_not_reached();
-        }
-        public override void add(JsonElement item) {
-            array.add_element(item.assert_as<Json.Node>());
-        }
-        public override void remove_first_where(Invercargill.PredicateDelegate<JsonElement> predicate) {
-            var index = index_of(predicate);
-            if(index >= 0) {
-                array.remove_element(index);
-            }
-        }
-        public override void remove_where(Invercargill.PredicateDelegate<JsonElement> predicate) {
-            with_positions()
-                .where(i => predicate((JsonElement)i.item))
-                .iterate(i => array.remove_element(i.position));
-        }
-    }
-
-}

src/json/Elements.vala

@@ -1,54 +0,0 @@
-
-using Invercargill;
-namespace InvercargillJson {
-
-    public interface JsonElements : Enumerable<JsonElement>, Elements {
-
-        public virtual Enumerable<JsonArray> as_arrays() {
-            return select<JsonArray>(n => new JsonArray.from_existing(n.assert_as<Json.Node>().get_array()));
-        }
-
-        public virtual Enumerable<bool> as_bools() {
-            return select<bool>(n => n.assert_as<Json.Node>().get_boolean());
-        }
-
-        public virtual Doubles as_doubles() {
-            return select<double?>(n => n.assert_as<Json.Node>().get_double()).promote_to<Doubles>();
-        }
-
-        public virtual Signed64BitIntegers as_integers() {
-            return select<int64?>(n => n.assert_as<Json.Node>().get_int()).promote_to<Signed64BitIntegers>();
-        }
-
-        public virtual Enumerable<string> as_strings() {
-            return select<string>(n => n.assert_as<Json.Node>().get_string());
-        }
-
-        public virtual Enumerable<JsonObject> as_objects() {
-            return select<JsonObject>(n => new JsonObject.from_existing(n.assert_as<Json.Node>().get_object()));
-        }
-
-        public virtual JsonArray to_json_array() {
-            var array = new JsonArray();
-            array.add_all((Enumerable<JsonElement>)this);
-            return array;
-        }
-
-    }
-
-    private class JsonElementsPromotionImplementation : Object, Promotion<Element> {
-        public bool can_wrap(GLib.Type element_type) {
-            return element_type.is_a(typeof(JsonElement));
-        }
-        public Enumerable<Element> wrap(Enumerable<Element> enumerable) {
-            return new JsonElementsProxy(enumerable.cast<JsonElement>());
-        }
-    }
-
-    private class JsonElementsProxy : ProxyEnumerable<JsonElement>, Elements, JsonElements {
-        public JsonElementsProxy(Enumerable<JsonElement> elements) {
-            inner = elements;
-        }
-    }
-
-}

src/json/Json.vala

@@ -1,332 +0,0 @@
-
-namespace InvercargillJson {
-
-
-    public class JsonElement : Object, Invercargill.Element {
-
-        private Json.Node node;
-
-        public JsonElement.from_string(string json) throws GLib.Error {
-            node = Json.from_string (json);
-        }
-
-        public JsonElement.from_file(string path) throws GLib.Error {
-            var parser = new Json.Parser();
-            parser.load_from_file(path);
-            node = parser.get_root();
-        }
-
-        public JsonElement.from_stream(InputStream stream) throws GLib.Error {
-            var parser = new Json.Parser();
-            parser.load_from_stream(stream);
-            node = parser.get_root();
-        }
-
-        public async JsonElement.from_stream_async(InputStream stream, GLib.Cancellable cancellable) throws GLib.Error {
-            var parser = new Json.Parser();
-            yield parser.load_from_stream_async (stream, cancellable);
-            node = parser.get_root();
-        }
-
-        internal JsonElement.from_node(Json.Node node) {
-            this.node = node;
-        }
-
-        public JsonElement.from_properties(Invercargill.Properties properties) throws Invercargill.ElementError {
-            node = new Json.Node (Json.NodeType.OBJECT);
-            var object = new JsonObject();
-            foreach (var item in properties) {
-                object.set(item.key, new JsonElement.from_element(item.value));
-            }
-            node.set_object (object.json_glib_object);
-        }
-
-        public JsonElement.from_elements(Invercargill.Elements elements) throws Invercargill.ElementError {
-            node = new Json.Node (Json.NodeType.ARRAY);
-            var array = new JsonArray();
-            foreach (var item in elements) {
-                array.add(new JsonElement.from_element (item));
-            }
-            node.set_array (array.json_glib_object);
-        }
-
-        public JsonElement.from_element(Invercargill.Element element) throws Invercargill.ElementError {
-            // Null node is top priority
-            if(element.is_null ()) {
-                node = new Json.Node(Json.NodeType.NULL);
-                node.init_null ();
-                return;
-            }
-
-            // Second priority is creation of arrays and objects
-            if(element.assignable_to<Invercargill.Properties>()) {
-                node = new Json.Node (Json.NodeType.OBJECT);
-                var object = new JsonObject();
-                foreach (var item in element.as<Invercargill.Properties>()) {
-                    object.set(item.key, new JsonElement.from_element(item.value));
-                }
-                node.set_object (object.json_glib_object);
-                return;
-            }
-            if(element.assignable_to<Invercargill.Elements>()) {
-                node = new Json.Node (Json.NodeType.ARRAY);
-                var array = new JsonArray();
-                foreach (var item in element.as<Invercargill.Elements>()) {
-                    array.add(new JsonElement.from_element (item));
-                }
-                node.set_array (array.json_glib_object);
-                return;
-            }
-
-            node = new Json.Node (Json.NodeType.VALUE);
-            var type = element.type();
-
-            // Third priority is conversion of known types
-            if(type == typeof(DateTime)) {
-                node.set_string (element.as<DateTime>().format_iso8601());
-                return;
-            }
-            if(type == typeof(Invercargill.BinaryData)) {
-                node.set_string (element.as<Invercargill.BinaryData>().to_base64());
-                return;
-            }
-            if(type == typeof(string)) {
-                node.set_string (element.as<string>());
-                return;
-            }
-            if(type == typeof(bool)) {
-                node.set_boolean (element.as<bool>());
-                return;
-            }
-            if(type == typeof(double)) {
-                node.set_double (element.as<double?>());
-                return;
-            }
-            if(type == typeof(int64)) {
-                node.set_int (element.as<int64?>());
-                return;
-            }
-            if(type == typeof(uint8)) {
-                node.set_int (element.as<uint>());
-                return;
-            }
-            if(type == typeof(int8)) {
-                node.set_int (element.as<int>());
-                return;
-            }
-            if(type == typeof(uint16)) {
-                node.set_int (element.as<uint16>());
-                return;
-            }
-            if(type == typeof(int16)) {
-                node.set_int (element.as<int16>());
-                return;
-            }
-            if(type == typeof(uint32)) {
-                node.set_int (element.as<uint32>());
-                return;
-            }
-            if(type == typeof(int32)) {
-                node.set_int (element.as<int32>());
-                return;
-            }
-            if(type == typeof(uint64?)) {
-                node.set_int ((int64)element.as<uint64?>());
-                return;
-            }
-            if(type == typeof(float?)) {
-                node.set_double (element.as<float?>());
-                return;
-            }            
-
-            // Last priority is the element's native conversions
-            if(element.assignable_to<string>()) {
-                node.set_string (element.as<string>());
-                return;
-            }
-            if(element.assignable_to<bool> ()) {
-                node.set_boolean(element.as<bool>());
-                return;
-            }
-            if(element.assignable_to<double?>()) {
-                node.set_double(element.as<double?>());
-                return;
-            }
-            if(element.assignable_to<int64?>()) {
-                node.set_int(element.as<int64?>());
-                return;
-            }
-
-            // Could not convert
-            throw new Invercargill.ElementError.INVALID_CONVERSION(@"No way to convert element $(element.get_type ().name()) containing type $(type.name()) to a type suitable for a JsonElement.");
-        }
-
-        public bool assignable_to_type (GLib.Type type) {
-            if(node.is_null() || type == typeof(Json.Node)) {
-                return true;
-            }
-            if(node.get_node_type() == Json.NodeType.ARRAY) {
-                return
-                    type == typeof(JsonArray) || 
-                    type == typeof(JsonElements) || 
-                    type == typeof(Invercargill.Elements) ||
-                    type == typeof(Json.Array);
-            }
-            if(node.get_node_type() == Json.NodeType.OBJECT) {
-                return
-                    type == typeof(JsonObject) || 
-                    type == typeof(Invercargill.Properties) ||
-                    type == typeof(Json.Object);
-            }
-            if(node.get_value_type().is_a(typeof(int64)) || node.get_value_type ().is_a(typeof(double))) {
-                return
-                    type == typeof(uint8) ||
-                    type == typeof(int8) ||
-                    type == typeof(uint16) ||
-                    type == typeof(int16) ||
-                    type == typeof(uint32) ||
-                    type == typeof(int32) ||
-                    type == typeof(uint64) ||
-                    type == typeof(int64) ||
-                    type == typeof(double) ||
-                    type == typeof(float) ||
-                    type == typeof(string);
-            }
-            if(node.get_value_type().is_a(typeof(string))) {
-                return
-                    type == typeof(string) ||
-                    type == typeof(Invercargill.BinaryData) ||
-                    (type == typeof(DateTime) && new DateTime.from_iso8601(node.get_string(), null) != null);
-            }
-            if(node.get_value_type().is_a(typeof(bool))) {
-                return type == typeof(bool);
-            }
-            return false;
-        }
-        public bool is_null () {
-            return node.is_null();
-        }
-        public bool try_get_as<T> (out T result) {
-            if(!assignable_to<T>()) {
-                result = null;
-                return false;
-            }
-            if(typeof(T) == typeof(Json.Node)) {
-                result = node;
-                return true;
-            }
-            if(node.is_null ()) {
-                result = null;
-                return true;
-            }
-            if(typeof(T) == typeof(JsonArray) || typeof(T) == typeof(Invercargill.Elements)) {
-                result = new JsonArray.from_existing (node.get_array ());
-                return true;
-            }
-            if(typeof(T) == typeof(Json.Array)) {
-                result = node.get_array();
-                return true;
-            }
-            if(typeof(T) == typeof(JsonObject) || typeof(T) == typeof(Invercargill.Properties)) {
-                result = new JsonObject.from_existing (node.get_object());
-                return true;
-            }
-            if(typeof(T) == typeof(Json.Object)) {
-                result = node.get_object();
-                return true;
-            }
-            if(typeof(T).is_a(typeof(uint8))) {
-                result = (uint8)node.get_int();
-                return true;
-            }
-            if(typeof(T).is_a(typeof(int8))) {
-                result = (int8)node.get_int();
-                return true;
-            }
-            if(typeof(T).is_a(typeof(uint16))) {
-                result = (uint16)node.get_int();
-                return true;
-            }
-            if(typeof(T).is_a(typeof(int16))) {
-                result = (int16)node.get_int();
-                return true;
-            }
-            if(typeof(T).is_a(typeof(uint32))) {
-                result = (uint32)node.get_int();
-                return true;
-            }
-            if(typeof(T).is_a(typeof(int32))) {
-                result = (int32)node.get_int();
-                return true;
-            }
-            if(typeof(T).is_a(typeof(uint64))) {
-                uint64? r = node.get_int();
-                result = r;
-                return true;
-            }
-            if(typeof(T).is_a(typeof(int64))) {
-                int64? r = node.get_int();
-                result = r;
-                return true;
-            }
-            if(typeof(T).is_a(typeof(double))) {
-                double? r = node.get_double();
-                result = r;
-                return true;
-            }
-            if(typeof(T).is_a(typeof(float))) {
-                float? r = (float)node.get_double();
-                result = r;
-                return true;
-            }
-            if(typeof(T).is_a(typeof(string))) {
-                if(node.get_value_type().is_a (typeof(double))) {
-                    result = node.get_double().to_string();
-                }
-                else if(node.get_value_type().is_a(typeof(int64))) {
-                    result = node.get_int().to_string();
-                }
-                result = node.get_string();
-                return true;
-            }
-            if(typeof(T).is_a(typeof(DateTime))) {
-                result = new DateTime.from_iso8601(node.get_string (), null);
-                return true;
-            }
-            if(typeof(T).is_a(typeof(Invercargill.BinaryData))) {
-                result = new Invercargill.BinaryData.from_base64(node.get_string ());
-                return true;
-            }
-            if(typeof(T).is_a(typeof(bool))) {
-                result = node.get_boolean();
-                return true;
-            }
-
-            warning(@"Type \"$(typeof(T).name())\" passed assignable check but the conversion is not implemented");
-            result = null;
-            return false;
-        }
-
-        public GLib.Type? type () {
-            return typeof(Json.Node);
-        }
-
-        public string stringify(bool pretty = false) {
-            return Json.to_string (node, pretty);
-        }
-
-        public void write_to_stream(OutputStream stream) throws Error {
-            var gen = new Json.Generator();
-            gen.set_root (node);
-            gen.to_stream (stream);
-        }
-
-        public void write_to_file(string path) throws Error {
-            var gen = new Json.Generator();
-            gen.set_root (node);
-            gen.to_file (path);
-        }
-
-    }
-
-}

src/json/Object.vala

@@ -1,91 +0,0 @@
-using Invercargill;
-
-namespace InvercargillJson {
-
-    public class JsonObject : Associative<string, JsonElement>, Properties {
-
-        private Json.Object object;
-
-        public Json.Object json_glib_object { get { return object; } }
-
-        public JsonObject() {
-            object = new Json.Object();
-        }
-
-        internal JsonObject.from_existing(Json.Object object) {
-            this.object = object;
-        }
-        public override void clear (string key) {
-            object.foreach_member ((o, n) => o.remove_member (n));
-        }
-        public override bool has (string key) {
-            return object.has_member(key);
-        }
-        public new override void @set (string key, JsonElement value) {
-            object.set_member(key, value.assert_as<Json.Node>());
-        }
-        public override bool try_get (string key, out JsonElement value) {
-            if(has(key)) {
-                value = new JsonElement.from_node(object.get_member(key));
-                return true;
-            }
-            value = null;
-            return false;
-        }
-        public override Tracker<KeyValuePair<string, Element>> get_tracker () {
-            var keys = object.get_members ();
-            var i = 0;
-            return new LambdaTracker<KeyValuePair<string, Element>>(
-                () => {
-                    return i < keys.length();
-                },
-                () => {
-                    return new KeyValuePair<string, Element> (keys.nth_data(i), new JsonElement.from_node(object.get_member(keys.nth_data(i++))));
-                });
-        }
-
-        public JsonArray? get_array(string key) {
-            var item = object.get_array_member(key);
-            if(item != null) {
-                return new JsonArray.from_existing(item);
-            }
-            return null;
-        }
-
-        public bool? get_bool(string key) {
-            return object.get_boolean_member(key);
-        }
-
-        public double? get_double(string key) {
-            return object.get_double_member(key);
-        }
-
-        public int64? get_integer(string key) {
-            return object.get_int_member(key);
-        }
-
-        public string? get_string(string key) {
-            return object.get_string_member(key);
-        }
-
-        public JsonObject? get_object(string key) {
-            var item = object.get_object_member(key);
-            if(item != null) {
-                return new JsonObject.from_existing(item);
-            }
-            return null;
-        }
-
-        public void set_native<T>(string key, T value) throws ElementError {
-            set(key, new JsonElement.from_element(new NativeElement<T>(value)));
-        }
-
-        public JsonElement as_element() {
-            var node = new Json.Node(Json.NodeType.OBJECT);
-            node.take_object(object);
-            return new JsonElement.from_node(node);
-        }
-
-    }
-
-}

src/json/PromotionRegistration.c

@@ -1,10 +0,0 @@
-
-#include "invercargill-json.h"
-#include "invercargill.h"
-
-VALA_EXTERN GType invercargill_json_json_elements_promotion_implementation_get_type (void) G_GNUC_CONST ;
-
-__attribute__((constructor))
-static void register_promotions() {
-    invercargill_register_promotion (INVERCARGILL_JSON_TYPE_JSON_ELEMENTS, invercargill_json_json_elements_promotion_implementation_get_type());
-}

src/json/meson.build

@@ -1,35 +0,0 @@
-
-dependencies = [
-    dependency('glib-2.0'),
-    dependency('gobject-2.0'),
-    dependency('gee-0.8'),
-    dependency('json-glib-1.0'),
-    invercargill_dep
-]
-
-sources = files('Json.vala')
-sources += files('PromotionRegistration.c')
-sources += files('Elements.vala')
-sources += files('Array.vala')
-sources += files('Object.vala')
-
-invercargill_json = shared_library('invercargill-json', sources,
-    dependencies: dependencies,
-    install: true,
-    vala_gir: 'invercargill_json-1.0.gir',
-    install_dir: [true, true, true, true]
-)
-invercargill_json_dep = declare_dependency(link_with: invercargill_json, include_directories: include_directories('.'))
-
-pkg = import('pkgconfig')
-pkg.generate(invercargill_json,
-    version : '0.1',
-    name : 'invercargill-json',)
-    
-g_ir_compiler = find_program('g-ir-compiler')
-custom_target('invercargill-json typelib', command: [g_ir_compiler, '--shared-library=libinvercargill-json.so', '--output', '@OUTPUT@', meson.current_build_dir() / 'invercargill_json-1.0.gir'],
-              output: 'invercargill_json-1.0.typelib',
-              depends: invercargill_json,
-              install: true,
-              install_dir: get_option('libdir') / 'girepository-1.0')
-              

src/meson.build

@@ -1,9 +1,4 @@
 project('invercargill', 'vala', 'c')
 subdir('lib')
 dependencies += invercargill_dep
-subdir('json')
-dependencies += invercargill_json_dep
-subdir('tests')
-
-# dependencies += dependency('fuse')
-# subdir('fuse')
+subdir('tests')

src/tests/Integration/Json.vala

@@ -1,35 +0,0 @@
-using Invercargill;
-using Invercargill.Convert;
-using InvercargillJson;
-using Json;
-
-void json_tests() {
-    Test.add_func("/invercargill/json/strings", () => {
-
-        var json_str = """[
-            "Glengarry",
-            "Gladstone",
-            "Strathern",
-            "Richmond",
-            "Georgetown"
-        ]""";
-
-        try {
-            var suburbs = new JsonElement.from_string(json_str)
-                .assert_as<JsonArray>()
-                .as_strings()
-                .to_array();
-            
-            assert_cmpint(5, CompareOperator.EQ, suburbs.length);
-            assert_cmpstr("Glengarry", CompareOperator.EQ, suburbs[0]);
-            assert_cmpstr("Gladstone", CompareOperator.EQ, suburbs[1]);
-            assert_cmpstr("Strathern", CompareOperator.EQ, suburbs[2]);
-            assert_cmpstr("Richmond", CompareOperator.EQ, suburbs[3]);
-            assert_cmpstr("Georgetown", CompareOperator.EQ, suburbs[4]);
-        }
-        catch(Error e) {
-            assert_no_error(e);
-        }
-    });
-
-}

src/tests/Integration/Promotion.vala

@@ -1,6 +1,5 @@
 using Invercargill;
 using Invercargill.Convert;
-using InvercargillJson;
 
 void promotion_tests() {
 
@@ -24,36 +23,4 @@ void promotion_tests() {
         
         assert_true(data == new_data);
     });
-
-    Test.add_func("/invercargill/promotion/json", () => {
-
-        var json_str = """[
-            "Glengarry",
-            "Gladstone",
-            "Strathern",
-            "Richmond",
-            "Georgetown"
-        ]""";
-
-        try {
-            var suburbs = new JsonElement.from_string(json_str)
-                .assert_as<JsonArray>()
-                .where(e => e.assert_as<string>().has_prefix("G"))
-                .promote_to<JsonElements>();
-            
-            var names = suburbs
-                .as_strings()
-                .to_array();
-
-            assert_cmpint(3, CompareOperator.EQ, suburbs.count());
-            assert_cmpint(3, CompareOperator.EQ, names.length);
-            assert_cmpstr("Glengarry", CompareOperator.EQ, names[0]);
-            assert_cmpstr("Gladstone", CompareOperator.EQ, names[1]);
-            assert_cmpstr("Georgetown", CompareOperator.EQ, names[2]);
-
-        }
-        catch(Error e) {
-            assert_no_error(e);
-        }
-    });
 }

src/tests/Integration/PropertyMapper.vala

@@ -1,7 +1,5 @@
 using Invercargill;
 using Invercargill.Convert;
-using InvercargillJson;
-using Json;
 
 void property_mapper_tests() {
 
@@ -36,38 +34,6 @@ void property_mapper_tests() {
 
     });
 
-    Test.add_func("/invercargill/property_mapper/map_from_json", () => {
-
-        var mapper = new PropertyMapperBuilder<MappedClass>()
-            .set_constructor(() => new MappedClass())
-            .map<string>("name", c => c.name, (c, v) => c.name = v)
-            .map<int>("number", c => c.number, (c, v) => c.number = v)
-            .build();
-
-
-        var json_str = """{
-            "number": 25,
-            "name": "Billy Barrow",
-            "not_mapped": "Invercargill"
-        }""";
-
-        try {
-            var properties = new JsonElement.from_string(json_str)
-                .assert_as<JsonObject>();
-    
-            var copy = mapper.materialise(properties);
-            assert(properties.where(p => p.value.assignable_to<string>()).any(p => p.value.assert_as<string>() == "Billy Barrow"));
-            assert_cmpint(25, CompareOperator.EQ, copy.number);
-            assert_cmpstr("Billy Barrow", CompareOperator.EQ, copy.name);
-            assert_null(copy.not_mapped);
-        }
-        catch(Error e) {
-            assert_no_error(e);
-        }
-
-
-    });
-
 }
 
 private class MappedClass {

src/tests/TestRunner.vala

@@ -19,7 +19,6 @@ public static int main(string[] args) {
     numbers_test();
     dictionary_tests();
     property_mapper_tests();
-    json_tests();
     cache_tests();
     
     Test.run();

src/tests/meson.build

@@ -18,7 +18,6 @@ sources += files('Integration/Promotion.vala')
 sources += files('Integration/Numbers.vala')
 sources += files('Integration/Dictionary.vala')
 sources += files('Integration/PropertyMapper.vala')
-sources += files('Integration/Json.vala')
 sources += files('Integration/Cache.vala')
 
 sources += files('Speed/SpeedTest.vala')