aridity 81__tar.gz → 82__tar.gz

{aridity-81 → aridity-82}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 81
+Version: 82
 Summary: DRY config and template system, easily extensible with Python
 Home-page: https://pypi.org/project/aridity/
 Author: foyono

{aridity-81 → aridity-82}/aridity/config.py

@@ -148,7 +148,7 @@ class ConfigCtrl:
         s = self.scope()
         obj = _wrappathorstream(frompathorstream).processtemplate(s)
         if getattr(topathorstream, 'writable', lambda: False)():
-            topathorstream.write(obj.cat())
+            topathorstream.write(obj.cat() if hasattr(topathorstream, 'encoding') else obj.binaryvalue)
         else:
             obj.writeout(topathorstream)
 

{aridity-81 → aridity-82}/aridity/grammar.py

@@ -79,7 +79,7 @@ class GFactory:
         return Concat(t, self.monitor)
 
     def _bracketspa(self, s, l, t):
-        return Concat(t[1:-1], self.monitor)
+        return Concat(t[1:-1] or [Text('')], self.monitor)
 
     def create(self, pa):
         def itercalls():

{aridity-81 → aridity-82}/aridity/model.py

@@ -40,6 +40,28 @@ class Resolved(Resolvable):
 
 nullmonitor = lambda text: None
 
+class NegBuffer:
+
+    def __init__(self):
+        self.text = ''
+
+    def insert(self, text):
+        self.text = text + self.text
+
+    def annihilate(self, obj):
+        if not self.text:
+            return obj
+        text = obj.cat()
+        if not text:
+            return obj
+        k = min(len(self.text), len(text))
+        assert self.text[:k] == text[:k]
+        self.text = self.text[k:]
+        return Text(text[k:])
+
+    def propagate(self, obj):
+        return Hole(obj, self.text) if self.text else obj
+
 class Concat(Resolvable):
 
     ignorable = False
@@ -59,27 +81,26 @@ class Concat(Resolvable):
     def resolve(self, scope, aslist = False):
         if aslist:
             return List([part.resolve(scope) for part in self.parts if not part.ignorable])
-        buffer = []
-        negbuffer = ''
+        result = Indeterminate
+        negbuffer = NegBuffer()
         for part in self.parts:
             obj = part.resolve(scope)
             try:
                 negtext = obj.holevalue
             except AttributeError:
-                text = obj.cat()
                 negtext = ''
             else:
-                text = obj.prefix.textvalue
-            k = min(len(negbuffer), len(text))
-            if k:
-                assert negbuffer[:k] == text[:k]
-                negbuffer = negbuffer[k:]
-                text = text[k:]
-            buffer.append(text)
-            self.monitor(text)
-            negbuffer = negtext + negbuffer
-        buffer = Text(''.join(buffer))
-        return Hole(buffer, negbuffer) if negbuffer else buffer
+                obj = obj.prefix
+            obj = negbuffer.annihilate(obj)
+            result = result.plus(obj)
+            try:
+                text = obj.cat()
+            except CatNotSupportedException:
+                pass
+            else:
+                self.monitor(text)
+            negbuffer.insert(negtext)
+        return negbuffer.propagate(result)
 
     def unparse(self):
         return ''.join(part.unparse() for part in self.parts)
@@ -118,6 +139,9 @@ class Blank(Cat, SimpleValue):
     ignorable = True
     boundary = False
 
+    def plus(self, that):
+        return Text(self.scalar + that.cat())
+
 class Boundary(SimpleValue):
 
     ignorable = True
@@ -149,6 +173,12 @@ class Text(Cat, BaseScalar):
     def scalar(self):
         return self.textvalue
 
+    @property
+    def binaryvalue(self):
+        if self.textvalue:
+            raise AttributeError('binaryvalue')
+        return b''
+
     def __init__(self, textvalue):
         self.textvalue = textvalue
 
@@ -172,6 +202,22 @@ class Text(Cat, BaseScalar):
             return o
         return Locator(s)
 
+    def plus(self, that):
+        return self._of(self.textvalue + that.cat())
+
+class Indeterminate:
+
+    def cat(self):
+        return ''
+
+    def plus(self, that):
+        return that
+
+    def totext(self):
+        return Text('')
+
+Indeterminate = Indeterminate()
+
 class Hole(BaseScalar):
 
     @property
@@ -261,6 +307,10 @@ class Resource(Resolved, Openable):
 
 class Binary(BaseScalar):
 
+    @classmethod
+    def _of(cls, *args):
+        return cls(*args)
+
     @property
     def scalar(self):
         return self.binaryvalue
@@ -272,6 +322,9 @@ class Binary(BaseScalar):
         with open(path, 'wb') as f:
             f.write(self.binaryvalue)
 
+    def plus(self, that):
+        return self._of(self.binaryvalue + that.binaryvalue)
+
 class Number(BaseScalar):
 
     @property
@@ -290,6 +343,9 @@ class Number(BaseScalar):
     def cat(self): # XXX: Should a parsed Number also be Text?
         return self.unparse()
 
+    def plus(self, that):
+        return Text(self.unparse() + that.cat())
+
 class Boolean(BaseScalar):
 
     @property

{aridity-81 → aridity-82}/aridity.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 81
+Version: 82
 Summary: DRY config and template system, easily extensible with Python
 Home-page: https://pypi.org/project/aridity/
 Author: foyono

{aridity-81 → aridity-82}/setup.py

@@ -49,7 +49,7 @@ class SourceInfo:
 sourceinfo = SourceInfo('.')
 setup(
     name = 'aridity',
-    version = '81',
+    version = '82',
     description = 'DRY config and template system, easily extensible with Python',
     url = 'https://pypi.org/project/aridity/',
     author = 'foyono',