opal 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdf74450cbd2b81a0d8ba44700ef6e0e77b5ca45
-  data.tar.gz: 01e6a0e881a43bdaa1eb4db93c0e1989ca1d4568
+  metadata.gz: 8fd073f86d2b6572a34ed96ac1e8bc35e14be214
+  data.tar.gz: 5f55dcc5f1e555bc2d53afababdfedd8a1fc480e
 SHA512:
-  metadata.gz: 90d5d6913908ef1d38f69d029d6033fbcd0d2214035a3cf34ebe5c5d8725e2bd37689009dbbd28e99ca27f9069cfe09b44445a0a3710e3d0e71f0d1ce00dd72b
-  data.tar.gz: bca3fd06513433d71ff656a473acf3269caa301a55589fdccea45cc463d9f865b6d558bbc1f427552f46586172f6f053cf6396cb5bbe193aa2e5b113783d0a86
+  metadata.gz: 8db2e2f1545e635e7822d52fe6a009ac2d50d335bd7a2855e0ac44f5eff366171106eec3d783ef3600924d60d28c042d634056119b594f54fa44d1f600952776
+  data.tar.gz: ba90ff768744ca87c6d5a54070292d6d6877dfbf4c3c21bdaa3fe73d13258acfaeea85bf8900251b42d325ce78a7b80b1479606cd1ec504516dd7bb4595f86f3

data/Gemfile

@@ -1,8 +1,6 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'opal-sprockets', :github => 'opal/opal-sprockets'
-
 # Stick with older racc until
 # https://github.com/tenderlove/racc/issues/32
 # is solved.

data/README.md

@@ -71,7 +71,7 @@ visit `http://localhost:9292/` in any web browser.
 What code is supposed to run where?
 
 * `lib/` code runs inside your ruby env. It compiles ruby to javascript.
-* `corelib/` is the runtime/corelib for our implementation (runs in browser)
+* `opal/` is the runtime/corelib for our implementation (runs in browser)
 * `stdlib/` is our implementation of ruby stdlib. It is optional (for browser).
 
 ### lib

data/Rakefile

@@ -54,9 +54,12 @@ task :dist do
   env = Opal::Environment.new
 
   Dir.mkdir 'build' unless File.directory? 'build'
+  libs = Dir['{opal,stdlib}/*.rb'].map { |lib| File.basename(lib, '.rb') }
+  width = libs.map(&:size).max
 
-  %w[opal opal-parser].each do |lib|
-    puts "* building #{lib}..."
+  libs.each do |lib|
+    print "* building #{lib}...".ljust(width+'* building ... '.size)
+    $stdout.flush
 
     src = env[lib].to_s
     min = uglify src
@@ -66,11 +69,11 @@ task :dist do
     File.open("build/#{lib}.min.js", 'w+')    { |f| f << min } if min
     File.open("build/#{lib}.min.js.gz", 'w+') { |f| f << gzp } if gzp
 
-    print "done. (development: #{src.size}B"
-    print ", minified: #{min.size}B" if min
-    print ", gzipped: #{gzp.size}Bx"  if gzp
+    print "done. ("
+    print "development: #{('%.2f' % (src.size/1000.0)).rjust(6)}KB"
+    print  ", minified: #{('%.2f' % (min.size/1000.0)).rjust(6)}KB" if min
+    print   ", gzipped: #{('%.2f' % (gzp.size/1000.0)).rjust(6)}KB" if gzp
     puts  ")."
-    puts
   end
 end
 
@@ -81,7 +84,7 @@ end
 
 # Used for uglifying source to minify
 def uglify(str)
-  IO.popen('uglifyjs', 'r+') do |i|
+  IO.popen('uglifyjs 2> /dev/null', 'r+') do |i|
     i.puts str
     i.close_write
     return i.read
@@ -93,7 +96,7 @@ end
 
 # Gzip code to check file size
 def gzip(str)
-  IO.popen('gzip -f', 'r+') do |i|
+  IO.popen('gzip -f 2> /dev/null', 'r+') do |i|
     i.puts str
     i.close_write
     return i.read

data/lib/opal.rb

@@ -16,7 +16,7 @@ module Opal
   end
 
   def self.core_dir
-    File.expand_path('../../corelib', __FILE__.untaint)
+    File.expand_path('../../opal', __FILE__.untaint)
   end
 
   def self.std_dir

data/lib/opal/version.rb

@@ -1,3 +1,3 @@
 module Opal
-  VERSION = '0.5.0'
+  VERSION = '0.5.2'
 end

data/opal.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'mspec', '1.5.20'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'racc'
-  s.add_development_dependency 'opal-sprockets', '~> 0.2.1'
+  s.add_development_dependency 'opal-sprockets', '~> 0.3.0'
   s.add_development_dependency 'rspec', '~> 2.14'
   s.add_development_dependency 'octokit', '~> 2.4.0'
 end

data/{corelib → opal/core}/array.rb

@@ -353,27 +353,42 @@ class Array
   end
 
   def cycle(n = nil, &block)
-    return if `self.length === 0 || n === 0`
+    return if empty? || n == 0
+
     return enum_for :cycle, n unless block
 
-    if `n === nil`
-      while true
-        if `#{(value = each(&block))} !== self`
-          return value
-        end
-      end
+    if n.nil?
+      %x{
+        while (true) {
+          for (var i = 0, length = self.length; i < length; i++) {
+            var value = $opal.$yield1(block, self[i]);
+
+            if (value === $breaker) {
+              return $breaker.$v;
+            }
+          }
+        }
+      }
     else
-      cycles = Opal.coerce_to n, Integer, :to_int
+      n = Opal.coerce_to! n, Integer, :to_int
 
-      unless Integer === cycles
-        raise TypeError, "can't convert #{n.class} into Integer (#{n.class}#to_int gives #{cycles.class}"
-      end
+      %x{
+        if (n <= 0) {
+          return self;
+        }
 
-      while cycles > 0
-        each(&block)
+        while (n > 0) {
+          for (var i = 0, length = self.length; i < length; i++) {
+            var value = $opal.$yield1(block, self[i]);
 
-        cycles -= 1
-      end
+            if (value === $breaker) {
+              return $breaker.$v;
+            }
+          }
+
+          n--;
+        }
+      }
     end
 
     self
@@ -459,6 +474,12 @@ class Array
   end
 
   def concat(other)
+    if Array === other
+      other = other.to_a
+    else
+      other = Opal.coerce_to other, Array, :to_ary
+    end
+
     %x{
       for (var i = 0, length = other.length; i < length; i++) {
         self.push(other[i]);
@@ -592,7 +613,12 @@ class Array
         return defaults;
       }
 
-      #{ raise IndexError, "Array#fetch" };
+      if (self.length === 0) {
+        #{raise IndexError, "index #{`original`} outside of array bounds: 0...0"}
+      }
+      else {
+        #{raise IndexError, "index #{`original`} outside of array bounds: -#{`self.length`}...#{`self.length`}"};
+      }
     }
   end
 
@@ -707,17 +733,17 @@ class Array
       for (var i = 0, length = self.length; i < length; i++) {
         var item = self[i];
 
-        if (#{`item`.respond_to?(:to_ary)}) {
+        if (#{`item`.respond_to? :to_ary}) {
           item = #{`item`.to_ary};
 
           if (level == null) {
-            result = result.concat(#{`item`.flatten});
+            result.push.apply(result, #{`item`.flatten.to_a});
           }
-          else if (level === 0) {
+          else if (level == 0) {
             result.push(item);
           }
           else {
-            result = result.concat(#{`item`.flatten(`level - 1`)});
+            result.push.apply(result, #{`item`.flatten(`level - 1`).to_a});
           }
         }
         else {
@@ -1056,7 +1082,7 @@ class Array
       for (var i = 0, length = self.length, item, value; i < length; i++) {
         item = self[i];
 
-        if ((value = block(item)) === $breaker) {
+        if ((value = $opal.$yield1(block, item)) === $breaker) {
           return $breaker.$v;
         }
 
@@ -1222,25 +1248,6 @@ class Array
 
   alias to_ary to_a
 
-  def to_n
-    %x{
-      var result = [], obj
-
-      for (var i = 0, len = self.length; i < len; i++) {
-        obj = self[i];
-
-        if (#{`obj`.respond_to? :to_n}) {
-          result.push(#{`obj`.to_n});
-        }
-        else {
-          result.push(obj);
-        }
-      }
-
-      return result;
-    }
-  end
-
   alias to_s inspect
 
   def transpose

data/{corelib → opal/core}/basic_object.rb

@@ -6,6 +6,10 @@ class BasicObject
     `self === other`
   end
 
+  def __id__
+    `self._id || (self._id = Opal.uid())`
+  end
+
   def __send__(symbol, *args, &block)
     %x{
       var func = self['$' + symbol]

data/{corelib → opal/core}/boolean.rb

@@ -28,14 +28,10 @@ class Boolean
   def to_s
     `(self == true) ? 'true' : 'false'`
   end
-
-  def to_n
-    `self.valueOf()`
-  end
 end
 
-TrueClass = Boolean
+TrueClass  = Boolean
 FalseClass = Boolean
 
-TRUE = true
+TRUE  = true
 FALSE = false

data/{corelib → opal/core}/enumerable.rb

@@ -122,6 +122,71 @@ module Enumerable
     }
   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 @@ module Enumerable
           current = 0;
 
       self.$each._p = function() {
-        if (number < current) {
+        if (number <= current) {
           result.push(#{Opal.destructure(`arguments`)});
         }
 
@@ -187,22 +252,28 @@ module Enumerable
     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();
@@ -214,6 +285,10 @@ module Enumerable
   def each_slice(n, &block)
     n = Opal.coerce_to n, Integer, :to_int
 
+    if `n <= 0`
+      raise ArgumentError, 'invalid slice size'
+    end
+
     return enum_for :each_slice, n unless block_given?
 
     %x{
@@ -252,8 +327,8 @@ module Enumerable
     nil
   end
 
-  def each_with_index(&block)
-    return enum_for :each_with_index unless block_given?
+  def each_with_index(*args, &block)
+    return enum_for :each_with_index, *args unless block_given?
 
     %x{
       var result,
@@ -271,14 +346,14 @@ module Enumerable
         index++;
       };
 
-      self.$each();
+      self.$each.apply(self, args);
 
       if (result !== undefined) {
         return result;
       }
     }
 
-    nil
+    self
   end
 
   def each_with_object(object, &block)
@@ -307,7 +382,7 @@ module Enumerable
     object
   end
 
-  def entries
+  def entries(*args)
     %x{
       var result = [];
 
@@ -315,7 +390,7 @@ module Enumerable
         result.push(#{Opal.destructure(`arguments`)});
       };
 
-      self.$each();
+      self.$each.apply(self, args);
 
       return result;
     }
@@ -393,35 +468,47 @@ module Enumerable
   end
 
   def first(number = undefined)
-    %x{
-      if (number == null) {
-        var result = nil;
+    if `number === undefined`
+      result = nil
 
+      %x{
         self.$each._p = function() {
           result = #{Opal.destructure(`arguments`)};
+
           return $breaker;
         };
+
+        self.$each();
       }
-      else {
+    else
+      result = []
+      number = Opal.coerce_to number, Integer, :to_int
+
+      if `number < 0`
+        raise ArgumentError, 'attempt to take negative size'
+      end
+
+      if `number == 0`
+        return []
+      end
+
+      %x{
         var current = 0,
-            result  = [],
             number  = #{Opal.coerce_to number, Integer, :to_int};
 
         self.$each._p = function() {
-          if (number <= current) {
-            return $breaker;
-          }
-
           result.push(#{Opal.destructure(`arguments`)});
 
-          current++;
+          if (number <= ++current) {
+            return $breaker;
+          }
         };
-      }
 
-      self.$each();
+        self.$each();
+      }
+    end
 
-      return result;
-    }
+    result
   end
 
   def grep(pattern, &block)
@@ -465,7 +552,7 @@ module Enumerable
   def group_by(&block)
     return enum_for :group_by unless block_given?
 
-    hash = Hash.new { |h, k| h[k] = [] }
+    hash = Hash.new
 
     %x{
       var result;
@@ -479,7 +566,7 @@ module Enumerable
           return $breaker;
         }
 
-        #{hash[`value`] << `param`};
+        #{(hash[`value`] ||= []) << `param`};
       }
 
       self.$each();
@@ -493,14 +580,29 @@ module Enumerable
   end
 
   def include?(obj)
-    any? { |v| v == obj }
+    %x{
+      var result = false;
+
+      self.$each._p = function() {
+        var param = #{Opal.destructure(`arguments`)};
+
+        if (#{`param` == obj}) {
+          result = true;
+          return $breaker;
+        }
+      }
+
+      self.$each();
+
+      return result;
+    }
   end
 
   def inject(object = undefined, sym = undefined, &block)
     %x{
       var result = object;
 
-      if (block !== nil) {
+      if (block !== nil && sym === undefined) {
         self.$each._p = function() {
           var value = #{Opal.destructure(`arguments`)};
 
@@ -547,6 +649,18 @@ module Enumerable
     }
   end
 
+  def lazy
+    Enumerator::Lazy.new(self, enumerator_size) {|enum, *args|
+      enum.yield(*args)
+    }
+  end
+
+  def enumerator_size
+    respond_to?(:size) ? size : nil
+  end
+
+  private :enumerator_size
+
   alias map collect
 
   def max(&block)
@@ -569,6 +683,10 @@ module Enumerable
             return $breaker;
           }
 
+          if (value === nil) {
+            #{raise ArgumentError, "comparison failed"};
+          }
+
           if (value > 0) {
             result = param;
           }
@@ -583,7 +701,7 @@ module Enumerable
             return;
           }
 
-          if (#{`param` <=> `result`} > 0) {
+          if (#{Opal.compare(`param`, `result`)} > 0) {
             result = param;
           }
         };
@@ -651,6 +769,10 @@ module Enumerable
             return $breaker;
           }
 
+          if (value === nil) {
+            #{raise ArgumentError, "comparison failed"};
+          }
+
           if (value < 0) {
             result = param;
           }
@@ -665,7 +787,7 @@ module Enumerable
             return;
           }
 
-          if (#{`param` <=> `result`} < 0) {
+          if (#{Opal.compare(`param`, `result`)} < 0) {
             result = param;
           }
         };