prism-cli 0.0.7 → 0.0.8

data/{dist → build}/prism.js

@@ -943,7 +943,19 @@ function rubyVTreeToSnabbdom(rvtree) {
   );
 }
 
-var currentContainer = document.getElementById('root');
+
+var currentContainer;
+var allLoaded = false;
+var modulesToLoad = [];
+
+function run(element, main) {
+  currentContainer = document.getElementById('root');
+  modulesToLoad = [fetchAndLoad("/prism-ruby/prism.rb"), fetchAndLoad(main)];
+
+  load(modulesToLoad, main);
+}
+
+window.Prism = {run};
 
 function render() {
   const rvtree = JSON.parse(Module.ccall("render", "string", []));
@@ -956,22 +968,57 @@ function render() {
 
 window.render = render;
 
-window.Module = {
-  preRun: [],
-  postRun: [ render ],
-  print: function() {
-    return function(e) {
-      1 < arguments.length && (e = Array.prototype.slice.call(arguments).join(" ")), console.log(e)
-    }
-  }(),
-  printErr: function(e) {
-    1 < arguments.length && (e = Array.prototype.slice.call(arguments).join(" ")), console.error(e)
-  },
-  canvas: function() {}(),
-  setStatus: function() {},
-  totalDependencies: 0,
-  monitorRunDependencies: function(e) {}
-};
+function fetchAndLoad(name) {
+  return fetch(name).then(r => r.text().then(t => ({ok: r.ok, text: t}))).then(({ok, text}) => {
+    if (!ok) {
+      throw new Error(`Prism: Could not load ${name}`, text);
+    }
+
+    return {name, text};
+  });
+}
+
+function load(modulesToLoad, main) {
+  modulePromise.then(() => {
+    Promise.all(modulesToLoad).then((modules) => {
+      for (let m of modules) {
+        const parts = m.name.split('/').filter(a => a.trim() !== '');
 
+        const directories = parts.slice(0, -1);
+        const basename = parts.slice(-1)[0];
+
+        const pwd = [];
+        for (let d of directories) {
+          FS.mkdir('./' + pwd.concat(d).join('/'));
+          pwd.push(d);
+        }
+
+        FS.writeFile(`./${m.name}`, m.text);
+      }
+
+      Module.ccall("load", "void", ["string"], [main]);
+      render();
+    });
+  });
+}
+
+const modulePromise = new Promise((resolve, reject) => {
+  window.Module = {
+    preRun: [],
+    postRun: [ resolve ],
+    print: function() {
+      return function(e) {
+        1 < arguments.length && (e = Array.prototype.slice.call(arguments).join(" ")), console.log(e)
+      }
+    }(),
+    printErr: function(e) {
+      1 < arguments.length && (e = Array.prototype.slice.call(arguments).join(" ")), console.error(e)
+    },
+    canvas: function() {}(),
+    setStatus: function() {},
+    totalDependencies: 0,
+    monitorRunDependencies: function(e) {}
+  };
+});
 
 },{"snabbdom":10,"snabbdom/h":1,"snabbdom/modules/attributes":4,"snabbdom/modules/class":5,"snabbdom/modules/dataset":6,"snabbdom/modules/eventlisteners":7,"snabbdom/modules/props":8,"snabbdom/modules/style":9}]},{},[13]);

data/src/prism.rb

@@ -33,6 +33,10 @@ module Prism
     def event(eventJSON, id)
       DOM.event(JSON::parse(eventJSON), id)
     end
+
+    def http_response(responseJSON, id)
+      HTTP._response(HTTP::Response.from_json(responseJSON), id)
+    end
   end
 
   class Component
@@ -319,3 +323,38 @@ module DOM
     end
   end
 end
+
+module HTTP
+  @@event_id = 0
+  @@listeners = {}
+
+  def self.get_event_id
+    @@event_id += 1
+
+    @@event_id.to_s
+  end
+
+  def self.add_listener(id, &block)
+    @@listeners[id] = block
+  end
+
+  def self.get(url, &block)
+    id = HTTP.get_event_id
+
+    InternalHTTP.http_request(url, id)
+
+    HTTP.add_listener(id, &block)
+  end
+
+  def self._response(text, id)
+    @@listeners[id].call(text)
+  end
+
+  class Response < Struct.new(:body)
+    def self.from_json(json)
+      data = JSON::parse(json)
+
+      new(data["body"])
+    end
+  end
+end

data/wasm-server.js

@@ -2,12 +2,63 @@ const http = require('http');
 const fs = require('fs');
 const path = require('path');
 
+function renderFileLink(p, name) {
+  return `<li><a href="${path.join(p, name)}">${name}</a></li>`;
+}
+
+function isDirectory(p) {
+  try {
+    return fs.statSync(p).isDirectory();
+  } catch (e) {
+    return false;
+  }
+}
+
 const port = parseInt(process.argv[2], 10) || 3042;
 const proxy = http.createServer((req, res) => {
   let p = path.join('.', req.url);
 
-  if (req.url === '/') {
-    p = path.join('.', 'index.html');
+  console.log(p);
+
+  if (p.startsWith('prism-assets')) {
+    p = path.join(__dirname, 'build', path.basename(p));
+  }
+
+  if (p.startsWith('prism-ruby')) {
+    p = path.join(__dirname, 'src', path.basename(p));
+  }
+
+  if (isDirectory(p)) {
+    const files = fs.readdirSync(p);
+
+    res.write(`
+<!DOCTYPE html>
+<html lang=en-us>
+
+<head>
+  <meta charset=utf-8>
+  <meta content="text/html; charset=utf-8" http-equiv=Content-Type>
+  <title>Prism Server</title>
+  <style>
+    html, body {
+      font-family: sans-serif;
+    }
+  </style>
+</head>
+
+  <body>
+    <h1>Prism Dev Server</h1>
+    <h2>${path.join(process.cwd(), p)}</h2>
+
+    <ul>
+      ${files.map(f => renderFileLink(req.url, f)).join("\n")}
+    </ul>
+
+  </body>
+</html>
+    `);
+    res.end();
+    return;
   }
 
   try {
@@ -17,6 +68,31 @@ const proxy = http.createServer((req, res) => {
     if (p.endsWith('.js')) {
       res.setHeader("Content-Type", "text/javascript")
     }
+    if (p.endsWith('.rb') && req.headers.accept.includes("text/html")) {
+      res.write(`
+<!DOCTYPE html>
+<html lang=en-us>
+
+<head>
+  <meta charset=utf-8>
+  <meta content="text/html; charset=utf-8" http-equiv=Content-Type>
+</head>
+  <body>
+    <div id="root"></div>
+  </body>
+  <script type="text/javascript" src="/prism-assets/prism.js"></script>
+  <script type="text/javascript" async src="/prism-assets/bundle.js"></script>
+  <script type="text/javascript">
+    Prism.run("#root", "/${p}");
+  </script>
+</html>
+      `);
+      res.end();
+      return;
+    }
+    if (p.endsWith('rb')) {
+      res.setHeader('Content-Type', "application/ruby");
+    }
     res.write(fs.readFileSync(p));
   } catch (e) {
     res.write(e.toString());

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prism-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Nick Johnstone
@@ -10,33 +10,29 @@ bindir: bin
 cert_chain: []
 date: 2019-10-29 00:00:00.000000000 Z
 dependencies: []
-description: "\n## Prism\n\nBuild React-style web apps with Ruby and WebAssembly \n\n###
-  Introduction\n\nPrism is a tool that uses [mruby](https://github.com/mruby/mruby)
-  and [emscripten](https://emscripten.org/) to compile ruby code to WebAssembly. It
-  also provides a runtime layer for working with the DOM and events, so you can use
-  it make SPAs.\n\n⚡️ Prism is currently in extremely early alpha. Expect bugs, breaking
-  API changes, missing functionality and rough edges. ⚡️\n\n### Getting started\n\nPrism
-  requires that you have both [mruby](https://github.com/mruby/mruby) and [emscripten](https://emscripten.org/)
-  installed and available on your path.\n\nYou can install mruby through your preferred
-  package manager, such as homebrew, apt-get or nix.\n\nPackage managers often have
-  outdated versions of emscripten, so it's recommended that you install via `emsdk`.
-  Instructions are available on the [emscripten website](https://emscripten.org/docs/getting_started/downloads.html).\n\nYou
-  can install Prism using `gem install prism-cli`.\n\n### CLI Usage\n\nYou can initialize
-  a new Prism app by running `prism init`. This simply creates a hello world sample
-  application, by default at `./app.rb` but you can customize the location by providing
-  an argument to `prism init`.\n\nYou can then run `prism build` to compile your application.
-  You can provide an entrypoint, but `./app.rb` is assumed by default.\n\n`prism build`
-  creates a sample html file, a bundle for Prism's runtime JS code, the emscripten
-  runtime code and the ruby compiled to Wasm.\n\nTo test your application, you can
-  run `prism server` and open `localhost:3042` in your browser. You should see a hello
-  world application with an input and some text. You should be able to change the
-  input and see the text change.\n\n### Writing a Prism App\n\nPrism apps are written
+description: "\n## Prism\n\n[![Join the chat at https://gitter.im/prism-rb/community](https://badges.gitter.im/prism-rb/community.svg)](https://gitter.im/prism-rb/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)\n\nBuild
+  frontend web apps with Ruby and WebAssembly \n\n### Introduction\n\nPrism is a framework
+  that helps you make frontend web applications with Ruby and WebAssembly. It uses
+  [mruby](https://github.com/mruby/mruby) and [emscripten](https://emscripten.org/)
+  to compile ruby code to WebAssembly. It also provides a runtime layer for working
+  with the DOM and events.\n\n⚡️ Prism is currently in extremely early alpha. Expect
+  bugs, breaking API changes, missing functionality and rough edges. ⚡️\n\n### Getting
+  started\n\nYou can install Prism from RubyGems using `gem install prism-cli`.\n\n###
+  CLI Usage\n\nYou can initialize a new Prism app by running `prism init`. This simply
+  creates a hello world sample application, by default at `./app.rb` but you can customize
+  the location by providing an argument to `prism init`.\n\nYou can then run `prism
+  server`, which will start a development server. If you then navigate to `localhost:3042/app.rb`,
+  you should see the sample application. Try changing the code and reloading the page,
+  and the app will update.\n\nIf an error occurs, it will be printed out to the browser
+  console.\n\nBuilding production releases of Prism apps through the command line
+  is still a work in progress.\n\n### Writing a Prism App\n\nPrism apps are written
   in mruby. mruby is a lightweight implementation of Ruby that's suitable for compiling
   to the web.\n\nmruby is similar in many ways to cruby and will be a familiar experience
   for someone who has only used the mainline interpreter. The most notable exception
   is that mruby only supports syntax up to ruby 1.9, which means there are no keyword
   arguments or safe traversal operator.\n\nThere are a number of other small differences,
-  and it's worth reviewing the [mruby limitations documentation](https://github.com/mruby/mruby/blob/master/doc/limitations.md).\n\nIf
+  and it's worth reviewing the [mruby limitations documentation](https://github.com/mruby/mruby/blob/master/doc/limitations.md).
+  You might also want to refer to the [mruby API docs](http://mruby.org/docs/api/).\n\nIf
   you run `prism init`, it will create a sample application that makes a good starting
   point. This is the code it outputs:\n\n```ruby\nclass HelloWorld < Prism::Component\n
   \ attr_accessor :name\n\n  def initialize(name = \"World\")\n    @name = name\n
@@ -148,8 +144,8 @@ description: "\n## Prism\n\nBuild React-style web apps with Ruby and WebAssembly
   starting Prism with funding is that I want as much of the work that's done on Prism
   as possible to be reimbursed, no matter who's doing it. The other aspect is that
   I don't have very much spare time for projects but if I can get paid for my work
-  I can do Prism as part of my day to day contract work.\n\n*[Support Prism on Open
-  Collective]*(https://opencollective.com/prism)\n\n### License\n\nPrism is available
+  I can do Prism as part of my day to day contract work.\n\n**[Support Prism on Open
+  Collective](https://opencollective.com/prism)**\n\n### License\n\nPrism is available
   under the MIT license. Please see the LICENSE file for more details.\n"
 email: ncwjohnstone@gmail.com
 executables:
@@ -158,39 +154,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/prism
-- dist/prism.js
-- main.c
-- mruby/build/emscripten/lib/libmruby.a
-- mruby/include/mrbconf.h
-- mruby/include/mruby.h
-- mruby/include/mruby/array.h
-- mruby/include/mruby/boxing_nan.h
-- mruby/include/mruby/boxing_no.h
-- mruby/include/mruby/boxing_word.h
-- mruby/include/mruby/class.h
-- mruby/include/mruby/common.h
-- mruby/include/mruby/compile.h
-- mruby/include/mruby/data.h
-- mruby/include/mruby/debug.h
-- mruby/include/mruby/dump.h
-- mruby/include/mruby/error.h
-- mruby/include/mruby/gc.h
-- mruby/include/mruby/hash.h
-- mruby/include/mruby/irep.h
-- mruby/include/mruby/istruct.h
-- mruby/include/mruby/khash.h
-- mruby/include/mruby/numeric.h
-- mruby/include/mruby/object.h
-- mruby/include/mruby/opcode.h
-- mruby/include/mruby/ops.h
-- mruby/include/mruby/proc.h
-- mruby/include/mruby/range.h
-- mruby/include/mruby/re.h
-- mruby/include/mruby/string.h
-- mruby/include/mruby/throw.h
-- mruby/include/mruby/value.h
-- mruby/include/mruby/variable.h
-- mruby/include/mruby/version.h
+- build/bundle.js
+- build/bundle.wasm
+- build/bundle.wasm.map
+- build/bundle.wast
+- build/prism.js
 - src/prism.rb
 - wasm-server.js
 homepage: https://github.com/prism/prism-rb

data/main.c

@@ -1,127 +0,0 @@
-#include <emscripten.h>
-#include <stdarg.h>
-#include <mruby.h>
-#include <mruby/irep.h>
-#include <mruby/array.h>
-#include <mruby/proc.h>
-#include <mruby/compile.h>
-#include <mruby/dump.h>
-#include <mruby/string.h>
-#include <mruby/variable.h>
-#include <mruby/throw.h>
-#include "bundle.c"
-
-mrb_value app;
-mrb_state *mrb;
-
-
-mrb_value
-add_event_listener(mrb_state *mrb, mrb_value self){
-  mrb_value selector, event, id;
-  mrb_get_args(mrb, "SSS", &selector, &event, &id);
-
-  EM_ASM_({
-    var selector = UTF8ToString($0);
-    var eventName = UTF8ToString($1);
-    var id = UTF8ToString($2);
-    var elements;
-
-    if (selector === 'document') {
-      elements = [window.document];
-    } else if (selector === 'body') {
-      elements = [window.document.body];
-    } else {
-      elements = document.querySelectorAll(selector);
-    }
-
-    for (var i = 0; i < elements.length; i++) {
-      var element = elements[i];
-
-      element.addEventListener(eventName, function(event) {
-        Module.ccall(
-          'event',
-          'void',
-          ['string', 'string', 'string'],
-          [stringifyEvent(event), id]
-        );
-
-        render();
-      });
-    };
-  }, RSTRING_PTR(selector), RSTRING_PTR(event), RSTRING_PTR(id));
-  return mrb_nil_value();
-}
-
-int
-main(int argc, const char * argv[])
-{
-  struct RClass *dom_class;
-
-  mrb = mrb_open();
-
-  if (!mrb) { /* handle error */ }
-  dom_class = mrb_define_class(mrb, "InternalDOM", mrb->object_class);
-  mrb_define_class_method(
-    mrb,
-    dom_class,
-    "add_event_listener",
-    add_event_listener,
-    MRB_ARGS_REQ(3)
-  );
-
-  app = mrb_load_irep(mrb, bundle);
-  mrb_gc_register(mrb, app);
-
-  return 1;
-}
-
-char* render() {
-  mrb_value result = mrb_funcall(mrb, app, "render", 0);
-  if (mrb->exc) {
-    mrb_print_error(mrb);
-    mrb->exc = NULL;
-  }
-  return RSTRING_PTR(result);
-}
-
-void dispatch(char* message) {
-  mrb_value str = mrb_str_new_cstr(mrb, message);
-  mrb_gc_register(mrb, str);
-  mrb_funcall(mrb, app, "dispatch", 1, str);
-  if (mrb->exc) {
-    mrb_print_error(mrb);
-    mrb->exc = NULL;
-  }
-  mrb_gc_unregister(mrb, str);
-}
-
-void event(char* message, char* id) {
-  mrb_value str = mrb_str_new_cstr(mrb, message);
-  mrb_value str2 = mrb_str_new_cstr(mrb, id);
-  mrb_funcall(mrb, app, "event", 2, str, str2);
-
-  if (mrb->exc) {
-    mrb_print_error(mrb);
-    mrb->exc = NULL;
-  }
-}
-
-// main
-//
-// make the ruby component
-// return a reference?
-//
-// dispatch
-//
-// call the ruby component with an event triggered by event handler
-// we might need the reference?
-//
-// what is the mruby api for calling methods?
-
-/**
- * Gets a class.
- * @param mrb The current mruby state.
- * @param name The name of the class.
- * @return [struct RClass *] A reference to the class.
-*/
-// MRB_API struct RClass * mrb_class_get(mrb_state *mrb, const char *name);