ucl 0.1.2.1 → 0.1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5badf6c3422aac319ce132dfde865c7e5532b5b6617ffdad9e5383026c176f7a
-  data.tar.gz: 6cac2b1806cfb4997ca0de3239c48b4241ef16ed0a64dd5f4772f2d79ab02937
+  metadata.gz: 9a2fae349a8cdd822fbe00b6aa665cbdb04116e0c3dd9d6f7e21cd60d9420b07
+  data.tar.gz: b61d92056c4d69c0be28e3a4515fbb187a5e10a522ae181c38a6c00b51f28d21
 SHA512:
-  metadata.gz: d9aba6119424b9e6d8488c870330b1603b79dadd74f3896f34eafb09c3eb30fb60fc20788dd8dbb9308ea405b14e7b65a037c9ed870c1697533af9dd72b91e34
-  data.tar.gz: b4e5702dac98848b069a09e611342e8607dcf580baa44c6da905a255c83e9b2f4aac02c2f4f8bf83c16a848b886fd3b085b9e93616a2437132926af181248e26
+  metadata.gz: b6bbdf996a6be09f56dc12d1709f35b8e0f13a22ff1f0581af11c526b74b82eca11ac352989bd2414691a86ce4025e0caffcd0f196b200a5dcff650c8fc55d61
+  data.tar.gz: ae3d58daa278a8f97f055ec47dbd2f874d3cd953bda701217d5b09999411a2617bcb340f9c826ca2db742bf4ed3999ebee55b0794485f40c452ff6acda2aa2fd

data/ext/ucl.c

@@ -5,7 +5,7 @@
 #include <stdbool.h>
 
 /* Fake flag */
-#define UCL_PARSER_KEY_SYMBOL (1 << 10)
+#define UCL_PARSER_KEY_SYMBOL (1 << 12)
 
 
 /**
@@ -25,87 +25,83 @@
 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   ;
+static int ucl_allowed_c_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)
+_iterate_valid_ucl(ucl_object_t const *root, int flags, bool *failed)
 {
-    const ucl_object_t *obj;
-    ucl_object_iter_t it    = NULL;
-    const ucl_object_t *cur;
-    ucl_object_iter_t it_obj = NULL;
+    ucl_object_iter_t   it  = ucl_object_iterate_new(NULL);
+    const ucl_object_t *obj = NULL;
 
-    VALUE lst = rb_ary_new();
-    
-    while ((obj = ucl_iterate_object (root, &it, false))) {
-	VALUE val;
-
-	switch (obj->type) {
-	case UCL_INT:
-	    val = rb_ll2inum((long long)ucl_object_toint(obj));
-	    break;
-	    
-	case UCL_FLOAT:
-	    val = rb_float_new(ucl_object_todouble(obj));
-	    break;
-	    
-	case UCL_STRING:
-	    val = rb_str_new_cstr(ucl_object_tostring(obj));
-	    break;
-	    
-	case UCL_BOOLEAN:
-	    val = ucl_object_toboolean(obj) ? Qtrue : Qfalse;
-	    break;
-	    
-	case UCL_TIME:
-	    val = rb_float_new(ucl_object_todouble(obj));
-	    break;
-	    
-	case UCL_OBJECT:
-	    it_obj = NULL;
-	    val    = rb_hash_new();		
-	    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))
-		          : rb_str_new_cstr(obj_key);
-		rb_hash_aset(val, key, _iterate_valid_ucl(cur, flags));
-	    }
-	    break;
-	    
-	case UCL_ARRAY:
-	    it_obj = NULL;		
-	    val    = rb_ary_new();
-	    while ((cur = ucl_iterate_object (obj, &it_obj, true))) {
-		rb_ary_push(val, _iterate_valid_ucl(cur, flags));
-	    }
-	    break;
-
-	case UCL_USERDATA:
-	    val = rb_str_new(obj->value.sv, obj->len);
-	    break;
-	    
-	case UCL_NULL:
-	    val = Qnil;
-	    break;
-
-	default:
-	    rb_bug("unhandled type (%d)", obj->type);
-    
-	}
-	rb_ary_push(lst, val);
+    VALUE val;
 
+    switch (root->type) {
+    case UCL_INT:
+	val = rb_ll2inum((long long)ucl_object_toint(root));
+	break;
+	
+    case UCL_FLOAT:
+	val = rb_float_new(ucl_object_todouble(root));
+	break;
+	
+    case UCL_STRING: {
+	size_t len;
+	const char *str = ucl_object_tolstring(root, &len);
+	val = rb_str_new(str, len);
+	break;
     }
-
-    switch(RARRAY_LENINT(lst)) {
-    case  0: return Qnil;
-    case  1: return RARRAY_PTR(lst)[0];
-    default: return lst;
+	
+    case UCL_BOOLEAN:
+	val = ucl_object_toboolean(root) ? Qtrue : Qfalse;
+	break;
+	
+    case UCL_TIME:
+	val = rb_float_new(ucl_object_todouble(root));
+	break;
+	
+    case UCL_OBJECT:
+	val = rb_hash_new();
+	it  = ucl_object_iterate_reset(it, root);
+	while ((obj = ucl_object_iterate_safe(it, !true))) {
+	    size_t keylen;
+	    const char *key = ucl_object_keyl(obj, &keylen);
+	    VALUE v_key = rb_str_new(key, keylen);
+	    if (flags & UCL_PARSER_KEY_SYMBOL)
+		v_key = rb_to_symbol(v_key);
+	    rb_hash_aset(val, v_key, _iterate_valid_ucl(obj, flags, failed));
+	}
+	*failed = ucl_object_iter_chk_excpn(it);
+	break;
+	
+    case UCL_ARRAY:
+	val = rb_ary_new();
+	it = ucl_object_iterate_reset(it, root);
+	while ((obj = ucl_object_iterate_safe(it, !true))) {
+	    rb_ary_push(val, _iterate_valid_ucl(obj, flags, failed));
+	}
+	*failed = ucl_object_iter_chk_excpn(it);
+	break;
+	
+    case UCL_USERDATA:
+	val = rb_str_new(root->value.sv, root->len);
+	break;
+	
+    case UCL_NULL:
+	val = Qnil;
+	break;
+	
+    default:
+	rb_bug("unhandled type (%d)", root->type);
+	
     }
+
+    ucl_object_iterate_free(it);
+    return val;
 }
 
 static VALUE
@@ -142,7 +138,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) & ucl_allowed_flags;
+    int c_flags = FIX2INT(flags) & ucl_allowed_c_flags;
 
     struct ucl_parser *parser =
 	ucl_parser_new(c_flags | UCL_PARSER_NO_IMPLICIT_ARRAYS);
@@ -157,12 +153,17 @@ ucl_s_parse(int argc, VALUE *argv, VALUE klass)
 	rb_raise(eUCLError, "%s", errormsg);
     }
 
-    ucl_object_t *root = ucl_parser_get_object(parser);
-    VALUE         res  = _iterate_valid_ucl(root, FIX2INT(flags));
+    bool          failed = false;
+    ucl_object_t *root   = ucl_parser_get_object(parser);
+    VALUE         res    = _iterate_valid_ucl(root, FIX2INT(flags), &failed);
 
     if (parser != NULL) { ucl_parser_free(parser); }
     if (root   != NULL) { ucl_object_unref(root);  }
-    
+
+    if (failed) {
+    	rb_raise(eUCLError, "failed to iterate over ucl object");
+    }
+
     return res;
 }
 
@@ -188,25 +189,32 @@ ucl_s_load_file(int argc, VALUE *argv, VALUE klass)
     rb_check_type(file,  T_STRING);
     rb_check_type(flags, T_FIXNUM);
 	
-    int   c_flags = FIX2INT(flags) & ucl_allowed_flags;
+    int   c_flags = FIX2INT(flags) & ucl_allowed_c_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);
-    
+    ucl_parser_set_filevars(parser, c_file, false);
+	
     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);
     }
 
-    ucl_object_t *root = ucl_parser_get_object(parser);
-    VALUE         res  = _iterate_valid_ucl(root, FIX2INT(flags));
+    bool          failed = false;
+    ucl_object_t *root   = ucl_parser_get_object(parser);
+    VALUE         res    = _iterate_valid_ucl(root, FIX2INT(flags), &failed);
 
     if (parser != NULL) { ucl_parser_free(parser); }
     if (root   != NULL) { ucl_object_unref(root);  }
     
+    if (failed) {
+    	rb_raise(eUCLError, "failed to iterate over ucl object");
+    }
+
     return res;
 }
 

data/ucl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
     s.name        = 'ucl'
-    s.version     = '0.1.2.1'
+    s.version     = '0.1.3.1'
     s.summary     = " Universal configuration library parser"
     s.description =  <<~EOF
       
@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
     s.homepage    = 'https://github.com/sdalu/ruby-ucl'
     s.license     = 'MIT'
 
-    s.authors     = [ "Stéphane D'Alu" ]
+    s.authors     = [ "Stéphane D'Alu"  ]
     s.email       = [ 'sdalu@sdalu.com' ]
 
-    s.extensions = [ 'ext/extconf.rb' ]
-    s.files      = %w[ ucl.gemspec ]  + Dir['ext/**/*.{c,h,rb}']
+    s.extensions  = [ 'ext/extconf.rb' ]
+    s.files       = %w[ ucl.gemspec ]  + Dir['ext/**/*.{c,h,rb}']
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucl
 version: !ruby/object:Gem::Version
-  version: 0.1.2.1
+  version: 0.1.3.1
 platform: ruby
 authors:
 - Stéphane D'Alu
@@ -43,7 +43,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.2
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Universal configuration library parser