RubyGems - opal - Versions diffs - 0.3.37 → 0.3.38 - Mend

opal 0.3.37 → 0.3.38

Files changed (51) hide show

data/CHANGELOG.md +11 -0
data/Gemfile +0 -8
data/README.md +7 -6
data/bin/opal +18 -10
data/config.ru +8 -21
data/lib/assets/javascripts/opal-parser.js.erb +3 -60
data/lib/assets/javascripts/opal/array.rb +87 -43
data/lib/assets/javascripts/opal/basic_object.rb +4 -0
data/lib/assets/javascripts/opal/boolean.rb +5 -3
data/lib/assets/javascripts/opal/class.rb +19 -4
data/lib/assets/javascripts/opal/comparable.rb +1 -1
data/lib/assets/javascripts/opal/enumerable.rb +32 -0
data/lib/assets/javascripts/opal/error.rb +1 -1
data/lib/assets/javascripts/opal/hash.rb +166 -103
data/lib/assets/javascripts/opal/json.rb +3 -2
data/lib/assets/javascripts/opal/kernel.rb +9 -1
data/lib/assets/javascripts/opal/native.rb +29 -0
data/lib/assets/javascripts/opal/nil_class.rb +9 -1
data/lib/assets/javascripts/opal/numeric.rb +6 -4
data/lib/assets/javascripts/opal/parser.js +57 -0
data/lib/assets/javascripts/opal/proc.rb +5 -5
data/lib/assets/javascripts/opal/regexp.rb +1 -1
data/lib/assets/javascripts/opal/runtime.js +13 -0
data/lib/assets/javascripts/opal/string.rb +14 -3
data/lib/assets/javascripts/opal/time.rb +1 -1
data/lib/opal.rb +1 -1
data/lib/opal/parser.rb +39 -13
data/lib/opal/processor.rb +13 -2
data/lib/opal/version.rb +1 -1
data/opal.gemspec +3 -0
data/spec/core/array/fill_spec.rb +26 -0
data/spec/core/array/try_convert_spec.rb +15 -0
data/spec/core/enumerable/each_slice_spec.rb +24 -0
data/spec/core/enumerable/group_by_spec.rb +16 -0
data/spec/core/module/const_get_spec.rb +34 -0
data/spec/core/module/undef_method_spec.rb +67 -0
data/spec/core/nil/to_h_spec.rb +10 -0
data/spec/core/proc/element_reference_spec.rb +21 -0
data/spec/{core → core_ext}/array/to_json_spec.rb +0 -0
data/spec/core_ext/method_missing_spec.rb +43 -0
data/spec/core_ext/native/fixtures/classes.rb +5 -0
data/spec/core_ext/native/initialize_spec.rb +8 -0
data/spec/core_ext/native/method_missing_spec.rb +7 -0
data/spec/core_ext/native/to_native_spec.rb +7 -0
data/spec/grammar/parser_spec.rb +1 -1
data/spec/language/super_spec.rb +20 -0
data/spec/language/variables_spec.rb +69 -0
data/spec/spec_helper.rb +9 -5
metadata +66 -8
data/lib/assets/javascripts/opal/core.rb +0 -36
data/spec/autorun.rb +0 -3

data/CHANGELOG.md ADDED Viewed

@@ -0,0 +1,11 @@
+## Edge ##
+*   Add Native module used for wrapping objects to forward calls as native
+    calls.
+*   Support method_missing for all objects. Feature can be enabled/disabled on
+    Opal::Processor.
+*   Hash can now use any ruby object as a key.
+*   Move to Sprockets based building via `Opal::Processor`.

data/Gemfile CHANGED Viewed

@@ -2,11 +2,3 @@ source :rubygems
 gemspec
 gem 'rake'
-gem 'sprockets'
-gem 'opal-spec', '~> 0.2.8'
-# for rebuilding grammar.rb from grammar.y
-group :grammar do
-  gem 'racc'
-end

data/README.md CHANGED Viewed

@@ -14,11 +14,13 @@ See the website, [http://opalrb.org](http://opalrb.org).
 ## Running tests
+First, install dependencies:
+    $ bundle install
 Tests can be run with phantomjs using:
-```
-$ rake
-```
+    $ rake
 Alternatively, you can just load up a rack instance using `rackup`, and
 visit `http://localhost:9292/` in any web browser.
@@ -34,14 +36,13 @@ to allow compilation in any javascript environment.
 ### lib/assets/javascripts
 This directory holds the opal runtime and corelib implemented in ruby and
-javascript. These are built using `rake opal`, as above.
+javascript. These are built using `rake`, as above.
 ### spec
 * **core** contains rubyspecs that apply to opal.
 * **language** applicable specs from rubyspec for testing language semantics
-* **opal** tests for extra methods/features in opal not found in standard ruby
-* **lib** specs for opal lib (parser, lexer, grammar etc)
+* **grammar** specs for opal lib (parser, lexer, grammar etc)
 ## License

data/bin/opal CHANGED Viewed

@@ -1,16 +1,24 @@
-#! /usr/bin/env ruby
+#!/usr/bin/env ruby
+require 'optparse'
 require 'opal'
-first = ARGV.first
+options = {}
+parser = OptionParser.new do |opts|
+  opts.banner = "Usage: opal [options] file.rb"
-if first.nil?
- puts "Usage: opal path/to/file.rb"
- puts 'Usage: opal "code to compile"'
-elsif first == '-v' or first == '--version'
-  puts Opal::VERSION
-elsif File.exist? first
-  puts Opal.parse File.read(first)
+  opts.on("-v", "--version", "Opal Version") do |v|
+    puts Opal::VERSION
+    exit
+  end
+end
+parser.parse!
+if ARGV.empty?
+  puts parser.banner
 else
-  puts Opal.parse(first)
+  src = ARGV.first
+  src = File.read src if File.exist? src
+  puts Opal.parse(src)
 end

data/config.ru CHANGED Viewed

@@ -1,26 +1,13 @@
 require 'bundler'
 Bundler.require
-html = <<HTML
-  <!DOCTYPE html>
-  <html>
-  <head>
-    <title>Opal corelib and runtime specs</title>
-  </head>
-    <body>
-      <script type="text/javascript" src="/assets/autorun.js"></script>
-    </body>
-  </html>
-HTML
+require 'opal/spec/server'
-map '/assets' do
-  env = Opal::Environment.new
-  env.append_path 'spec'
-  run env
-end
+# method_missing can be turned off if required (on by default)
+# Opal::Processor.method_missing_enabled = false
-map '/' do
-  run lambda { |env|
-    [200, {'Content-Type' => 'text/html'}, [html]]
-  }
-end
+# Run in non-debug mode (faster, all files concatenated into 1 file)
+run Opal::Spec::Server.new(false)
+# Run in debug mode - all files loaded seperately, but slower
+# run Opal::Spec::Server.new

data/lib/assets/javascripts/opal-parser.js.erb CHANGED Viewed

@@ -1,65 +1,8 @@
-//= require opal/racc
-//= require opal/strscan
+<% require_asset 'opal/racc' %>
+<% require_asset 'opal/strscan' %>
+<% require_asset 'opal/parser' %>
 // We need (some) of the libs from our real ruby parser (not in sprockets load path)
 <% ['/grammar', '/lexer', '/parser', '/scope', ''].each do |f| %>
   <%= Opal.parse File.read(File.join Opal.core_dir, '..', '..', "opal#{f}.rb") %>
 <% end %>
-(function() {
-  // quick exit if not insde browser
-  if (typeof(window) === 'undefined' || typeof(document) === 'undefined') {
-    return;
-  }
-  function findRubyScripts() {
-    var all = document.getElementsByTagName('script');
-    for (var i = 0, script; i < all.length; i++) {
-      script = all[i];
-      if (script.type === 'text/ruby') {
-        if (script.src) {
-          request(script.src, function(result) {
-            runRuby(result);
-          });
-        }
-        else {
-          runRuby(script.innerHTML);
-        }
-      }
-      else if (script.type === 'text/erb') {
-        runERB(script.innerHTML);
-      }
-    }
-  }
-  function runRuby(source) {
-    var js = Opal.Opal.Parser.$new().$parse(source);
-    eval('(' + js + ')()');
-  }
-  function request(url, callback) {
-    var xhr = new (window.ActiveXObject || XMLHttpRequest)('Microsoft.XMLHTTP');
-    xhr.open('GET', url, true);
-    if ('overrideMimeType' in xhr) {
-      xhr.overrideMimeType('text/plain');
-    }
-    xhr.onreadystatechange = function() {
-      if (xhr.readyState === 4) {
-        if (xhr.status === 0 || xhr.status === 200) {
-          callback(xhr.responseText);
-        }
-        else {
-          throw new Error('Could not load ruby at: ' + url);
-        }
-      }
-    };
-    xhr.send(null);
-  }
-  if (window.addEventListener) {
-    window.addEventListener('DOMContentLoaded', findRubyScripts, false);
-  }
-  else {
-    window.attachEvent('onload', findRubyScripts);
-  }
-})();

data/lib/assets/javascripts/opal/array.rb CHANGED Viewed

@@ -1,14 +1,11 @@
 class Array < `Array`
-  %x{
-    Array.prototype._isArray = true;
-  }
   include Enumerable
+  # Mark all javascript arrays as being valid ruby arrays
+  `def._isArray = true`
   def self.[](*objects)
-    %x{
-      return objects;
-    }
+    objects
   end
   def self.new(size, obj = nil, &block)
@@ -37,6 +34,16 @@ class Array < `Array`
     }
   end
+  def self.try_convert(obj)
+    %x{
+      if (obj._isArray) {
+        return obj;
+      }
+      return nil;
+    }
+  end
   def &(other)
     %x{
       var result = [],
@@ -416,6 +423,23 @@ class Array < `Array`
     }
   end
+  def fill(obj = undefined, &block)
+    %x{
+      if (block !== nil) {
+        for (var i = 0, length = #{self}.length; i < length; i++) {
+          #{self}[i] = block(i);
+        }
+      }
+      else {
+        for (var i = 0, length = #{self}.length; i < length; i++) {
+          #{self}[i] = obj;
+        }
+      }
+    }
+    self
+  end
   def first(count)
     %x{
       if (count != null) {
@@ -760,6 +784,19 @@ class Array < `Array`
   alias size length
+  def shuffle()
+    %x{
+        for (var i = #{self}.length - 1; i > 0; i--) {
+          var j = Math.floor(Math.random() * (i + 1));
+          var tmp = #{self}[i];
+          #{self}[i] = #{self}[j];
+          #{self}[j] = tmp;
+        }
+        return #{self};
+    }
+  end
   alias slice :[]
   def slice!(index, length)
@@ -780,6 +817,28 @@ class Array < `Array`
     }
   end
+  def sort(&block)
+    %x{
+      var copy = #{self}.slice();
+      if (block !== nil) {
+        return copy.sort(block);
+      }
+      return copy.sort();
+    }
+  end
+  def sort!(&block)
+    %x{
+      if (block !== nil) {
+        return #{self}.sort(block);
+      }
+      return #{self}.sort();
+    }
+  end
   def take(count)
     `#{self}.slice(0, count)`
   end
@@ -824,6 +883,26 @@ class Array < `Array`
     }
   end
+  def to_native
+    %x{
+      var result = [], obj
+      for (var i = 0, len = #{self}.length; i < len; i++) {
+        obj = #{self}[i];
+        if (obj.$to_native) {
+          result.push(#{ `obj`.to_native });
+        }
+        else {
+          result.push(obj);
+        }
+      }
+      return result;
+    }
+  end
   alias to_s inspect
   def uniq
@@ -911,39 +990,4 @@ class Array < `Array`
       return result;
     }
   end
-  def sort(&block)
-    %x{
-      var copy = #{self}.slice();
-      if (block !== nil) {
-        return copy.sort(block);
-      }
-      return copy.sort();
-    }
-  end
-  def sort!(&block)
-    %x{
-      if (block !== nil) {
-        return #{self}.sort(block);
-      }
-      return #{self}.sort();
-    }
-  end
-  def shuffle()
-    %x{
-        for (var i = #{self}.length - 1; i > 0; i--) {
-          var j = Math.floor(Math.random() * (i + 1));
-          var tmp = #{self}[i];
-          #{self}[i] = #{self}[j];
-          #{self}[j] = tmp;
-        }
-        return #{self};
-    }
-  end
-end
+end

data/lib/assets/javascripts/opal/basic_object.rb CHANGED Viewed

@@ -46,4 +46,8 @@ class BasicObject
       return result;
     }
   end
+  def method_missing(symbol, *args, &block)
+    Kernel.raise NoMethodError, "undefined method `#{symbol}' for BasicObject instance"
+  end
 end

data/lib/assets/javascripts/opal/boolean.rb CHANGED Viewed

@@ -1,7 +1,5 @@
 class Boolean < `Boolean`
-  %x{
-    Boolean.prototype._isBoolean = true;
-  }
+  `def._isBoolean = true`
   def &(other)
     `(#{self} == true) ? (other !== false && other !== nil) : false`
@@ -19,6 +17,10 @@ class Boolean < `Boolean`
     `(#{self} == true) === other.valueOf()`
   end
+  def as_json
+    self
+  end
   alias singleton_class class
   def to_json

data/lib/assets/javascripts/opal/class.rb CHANGED Viewed

@@ -128,6 +128,18 @@ class Class
   alias attr attr_accessor
+  def const_get(name)
+    %x{
+      var result = #{self}._scope[name];
+      if (result == null) {
+        #{ raise NameError, "uninitialized constant #{name}" }
+      }
+      return result;
+    }
+  end
   def define_method(name, &block)
     %x{
       if (block === nil) {
@@ -229,8 +241,11 @@ class Class
   alias protected public
   def superclass
-    %x{
-      return #{self}._super || nil;
-    }
+    `#{self}._super || nil`
+  end
+  def undef_method(symbol)
+    `#{self}.prototype['$' + symbol] = undefined`
+    self
   end
-end
+end

data/lib/assets/javascripts/opal/comparable.rb CHANGED Viewed

@@ -22,4 +22,4 @@ module Comparable
   def between?(min, max)
     self > min && self < max
   end
-end
+end