opal 0.3.17 → 0.3.18

data/.gitignore

@@ -9,7 +9,6 @@ Gemfile.lock
 pkg/*
 /runtime/*.js
 /*.js
-/docs
 /gh-pages
 /examples/**/*.js
 /build

data/Gemfile

@@ -9,9 +9,4 @@ group :browser do
   gem "opal-racc"
   gem "opal-spec"
   gem "opal-strscan"
-end
-
-group :documentation do
-  gem "redcarpet"
-  gem "albino"
 end

data/Rakefile

@@ -13,8 +13,9 @@ task :opal do
 end
 
 Opal::BuilderTask.new do |t|
-  t.name  = 'opal'
-  t.files = []
+  t.name         = 'opal'
+  t.files        = []
+  t.specs_dir    = './core/spec'
   t.dependencies = %w[opal-spec opal-racc opal-strscan]
 end
 
@@ -78,7 +79,7 @@ namespace :docs do
     end
   end
 
-  task :index do
+  task :build do
     require 'redcarpet'
     require 'albino'
 
@@ -89,12 +90,14 @@ namespace :docs do
     end
 
     markdown = Redcarpet::Markdown.new(klass, :fenced_code_blocks => true)
+    sources  = %w[index]
 
-    File.open('gh-pages/index.html', 'w+') do |o|
-      o.write File.read('docs/pre.html')
-      o.write markdown.render(File.read 'docs/index.md')
-      o.write markdown.render(File.read 'CHANGELOG.md')
-      o.write File.read('docs/post.html')
+    sources.each do |s|
+      File.open(File.join('gh-pages', "#{s}.html"), 'w+') do |o|
+        o.write File.read('docs/pre.html')
+        o.write markdown.render(File.read "docs/#{s}.md")
+        o.write File.read('docs/post.html')
+      end
     end
   end
 

data/bin/opal

@@ -1,43 +1,15 @@
 #! /usr/bin/env ruby
 
-require 'optparse'
 require 'opal'
 
-options = {}
-
-OptionParser.new do |opts|
-   opts.on('-c', '--compile', 'Compile ruby') do
-    options[:compile] = true
-  end
-
-  opts.on('-o', '--out FILE', 'Output file') do |o|
-    options[:out] = o
-  end
-
-  opts.on('-p', '--print', 'Print result') do
-    options[:print] = true
-  end
-
-  opts.on_tail("-v", "--version", "Show version") do
-    puts Opal::VERSION
-    exit
-  end
-end.parse! rescue abort("See `opal --help' for usage information.")
-
-if options[:compile]
-  puts "No sources given" if ARGV.empty?
-
-  ARGV.each do |s|
-    puts "need to compile #{s}"
-  end
-
-elsif options[:print]
-  puts "No sources given" if ARGV.empty?
-
-  ARGV.each do |s|
-    puts Opal.parse s
-  end
+first = ARGV.first
 
+if first.nil?
+ puts "Usage: opal path/to/file.rb"
+elsif first == '-v' or first == '--version'
+  puts Opal::VERSION
+elsif File.exist? first
+  puts Opal.parse File.read(first)
 else
-  puts "No sources given"
+  puts Opal.parse(first)
 end

data/core/hash.rb

@@ -186,11 +186,11 @@ class Hash
         var bucket = map[assoc],
             value;
 
-        if ((value = block.call($context, null, bucket[0], bucket[1])) === $breaker) {
-          return $breaker.$v;
+        if ((value = block.call(__context, bucket[0], bucket[1])) === __breaker) {
+          return __breaker.$v;
         }
 
-        if (value !== false && value !== null) {
+        if (value !== false && value !== nil) {
           delete map[assoc];
         }
       }
@@ -452,7 +452,7 @@ class Hash
       var map  = this.map,
           map2 = other.map;
 
-      if (block === null) {
+      if (block == null || block === nil) {
         for (var assoc in map2) {
           var bucket = map2[assoc];
 
@@ -464,7 +464,7 @@ class Hash
           var bucket = map2[assoc], key = bucket[0], val = bucket[1];
 
           if (map.hasOwnProperty(assoc)) {
-            val = block.call($context, null, key, map[assoc][1], val);
+            val = block.call(__context, key, map[assoc][1], val);
           }
 
           map[assoc] = [key, val];

data/core/match_data.rb

@@ -26,7 +26,7 @@ class MatchData
   alias size length
 
   def to_a
-    `$slice.call(this.$data)`
+    `__slice.call(this.$data)`
   end
 
   def to_s

data/core/module.rb

@@ -181,11 +181,9 @@ class Module
 
   def include(*mods)
     %x{
-      console.log("including " + this._name);
       var i = mods.length - 1, mod;
       while (i >= 0) {
         #{mod = `mods[i]`};
-        console.log("include: " + mod._name);
 
         define_iclass(this, mod);
 

data/core/runtime.js

@@ -165,7 +165,7 @@ Opal.undef = function(klass) {
   for (var i = 0, length = args.length; i < length; i++) {
     var mid = args[i], id = mid_to_jsid[mid];
 
-    delete klass.$m_tbl[id];
+    delete klass._proto[id];
   }
 };
 

data/{spec → core/spec}/core/hash/merge_spec.rb

@@ -18,20 +18,20 @@ describe "Hash#merge" do
   end
 end
 
-describe "Hash#merge" do
+describe "Hash#merge!" do
   it "adds the entries from other, overwriting duplicate keys. Returns self" do
     h = {:_1 => 'a', :_2 => '3'}
-    h.merge(:_1 => '9', :_9 => 2).should equal(h)
+    h.merge!(:_1 => '9', :_9 => 2).should equal(h)
     h.should == {:_1 => "9", :_2 => "3", :_9 => 2}
   end
 
   it "sets any duplicate key to the value of block if passed a block" do
     h1 = {:a => 2, :b => -1}
     h2 = {:a => -2, :c => 1}
-    h1.merge(h2) { |k,x,y| 3.14 }.should equal(h1)
+    h1.merge!(h2) { |k,x,y| 3.14 }.should equal(h1)
     h1.should == {:c => 1, :b => -1, :a => 3.14}
 
-    h1.merge(h1) { nil }
+    h1.merge!(h1) { nil }
     h1.should == {:a => nil, :b => nil, :c => nil}
   end
 end

data/core/spec/index.html

@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+<head>
+  <title></title>
+</head>
+<body>
+  <script type="text/javascript" src="../../build/opal.js"></script>
+  <script type="text/javascript" src="../../build/opal-spec.js"></script>
+  <script type="text/javascript" src="../../build/opal.specs.js"></script>
+</body>
+</html>