opal 0.3.22 → 0.3.25

data/core/regexp.rb

@@ -11,9 +11,7 @@ class Regexp < `RegExp`
     `other.constructor == RegExp && #{self}.toString() === other.toString()`
   end
 
-  def ===(obj)
-    `#{self}.test(obj)`
-  end
+  alias_native :===, :test
 
   def =~(string)
     %x{
@@ -36,9 +34,7 @@ class Regexp < `RegExp`
 
   alias eql? ==
 
-  def inspect
-    `#{self}.toString()`
-  end
+  alias_native :inspect, :toString
 
   def match(pattern)
     %x{

data/core/runtime.js

@@ -238,30 +238,6 @@ var bridge_class = function(constructor) {
 
   bridged_classes.push(constructor);
 
-  var allocator = function(initializer) {
-    var result, kls = this, methods = kls._methods, proto = kls.prototype;
-
-    if (initializer == null) {
-      result = new constructor
-    }
-    else {
-      result = new constructor(initializer);
-    }
-
-    if (kls === constructor) {
-      return result;
-    }
-
-    result._klass = kls;
-
-    for (var i = 0, length = methods.length; i < length; i++) {
-      var method = methods[i];
-      result[method] = proto[method];
-    }
-
-    return result;
-  };
-
   var table = Object.prototype, methods = Object._methods;
 
   for (var i = 0, length = methods.length; i < length; i++) {
@@ -269,13 +245,13 @@ var bridge_class = function(constructor) {
     constructor.prototype[m] = table[m];
   }
 
-  constructor.$allocate = allocator;
-
   constructor._smethods.push('$allocate');
 
   return constructor;
 };
 
+Opal.puts = function(a) { console.log(a); };
+
 // Initialization
 // --------------
 

data/core/string.rb

@@ -11,7 +11,7 @@ class String < `String`
 
   def self.new(str = '')
     %x{
-      return #{allocate str}
+      return new String(str)
     }
   end
 
@@ -91,7 +91,6 @@ class String < `String`
     }
   end
 
-  # TODO: implement range based accessors
   def [](index, length)
     %x{
       var size = #{self}.length;
@@ -151,8 +150,6 @@ class String < `String`
   end
 
   def chars
-    return enum_for :chars unless block_given?
-
     %x{
       for (var i = 0, length = #{self}.length; i < length; i++) {
         #{yield `#{self}.charAt(i)`}
@@ -183,16 +180,24 @@ class String < `String`
   def count(str)
     `(#{self}.length - #{self}.replace(new RegExp(str,"g"), '').length) / str.length`
   end
+  
+  def demodulize
+    %x{
+      var idx = #{self}.lastIndexOf('::');
 
-  def downcase
-    `#{self}.toLowerCase()`
+      if (idx > -1) {
+        return #{self}.substr(idx + 2);
+      }
+      
+      return #{self};
+    }
   end
 
+  alias_native :downcase, :toLowerCase
+
   alias each_char chars
 
   def each_line (separator = $/)
-    return enum_for :each_line, separator unless block_given?
-
     %x{
       var splitted = #{self}.split(separator);
 
@@ -226,13 +231,9 @@ class String < `String`
     `#{self}.toString() === val.toString()`
   end
 
-  def getbyte(idx)
-    `#{self}.charCodeAt(idx)`
-  end
+  alias_native :getbyte, :charCodeAt
 
   def gsub(pattern, replace, &block)
-    return enum_for :gsub, pattern, replace if !block && `pattern == null`
-
     if pattern.is_a?(String)
       pattern = /#{Regexp.escape(pattern)}/
     end
@@ -246,9 +247,7 @@ class String < `String`
     }
   end
 
-  def hash
-    `#{self}.toString()`
-  end
+  alias_native :hash, :toString
 
   def hex
     to_i 16
@@ -259,11 +258,11 @@ class String < `String`
   end
 
   def index(what, offset)
-    unless String === what || Regexp === what
-      raise TypeError, "type mismatch: #{what.class} given"
-    end
-
     %x{
+      if (!what._isString && !what._isRegexp) {
+        throw new Error('type mismatch');
+      }
+
       var result = -1;
 
       if (offset != null) {
@@ -502,17 +501,20 @@ class String < `String`
     }
   end
 
-  def to_s
-    `#{self}.toString()`
-  end
+  alias_native :to_s, :toString
 
   alias to_str to_s
 
   alias to_sym intern
-
-  def upcase
-    `#{self}.toUpperCase()`
+  
+  def underscore
+    `#{self}.replace(/[-\\s]+/g, '_')
+            .replace(/([A-Z\\d]+)([A-Z][a-z])/g, '$1_$2')
+            .replace(/([a-z\\d])([A-Z])/g, '$1_$2')
+            .toLowerCase()`
   end
+
+  alias_native :upcase, :toUpperCase
 end
 
 Symbol = String

data/core/struct.rb

@@ -74,14 +74,10 @@ class Struct
   end
 
   def each
-    return enum_for :each unless block_given?
-
     members.each { |name| yield self[name] }
   end
 
   def each_pair
-    return enum_for :each_pair unless block_given?
-
     members.each { |name| yield name, self[name] }
   end
 

data/core/{erb.rb → templates.rb}

@@ -1,4 +1,4 @@
-# A really small ERB implementation for Opal.
+# A wapper for ERB templates in Opal. Other templates may be used
 class ERB
 
   # @private Stores all registered instances
@@ -20,11 +20,13 @@ class ERB
   # implementation uses a normal object as a context.
   #
   #   view = UserView.new
-  #   ERB[:user_view].result(view)
+  #   ERB[:user_view].render(view)
   #
   # @param [Object] context
   # @result [String]
-  def result(context)
-    context.instance_eval &@body
+  def render(content)
+    content.instance_eval(&@body)
   end
+
+  alias :result :render
 end

data/core/time.rb

@@ -2,7 +2,7 @@ class Time < `Date`
   include Comparable
 
   def self.at(seconds, frac = 0)
-    allocate `seconds * 1000 + frac`
+    `new Date(seconds * 1000 + frac)`
   end
 
   def self.new(year, month, day, hour, minute, second, millisecond)
@@ -44,9 +44,7 @@ class Time < `Date`
     to_f <=> other.to_f
   end
 
-  def day
-    `#{self}.getDate()`
-  end
+  alias_native :day, :getDate
 
   def eql?(other)
     other.is_a?(Time) && (self <=> other).zero?
@@ -56,15 +54,11 @@ class Time < `Date`
     `#{self}.getDay() === 5`
   end
 
-  def hour
-    `#{self}.getHours()`
-  end
+  alias_native :hour, :getHours
 
   alias mday day
 
-  def min
-    `#{self}.getMinutes()`
-  end
+  alias_native :min, :getMinutes
 
   def mon
     `#{self}.getMonth() + 1`
@@ -80,9 +74,7 @@ class Time < `Date`
     `#{self}.getDay() === 6`
   end
 
-  def sec
-    `#{self}.getSeconds()`
-  end
+  alias_native :sec, :getSeconds
 
   def sunday?
     `#{self}.getDay() === 0`
@@ -104,15 +96,11 @@ class Time < `Date`
     `#{self}.getDay() === 2`
   end
 
-  def wday
-    `#{self}.getDay()`
-  end
+  alias_native :wday, :getDay
 
   def wednesday?
     `#{self}.getDay() === 3`
   end
 
-  def year
-    `#{self}.getFullYear()`
-  end
+  alias_native :year, :getFullYear
 end

data/core/top_self.rb

@@ -1,7 +1,7 @@
-def self.to_s
+def to_s
   'main'
 end
 
-def self.include(mod)
+def include(mod)
   Object.include mod
 end

data/lib/opal.rb

@@ -58,6 +58,17 @@ module Opal
     ].join("\n")
   end
 
+  # Returns parser prebuilt for js-environments.
+  #
+  # @return [String]
+  def self.parser_code
+    [
+      Builder.new(:files => %w(racc.rb strscan.rb), :dir => self.core_dir).build,
+      self.build_gem('opal'),
+      File.read(File.join self.core_dir, 'browser.js')
+    ].join("\n")
+  end
+
   # Build gem with given name to a string.
   #
   #   Opal.build_gem 'opal-spec'
@@ -81,8 +92,8 @@ module Opal
   #
   # @param [String] files files to build
   # @return [String]
-  def self.build_files(files)
-    Builder.new(:files => files).build
+  def self.build_files(files, dir=nil)
+    Builder.new(:files => files, :dir => dir).build
   end
 
   def self.opal_dir

data/lib/opal/builder.rb

@@ -28,7 +28,7 @@ module Opal
       files = []
 
       sources.each do |s|
-        s = File.join @dir, s
+        s = File.expand_path(File.join @dir, s)
         if File.directory? s
           files.push *Dir[File.join(s, '**/*.{rb,js,erb}')]
         elsif %w(.rb .js .erb).include? File.extname(s)
@@ -71,7 +71,7 @@ module Opal
         code = @parser.parse File.read(file), lib_name
         @requires[lib_name] = @parser.requires
       elsif File.extname(file) == '.erb'
-        template_name = File.basename(file).chomp(File.extname(file))
+        template_name = lib_name_for(file).chomp(File.extname(file))
         code = Opal::ERBParser.new.parse File.read(file), template_name
         @requires[lib_name] = []
       else # javascript
@@ -89,7 +89,7 @@ module Opal
     def lib_name_for(file)
       file = file.sub(/^#{@dir}\//, '')
       file = file.chomp File.extname(file)
-      file.sub(/^(lib|spec)\//, '')
+      file.sub(/^(lib|spec|app)\//, '')
     end
   end
 end

data/lib/opal/erb_parser.rb

@@ -9,8 +9,9 @@ module Opal
 
     def compile(str, name)
       res = "ERB.new('#{name}') do\nout = []\nout.<<(\"" +
-      str.gsub(/<%=([\s\S]+?)%>/) do
-        "\")\nout.<<(" + $1.gsub(/\\'/, "'") + ")\nout.<<(\""
+      str.gsub('"', '\\"'
+      ).gsub(/<%=([\s\S]+?)%>/) do
+        "\")\nout.<<(" + $1.gsub(/\\'/, "'").gsub(/\\"/, '"') + ")\nout.<<(\""
       end.gsub(/<%([\s\S]+?)%>/) do
         "\")\n" + $1 + "\nout.<<(\""
       end + "\")\nout.join\nend"

data/lib/opal/parser.rb

@@ -36,8 +36,7 @@ module Opal
 
       @helpers  = {
         :breaker  => true,
-        :slice    => true,
-        :mm       => true
+        :slice    => true
       }
 
       top @grammar.parse(source, file)
@@ -540,6 +539,13 @@ module Opal
       "%s%s = %s.%s" % [@scope.proto, meth, @scope.proto, func]
     end
 
+    def handle_respond_to(sexp, level)
+      recv, mid, arglist = sexp
+      recv ||= s(:self)
+      meth = process(arglist[1], level) if arglist[1]
+      "(!!#{process(recv, level)}['$' + #{meth}])"
+    end
+
     # s(:call, recv, :mid, s(:arglist))
     # s(:call, nil, :mid, s(:arglist))
     def process_call(sexp, level)
@@ -565,6 +571,8 @@ module Opal
         end
 
         return "//= require #{path[1]}"
+      when :respond_to?
+        return handle_respond_to(sexp, level)
       end
 
       splat = arglist[1..-1].any? { |a| a.first == :splat }

data/lib/opal/rake_task.rb

@@ -6,12 +6,13 @@ module Opal
   class RakeTask
     include Rake::DSL if defined? Rake::DSL
 
-    attr_accessor :name, :build_dir, :specs_dir, :files, :dependencies
+    attr_accessor :name, :build_dir, :specs_dir, :files, :dependencies, :parser, :dir
 
     def initialize(namespace = nil)
       @project_dir = Dir.getwd
 
       @name         = File.basename(@project_dir)
+      @dir          = @project_dir
       @build_dir    = 'build'
       @specs_dir    = 'spec'
       @files        = Dir['lib/**/*.{rb,js,erb}']
@@ -40,7 +41,7 @@ module Opal
       task 'opal:build' do
         out = File.join @build_dir, "#{ @name }.js"
         puts " * #{out}"
-        write_code Opal.build_files(@files), out
+        write_code Opal.build_files(@files, @dir), out
       end
 
       desc "Build specs"
@@ -56,6 +57,13 @@ module Opal
         puts " * #{out}"
         write_code Opal.runtime, out
 
+        # build opal-parser?
+        if @parser
+          out = File.join @build_dir, 'opal-parser.js'
+          puts " * #{out}"
+          write_code Opal.parser_code, out
+        end
+
         @dependencies.each { |dep| build_gem dep }
       end