ucl 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 123bfade721343ef51a1b839b450365e7d2aa934e16e9d537a708582336aca60
-  data.tar.gz: c2f59b562e9a13fb4535e65055acf6d4fa8e140161ecb445875699314163cc93
+  metadata.gz: 3fb8e8b518ea32adfa5365bf32e260487f3aa4ec9e546738911e6cf37a16e300
+  data.tar.gz: e9067e8747899c187f9ae400cd4bfe58e4343c41ff04b70cdbe161a500062bfc
 SHA512:
-  metadata.gz: fe5a117504dd4694952d5555107a8c7c886ca25a5a2bebe5e52f394552fbf39386175040080a85dcaf4a240d7837af436a483255ae0f2411932de2b62bbed98f
-  data.tar.gz: ccebbfb07adabb8e892c855ccacf385ee79a81415b5f57a1b1ce50fffb7fb01e233902265bac6f6950fc3aa93e44f8a8067c122a08e029ce85df1348294bb94c
+  metadata.gz: 962eea2f25228aec1ee903315074ceabd9cc424b2afab0963e68179fd39f1666abe6954404594ae6d4c658704b89200d4bfad21174bc9cd298b8ce66ea9252b7
+  data.tar.gz: b5c9bbe4b92be69734f5bd0df81a043dba97158489da7f67d7fce6e33f976a6eb209c45b7a72690bd441aa2fd8aed203f47389753328efd875fe05175e875afa

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)
@@ -103,6 +108,20 @@ _iterate_valid_ucl(ucl_object_t const *root, int flags)
     }
 }
 
+static VALUE
+ucl_s_get_flags(VALUE klass)
+{
+    return rb_iv_get(klass, "@flags");
+}
+
+
+static VALUE
+ucl_s_set_flags(VALUE klass, VALUE val)
+{
+    rb_check_type(val, T_FIXNUM);
+    rb_iv_set(klass, "@flags", val);
+    return val;
+}
 
 
 /**
@@ -116,19 +135,14 @@ _iterate_valid_ucl(ucl_object_t const *root, int flags)
 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 = INT2FIX(0);
+    if (NIL_P(flags)) flags = ucl_s_get_flags(mUCL);
 
     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);
@@ -138,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;
 }
@@ -173,22 +183,38 @@ 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;
 }
 
 
 
 
+
+
 void Init_ucl(void) {
     /* Main classes */
     mUCL      = rb_define_class("UCL", rb_cObject);
@@ -200,11 +226,15 @@ void Init_ucl(void) {
     rb_define_const(mUCL, "DISABLE_MACRO", INT2FIX(UCL_PARSER_DISABLE_MACRO));
     rb_define_const(mUCL, "NO_FILEVARS",   INT2FIX(UCL_PARSER_NO_FILEVARS  ));
     rb_define_const(mUCL, "KEY_SYMBOL",    INT2FIX(UCL_PARSER_KEY_SYMBOL   ));
-    
+
+    /* Variables */
+    ucl_s_set_flags(mUCL, INT2FIX(0));
+	
     /* Definitions */
     rb_define_singleton_method(mUCL, "load_file", ucl_s_load_file, -1);
     rb_define_singleton_method(mUCL, "parse",     ucl_s_parse,     -1);
-
+    rb_define_singleton_method(mUCL, "flags",     ucl_s_get_flags,  0);
+    rb_define_singleton_method(mUCL, "flags=",    ucl_s_set_flags,  1);
 }
 
 

data/ucl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
     s.name        = 'ucl'
-    s.version     = '0.1.0'
+    s.version     = '0.1.2'
     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.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Stéphane D'Alu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-19 00:00:00.000000000 Z
+date: 2022-12-20 00:00:00.000000000 Z
 dependencies: []
 description: |2+