opal 0.3.41 → 0.3.42

data/opal/opal/kernel.rb

@@ -92,6 +92,10 @@ module Kernel
     }
   end
 
+  def dup
+    self.class.allocate
+  end
+
   def enum_for(method = :each, *args)
     Enumerator.new self, method, *args
   end
@@ -272,7 +276,9 @@ module Kernel
       var result = [];
 
       for (var name in #{self}) {
-        result.push(name);
+        if (name.charAt(0) !== '$') {
+          result.push(name);
+        }
       }
 
       return result;
@@ -328,7 +334,7 @@ module Kernel
   def proc(&block)
     %x{
       if (block === nil) {
-        no_block_given();
+        #{ raise ArgumentError, 'no block given' };
       }
       block.is_lambda = false;
       return block;
@@ -355,7 +361,7 @@ module Kernel
 
   alias print puts
 
-  def raise(exception, string)
+  def raise(exception = "", string = undefined)
     %x{
       if (typeof(exception) === 'string') {
         exception = #{RuntimeError.new exception};
@@ -389,6 +395,7 @@ module Kernel
         meta._klass = __opal.Class;
         #{self}._singleton = meta;
         meta.prototype = #{self};
+        meta._isSingleton = true;
 
         return meta;
       }
@@ -420,6 +427,10 @@ module Kernel
 
   alias sprintf format
 
+  def String(str)
+    `String(str)`
+  end
+
   def tap(&block)
     yield self
     self

data/opal/opal/nil_class.rb

@@ -19,6 +19,10 @@ class NilClass
     self
   end
 
+  def dup
+    raise TypeError
+  end
+
   def inspect
     'nil'
   end

data/opal/opal/proc.rb

@@ -9,7 +9,15 @@ class Proc < `Function`
   end
 
   def call(*args)
-    `#{self}.apply(null, #{args})`
+    %x{
+      var result = #{self}.apply(null, #{args});
+
+      if (result === __breaker) {
+        return __breaker.$v;
+      }
+
+      return result;
+    }
   end
 
   alias [] call

data/opal/opal/racc.rb

@@ -157,7 +157,7 @@ module Racc
 
         elsif act == -reduce_n
           # reduce
-          raise "Opal Syntax Error: unexpected '#{racc_tok.inspect}'"
+          raise SyntaxError, "unexpected '#{racc_tok.inspect}'"
 
         else
           raise "Rac: unknown action: #{act}"
@@ -212,4 +212,4 @@ module Racc
       puts '  ]'
     end
   end
-end
+end

data/opal/opal/regexp.rb

@@ -1,6 +1,6 @@
 class Regexp < `RegExp`
   def self.escape(string)
-    `string.replace(/([.*+?^=!:${}()|[\]\\/\\])/g, '\\$1')`
+    `string.replace(/[\\-\\[\\]\\/\\{\\}\\(\\)\\*\\+\\?\\.\\\\\^\\$\\|]/g, '\\\\$&')`
   end
 
   def self.new(string, options = undefined)

data/opal/opal/runtime.js

@@ -235,12 +235,15 @@
   };
 
   Opal.puts = function(a) { console.log(a); };
-  
+
   // Method missing dispatcher
   Opal.mm = function(mid) {
-    return function() {
+    var dispatcher = function() {
+      this.$method_missing._p = dispatcher._p;
       return this.$method_missing.apply(this, [mid].concat(__slice.call(arguments)));
-    }
+    };
+
+    return dispatcher;
   };
 
   // Const missing dispatcher
@@ -332,6 +335,12 @@
     }
   }
 
+  // Defines methods onto Object (which are then donated to bridged classes)
+  Object._defn = function (mid, body) {
+    this.prototype[mid] = body;
+    this._donate([mid]);
+  };
+
   var bridged_classes = Object.$included_in = [];
 
   BasicObject._scope = Object._scope = Opal;
@@ -350,7 +359,8 @@
   Opal.top = new Object;
 
   Opal.klass(Object, Object, 'NilClass', NilClass)
-  Opal.nil = new NilClass;
+  var nil = Opal.nil = new NilClass;
+  nil.call = nil.apply = function() { throw Opal.LocalJumpError.$new('no block given'); };
 
   Opal.breaker  = new Error('unexpected break');
 }).call(this);

data/opal/opal/string.rb

@@ -99,15 +99,28 @@ class String < `String`
             length  = index.end,
             index   = index.begin;
 
+        if (index < 0) {
+          index += size;
+        }
+
+        if (length < 0) {
+          length += size;
+        }
+
+        if (!exclude) {
+          length += 1;
+        }
+
         if (index > size) {
           return nil;
         }
 
+        length = length - index;
+
         if (length < 0) {
-          length += size;
+          length = 0;
         }
 
-        if (exclude) length -= 1;
         return #{self}.substr(index, length);
       }
 
@@ -243,7 +256,7 @@ class String < `String`
 
   alias_native :getbyte, :charCodeAt
 
-  def gsub(pattern, replace = undefined)
+  def gsub(pattern, replace = undefined, &block)
     if pattern.is_a?(String)
       pattern = /#{Regexp.escape(pattern)}/
     end
@@ -253,6 +266,7 @@ class String < `String`
           options = pattern.substr(pattern.lastIndexOf('/') + 1) + 'g',
           regexp  = pattern.substr(1, pattern.lastIndexOf('/') - 1);
 
+      #{self}.$sub._p = block;
       return #{self}.$sub(new RegExp(regexp, options), replace);
     }
   end
@@ -507,7 +521,10 @@ class String < `String`
     %x{
       var name = '$' + #{self};
 
-      return function(arg) { return arg[name](); };
+      return function(arg) {
+        var meth = arg[name];
+        return meth ? meth.call(arg) : arg.$method_missing(name);
+      };
     }
   end
 

data/opal/opal/time.rb

@@ -1,3 +1,8 @@
+days_of_week = %w[Sunday Monday Tuesday Wednesday Thursday Friday Saturday Sunday]
+short_days = %w[Sun Mon Tue Wed Thu Fri Sat]
+short_months = %w[Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec]
+long_months = %w[January Febuary March April May June July August September October November December]
+
 class Time < `Date`
   include Comparable
 
@@ -32,6 +37,10 @@ class Time < `Date`
     `new Date()`
   end
 
+  def self.parse(str)
+    `Date.parse(str)`
+  end
+
   def +(other)
     Time.allocate(self.to_f + other.to_f)
   end
@@ -78,6 +87,24 @@ class Time < `Date`
 
   alias_native :sec, :getSeconds
 
+  def strftime(format = '')
+    %x{
+      var d = #{self};
+
+      return format.replace(/%(-?.)/g, function(full, m) {
+        switch (m) {
+          case 'a': return short_days[d.getDay()];
+          case 'A': return days_of_week[d.getDay()];
+          case 'b': return short_months[d.getMonth()];
+          case 'B': return long_months[d.getMonth()];
+          case '-d': return d.getDate();
+          case 'Y': return d.getFullYear();
+          default: return m ;
+        }
+      });
+    }
+  end
+
   def sunday?
     `#{self}.getDay() === 0`
   end

data/spec/core/array/allocate_spec.rb

@@ -1,3 +1,5 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
 describe "Array.allocate" do
   it "returns an instance of Array" do
     ary = Array.allocate
@@ -10,4 +12,8 @@ describe "Array.allocate" do
     ary << 1
     ary.should == [1]
   end
-end
+
+  it "does not accept any arguments" do
+    lambda { Array.allocate(1) }.should raise_error(ArgumentError)
+  end
+end

data/spec/core/array/append_spec.rb

@@ -1,3 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+
 describe "Array#<<" do
   it "pushes the object onto the end of the array" do
     ([ 1, 2 ] << "c" << "d" << [ 3, 4 ]).should == [1, 2, "c", "d", [3, 4]]
@@ -6,8 +9,8 @@ describe "Array#<<" do
   it "returns self to allow chaining" do
     a = []
     b = a
-    (a << 1).should == b
-    (a << 2 << 3).should == b
+    (a << 1).should equal(b)
+    (a << 2 << 3).should equal(b)
   end
 
   it "correctly resizes the Array" do
@@ -25,4 +28,16 @@ describe "Array#<<" do
     a << :foo
     a.should == [:foo]
   end
-end
+
+  ruby_version_is '' ... '1.9' do
+    it "raises a TypeError on a frozen array" do
+      lambda { ArraySpecs.frozen_array << 5 }.should raise_error(TypeError)
+    end
+  end
+
+  ruby_version_is '1.9' do
+    it "raises a RuntimeError on a frozen array" do
+      lambda { ArraySpecs.frozen_array << 5 }.should raise_error(RuntimeError)
+    end
+  end
+end

data/spec/core/array/array_spec.rb

@@ -0,0 +1,7 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+describe "Array" do
+  it "includes Enumerable" do
+    Array.ancestors.include?(Enumerable).should == true
+  end
+end

data/spec/core/array/assoc_spec.rb

@@ -1,3 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+
 describe "Array#assoc" do
   it "returns the first array whose 1st item is == obj or nil" do
     s1 = ["colors", "red", "blue", "green"]
@@ -7,11 +10,23 @@ describe "Array#assoc" do
     s5 = [:letters, "a", "i", "u"]
     s_nil = [nil, nil]
     a = [s1, s2, s3, s4, s5, s_nil]
-    a.assoc(s1.first).should == s1
-    a.assoc(s2.first).should == s2
-    a.assoc(s3.first).should == s3
-    a.assoc(s4.first).should == s1
-    a.assoc(s5.first).should == s2
+    a.assoc(s1.first).should equal(s1)
+    a.assoc(s2.first).should equal(s2)
+    a.assoc(s3.first).should equal(s3)
+    a.assoc(s4.first).should equal(s1)
+    a.assoc(s5.first).should equal(s2)
+    a.assoc(s_nil.first).should equal(s_nil)
+    a.assoc(4).should equal(s3)
+    a.assoc("key not in array").should be_nil
+  end
+
+  it "calls == on first element of each array" do
+    key1 = 'it'
+    key2 = mock('key2')
+    items = [['not it', 1], [ArraySpecs::AssocKey.new, 2], ['na', 3]]
+
+    items.assoc(key1).should equal(items[1])
+    items.assoc(key2).should be_nil
   end
 
   it "ignores any non-Array elements" do
@@ -19,7 +34,7 @@ describe "Array#assoc" do
     s1 = [4]
     s2 = [5, 4, 3]
     a = ["foo", [], s1, s2, nil, []]
-    a.assoc(s1.first).should == s1
-    a.assoc(s2.first).should == s2
+    a.assoc(s1.first).should equal(s1)
+    a.assoc(s2.first).should equal(s2)
   end
-end
+end

data/spec/core/array/at_spec.rb

@@ -1,3 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+
 describe "Array#at" do
   it "returns the (n+1)'th element for the passed index n" do
     a = [1, 2, 3, 4, 5, 6]
@@ -12,14 +15,14 @@ describe "Array#at" do
     a.at(7).should == nil
   end
 
-  it "returns the (-n)'th element from the last, for the given negative index n" do
+  it "returns the (-n)'th elemet from the last, for the given negative index n" do
     a = [1, 2, 3, 4, 5, 6]
     a.at(-1).should == 6
     a.at(-2).should == 5
     a.at(-6).should == 1
   end
 
-  it "returns nil if the given index is less than -len, where len is length of the array" do
+  it "returns nil if the given index is less than -len, where len is length of the array"  do
     a = [1, 2, 3, 4, 5, 6]
     a.at(-7).should == nil
     a.at(-8).should == nil
@@ -33,4 +36,21 @@ describe "Array#at" do
     a.at(-100)
     a.length.should == 6
   end
-end
+
+  it "tries to convert the passed argument to an Integer using #to_int" do
+    a = ["a", "b", "c"]
+    a.at(0.5).should == "a"
+
+    obj = mock('to_int')
+    obj.should_receive(:to_int).and_return(2)
+    a.at(obj).should == "c"
+  end
+
+  it "raises a TypeError when the passed argument can't be coerced to Integer" do
+    lambda { [].at("cat") }.should raise_error(TypeError)
+  end
+
+  it "raises an ArgumentError when 2 or more arguments is passed" do
+    lambda { [:a, :b].at(0,1) }.should raise_error(ArgumentError)
+  end
+end

data/spec/core/array/choice_spec.rb

@@ -0,0 +1,20 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+
+describe "Array#choice" do
+  ruby_version_is "1.8.7"..."1.9" do
+    it "returns a value from the array" do
+      [4].choice.should eql(4)
+    end
+
+    it "returns a distribution of results" do
+      source = [0,1,2,3,4]
+      choices = ArraySpecs::SampleRange.collect { |el| source.choice }
+      choices.uniq.sort.should == source
+    end
+
+    it "returns nil for empty arrays" do
+      [].choice.should be_nil
+    end
+  end
+end

data/spec/core/array/clear_spec.rb

@@ -1,14 +1,17 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+
 describe "Array#clear" do
   it "removes all elements" do
     a = [1, 2, 3, 4]
-    a.clear
+    a.clear.should equal(a)
     a.should == []
   end
 
   it "returns self" do
     a = [1]
-    old = a.object_id
-    a.clear.object_id.should == old
+    oid = a.object_id
+    a.clear.object_id.should == oid
   end
 
   it "leaves the Array empty" do
@@ -17,4 +20,42 @@ describe "Array#clear" do
     a.empty?.should == true
     a.size.should == 0
   end
-end
+
+  it "keeps tainted status" do
+    a = [1]
+    a.taint
+    a.tainted?.should be_true
+    a.clear
+    a.tainted?.should be_true
+  end
+
+  it "does not accept any arguments" do
+    lambda { [1].clear(true) }.should raise_error(ArgumentError)
+  end
+
+  ruby_version_is '1.9' do
+    it "keeps untrusted status" do
+      a = [1]
+      a.untrust
+      a.untrusted?.should be_true
+      a.clear
+      a.untrusted?.should be_true
+    end
+  end
+
+  ruby_version_is '' ... '1.9' do
+    it "raises a TypeError on a frozen array" do
+      a = [1]
+      a.freeze
+      lambda { a.clear }.should raise_error(TypeError)
+    end
+  end
+
+  ruby_version_is '1.9' do
+    it "raises a RuntimeError on a frozen array" do
+      a = [1]
+      a.freeze
+      lambda { a.clear }.should raise_error(RuntimeError)
+    end
+  end
+end