esruby 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd5da76d0d225e6d42316dc57217fb8f1e412043
-  data.tar.gz: 097fc7b776e2d56570b23c1fd16373e1d6383d27
+  metadata.gz: c9f97ad43c8652ddb099701a6a3281fc56f35e26
+  data.tar.gz: 115fac3faed60bc8f939dc6b5ceffbda67e27b7c
 SHA512:
-  metadata.gz: c0fbea22fb85dd5a15c65b315f26d13146b1a5bc0381b4293eac5566bfd0e57b299abaf93e4c47b43667b22a52689cf2dddd0f6ec07cd53c074e12c3acbb9750
-  data.tar.gz: a6f84a1b8fd0ff472c98f170f6907cf06f0deff30f35cef526f5ce169a77457bc1341b68107ab4895dccc277b5dc8e3f63aec188ec2e19da84f0304c1c5a6b1c
+  metadata.gz: 4caa20cb2a49da0317f50544b0f73f0d414368c4fa032d88cfacf01b4e328f3907ae27a06d70984755d0aa5495542f2d6d0de95af51d3e039bc53d78df5e6e07
+  data.tar.gz: 65ade892ebbf6c39ea66960ab6366a980aae6ab61aaddae25f72f55f1c00a910cb4c7b56777d532b79a0fb04a4379901c616f11d362576079368a03330d4fb28

data/README.md

@@ -33,6 +33,10 @@ to your `.bashrc` and `.profile`
 * you will now have `www/app.js` and `www/index.html`
 * a simple way to serve these files would be `ruby -run -e httpd www -p 4444`
 * the app with be available at http://localhost:4444
+
+# Binding with JS
+Explore my [esruby-bind](https://github.com/robfors/esruby-bind) gem that binds the Ruby and JS object space together.
+
 # License
 
 This project is distributed under the MIT License. See LICENSE for further details.

data/lib/esruby/build.rb

@@ -55,6 +55,7 @@ module ESRuby
         js_files += specification.appended_js_sources
       end
       js_files += @configuration.appended_js_sources
+      js_files << "#{gem_directory}/resources/js/esruby.js"
       js_files
     end
     
@@ -116,8 +117,7 @@ module ESRuby
       RakeFileUtils.sh "#{mrbc} -B app -o #{build_directory}/app.c #{ruby_sources.join(" ")}"
       RakeFileUtils.sh "emcc --bind -I #{mruby_directory}/include #{build_directory}/app.c -o #{build_directory}/app.o #{build_directory}/emscripten/lib/libmruby.a -lm #{js_arguments} #{optimization_argument} #{closure_argument} #{debug_argument}"
       RakeFileUtils.sh "emcc -std=c++11 --bind -I #{mruby_directory}/include #{gem_directory}/resources/cpp/esruby.cpp -o #{build_directory}/esruby.o #{build_directory}/emscripten/lib/libmruby.a -lm #{js_arguments} #{optimization_argument} #{closure_argument} #{debug_argument}"
-      RakeFileUtils.sh "emcc -std=c++11 --bind -I #{mruby_directory}/include #{gem_directory}/resources/cpp/main.cpp -o #{build_directory}/main.o #{build_directory}/emscripten/lib/libmruby.a -lm #{js_arguments} #{optimization_argument} #{closure_argument} #{debug_argument}"
-      RakeFileUtils.sh "emcc --bind -I #{mruby_directory}/include -o #{build_directory}/output.js #{build_directory}/app.o #{build_directory}/esruby.o #{build_directory}/main.o #{build_directory}/emscripten/lib/libmruby.a -lm #{js_arguments} #{optimization_argument} #{closure_argument} #{debug_argument}"
+      RakeFileUtils.sh "emcc --bind -I #{mruby_directory}/include -o #{build_directory}/output.js #{build_directory}/app.o #{build_directory}/esruby.o #{build_directory}/emscripten/lib/libmruby.a -lm #{js_arguments} #{optimization_argument} #{closure_argument} #{debug_argument}"
       #if build.build_mode == 'production'
       #  sh "java -jar #{PROJECT_DIRECTORY}/emsdk/emscripten/incoming/third_party/closure-compiler/compiler.jar --js #{build.absolute_build_directory}/output.js --js_output_file #{build.absolute_output}"
       #else

data/resources/cpp/esruby.cpp

@@ -1,64 +1,51 @@
 #include "esruby.hpp"
 
-ESRuby::ESRuby()
+mrb_state* ESRuby::_mrb = nullptr;
+
+void ESRuby::start()
 {
+  if (_mrb)
+  {
+    printf("Error: ESRuby already started\n");
+    throw std::runtime_error("Error: ESRuby already started");
+  }
   _mrb = mrb_open();
   if (!_mrb)
+  {
+    printf("error opening new mrb state\n");
     throw std::runtime_error("error opening new mrb state");
-  _print_level = 1;
+  }
+  mrb_load_irep(_mrb, app);
+  // print error if any
+  if (_mrb->exc)
+  {
+    mrb_p(_mrb, mrb_obj_value(_mrb->exc));
+    _mrb->exc = 0;
+    throw std::runtime_error("ruby error encountered");
+  }
 }
 
-ESRuby::~ESRuby()
+void ESRuby::stop()
 {
+  if (!_mrb)
+  {
+    printf("Error: ESRuby not active\n");
+    throw std::runtime_error("Error: ESRuby not active");
+  }
   mrb_close(_mrb);
-}
-
-int ESRuby::get_print_level()
-{
-  return _print_level;
-}
-
-void ESRuby::run()
-{
-  mrb_value result = mrb_load_irep(_mrb, app);
-  
-  // print levels:
-  switch(_print_level)
+  // print error if any
+  if (_mrb->exc)
   {
-    case 0: // do not print anything
-      break;
-    case 1: // print errors only
-      if (_mrb->exc)
-      {
-        mrb_p(_mrb, mrb_obj_value(_mrb->exc));
-        _mrb->exc = 0;
-      }
-      break;
-    case 2: // print errors and results
-      if (_mrb->exc)
-      {
-        mrb_p(_mrb, mrb_obj_value(_mrb->exc));
-        _mrb->exc = 0;
-      }
-      mrb_p(_mrb, result);
-      break;
+    mrb_p(_mrb, mrb_obj_value(_mrb->exc));
+    _mrb->exc = 0;
+    throw std::runtime_error("ruby error encountered");
   }
 }
 
-void ESRuby::set_print_level(int new_print_level)
-{
-  if (new_print_level >= 0 && new_print_level <= 2)
-    _print_level = new_print_level;
-  else
-    throw std::runtime_error("print level not valid");
-}
-
 EMSCRIPTEN_BINDINGS(esruby)
 {
-  emscripten::class_<ESRuby>("Webruby")
-    .constructor<>()
-    .function("get_print_level", &ESRuby::get_print_level)
-    .function("run", &ESRuby::run)
-    .function("set_print_level", &ESRuby::set_print_level)
+  emscripten::class_<ESRuby>("ESRuby")
+    .class_function("start", &ESRuby::start)
+    .class_function("stop", &ESRuby::stop)
   ;
 }

data/resources/cpp/esruby.hpp

@@ -26,16 +26,12 @@ class ESRuby
 
   public:
   
-  ESRuby();
-  ~ESRuby();
-  int get_print_level();
-  void run();
-  void set_print_level(int new_print_level);
+  static void start();
+  static void stop();
   
-  protected:
+  private:
   
-  mrb_state* _mrb;
-  int _print_level;
+  static mrb_state* _mrb;
   
 };
 

data/resources/js/esruby.js

@@ -1,45 +1,17 @@
-ESRuby = class
+class ESRuby
 {
-  constructor()
+  
+  static start()
   {
-    if (ESRuby.instance)
-      return ESRuby.instance;
-    
+    Module.ESRuby.start();
   }
   
-  // Default print level is errors only
-  this.print_level = 1;
-      if (typeof opts.print_level === "number" && opts.print_level >= 0)
-      {
-        this.print_level = opts.print_level;
-      }
-      this.mrb = _mrb_open();
-      _esruby_internal_setup(this.mrb);
-    };
-    
-    ESRUBY.prototype.close = function()
-    {
-      _mrb_close(this.mrb);
-    };
-    
-    ESRUBY.prototype.run = function()
-    {
-      _esruby_internal_run(this.mrb, this.print_level);
-    };
-    
-    ESRUBY.prototype.set_print_level = function(level)
-    {
-      if (level >= 0) this.print_level = level;
-    };
-    
-
-    if (typeof window === 'object')
-    {
-      window['ESRUBY'] = ESRUBY;
-    }
-    else
-    {
-      global['ESRUBY'] = ESRUBY;
-    }
+  static stop()
+  {
+    Module.ESRuby.stop();
   }
-) ();
+  
+}
+
+window.addEventListener("load", ESRuby.start);
+window.addEventListener("unload", ESRuby.stop);

data/resources/project_template/config.rb

@@ -27,8 +27,6 @@ ESRuby::Build.new do |conf|
   #conf.ldflags << "--memory-init-file 0"
   
   # JavaScript calling interface
-  #conf.gem :git => 'git://github.com/xxuejie/mruby-js.git', :branch => 'master'
-  
   # conf.add_gem 'gems/esruby-bind'
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esruby
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Rob Fors
@@ -44,7 +44,6 @@ files:
 - resources/build_config.eruby
 - resources/cpp/esruby.cpp
 - resources/cpp/esruby.hpp
-- resources/cpp/main.cpp
 - resources/js/esruby.js
 - resources/mruby/AUTHORS
 - resources/mruby/CONTRIBUTING.md
@@ -442,7 +441,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby running in the browser

data/resources/cpp/main.cpp

@@ -1,9 +0,0 @@
-#include "esruby.hpp"
-
-
-int main() 
-{
-  ESRuby* esruby = new ESRuby;
-  esruby->run();
-  return 0;
-}