RubyGems - opal - Versions diffs - 0.4.2 → 0.4.3 - Mend

opal 0.4.2 → 0.4.3

Files changed (93) hide show

data/.travis.yml +5 -0
data/README.md +42 -2
data/Rakefile +7 -6
data/bin/opal +2 -2
data/{opal → corelib}/opal.rb +21 -21
data/{opal → corelib}/opal/array.rb +37 -24
data/{opal → corelib}/opal/basic_object.rb +0 -0
data/{opal → corelib}/opal/boolean.rb +0 -0
data/{opal → corelib}/opal/class.rb +45 -22
data/{opal → corelib}/opal/comparable.rb +0 -0
data/{opal → corelib}/opal/enumerable.rb +0 -0
data/{opal → corelib}/opal/enumerator.rb +0 -0
data/{opal → corelib}/opal/error.rb +16 -12
data/{opal → corelib}/opal/hash.rb +2 -2
data/{opal → corelib}/opal/kernel.rb +16 -14
data/{opal → corelib}/opal/native.rb +0 -0
data/{opal → corelib}/opal/nil_class.rb +1 -1
data/{opal → corelib}/opal/numeric.rb +0 -0
data/{opal → corelib}/opal/proc.rb +0 -0
data/{opal → corelib}/opal/range.rb +2 -2
data/{opal → corelib}/opal/regexp.rb +0 -0
data/{opal → corelib}/opal/runtime.js +92 -126
data/{opal → corelib}/opal/string.rb +14 -13
data/{opal → corelib}/opal/time.rb +0 -0
data/lib/opal.rb +9 -8
data/lib/opal/builder.rb +81 -0
data/lib/opal/erb.rb +17 -0
data/lib/opal/grammar.rb +33 -30
data/lib/opal/grammar.y +18 -15
data/lib/opal/grammar_helpers.rb +5 -5
data/lib/opal/lexer.rb +3 -2
data/lib/opal/parser.rb +58 -41
data/lib/opal/require_parser.rb +77 -0
data/lib/opal/version.rb +1 -1
data/opal.gemspec +1 -1
data/{config.ru → spec/config.ru} +0 -0
data/spec/opal/array/to_json_spec.rb +3 -1
data/spec/opal/boolean/to_json_spec.rb +3 -1
data/spec/opal/erb/erb_spec.rb +25 -0
data/spec/opal/erb/quoted.opalerb +1 -0
data/spec/opal/erb/simple.opalerb +1 -0
data/spec/opal/json/parse_spec.rb +3 -1
data/spec/opal/kernel/to_json_spec.rb +3 -1
data/spec/opal/nil/to_json_spec.rb +3 -1
data/spec/opal/string/to_json_spec.rb +3 -1
data/spec/parser/int_spec.rb +13 -0
data/spec/parser/regexp_spec.rb +16 -0
data/spec/parser/str_spec.rb +11 -0
data/spec/rubyspec/core/array/plus_spec.rb +7 -2
data/spec/rubyspec/core/hash/to_json_spec.rb +3 -1
data/spec/rubyspec/core/numeric/to_json_spec.rb +3 -1
data/spec/rubyspec/language/defined_spec.rb +9 -0
data/spec/rubyspec/library/stringscanner/pos_spec.rb +20 -0
data/{opal → stdlib}/date.rb +0 -0
data/stdlib/erb.rb +26 -0
data/{opal → stdlib}/fileutils.rb +0 -0
data/{opal → stdlib}/iconv.rb +0 -0
data/{opal/opal → stdlib}/json.rb +0 -0
data/{opal → stdlib}/observer.rb +0 -0
data/{opal → stdlib}/opal-browser/local_storage.rb +0 -0
data/{opal → stdlib}/opal-browser/script_loader.rb +1 -1
data/{opal → stdlib}/opal-parser.js.erb +1 -1
data/{opal → stdlib}/opal-source-maps.js.erb +0 -0
data/{opal → stdlib}/pp.rb +0 -0
data/{opal → stdlib}/racc.rb +0 -0
data/{opal → stdlib}/rbconfig.rb +0 -0
data/{opal → stdlib}/source_map.rb +1 -1
data/{opal → stdlib}/source_map/generator.rb +0 -0
data/{opal → stdlib}/source_map/parser.rb +0 -0
data/{opal → stdlib}/source_map/vlq.rb +0 -0
data/{opal → stdlib}/strscan.rb +15 -0
data/{opal → stdlib}/yaml.rb +0 -0
metadata +87 -77
checksums.yaml +0 -7
data/CHANGELOG.md +0 -176
data/examples/native/Gemfile +0 -3
data/examples/native/README.md +0 -17
data/examples/native/app/app.rb +0 -57
data/examples/native/config.ru +0 -8
data/examples/native/index.html.erb +0 -12
data/examples/rack/Gemfile +0 -3
data/examples/rack/README.md +0 -22
data/examples/rack/app/app.rb +0 -5
data/examples/rack/config.ru +0 -20
data/examples/rack/index.html +0 -12
data/examples/server/Gemfile +0 -3
data/examples/server/README.md +0 -22
data/examples/server/app/app.rb +0 -18
data/examples/server/config.ru +0 -10
data/examples/server/index.html.erb +0 -10
data/opal/opal-template.rb +0 -33
data/spec/opal/class/_inherited_spec.rb +0 -32
data/spec/opal/class/new_spec.rb +0 -27

data/.travis.yml CHANGED Viewed

@@ -3,6 +3,11 @@ language: ruby
 rvm:
   - 1.8.7
   - 1.9.3
+  - 2.0.0
 notifications:
   irc: "irc.freenode.org#opal"
+matrix:
+  allow_failures:
+    - rvm: 2.0.0

data/README.md CHANGED Viewed

@@ -13,6 +13,41 @@ is a Freenode IRC channel at [#opal](http://webchat.freenode.net/?channels=opal)
 See the website, [http://opalrb.org](http://opalrb.org).
+### Compiling ruby code
+`Opal.parse` is a simple interface to just compile a string of ruby into a
+string of javascript code.
+```ruby
+Opal.parse("puts 'wow'")  # => "(function() { ... })()"
+```
+Running this by itself is not enough, you need the opal runtime/corelib.
+### Building the corelib
+`Opal::Builder` can be used to build the runtime/corelib into a string.
+```ruby
+Opal::Builder.build('opal') #=> "(function() { ... })()"
+```
+### Running compiled code
+You can write the above two strings to file, and run as:
+```html
+<!DOCTYPE html>
+<html>
+  <head>
+    <script src="opal.js"></script>
+    <script src="app.js"></script>
+  </head>
+</html>
+```
+Just open a browser to this page and view the console.
 ## Running tests
 First, install dependencies:
@@ -34,10 +69,15 @@ The `lib` directory holds the opal parser/compiler used to compile ruby
 into javascript. It is also built ready for the browser into `opal-parser.js`
 to allow compilation in any javascript environment.
-### opal
+### corelib
 This directory holds the opal runtime and corelib implemented in ruby and
-javascript. These are built using `rake`, as above.
+javascript.
+### stdlib
+Holds the stdlib that opal currently supports. This includes Observable,
+StringScanner, Date, etc.
 ### spec

data/Rakefile CHANGED Viewed

@@ -29,6 +29,8 @@ class RunSpec
     exit 1 unless success
+  rescue => e
+    puts e.message
   ensure
     Process.kill(:SIGINT, server)
     Process.wait
@@ -118,6 +120,8 @@ end
 desc "Build opal.js and opal-parser.js to build/"
 task :dist do
   Opal::Processor.arity_check_enabled = false
+  Opal::Processor.source_map_enabled = false
+  Opal::Processor.method_missing_enabled = false
   env = Opal::Environment.new
@@ -127,8 +131,9 @@ task :dist do
     puts "* building #{lib}..."
     src = env[lib].to_s
-    min = uglify src
-    gzp = gzip min
+    #min = uglify src
+    #gzp = gzip min
+    min = gzp = nil
     File.open("build/#{lib}.js", 'w+')        { |f| f << src }
     File.open("build/#{lib}.min.js", 'w+')    { |f| f << min } if min
@@ -142,10 +147,6 @@ task :dist do
   end
 end
-desc "Check file sizes for opal.js runtime"
-task :sizes => :dist do
-end
 desc "Rebuild grammar.rb for opal parser"
 task :racc do
   %x(racc -l lib/opal/grammar.y -o lib/opal/grammar.rb)

data/bin/opal CHANGED Viewed

@@ -49,7 +49,7 @@ parser = OptionParser.new do |opts|
   opts.separator 'Compilation Options:'
   opts.on('-M', '--no-method-missing', 'Disable method missing') do |value|
-    options[:method_missing_enabled] = false
+    options[:method_missing] = false
   end
   opts.on('-O', '--no-optimized-operators', 'Disable optimized operators') do |value|
@@ -61,7 +61,7 @@ parser = OptionParser.new do |opts|
   end
   opts.on('-C', '--no-const-missing', 'Disable const missing') do |value|
-    options[:const_missing_enabled] = false
+    options[:const_missing] = false
   end
   dynamic_require_levels = %w[error warning ignore]

data/{opal → corelib}/opal.rb RENAMED Viewed

@@ -1,23 +1,22 @@
-#= require 'opal/runtime'
-#= require 'opal/class'
-#= require 'opal/basic_object'
-#= require 'opal/kernel'
-#= require 'opal/nil_class'
-#= require 'opal/boolean'
-#= require 'opal/error'
-#= require 'opal/regexp'
-#= require 'opal/comparable'
-#= require 'opal/enumerable'
-#= require 'opal/enumerator'
-#= require 'opal/array'
-#= require 'opal/hash'
-#= require 'opal/string'
-#= require 'opal/numeric'
-#= require 'opal/proc'
-#= require 'opal/range'
-#= require 'opal/time'
-#= require 'opal/json'
-#= require 'opal/native'
+require 'opal/runtime'
+require 'opal/class'
+require 'opal/basic_object'
+require 'opal/kernel'
+require 'opal/nil_class'
+require 'opal/boolean'
+require 'opal/error'
+require 'opal/regexp'
+require 'opal/comparable'
+require 'opal/enumerable'
+require 'opal/enumerator'
+require 'opal/array'
+require 'opal/hash'
+require 'opal/string'
+require 'opal/numeric'
+require 'opal/proc'
+require 'opal/range'
+require 'opal/time'
+require 'opal/native'
 # regexp matches
 $& = $~ = $` = $' = nil
@@ -45,7 +44,8 @@ STDOUT        = $stdout = Object.new
 RUBY_PLATFORM = 'opal'
 RUBY_ENGINE   = 'opal'
 RUBY_VERSION  = '1.9.3'
-RUBY_RELEASE_DATE = '2013-05-02'
+RUBY_ENGINE_VERSION = '0.4.3'
+RUBY_RELEASE_DATE = '2013-07-24'
 def self.to_s
   'main'

data/{opal → corelib}/opal/array.rb RENAMED Viewed

@@ -14,15 +14,15 @@ class Array
   def self.new(size = undefined, obj = nil, &block)
     %x{
       if (arguments.length > 2)
         #{raise ArgumentError.new("wrong number of arguments. Array#new")};
-      if (arguments.length == 0)
+      if (arguments.length == 0)
         return [];
-      var size,
-          obj = arguments[1],
+      var size,
+          obj = arguments[1],
           arr = [];
       if (!obj) {
@@ -45,20 +45,20 @@ class Array
           } else {
             #{raise TypeError.new("can't convert to Integer. Array#new")};
           }
-        } else {
+        } else {
           #{raise TypeError.new("can't convert to Integer. Array#new")};
         }
       }
       if (size < 0) {
         #{raise ArgumentError.new("negative array size")};
       }
       if (obj == undefined) {
         obj = nil;
       }
       if (block === nil)
         for (var i = 0; i < size; i++) {
           arr.push(obj);
@@ -71,8 +71,8 @@ class Array
           }
           arr[i] = block(i);
         }
-      }
+      }
       return arr;
     }
   end
@@ -135,7 +135,20 @@ class Array
   end
   def +(other)
-    `#{self}.concat(other)`
+    %x{
+      var arr = other;
+      if (!other._isArray){
+        if (#{other.respond_to?(:to_ary)}) {
+          arr = other['$to_ary']();
+        }
+        else {
+          #{raise TypeError.new("can't convert to Array. Array#+") };
+        }
+      }
+      return #{self}.concat(arr);
+    }
   end
   def -(other)
@@ -144,32 +157,32 @@ class Array
           b = #{other},
           tmp = [],
           result = [];
-     if (typeof(b) == "object" && !(b instanceof Array))  {
+     if (typeof(b) == "object" && !(b._isArray))  {
         if (b['$to_ary'] && typeof(b['$to_ary']) == "function") {
           b = b['$to_ary']();
         } else {
           #{raise TypeError.new("can't convert to Array. Array#-") };
         }
       }else if ((typeof(b) != "object")) {
-        #{raise TypeError.new("can't convert to Array. Array#-") };
-      }
+        #{raise TypeError.new("can't convert to Array. Array#-") };
+      }
       if (a.length == 0)
         return [];
       if (b.length == 0)
-        return a;
-      for(var i = 0, length = b.length; i < length; i++) {
+        return a;
+      for(var i = 0, length = b.length; i < length; i++) {
         tmp[b[i]] = true;
       }
       for(var i = 0, length = a.length; i < length; i++) {
-        if (!tmp[a[i]]) {
+        if (!tmp[a[i]]) {
           result.push(a[i]);
-        }
+        }
      }
-      return result;
+      return result;
     }
   end

data/{opal → corelib}/opal/basic_object.rb RENAMED Viewed

File without changes

data/{opal → corelib}/opal/boolean.rb RENAMED Viewed

File without changes

data/{opal → corelib}/opal/class.rb RENAMED Viewed

@@ -23,22 +23,41 @@ class Class
     `__opal.bridge(name, constructor)`
   end
+  def ===(object)
+    %x{
+      if (object == null) {
+        return false;
+      }
+      var search = object._klass;
+      while (search) {
+        if (search === #{self}) {
+          return true;
+        }
+        search = search._super;
+      }
+      return false;
+    }
+  end
   def allocate
     %x{
-      var obj = new #{self};
+      var obj = new #{self}._alloc;
       obj._id = Opal.uid();
       return obj;
     }
   end
   def alias_method(newname, oldname)
-    `#{self}.prototype['$' + newname] = #{self}.prototype['$' + oldname]`
+    `#{self}._proto['$' + newname] = #{self}._proto['$' + oldname]`
     self
   end
   def alias_native(mid, jsid)
-    `#{self}.prototype['$' + mid] = #{self}.prototype[jsid]`
+    `#{self}._proto['$' + mid] = #{self}._proto[jsid]`
   end
   def ancestors
@@ -77,8 +96,8 @@ class Class
       module._included_in.push(klass);
-      var donator   = module.prototype,
-          prototype = klass.prototype,
+      var donator   = module._proto,
+          prototype = klass._proto,
           methods   = module._methods;
       for (var i = 0, length = methods.length; i < length; i++) {
@@ -86,9 +105,9 @@ class Class
         prototype[method] = donator[method];
       }
-      if (prototype._smethods) {
-        prototype._smethods.push.apply(prototype._smethods, methods);
-      }
+      // if (prototype._smethods) {
+      //  prototype._smethods.push.apply(prototype._smethods, methods);
+      //}
       if (klass._included_in) {
         __opal.donate(klass, methods.slice(), true);
@@ -105,14 +124,14 @@ class Class
   def attr_reader(*names)
     %x{
-      var proto = #{self}.prototype, cls = #{self};
+      var proto = #{self}._proto, cls = #{self};
       for (var i = 0, length = names.length; i < length; i++) {
         (function(name) {
           proto[name] = nil;
           var func = function() { return this[name] };
           if (cls._isSingleton) {
-            __opal.defs(proto, '$' + name, func);
+            proto.constructor.prototype['$' + name] = func;
           }
           else {
             proto['$' + name] = func;
@@ -126,14 +145,14 @@ class Class
   def attr_writer(*names)
     %x{
-      var proto = #{self}.prototype, cls = #{self};
+      var proto = #{self}._proto, cls = #{self};
       for (var i = 0, length = names.length; i < length; i++) {
         (function(name) {
           proto[name] = nil;
           var func = function(value) { return this[name] = value; };
           if (cls._isSingleton) {
-            __opal.defs(proto, '$' + name + '=', func);
+            proto.constructor.prototype['$' + name + '='] = func;
           }
           else {
             proto['$' + name + '='] = func;
@@ -258,10 +277,10 @@ class Class
       var jsid    = '$' + name;
       block._jsid = jsid;
-      block._sup  = #{self}.prototype[jsid];
+      block._sup  = #{self}._proto[jsid];
       block._s    = null;
-      #{self}.prototype[jsid] = block;
+      #{self}._proto[jsid] = block;
       __opal.donate(#{self}, [jsid]);
       return null;
@@ -289,9 +308,9 @@ class Class
   def instance_methods(include_super = false)
     %x{
-      var methods = [], proto = #{self}.prototype;
+      var methods = [], proto = #{self}._proto;
-      for (var prop in #{self}.prototype) {
+      for (var prop in #{self}._proto) {
         if (!include_super && !proto.hasOwnProperty(prop)) {
           continue;
         }
@@ -331,7 +350,7 @@ class Class
   def method_defined?(method)
     %x{
-      if (typeof(#{self}.prototype['$' + method]) === 'function') {
+      if (typeof(#{self}._proto['$' + method]) === 'function') {
         return true;
       }
@@ -342,9 +361,9 @@ class Class
   def module_function(*methods)
     %x{
       for (var i = 0, length = methods.length; i < length; i++) {
-        var meth = methods[i], func = #{self}.prototype['$' + meth];
+        var meth = methods[i], func = #{self}._proto['$' + meth];
-        #{self}['$' + meth] = func;
+        #{self}.constructor.prototype['$' + meth] = func;
       }
       return #{self};
@@ -357,8 +376,8 @@ class Class
   def new(*args, &block)
     %x{
-      if (#{self}.prototype.$initialize) {
-        var obj = new #{self};
+      if (#{self}._proto.$initialize) {
+        var obj = new #{self}._alloc;
         obj._id = Opal.uid();
         obj.$initialize._p = block;
@@ -385,8 +404,12 @@ class Class
     `#{self}._super || nil`
   end
+  def to_s
+    `#{self}._name`
+  end
   def undef_method(symbol)
-    `#{self}.prototype['$' + symbol] = undefined`
+    `#{self}._proto['$' + symbol] = undefined`
     self
   end
 end