yamlscript 0.1.0__tar.gz → 0.1.3__tar.gz

{yamlscript-0.1.0/lib/yamlscript.egg-info → yamlscript-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: yamlscript
-Version: 0.1.0
+Version: 0.1.3
 Summary: Program in YAML
 Home-page: https://github.com/ingydotnet/yamlscript
 Author: Ingy döt Net

{yamlscript-0.1.0 → yamlscript-0.1.3}/ReadMe.md

@@ -51,15 +51,25 @@ Us the `yamlscript` module in your Python program like this:
 ```python
 import yamlscript
 
-ys = yamlscript.YAMLScript(options_dict)
-
+ys_file = open('file.ys')
 ys_code = open('file.ys').read()
 
-ys.run(ys_code)
+# Class method
+data = yamlscript.load(ys_file)
+data = yamlscript.load(ys_code)
 
+# Instance method
+ys = yamlscript.YAMLScript()
+data = ys.load(ys_file)
 data = ys.load(ys_code)
 
-clojure_code = ys.compile(ys_code)
+# Error handling
+try:
+    yamlscript.load("a: b: c")
+except Exception as e:
+    print(e)
+    print(ys.error['cause'])
+    print(ys.error['trace'])
 ```
 
 

yamlscript-0.1.3/lib/yamlscript/__init__.py

@@ -0,0 +1,20 @@
+import io
+from . import loader
+
+class YAMLScript():
+  def load(self, input):
+    if isinstance(input, str):
+      return self._load_string(input)
+    elif isinstance(input, io.IOBase):
+      return self._load_string(input.read())
+
+  def _load_string(self, input):
+    self.error = None
+    resp = loader.Loader().load(input)
+    error = self.error = resp.get('error')
+    if error:
+      raise Exception(error['cause'])
+    return resp['data']
+
+def load(input):
+  return YAMLScript().load(input)

{yamlscript-0.1.0 → yamlscript-0.1.3}/lib/yamlscript/loader.py

@@ -2,7 +2,7 @@ import os, sys
 import ctypes
 import json
 
-yamlscript_version = '0.1.30'
+yamlscript_version = '0.1.33'
 
 so = 'dylib' if sys.platform == 'darwin' else 'so'
 libys_name = 'libyamlscript.' + so + '.' + yamlscript_version
@@ -32,11 +32,8 @@ libys.graal_create_isolate(
   ctypes.byref(isolatethread),
 )
 
-compile_ys_to_clj = libys.compile_ys_to_clj
-compile_ys_to_clj.restype = ctypes.c_char_p
-
-eval_ys_to_json = libys.eval_ys_to_json
-eval_ys_to_json.restype = ctypes.c_char_p
+load_ys_to_json = libys.load_ys_to_json
+load_ys_to_json.restype = ctypes.c_char_p
 
 # User API class:
 class Loader():
@@ -47,30 +44,10 @@ class Loader():
   Load the returned JSON into a Python value and return that.
   """
 
-  def compile(self, ys_str):
-    ys_input = ys_str.rstrip().replace("\n", "\\n")
-
-    data_json = compile_ys_to_clj(
-      isolatethread,
-      ctypes.c_char_p(bytes(ys_input, "utf8")),
-    ).decode()
-
-    data_value = json.loads(data_json)
-
-    # free_buffer(data_buffer)
-
-    return data_value.get("clojure")
-
-  def load(self, ys_str):
-    ys_input = ys_str.rstrip().replace("\n", "\\n")
-
-    data_json = eval_ys_to_json(
+  def load(self, ys_input):
+    data_json = load_ys_to_json(
       isolatethread,
       ctypes.c_char_p(bytes(ys_input, "utf8")),
     ).decode()
 
-    data_value = json.loads(data_json)
-
-    # free_buffer(data_buffer)
-
-    return data_value
+    return json.loads(data_json)

{yamlscript-0.1.0 → yamlscript-0.1.3/lib/yamlscript.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: yamlscript
-Version: 0.1.0
+Version: 0.1.3
 Summary: Program in YAML
 Home-page: https://github.com/ingydotnet/yamlscript
 Author: Ingy döt Net

{yamlscript-0.1.0 → yamlscript-0.1.3}/setup.py

@@ -1,5 +1,4 @@
-version = '0.1.0'
-yamlscript_version = '0.1.30'
+version = '0.1.3'
 
 from setuptools import setup
 import pathlib

yamlscript-0.1.0/lib/yamlscript/__init__.py

@@ -1,31 +0,0 @@
-import io
-from . import loader
-
-class YAMLScript():
-  def compile(self, input):
-    if isinstance(input, str):
-      return self._compile_string(input)
-    elif isinstance(input, io.IOBase):
-      return self._compile_string(input.read())
-
-  def load(self, input):
-    if isinstance(input, str):
-      return self._load_string(input)
-    elif isinstance(input, io.IOBase):
-      return self._load_string(input.read())
-
-  def _compile_string(self, input):
-    return loader.Loader().compile(input)
-
-  def _load_string(self, input):
-    return loader.Loader().load(input)
-
-def compile(input):
-  return YAMLScript().compile(input)
-
-def load(input):
-  return YAMLScript().load(input)
-
-def run(input):
-  YAMLScript().load(input)
-  return None