opal · Nov 10, 2013 · Nov 10, 2013 · Nov 10, 2013 · Nov 10, 2013 · Nov 10, 2013
Showing with 109 additions and 33 deletions.

+83 −12 opal/core/enumerable.rb

+4 −2 opal/core/string.rb

+15 −10 opal/opal.rb

+4 −0 spec/filters/20.rb

+1 −3 spec/filters/bugs/enumerable.rb

+0 −6 spec/filters/bugs/enumerator.rb

+2 −0 spec/filters/unsupported/enumerator.rb
diff --git a/opal/core/enumerable.rb b/opal/core/enumerable.rb
@@ -122,6 +122,71 @@ def count(object = undefined, &block)
     }
   end
 
+  def cycle(n = nil, &block)
+    return enum_for :cycle, n unless block
+
+    unless n.nil?
+      n = Opal.coerce_to! n, Integer, :to_int
+
+      return if `n <= 0`
+    end
+
+    %x{
+      var result,
+          all  = [];
+
+      self.$each._p = function() {
+        var param = #{Opal.destructure(`arguments`)},
+            value = $opal.$yield1(block, param);
+
+        if (value === $breaker) {
+          result = $breaker.$v;
+          return $breaker;
+        }
+
+        all.push(param);
+      }
+
+      self.$each();
+
+      if (result !== undefined) {
+        return result;
+      }
+
+      if (all.length === 0) {
+        return nil;
+      }
+    }
+
+    if n.nil?
+      %x{
+        while (true) {
+          for (var i = 0, length = all.length; i < length; i++) {
+            var value = $opal.$yield1(block, all[i]);
+
+            if (value === $breaker) {
+              return $breaker.$v;
+            }
+          }
+        }
+      }
+    else
+      %x{
+        while (n > 1) {
+          for (var i = 0, length = all.length; i < length; i++) {
+            var value = $opal.$yield1(block, all[i]);
+
+            if (value === $breaker) {
+              return $breaker.$v;
+            }
+          }
+
+          n--;
+        }
+      }
+    end
+  end
+
   def detect(ifnone = undefined, &block)
     return enum_for :detect, ifnone unless block_given?
 
@@ -170,7 +235,7 @@ def drop(number)
           current = 0;
 
       self.$each._p = function() {
-        if (number < current) {
+        if (number <= current) {
           result.push(#{Opal.destructure(`arguments`)});
         }
 
@@ -187,22 +252,28 @@ def drop_while(&block)
     return enum_for :drop_while unless block_given?
 
     %x{
-      var result = [];
+      var result   = [],
+          dropping = true;
 
       self.$each._p = function() {
-        var param = #{Opal.destructure(`arguments`)},
-            value = $opal.$yield1(block, param);
+        var param = #{Opal.destructure(`arguments`)};
 
-        if (value === $breaker) {
-          result = $breaker.$v;
-          return $breaker;
-        }
+        if (dropping) {
+          var value = $opal.$yield1(block, param);
 
-        if (#{Opal.truthy?(`value`)}) {
-          return;
-        }
+          if (value === $breaker) {
+            result = $breaker.$v;
+            return $breaker;
+          }
 
-        result.push(param);
+          if (#{Opal.falsy?(`value`)}) {
+            dropping = false;
+            result.push(param);
+          }
+        }
+        else {
+          result.push(param);
+        }
       };
 
       self.$each();

diff --git a/opal/core/string.rb b/opal/core/string.rb
@@ -267,7 +267,7 @@ def empty?
   def end_with?(*suffixes)
     %x{
       for (var i = 0, length = suffixes.length; i < length; i++) {
-        var suffix = suffixes[i];
+        var suffix = #{Opal.coerce_to `suffixes[i]`, String, :to_str};
 
         if (self.length >= suffix.length && self.substr(0 - suffix.length) === suffix) {
           return true;
@@ -563,7 +563,9 @@ def split(pattern = $; || ' ', limit = undefined)
   def start_with?(*prefixes)
     %x{
       for (var i = 0, length = prefixes.length; i < length; i++) {
-        if (#{self}.indexOf(prefixes[i]) === 0) {
+        var prefix = #{Opal.coerce_to `prefixes[i]`, String, :to_str};
+
+        if (self.indexOf(prefix) === 0) {
           return true;
         }
       }

diff --git a/opal/opal.rb b/opal/opal.rb
@@ -28,21 +28,26 @@
 $& = $~ = $` = $' = nil
 
 # stub library path
-$:            = []
+$: = []
+$" = []
 
 # split lines
-$/            = "\n"
-$,            = " "
+$/ = "\n"
+$, = " "
 
-ARGV          = []
-ARGF          = Object.new
-ENV           = {}
+ARGV = []
+ARGF = Object.new
+ENV  = {}
 
-RUBY_PLATFORM = 'opal'
-RUBY_ENGINE   = 'opal'
-RUBY_VERSION  = '1.9.3'
+$VERBOSE = false
+$DEBUG   = false
+$SAFE    = 0
+
+RUBY_PLATFORM       = 'opal'
+RUBY_ENGINE         = 'opal'
+RUBY_VERSION        = '1.9.3'
 RUBY_ENGINE_VERSION = '0.5.1'
-RUBY_RELEASE_DATE = '2013-11-10'
+RUBY_RELEASE_DATE   = '2013-08-13'
 
 module Opal
   def self.coerce_to(object, type, method)

diff --git a/spec/filters/20.rb b/spec/filters/20.rb
@@ -0,0 +1,4 @@
+opal_filter "2.0 behaviour" do
+  fails "Enumerator.new ignores block if arg given"
+  fails "String#end_with? ignores arguments not convertible to string"
+end
diff --git a/spec/filters/bugs/enumerable.rb b/spec/filters/bugs/enumerable.rb
@@ -1,7 +1,5 @@
 opal_filter "Enumerable" do
-  fails "Enumerable#drop passed a number n as an argument tries to convert n to an Integer using #to_int"
-
-  fails "Enumerable#drop_while passes elements to the block until the first false"
+  fails "Enumerable#cycle passed a number n as an argument raises an ArgumentError if more arguments are passed"
 
   fails "Enumerable#each_slice raises an Argument Error if there is not a single parameter > 0"
 

diff --git a/spec/filters/bugs/enumerator.rb b/spec/filters/bugs/enumerator.rb
diff --git a/spec/filters/unsupported/enumerator.rb b/spec/filters/unsupported/enumerator.rb
@@ -8,4 +8,6 @@
   fails "Enumerator#rewind has no effect on a new enumerator"
   fails "Enumerator#rewind has no effect if called multiple, consecutive times"
   fails "Enumerator#rewind does nothing if the object doesn't have a #rewind method"
+  fails "Enumerator#rewind works with peek to reset the position"
+  fails "Enumerator#rewind calls the enclosed object's rewind method if one exists"
 end