Make opal-parser.rb simpler

opal · Oct 30, 2013 · 0a9aad2 · 0a9aad2
1 parent 87fb01a
commit 0a9aad2
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 34 deletions.
diff --git a/lib/opal.rb b/lib/opal.rb
@@ -43,6 +43,6 @@ def self.use_gem(gem_name, include_dependecies = true)
 
   # Private, don't add to these directly (use .append_path instead).
   def self.paths
-    @paths ||= [core_dir.untaint, std_dir.untaint]
+    @paths ||= [core_dir.untaint, std_dir.untaint, gem_dir.untaint]
   end
 end
diff --git a/lib/opal/source_map.rb b/lib/opal/source_map.rb
@@ -1,4 +1,4 @@
-require 'opal'
+# require 'opal'
 require 'source_map'
 
 module Opal

diff --git a/stdlib/opal-gem.js.erb b/stdlib/opal-gem.js.erb
diff --git a/stdlib/opal-parser.rb b/stdlib/opal-parser.rb
@@ -1,8 +1,46 @@
-require 'opal-gem'
+require 'opal/compiler'
+require 'opal/builder'
+require 'opal/erb'
+require 'opal/version'
+
+module Opal
+  def self.compile(source, options = {})
+    Compiler.new.compile(source, options)
+  end
+end
 
 module Kernel
   def eval(str)
     code = Opal.compile str
     `eval(#{code})`
   end
 end
+
+%x{
+  Opal.compile = function(str) {
+    return Opal.Opal.$compile(str);
+  };
+
+  Opal.eval = function(str) {
+    return eval(Opal.compile(str));
+  };
+
+  function run_ruby_scripts() {
+    var tags = document.getElementsByTagName('script');
+
+    for (var i = 0, len = tags.length; i < len; i++) {
+      if (tags[i].type === "text/ruby") {
+        Opal.eval(tags[i].innerHTML);
+      }
+    }
+  }
+
+  if (typeof(document) !== 'undefined') {
+    if (window.addEventListener) {
+      window.addEventListener('DOMContentLoaded', run_ruby_scripts, false);
+    }
+    else {
+      window.attachEvent('onload', run_ruby_scripts);
+    }
+  }
+}
diff --git a/stdlib/racc/parser.rb.rb b/stdlib/racc/parser.rb.rb