opal 0.3.19 → 0.3.20

data/core/string.rb

@@ -1,7 +1,6 @@
 class String < `String`
   %x{
-    def._isString = true;
-    var string_class = this;
+    String_prototype._isString = true;
   }
 
   include Comparable
@@ -80,7 +79,7 @@ class String < `String`
   def =~(other)
     %x{
       if (typeof other === 'string') {
-        throw RubyTypeError.$new('string given');
+        #{ raise 'string given' };
       }
 
       return #{other =~ self};
@@ -88,8 +87,7 @@ class String < `String`
   end
 
   # TODO: implement range based accessors
-  # TODO: implement regex based accessors
-  def [](index, length = undefined)
+  def [](index, length)
     %x{
       if (length == null) {
         if (index < 0) {
@@ -162,9 +160,7 @@ class String < `String`
     `this.charAt(0)`
   end
 
-  def downcase
-    `this.toLowerCase()`
-  end
+  alias_native :downcase, :toLowerCase
 
   alias each_char chars
 
@@ -204,12 +200,10 @@ class String < `String`
     `this.toString() === val.toString()`
   end
 
-  def getbyte(index)
-    `this.charCodeAt(index)`
-  end
+  alias_native :getbyte, :charCodeAt
 
-  def gsub(pattern, replace = undefined, &block)
-    return enum_for :gsub, pattern, replace if !block && `pattern === undefined`
+  def gsub(pattern, replace, &block)
+    return enum_for :gsub, pattern, replace if !block && `pattern == null`
 
     if pattern.is_a?(String)
       pattern = /#{Regexp.escape(pattern)}/
@@ -224,9 +218,7 @@ class String < `String`
     }
   end
 
-  def hash
-    `this.toString()`
-  end
+  alias_native :hash, :toString
 
   def hex
     to_i 16
@@ -236,7 +228,7 @@ class String < `String`
     `this.indexOf(other) !== -1`
   end
 
-  def index(what, offset = undefined)
+  def index(what, offset)
     unless String === what || Regexp === what
       raise TypeError, "type mismatch: #{what.class} given"
     end
@@ -244,7 +236,7 @@ class String < `String`
     %x{
       var result = -1;
 
-      if (offset !== undefined) {
+      if (offset != null) {
         if (offset < 0) {
           offset = this.length - offset;
         }
@@ -315,7 +307,7 @@ class String < `String`
     `this.replace(/^\\s*/, '')`
   end
 
-  def match(pattern, pos = undefined, &block)
+  def match(pattern, pos, &block)
     (pattern.is_a?(Regexp) ? pattern : /#{Regexp.escape(pattern)}/).match(self, pos, &block)
   end
 
@@ -377,15 +369,13 @@ class String < `String`
     `this.replace(/^\\s*/, '').replace(/\\s*$/, '')`
   end
 
-  def sub(pattern, replace = undefined, &block)
+  def sub(pattern, replace, &block)
     %x{
       if (typeof(replace) === 'string') {
         return this.replace(pattern, replace);
       }
       if (block !== nil) {
         return this.replace(pattern, function(str) {
-          //$opal.match_data = arguments
-
           return block.call(__context, str);
         });
       }
@@ -394,13 +384,13 @@ class String < `String`
           return this.replace(pattern, function(str) {
             var value = #{replace[str]};
 
-            return (value === null) ? undefined : #{value.to_s};
+            return (value == null) ? nil : #{value.to_s};
           });
         }
         else {
           replace = #{String.try_convert(replace)};
 
-          if (replace === null) {
+          if (replace == null) {
             #{raise TypeError, "can't convert #{replace.class} into String"};
           }
 
@@ -433,7 +423,7 @@ class String < `String`
         return $1 ? $0.toUpperCase() : $0.toLowerCase();
       });
 
-      if (this._klass === string_class) {
+      if (this._klass === String) {
         return str;
       }
 
@@ -455,11 +445,7 @@ class String < `String`
     %x{
       var result = parseFloat(this);
 
-      if (isNaN(result)) {
-        return 0;
-      }
-
-      return result;
+      return isNaN(result) ? 0 : result;
     }
   end
 
@@ -475,6 +461,8 @@ class String < `String`
     }
   end
 
+  alias to_json inspect
+
   def to_proc
     %x{
       var self = this, jsid = mid_to_jsid(self);
@@ -483,17 +471,13 @@ class String < `String`
     }
   end
 
-  def to_s
-    `this.toString()`
-  end
+  alias_native :to_s, :toString
 
   alias to_str to_s
 
   alias to_sym intern
 
-  def upcase
-    `this.toUpperCase()`
-  end
+  alias_native :upcase, :toUpperCase
 end
 
-Symbol = String
+Symbol = String

data/core/struct.rb

@@ -2,7 +2,7 @@ class Struct
   def self.new(name, *args)
     return super unless self == Struct
 
-    if name.is_a?(String)
+    if name[0] == name[0].upcase
       Struct.const_set(name, new(*args))
     else
       args.unshift name
@@ -14,6 +14,10 @@ class Struct
   end
 
   def self.define_struct_attribute(name)
+    if self == Struct
+      raise ArgumentError, 'you cannot define attributes to the Struct class'
+    end
+
     members << name
 
     define_method name do
@@ -26,6 +30,10 @@ class Struct
   end
 
   def self.members
+    if self == Struct
+      raise ArgumentError, 'the Struct class has no members'
+    end
+
     @members ||= []
   end
 
@@ -42,7 +50,7 @@ class Struct
   end
 
   def [](name)
-    if name.is_a?(Integer)
+    if Integer === name
       raise IndexError, "offset #{name} too large for struct(size:#{members.size})" if name >= members.size
 
       name = members[name]
@@ -54,7 +62,7 @@ class Struct
   end
 
   def []=(name, value)
-    if name.is_a?(Integer)
+    if Integer === name
       raise IndexError, "offset #{name} too large for struct(size:#{members.size})" if name >= members.size
 
       name = members[name]

data/core/time.rb

@@ -1,36 +1,43 @@
-class Time
+class Time < `Date`
   include Comparable
 
   def self.at(seconds, frac = 0)
-    result = allocate
-    `result.time = new Date(seconds * 1000 + frac)`
-    result
+    allocate `seconds * 1000 + frac`
   end
 
-  def self.now
-    result = allocate
-    `result.time = new Date()`
-    result
+  def self.new(year, month, day, hour, minute, second, millisecond)
+    %x{
+      switch (arguments.length) {
+        case 1:
+          return new Date(year);
+        case 2:
+          return new Date(year, month - 1);
+        case 3:
+          return new Date(year, month - 1, day);
+        case 4:
+          return new Date(year, month - 1, day, hour);
+        case 5:
+          return new Date(year, month - 1, day, hour, minute);
+        case 6:
+          return new Date(year, month - 1, day, hour, minute, second);
+        case 7:
+          return new Date(year, month - 1, day, hour, minute, second, millisecond);
+        default:
+          return new Date();
+      }
+    }
   end
 
-  def initialize
-    `this.time = new Date()`
+  def self.now
+    allocate
   end
 
   def +(other)
-    %x{
-      var res = #{Time.allocate};
-      res.time = new Date(#{to_f + other.to_f});
-      return res;
-    }
+    Time.allocate(self.to_f + other.to_f)
   end
 
   def -(other)
-    %x{
-      var res = #{Time.allocate};
-      res.time = new Date(#{to_f - other.to_f});
-      return res;
-    }
+    Time.allocate(self.to_f - other.to_f)
   end
 
   def <=>(other)
@@ -38,7 +45,7 @@ class Time
   end
 
   def day
-    `this.time.getDate()`
+    `this.getDate()`
   end
 
   def eql?(other)
@@ -46,66 +53,66 @@ class Time
   end
 
   def friday?
-    `this.time.getDay() === 5`
+    `this.getDay() === 5`
   end
 
   def hour
-    `this.time.getHours()`
+    `this.getHours()`
   end
 
   alias mday day
 
   def min
-    `this.time.getMinutes()`
+    `this.getMinutes()`
   end
 
   def mon
-    `this.time.getMonth() + 1`
+    `this.getMonth() + 1`
   end
 
   def monday?
-    `this.time.getDay() === 1`
+    `this.getDay() === 1`
   end
 
   alias month mon
 
   def saturday?
-    `this.time.getDay() === 6`
+    `this.getDay() === 6`
   end
 
   def sec
-    `this.time.getSeconds()`
+    `this.getSeconds()`
   end
 
   def sunday?
-    `this.time.getDay() === 0`
+    `this.getDay() === 0`
   end
 
   def thursday?
-    `this.time.getDay() === 4`
+    `this.getDay() === 4`
   end
 
   def to_f
-    `this.time.getTime() / 1000`
+    `this.getTime() / 1000`
   end
 
   def to_i
-    `parseInt(this.time.getTime() / 1000)`
+    `parseInt(this.getTime() / 1000)`
   end
 
   def tuesday?
-    `this.time.getDay() === 2`
+    `this.getDay() === 2`
   end
 
   def wday
-    `this.time.getDay()`
+    `this.getDay()`
   end
 
   def wednesday?
-    `this.time.getDay() === 3`
+    `this.getDay() === 3`
   end
 
   def year
-    `this.time.getFullYear()`
+    `this.getFullYear()`
   end
-end
+end

data/lib/opal.rb

@@ -5,9 +5,9 @@ require 'opal/version'
 
 module Opal
   # Parse given string of ruby into javascript
-  def self.parse(str)
-    js = Parser.new.parse str
-    "(#{js}).call(Opal.top);"
+  def self.parse(str, file='(file)')
+    js = Parser.new.parse str, file
+    "(#{js})();"
   end
 
   # Returns opal runtime js code (string)

data/lib/opal/builder.rb

@@ -12,23 +12,17 @@ module Opal
 
       methods = Parser::METHOD_NAMES.map { |f, t| "'#{f}': '$#{t}$'" }
       runtime = File.read(File.join core_dir, 'runtime.js')
-      corelib = Opal.parse corelib.join("\n")
+      corelib = Opal.parse corelib.join("\n"), '(corelib)'
 
       [
-        "/*!",
-        " * Opal v#{Opal::VERSION}",
-        " * http://opalrb.org",
-        " *",
-        " * Copyright 2012, Adam Beynon",
-        " * Released under the MIT License",
-        " */",
+        "// Opal v#{Opal::VERSION}",
+        "// http://opalrb.org",
+        "// Copyright 2012, Adam Beynon",
+        "// Released under the MIT License",
         "(function(undefined) {",
         runtime,
-        "var method_names = {#{ methods.join ', ' }},",
-        "reverse_method_names = {};",
-        "for (var id in method_names) {",
-        "reverse_method_names[method_names[id]] = id;",
-        "}",
+        "var method_names = {#{ methods.join ', ' }};",
+        "Opal.version = #{ Opal::VERSION.inspect };",
         corelib,
         "}).call(this);"
       ].join("\n")
@@ -41,7 +35,6 @@ module Opal
     def initialize(options = {})
       @sources = Array(options[:files])
       @options = options
-      @debug   = !!options[:debug]
     end
 
     def build
@@ -50,11 +43,13 @@ module Opal
       end
 
       @dir = File.expand_path(@options[:dir] || Dir.getwd)
-      @main = @options[:main]
 
       files = files_for @sources
       FileUtils.mkdir_p File.dirname(out)
 
+      @files    = {}
+      @requires = {}
+
       build_to files, out
     end
 
@@ -70,36 +65,62 @@ module Opal
         end
       end
 
-      files.map! { |f| File.expand_path f }
-
       files
     end
 
     def build_to(files, out)
-      @parser = Parser.new :debug => @debug
+      @parser = Parser.new
 
       files.each { |file| build_file(file) }
 
       File.open(out, 'w+') do |o|
-        files.each do |file|
-          js = build_file file
-          o.puts js
+        build_order(@requires).each do |f|
+          o.puts @files[f]
         end
+      end
+    end
+
+    # @param [Hash<Array<String>>] files hash of dependencies
+    def build_order(files)
+      all     = files.keys
+      result  = []
+      handled = {}
+
+      all.each { |r| _find_build_order r, files, handled, result }
+      result
+    end
 
-        o.puts "Opal.require(#{@main.inspect});" if @main
+    def _find_build_order(file, files, handled, result)
+      if handled[file] or !files[file]
+        return
       end
+
+      handled[file] = true
+
+      files[file].each do |r|
+        _find_build_order r, files, handled, result
+      end
+
+      result << file
     end
 
     def build_file(file)
-      lib_name = lib_name_for file
+      lib_name    = lib_name_for file
+      parser_name = parser_name_for file
 
-      code = if File.extname(file) == '.rb'
-        @parser.parse File.read(file), file
+      if File.extname(file) == '.rb'
+        code = @parser.parse File.read(file), parser_name
+        @requires[lib_name] = @parser.requires
+        code = "(#{code})();"
       else
-        File.read file
+        code = File.read file
       end
 
-      "Opal.define(#{lib_name.inspect}, #{code});"
+      @files[lib_name] = "// file #{ parser_name }\n#{ code }"
+    end
+
+    def parser_name_for(file)
+      file.sub /^#{@dir}\//, ''
     end
 
     def lib_name_for(file)