opal 0.7.0.beta1 → 0.7.0.beta2

data/spec/opal/stdlib/promise/rescue_spec.rb

@@ -32,4 +32,13 @@ describe 'Promise#rescue' do
     Promise.error(23).rescue { |v| x = v }.rescue { x = 42 }
     x.should == 23
   end
+
+  it 'raises an exception when the promise has already been chained' do
+    p = Promise.value(2)
+    p.then {}
+
+    proc {
+      p.rescue {}
+    }.should raise_error(ArgumentError)
+  end
 end

data/spec/opal/stdlib/promise/then_spec.rb

@@ -51,4 +51,13 @@ describe 'Promise#then' do
 
     x.should be_kind_of(RuntimeError)
   end
+
+  it 'raises an exception when the promise has already been chained' do
+    p = Promise.value(2)
+    p.then {}
+
+    proc {
+      p.then {}
+    }.should raise_error(ArgumentError)
+  end
 end

data/spec/opal/stdlib/promise/trace_spec.rb

@@ -32,4 +32,13 @@ describe 'Promise#trace' do
 
     x.should == 6
   end
+
+  it 'raises an exception when the promise has already been chained' do
+    p = Promise.value(2)
+    p.then {}
+
+    proc {
+      p.trace {}
+    }.should raise_error(ArgumentError)
+  end
 end

data/spec/rubyspecs

@@ -31,11 +31,22 @@ corelib/core/fixnum/to_s_spec
 corelib/core/fixnum/zero_spec
 
 corelib/core/integer/downto_spec
+corelib/core/integer/even_spec
+corelib/core/integer/upto_spec
 
 corelib/core/enumerator/each_spec
 corelib/core/enumerator/new_spec
 corelib/core/enumerator/next_spec
 corelib/core/enumerator/rewind_spec
+corelib/core/enumerator/with_index_spec
+
+corelib/core/exception/initialize_spec
+corelib/core/exception/inspect_spec
+corelib/core/exception/message_spec
+corelib/core/exception/name_spec
+corelib/core/exception/new_spec
+corelib/core/exception/reason_spec
+corelib/core/exception/to_s_spec
 
 corelib/core/kernel/comparison_spec
 corelib/core/kernel/eql_spec
@@ -46,8 +57,11 @@ corelib/core/kernel/to_s_spec
 corelib/core/kernel/warn_spec
 
 corelib/core/matchdata/captures_spec
+corelib/core/matchdata/element_reference_spec
 corelib/core/matchdata/inspect_spec
 corelib/core/matchdata/length_spec
+corelib/core/matchdata/post_match_spec
+corelib/core/matchdata/pre_match_spec
 corelib/core/matchdata/regexp_spec
 corelib/core/matchdata/size_spec
 corelib/core/matchdata/string_spec
@@ -55,6 +69,8 @@ corelib/core/matchdata/to_a_spec
 corelib/core/matchdata/to_s_spec
 corelib/core/matchdata/values_at_spec
 
+corelib/core/module/module_function_spec
+
 corelib/core/range/begin_spec
 corelib/core/range/case_compare_spec
 corelib/core/range/end_spec
@@ -197,6 +213,7 @@ corelib/core/regexp/case_compare_spec
 corelib/core/regexp/eql_spec
 corelib/core/regexp/equal_value_spec
 corelib/core/regexp/escape_spec
+corelib/core/regexp/last_match_spec
 corelib/core/regexp/match_spec
 corelib/core/regexp/quote_spec
 
@@ -245,7 +262,7 @@ corelib/language/singleton_class_spec
 # corelib/language/splat_spec - can't parse all splats
 # corelib/language/string_spec - can't parse strings using control-characters
 corelib/language/super_spec
-# corelib/language/symbol_spec - lots fail
+corelib/language/symbol_spec
 # corelib/language/throw_spec - unsupported
 corelib/language/undef_spec
 corelib/language/unless_spec
@@ -254,44 +271,55 @@ corelib/language/until_spec
 corelib/language/while_spec
 # corelib/language/yield_spec - can't parse destructuring argument list, see block_spec
 
-stdlib/rubysl-singleton/spec/
-stdlib/rubysl-observer/spec/
+stdlib/rubysl-singleton/spec
+stdlib/rubysl-observer/spec
+stdlib/rubysl-pathname/spec
 
+stdlib/rubysl-strscan/spec/beginning_of_line_spec
 stdlib/rubysl-strscan/spec/bol_spec
 stdlib/rubysl-strscan/spec/check_spec
 stdlib/rubysl-strscan/spec/element_reference_spec
+stdlib/rubysl-strscan/spec/eos_spec
 stdlib/rubysl-strscan/spec/get_byte_spec
+stdlib/rubysl-strscan/spec/peek_spec
 stdlib/rubysl-strscan/spec/pos_spec
+stdlib/rubysl-strscan/spec/reset_spec
+stdlib/rubysl-strscan/spec/rest_spec
 stdlib/rubysl-strscan/spec/scan_spec
 stdlib/rubysl-strscan/spec/skip_spec
 stdlib/rubysl-strscan/spec/terminate_spec
 
 stdlib/rubysl-delegate/spec/delegator/send_spec
 
+stdlib/rubysl-erb/spec/util/h_spec
 stdlib/rubysl-erb/spec/util/html_escape_spec
 
 stdlib/rubysl-set/spec/add_spec
 stdlib/rubysl-set/spec/append_spec
+stdlib/rubysl-set/spec/classify_spec
 stdlib/rubysl-set/spec/clear_spec
+stdlib/rubysl-set/spec/collect_spec
 stdlib/rubysl-set/spec/constructor_spec
 stdlib/rubysl-set/spec/delete_if_spec
 stdlib/rubysl-set/spec/delete_spec
+stdlib/rubysl-set/spec/difference_spec
 stdlib/rubysl-set/spec/each_spec
 stdlib/rubysl-set/spec/empty_spec
 stdlib/rubysl-set/spec/enumerable/to_set_spec
+stdlib/rubysl-set/spec/eql_spec
 stdlib/rubysl-set/spec/equal_value_spec
 stdlib/rubysl-set/spec/include_spec
 stdlib/rubysl-set/spec/initialize_spec
 stdlib/rubysl-set/spec/length_spec
+stdlib/rubysl-set/spec/map_spec
 stdlib/rubysl-set/spec/member_spec
 stdlib/rubysl-set/spec/merge_spec
+stdlib/rubysl-set/spec/minus_spec
+stdlib/rubysl-set/spec/replace_spec
 stdlib/rubysl-set/spec/size_spec
+stdlib/rubysl-set/spec/subtract_spec
 stdlib/rubysl-set/spec/to_a_spec
-# stdlib/rubysl-set/spec/classify_spec
-# stdlib/rubysl-set/spec/collect_spec
-# stdlib/rubysl-set/spec/difference_spec
 # stdlib/rubysl-set/spec/divide_spec
-# stdlib/rubysl-set/spec/eql_spec
 # stdlib/rubysl-set/spec/exclusion_spec
 # stdlib/rubysl-set/spec/flatten_merge_spec
 # stdlib/rubysl-set/spec/flatten_spec
@@ -300,30 +328,23 @@ stdlib/rubysl-set/spec/to_a_spec
 # stdlib/rubysl-set/spec/inspect_spec
 # stdlib/rubysl-set/spec/intersection_spec
 # stdlib/rubysl-set/spec/keep_if_spec
-# stdlib/rubysl-set/spec/map_spec
-# stdlib/rubysl-set/spec/minus_spec
 # stdlib/rubysl-set/spec/plus_spec
 # stdlib/rubysl-set/spec/pretty_print_cycle_spec
 # stdlib/rubysl-set/spec/pretty_print_spec
 # stdlib/rubysl-set/spec/proper_subset_spec
 # stdlib/rubysl-set/spec/proper_superset_spec
 # stdlib/rubysl-set/spec/reject_spec
-# stdlib/rubysl-set/spec/replace_spec
 # stdlib/rubysl-set/spec/select_spec
 # stdlib/rubysl-set/spec/subset_spec
-# stdlib/rubysl-set/spec/subtract_spec
 # stdlib/rubysl-set/spec/superset_spec
 # stdlib/rubysl-set/spec/union_spec
 
-
-
-
-stdlib/rubysl-pathname/spec/new_spec
-stdlib/rubysl-pathname/spec/equal_value_spec
-stdlib/rubysl-pathname/spec/absolute_spec
-stdlib/rubysl-pathname/spec/relative_spec
-
+stdlib/rubysl-date/spec/date/add_month_spec
 stdlib/rubysl-date/spec/date/add_spec
+stdlib/rubysl-date/spec/date/append_spec
+stdlib/rubysl-date/spec/date/case_compare_spec
 stdlib/rubysl-date/spec/date/eql_spec
+stdlib/rubysl-date/spec/date/minus_month_spec
 stdlib/rubysl-date/spec/date/minus_spec
 stdlib/rubysl-date/spec/date/plus_spec
+stdlib/rubysl-date/spec/date/strftime_spec

data/spec/spec_helper.rb

@@ -26,11 +26,16 @@ module Kernel
   end
 end
 
-if `!!window.OPAL_SPEC_PHANTOM`
-  require 'phantomjs'
-  formatter_class = PhantomFormatter
-else
-  formatter_class = BrowserFormatter
+case
+when defined?(NodeJS)
+  formatter_class = NodeJSFormatter
+when `(typeof(window) !== 'undefined')`
+  if `!!window.OPAL_SPEC_PHANTOM`
+    require 'phantomjs'
+    formatter_class = PhantomFormatter
+  else
+    formatter_class = BrowserFormatter
+  end
 end
 
 # Uncomment the following to see example titles when they're executed.

data/stdlib/date.rb

@@ -94,6 +94,30 @@ class Date
     }
   end
 
+  def >>(n)
+    %x{
+      if (!n.$$is_number) {
+        #{raise TypeError};
+      }
+
+      var result = #{clone}, date = result.date, cur = date.getDate();
+      date.setDate(1);
+      date.setMonth(date.getMonth() + n);
+      date.setDate(Math.min(cur, days_in_month(date.getFullYear(), date.getMonth())));
+      return result;
+    }
+  end
+
+  def <<(n)
+    %x{
+      if (!n.$$is_number) {
+        #{raise TypeError};
+      }
+
+      return #{self >> `-n`};
+    }
+  end
+
   alias eql? ==
 
   def clone
@@ -104,14 +128,24 @@ class Date
     `#@date.getDate()`
   end
 
+  def friday?
+    wday == 5
+  end
+
+  def monday?
+    wday == 1
+  end
+
   def month
     `#@date.getMonth() + 1`
   end
 
   def next
-    res = self.clone
-    `res.date.setDate(#@date.getDate() + 1)`
-    res
+    self + 1
+  end
+
+  def next_day(n=1)
+    self + n
   end
 
   def next_month
@@ -124,10 +158,8 @@ class Date
     }
   end
 
-  def prev
-    res = self.clone
-    `res.date.setDate(#@date.getDate() - 1)`
-    res
+  def prev_day(n=1)
+    self - n
   end
 
   def prev_month
@@ -140,8 +172,28 @@ class Date
     }
   end
 
+  def saturday?
+    wday == 6
+  end
+
   def strftime(format = '')
-    `#@date.$strftime(#{format})`
+    %x{
+      if (format == '') {
+        return #{to_s};
+      }
+
+      return #@date.$strftime(#{format});
+    }
+  end
+
+  alias_method :succ, :next
+
+  def sunday?
+    wday == 0
+  end
+
+  def thursday?
+    wday == 4
   end
 
   def to_s
@@ -153,10 +205,18 @@ class Date
     }
   end
 
+  def tuesday?
+    wday == 2
+  end
+
   def wday
     `#@date.getDay()`
   end
 
+  def wednesday?
+    wday == 3
+  end
+
   def year
     `#@date.getFullYear()`
   end

data/stdlib/json.rb

@@ -78,7 +78,7 @@ module JSON
     options[:object_class] ||= Hash
     options[:array_class]  ||= Array
 
-    `to_opal(js_object, options.map)`
+    `to_opal(js_object, options.smap)`
   end
 
   def self.generate(obj, options = {})
@@ -136,11 +136,24 @@ end
 class Hash
   def to_json
     %x{
-      var inspect = [], keys = self.keys, map = self.map;
+      var inspect = [],
+          keys = self.keys,
+          _map = self.map,
+          smap = self.smap,
+          map, khash;
 
       for (var i = 0, length = keys.length; i < length; i++) {
         var key = keys[i];
-        inspect.push(#{`key`.to_s.to_json} + ':' + #{`map[key]`.to_json});
+
+        if (key.$$is_string) {
+          map = smap;
+          khash = key;
+        } else {
+          map = _map;
+          khash = key.$hash();
+        }
+
+        inspect.push(#{`key`.to_s.to_json} + ':' + #{`map[khash]`.to_json});
       }
 
       return '{' + inspect.join(', ') + '}';

data/stdlib/native.rb

@@ -170,7 +170,7 @@ class Native::Object < BasicObject
   end
 
   def has_key?(name)
-    `$opal.hasOwnProperty.call(#@native, #{name})`
+    `Opal.hasOwnProperty.call(#@native, #{name})`
   end
 
   alias key? has_key?
@@ -231,7 +231,7 @@ class Native::Object < BasicObject
   end
 
   def respond_to_missing?(name)
-    `$opal.hasOwnProperty.call(#@native, #{name})`
+    `Opal.hasOwnProperty.call(#@native, #{name})`
   end
 
   def method_missing(mid, *args, &block)
@@ -250,7 +250,7 @@ class Native::Object < BasicObject
   end
 
   def is_a?(klass)
-    `$opal.is_a(self, klass)`
+    `Opal.is_a(self, klass)`
   end
 
   alias kind_of? is_a?
@@ -295,7 +295,7 @@ class Native::Array
 
     %x{
       for (var i = 0, length = #{length}; i < length; i++) {
-        var value = $opal.$yield1(block, #{self[`i`]});
+        var value = Opal.yield1(block, #{self[`i`]});
 
         if (value === $breaker) {
           return $breaker.$v;
@@ -459,17 +459,27 @@ class Hash
     %x{
       if (defaults != null) {
         if (defaults.constructor === Object) {
-          var map  = self.map,
-              keys = self.keys;
+          var _map = self.map,
+              smap = self.smap,
+              keys = self.keys,
+              map, khash, value;
 
           for (var key in defaults) {
-            var value = defaults[key];
+            value = defaults[key];
+
+            if (key.$$is_string) {
+              map = smap;
+              khash = key;
+            } else {
+              map = _map;
+              khash = key.$hash();
+            }
 
             if (value && value.constructor === Object) {
-              map[key] = #{Hash.new(`value`)};
+              map[khash] = #{Hash.new(`value`)};
             }
             else {
-              map[key] = #{Native(`defaults[key]`)};
+              map[khash] = #{Native(`value`)};
             }
 
             keys.push(key);
@@ -491,19 +501,28 @@ class Hash
     %x{
       var result = {},
           keys   = self.keys,
-          map    = self.map,
-          bucket,
-          value;
+          _map   = self.map,
+          smap   = self.smap,
+          map, khash, value;
 
       for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i],
-            obj = map[key];
+        key   = keys[i];
+
+        if (key.$$is_string) {
+          map = smap;
+          khash = key;
+        } else {
+          map = _map;
+          khash = key.$hash();
+        }
 
-        if (#{`obj`.respond_to? :to_n}) {
-          result[key] = #{`obj`.to_n};
+        value = map[khash];
+
+        if (#{`value`.respond_to? :to_n}) {
+          result[key] = #{`value`.to_n};
         }
         else {
-          result[key] = obj;
+          result[key] = value;
         }
       }