Merge branch 'gh-pages' of https://github.com/LivelyKernel/lively4-core into gh-pages

Author: BraunTom

.github/workflows/ci.yml

@@ -0,0 +1,16 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+    steps:
+    - name: Clone lively4-core repository
+      uses: actions/checkout@v2
+    - name: Use Node.js 0.11
+      uses: actions/setup-node@v1
+      with:
+        node-version: 0.11
+    - run: npm install
+    - run: xvfb-run npm test

README.md

@@ -2,7 +2,8 @@
 
 # An Explorative, Self-supporting, Web-based Development Environment
 
-[![Build Status](https://travis-ci.org/LivelyKernel/lively4-core.svg)](https://travis-ci.org/LivelyKernel/lively4-core)
+[![Build Status](https://travis-ci.org/LivelyKernel/lively4-core.svg)](https://travis-ci.org/LivelyKernel/lively4-core) [![Build Status Github](https://github.com/LivelyKernel/lively4-core/workflows/CI/badge.svg)](https://github.com/LivelyKernel/lively4-core/actions?query=workflow%3ACI)
+
 
 ## Getting Started{style="clear:both"}
 
@@ -17,7 +18,7 @@ A project or branch of a project on GitHub can be checked out in multiple direct
 - [lively4-jens](https://lively-kernel.org/lively4/lively4-jens/start.html)
 - ...
 
-The Livel4 server and GitHub sync tools can check out arbitrary projects, such as the code of [lively4-server](https://lively-kernel.org/lively4/lively4-server/) itself, or the source of a paper hosted by overleaf.
+The Lively4 server and GitHub sync tools can check out arbitrary projects, such as the code of [lively4-server](https://lively-kernel.org/lively4/lively4-server/) itself, or the source of a paper hosted by overleaf.
 
 ## Authors / Contributors
 

[object Object]

@@ -21,7 +21,7 @@ const exampleQueries = [
 ]
 
 
-function createUILayer(object, key) {
+/*function createUILayer(object, key) {
   var subDiv = <div id="innerDiv" style="margin: 5px; border: 1px solid gray;">{key}</div>;
   var valueOrObject = object[key];
   if (typeof(valueOrObject) == "object") {
@@ -33,6 +33,33 @@ function createUILayer(object, key) {
     subDiv.appendChild(input);
   }
   return subDiv;
+}*/
+
+function parseQuery(object) {
+  var subDiv = <div id="innerDiv" style="margin: 5px; border: 1px solid gray;"></div>;
+  
+  switch(object.type) {
+    case "simple":
+      [object.attribute, object.comparator, object.value].forEach(value => {
+        var input = <input value={value}></input>;
+        subDiv.appendChild(input)
+      });
+      break;
+    case "conjunction":
+      var input = <input value={object.conjunction}></input>;
+      var left = parseQuery(object.left);
+      var right = parseQuery(object.right);
+      [input, left, right].forEach(element => {
+        subDiv.appendChild(element);
+      });
+      break;
+    case "composite":
+      [object.attribute, object.comparator, object.value].forEach(value => {
+        var input = <input value={value}></input>;
+        subDiv.appendChild(input)
+      });
+  }
+  return subDiv;
 }
 
 
@@ -54,12 +81,38 @@ export default class LeoUIExample{
 
 //     world.addEventListener('drop', drop);
 
-    var g = ohm.grammar('Academic { \n  Exp = \n    AcademicQuery \n \n  AcademicQuery = Attribute Comparator Value -- simple \n    | ("And" | "Or") "(" AcademicQuery "," AcademicQuery ")" -- complex \n    | "Composite(" CompositeQuery ")" -- composite \n \n  CompositeQuery = Attribute "." Attribute Comparator Value -- simple \n    | ("And" | "Or") "(" CompositeQuery "," CompositeQuery ")" -- complex \n \n  Comparator = \n    PartialComparator "="? \n  PartialComparator = \n    "=" | "<" | ">" \n \n  Attribute (an attribute) = \n    letter letter? letter? \n  \n Value (a value) = \n    "\'" alnum* "\'" -- string \n    | Number \n    | Date \n    | ( "[" | "(" ) Number "," Number ( "]" | ")" ) -- numberRange \n    | ( "[" | "(" ) Date "," Date ( "]" | ")" ) -- dateRange \n \n  Number = \n    digit+ \n  Date = \n    "\'" Number "-" Number "-" Number "\'" \n}');
-    
-    /*lively.notify(g.match("Composite(And(AA.AuN='mike smith',AA.AfN='harvard university'))").succeeded(), "Composite(And(AA.AuN='mike smith',AA.AfN='harvard university'))");
-    lively.notify(g.match("And(AA.AuN='mike smith',AA.AfN='harvard university')").succeeded(), "And(AA.AuN='mike smith',AA.AfN='harvard university')");*/
-    
-    //var queryObject = {};
+    var g = ohm.grammar(
+      `Academic { 
+        Exp =
+          AcademicQuery
+
+        AcademicQuery = Attribute Comparator Value -- simple
+          | ("And" | "Or") "(" AcademicQuery "," AcademicQuery ")" -- complex
+          | "Composite(" CompositeQuery ")" -- composite
+        CompositeQuery = Attribute "." Attribute Comparator Value -- simple
+          | ("And" | "Or") "(" CompositeQuery "," CompositeQuery ")" -- complex
+
+        Comparator =
+          PartialComparator "="?
+        PartialComparator =
+          "=" | "<" | ">"
+
+        Attribute (an attribute) =
+          letter letter? letter?
+
+        Value (a value) =
+          "\'" alnum* "\'" -- string
+          | Number
+          | Date
+          | ( "[" | "(" ) Number "," Number ( "]" | ")" ) -- numberRange
+          | ( "[" | "(" ) Date "," Date ( "]" | ")" ) -- dateRange
+
+        Number =
+          digit+
+          Date =
+          "\'" Number "-" Number "-" Number "\'"
+      }`
+    );
 
     var s = g.createSemantics();
 
@@ -70,36 +123,43 @@ export default class LeoUIExample{
         },
 
         AcademicQuery_simple: function(attribute, comparator, value) {
-          return { [attribute.interpret()]: {
-            "comparator": comparator.interpret(),
-            "value": value.interpret(),
-          }}
+          return {
+            "attribute" : attribute.interpret(),
+            "comparator" : comparator.interpret(),
+            "value" : value.interpret(),
+            "type" : "simple"
+          }
         },
         AcademicQuery_complex: function(conjunction, _1, left, _2, right, _3) {
-          return {[conjunction.sourceString]: [
-            left.interpret(),
-            right.interpret()
-          ]}
+          return {
+            "conjunction" : conjunction.sourceString,
+            "left" : left.interpret(), 
+            "right" : right.interpret(),
+            "type" : "conjunction"
+           }
         },
         AcademicQuery_composite: function(_1, query, _2) {
           return query.interpret();
         },
 
         CompositeQuery_simple: function(mainAttribute, _, secondaryAttribute, comparator, value) {
-          return {[mainAttribute.interpret()]:
-                  {[secondaryAttribute.interpret()]:
-                    {
-                      "comparator": comparator.interpret(),
-                      "value": value.interpret(),
-                    }
-                  }
+          // would it make sense to split main and secondary attribute?
+          var main = mainAttribute.interpret();
+          var secondary = secondaryAttribute.interpret();
+          return {
+            "attribute" : main + "." + secondary,
+            "comparator" : comparator.interpret(),
+            "value" : value.interpret(),
+            "type" : "composite"
           }
         },
         CompositeQuery_complex: function(conjunction, _1, left, _2, right, _3) {
-          return {[conjunction.sourceString]: [
-            left.interpret(),
-            right.interpret()
-          ]}
+          return {
+            "conjunction" : conjunction.sourceString,
+            "left" : left.interpret(), 
+            "right" : right.interpret(),
+            "type" : "conjunction"
+          }
         },
 
         Comparator: function(main, secondary) {
@@ -120,7 +180,6 @@ export default class LeoUIExample{
           return string.sourceString;
         },
         Value_numberRange: function(leftBracket, nLeft, _, nRight, rightBracket) {
-          // TODO: refactor
           return "TODO";//arguments.map(a => {a.sourceString}).join('');
         },
         Value_dateRange: function(leftBracket, dLeft, _, dRight, rightBracket) {
@@ -169,60 +228,21 @@ export default class LeoUIExample{
 //       event.target.appendChild(lively.query(this, '#'+data))
 //     }
 
-    var query = "Ti='indexing by latent seman'";
+    var query = "And(Or(Y='1985', Y='2008'), Ti='disordered electronic systems')";
     var match = g.match(query);
     var queryObject = s(match).interpret();
 
-    var div = <div id="outerDiv"></div>
+    var input = <input id="queryInput" value={query} style="width: 100%"></input>
+    var div = <div id="outerDiv" style="padding-right : 20px">
+          {input}
+        </div>
 
-    Object.keys(queryObject).forEach(key => {
+    /*Object.keys(queryObject).forEach(key => {
       div.appendChild(createUILayer(queryObject, key));
-    });
-    //div.appendChild(<div>key</div>)
+    });*/
 
+    div.appendChild(parseQuery(queryObject));
+    
     return div;
-    // <div>
-    //   <table>
-    //     <tr>
-    //       <td>
-    //         Title
-    //       </td>
-    //       <td>
-    //         Author
-    //       </td>
-    //       <td>
-    //         Year
-    //       </td>
-    //     </tr>
-    //     <tr style="vertical-align:top">
-    //       <td>
-    //         <input value='something'></input>
-    //       </td>
-    //       <td>
-    //         <table>
-    //           <tr>
-    //             <td>
-    //               Name
-    //             </td>
-    //             <td>
-    //               <input value='name'></input>
-    //             </td>
-    //           </tr>
-    //           <tr>
-    //             <td>
-    //               Institution
-    //             </td>
-    //             <td>
-    //               <input value='inst'></input>
-    //             </td>
-    //           </tr>
-    //         </table>
-    //       </td>
-    //       <td>
-    //         <input value='2001'></input>
-    //       </td>
-    //     </tr>
-    //   </table>
-    // </div>
   }
 }

demos/bibliographie/leoUIexample.js

@@ -47,7 +47,7 @@ import ohm from "https://unpkg.com/[email protected]/dist/ohm.js"
 
 
 var myGrammar = ohm.grammar(
-'Academic {
+`Academic {
   Exp =
     AcademicQuery
 
@@ -80,7 +80,7 @@ var myGrammar = ohm.grammar(
     digit+
   Date =
     "'" digit digit digit digit "-" digit digit "-" digit digit "'"
-}')
+}`)
 
 
 

demos/bibliographie/leonotes.md

@@ -35,7 +35,7 @@ get('tosave')
 ```
 
 
-### Nice use case of #Livel4Chrome...
+### Nice use case of #Lively4Chrome...
 
 I had to get the list of our mailinglist subsribers...
 So I went to its website. I could not find an export link, but just the list as an HTML table...

doc/journal/2016-03-10.md

@@ -8,7 +8,7 @@ Getting the commit that last changed a file... e.g. the revision number of a fil
 
 ### Working on lively4-server from within lively4
 
-Ok, we talked about it and thought lets wait until the livel4-services project can gives us a live view on a terminal...
+Ok, we talked about it and thought lets wait until the lively4-services project can gives us a live view on a terminal...
 
 But then todays seminar came and here it is, the line of code that kills our lively server.
 

doc/journal/2016-04-27.md

@@ -0,0 +1,23 @@
+## 2020-11-25 Custom #Workspace
+*Author: @JensLincke*
+
+
+```javascript
+var string =  "3 + 4";
+
+var id = "SpecialWorkspace"
+var codemirror = document.body.querySelector("#" + id);
+
+(async () => {
+  if (!codemirror) {
+    codemirror = await lively.openWorkspace("3 + 4")  
+    codemirror.parentElement.setAttribute("title", "Special Workspace")
+    codemirror.id = id
+  }
+  codemirror.boundEval = async function(s) {
+    await lively.sleep(500)
+    return ({ value: "I cannot evalutate: " +s})
+  }
+})();
+```
+![](custom_workspace.png)

doc/journal/2020-11-25.md/custom_workspace.png

@@ -0,0 +1,22 @@
+## 2020-11-30 #Server #Testing #Issue
+*Author: @JensLincke*
+
+
+## How to Automate this Test?
+
+1. Setup:
+```javascript
+lively.files.saveFile("http://localhost:9006/Dropbox/Thesis/Literature/_misc/foo.md", "test content")
+```
+
+2. Test:
+```javascript
+fetch("http://localhost:9006/Dropbox/Thesis/Literature/_misc/foo.md", {
+        method: "MOVE",
+        headers: {
+          destination: "http://localhost:9006/Dropbox/Thesis/Literature/_misc/" + encodeURI("foo―é.md")
+        }
+      }).then(r => r.text())
+```
+
+3. check that there is not error... and the file is there?