ucl 0.1.1 → 0.1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 425cfe9bbc447dd450e023ce22cf7d87ff55999c44e9c662c478bfb04f27afdc
-  data.tar.gz: c71501063aa394c0f32f8a9e6ad66f4ca54a61309af6ee1f9e78d960d26711da
+  metadata.gz: 5badf6c3422aac319ce132dfde865c7e5532b5b6617ffdad9e5383026c176f7a
+  data.tar.gz: 6cac2b1806cfb4997ca0de3239c48b4241ef16ed0a64dd5f4772f2d79ab02937
 SHA512:
-  metadata.gz: dd42a5c178ca47bf3287b72bf7fa150ca21242c457cb8421590fa12f41a8d721079c3fe582335d85e7339c5cd5fd0b866dad2fa3a9569dba1eebf0460f4e2089
-  data.tar.gz: ca19582a1d3ef8882e46dae1da77c614d59cfe953b86fb05bc82e8dae491af6388acdf2085075c90b2f324870dc8ec26e6aebc8c8f6cd9d7f7513c334897b90a
+  metadata.gz: d9aba6119424b9e6d8488c870330b1603b79dadd74f3896f34eafb09c3eb30fb60fc20788dd8dbb9308ea405b14e7b65a037c9ed870c1697533af9dd72b91e34
+  data.tar.gz: b4e5702dac98848b069a09e611342e8607dcf580baa44c6da905a255c83e9b2f4aac02c2f4f8bf83c16a848b886fd3b085b9e93616a2437132926af181248e26

data/ext/ucl.c

@@ -25,6 +25,11 @@
 static VALUE mUCL                        = Qundef;
 static VALUE eUCLError                   = Qundef;
 
+static int ucl_allowed_flags = UCL_PARSER_KEY_LOWERCASE |
+	                       UCL_PARSER_NO_TIME       |
+	                       UCL_PARSER_DISABLE_MACRO |
+	                       UCL_PARSER_NO_FILEVARS   ;
+
 
 VALUE
 _iterate_valid_ucl(ucl_object_t const *root, int flags)
@@ -36,7 +41,7 @@ _iterate_valid_ucl(ucl_object_t const *root, int flags)
 
     VALUE lst = rb_ary_new();
     
-    while ((obj = ucl_object_iterate (root, &it, false))) {
+    while ((obj = ucl_iterate_object (root, &it, false))) {
 	VALUE val;
 
 	switch (obj->type) {
@@ -63,7 +68,7 @@ _iterate_valid_ucl(ucl_object_t const *root, int flags)
 	case UCL_OBJECT:
 	    it_obj = NULL;
 	    val    = rb_hash_new();		
-	    while ((cur = ucl_object_iterate(obj, &it_obj, true))) {
+	    while ((cur = ucl_iterate_object(obj, &it_obj, true))) {
 		const char *obj_key = ucl_object_key(cur);
 		VALUE key = (flags & UCL_PARSER_KEY_SYMBOL)
 		          ? rb_id2sym(rb_intern(obj_key))
@@ -75,7 +80,7 @@ _iterate_valid_ucl(ucl_object_t const *root, int flags)
 	case UCL_ARRAY:
 	    it_obj = NULL;		
 	    val    = rb_ary_new();
-	    while ((cur = ucl_object_iterate (obj, &it_obj, true))) {
+	    while ((cur = ucl_iterate_object (obj, &it_obj, true))) {
 		rb_ary_push(val, _iterate_valid_ucl(cur, flags));
 	    }
 	    break;
@@ -130,11 +135,6 @@ ucl_s_set_flags(VALUE klass, VALUE val)
 static VALUE
 ucl_s_parse(int argc, VALUE *argv, VALUE klass)
 {
-    static int allowed_flags = UCL_PARSER_KEY_LOWERCASE |
-	                       UCL_PARSER_NO_TIME       |
-	                       UCL_PARSER_DISABLE_MACRO |
-	                       UCL_PARSER_NO_FILEVARS   ;
-
     VALUE data, flags;
     rb_scan_args(argc, argv, "11", &data, &flags);
     if (NIL_P(flags)) flags = ucl_s_get_flags(mUCL);
@@ -142,7 +142,7 @@ ucl_s_parse(int argc, VALUE *argv, VALUE klass)
     rb_check_type(data,  T_STRING);
     rb_check_type(flags, T_FIXNUM);
 	
-    int c_flags = FIX2INT(flags) & allowed_flags;
+    int c_flags = FIX2INT(flags) & ucl_allowed_flags;
 
     struct ucl_parser *parser =
 	ucl_parser_new(c_flags | UCL_PARSER_NO_IMPLICIT_ARRAYS);
@@ -152,20 +152,16 @@ ucl_s_parse(int argc, VALUE *argv, VALUE klass)
 			 RSTRING_LEN(data));
     
     if (ucl_parser_get_error(parser)) {
-	rb_raise(eUCLError, "%s", ucl_parser_get_error(parser));
+	const char *errormsg = ucl_parser_get_error(parser);
+	if (parser != NULL) { ucl_parser_free(parser); }
+	rb_raise(eUCLError, "%s", errormsg);
     }
 
     ucl_object_t *root = ucl_parser_get_object(parser);
+    VALUE         res  = _iterate_valid_ucl(root, FIX2INT(flags));
 
-    VALUE res = _iterate_valid_ucl(root, FIX2INT(flags));
-
-    if (parser != NULL) {
-	ucl_parser_free(parser);
-    }
-    
-    if (root != NULL) {
-	ucl_object_unref(root);
-    }
+    if (parser != NULL) { ucl_parser_free(parser); }
+    if (root   != NULL) { ucl_object_unref(root);  }
     
     return res;
 }
@@ -187,17 +183,31 @@ ucl_s_load_file(int argc, VALUE *argv, VALUE klass)
 {
     VALUE file, flags;
     rb_scan_args(argc, argv, "11", &file, &flags);
+    if (NIL_P(flags)) flags = ucl_s_get_flags(mUCL);
 
-    VALUE read_kwargs = rb_hash_new();
-    rb_hash_aset(read_kwargs, rb_id2sym(rb_intern("encoding")),
-		 rb_str_new_cstr("BINARY"));
+    rb_check_type(file,  T_STRING);
+    rb_check_type(flags, T_FIXNUM);
+	
+    int   c_flags = FIX2INT(flags) & ucl_allowed_flags;
+    char *c_file  = StringValueCStr(file);
+    
+    struct ucl_parser *parser =
+	ucl_parser_new(c_flags | UCL_PARSER_NO_IMPLICIT_ARRAYS);
+    ucl_parser_add_file(parser, c_file);
+    
+    if (ucl_parser_get_error(parser)) {
+	const char *errormsg = ucl_parser_get_error(parser);
+	if (parser != NULL) { ucl_parser_free(parser); }
+	rb_raise(eUCLError, "%s", errormsg);
+    }
 
-    VALUE read_args[] = { file, read_kwargs };
-    VALUE data = rb_funcallv_kw(rb_cFile, rb_intern("read"),
-				2, read_args, RB_PASS_KEYWORDS);
+    ucl_object_t *root = ucl_parser_get_object(parser);
+    VALUE         res  = _iterate_valid_ucl(root, FIX2INT(flags));
 
-    VALUE parse_args[] = { data, flags };
-    return ucl_s_parse(2, parse_args, klass);
+    if (parser != NULL) { ucl_parser_free(parser); }
+    if (root   != NULL) { ucl_object_unref(root);  }
+    
+    return res;
 }
 
 

data/ucl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
     s.name        = 'ucl'
-    s.version     = '0.1.1'
+    s.version     = '0.1.2.1'
     s.summary     = " Universal configuration library parser"
     s.description =  <<~EOF
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ucl
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2.1
 platform: ruby
 authors:
 - Stéphane D'Alu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-20 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies: []
 description: |2+
 
@@ -43,7 +43,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.23
+rubygems_version: 3.4.2
 signing_key:
 specification_version: 4
 summary: Universal configuration library parser