opal 0.3.41 → 0.3.42

data/opal/opal/class.rb

@@ -96,14 +96,18 @@ class Class
 
   def attr_reader(*names)
     %x{
-      var proto = #{self}.prototype;
+      var proto = #{self}.prototype, cls = #{self};
       for (var i = 0, length = names.length; i < length; i++) {
         (function(name) {
           proto[name] = nil;
-
-          proto['$' + name] = function() {
-            return this[name];
-          };
+          var func = function() { return this[name] };
+
+          if (cls._isSingleton) {
+            proto._defs('$' + name, func);
+          }
+          else {
+            proto['$' + name] = func;
+          }
         })(names[i]);
       }
     }
@@ -113,14 +117,18 @@ class Class
 
   def attr_writer(*names)
     %x{
-      var proto = #{self}.prototype;
+      var proto = #{self}.prototype, cls = #{self};
       for (var i = 0, length = names.length; i < length; i++) {
         (function(name) {
           proto[name] = nil;
-
-          proto['$' + name + '='] = function(value) {
-            return this[name] = value;
-          };
+          var func = function(value) { return this[name] = value; };
+
+          if (cls._isSingleton) {
+            proto._defs('$' + name + '=', func);
+          }
+          else {
+            proto['$' + name + '='] = func;
+          }
         })(names[i]);
       }
     }
@@ -129,6 +137,10 @@ class Class
 
   alias attr attr_accessor
 
+  def const_defined?(name)
+    `!!(#{self}._scope[#{name}])`
+  end
+
   def const_get(name)
     %x{
       var result = #{self}._scope[name];
@@ -155,8 +167,12 @@ class Class
     }
   end
 
-  def define_method(name, &block)
+  def define_method(name, method = undefined, &block)
     %x{
+      if (method) {
+        block = method;
+      }
+
       if (block === nil) {
         no_block_given();
       }
@@ -234,16 +250,38 @@ class Class
 
   alias class_eval module_eval
 
+  def method_defined?(method)
+    %x{
+      if (typeof(#{self}.prototype['$' + method]) === 'function') {
+        return true;
+      }
+
+      return false;
+    }
+  end
+
+  def module_function(*methods)
+    %x{
+      for (var i = 0, length = methods.length; i < length; i++) {
+        var meth = methods[i], func = #{self}.prototype['$' + meth];
+
+        #{self}['$' + meth] = func;
+      }
+
+      return #{self};
+    }
+  end
+
   def name
     `#{self}._name`
   end
 
-  def new(*)
+  def new(*args, &block)
     %x{
-      var args = __slice.call(arguments);
       var obj = new #{self};
       obj._id = Opal.uid();
 
+      obj.$initialize._p = block;
       obj.$initialize.apply(obj, args);
       return obj;
     }

data/opal/opal/date.rb

@@ -1,10 +1,5 @@
 native_date = `Date`
 
-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 Date
   def self.wrap(native)
     instance = allocate
@@ -114,21 +109,7 @@ class Date
   end
 
   def strftime(format = '')
-    %x{
-      var d = #{self}._date;
-
-      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 ;
-        }
-      });
-    }
+    `#{self}._date.$strftime(#{format})`
   end
 
   def to_s

data/opal/opal/enumerable.rb

@@ -6,11 +6,15 @@ module Enumerable
       if (block !== nil) {
         proc = function(obj) {
           var value;
-
-          if ((value = block(obj)) === __breaker) {
+          var args = [];
+          for(var i = 0; i < arguments.length; i ++) {
+            args[i] = arguments[i];
+          }
+          
+          if ((value = block.apply(#{self}, args)) === __breaker) {
             return __breaker.$v;
           }
-
+             
           if (value === false || value === nil) {
             result = false;
             __breaker.$v = nil;
@@ -21,7 +25,7 @@ module Enumerable
       }
       else {
         proc = function(obj) {
-          if (obj === false || obj === nil) {
+          if ((obj === false || obj === nil) && arguments.length < 2) {  
             result = false;
             __breaker.$v = nil;
 
@@ -30,21 +34,26 @@ module Enumerable
         }
       }
 
-      #{self}.$each(proc);
+      #{self}.$each._p = proc;
+      #{self}.$each();
 
       return result;
     }
   end
 
-  def any?(&block)
+  def any?(&block) 
     %x{
       var result = false, proc;
 
       if (block !== nil) {
         proc = function(obj) {
           var value;
-
-          if ((value = block(obj)) === __breaker) {
+          var args = [];
+          for(var i = 0; i < arguments.length; i ++) {
+            args[i] = arguments[i];
+          }
+          
+          if ((value = block.apply(#{self}, args)) === __breaker) {
             return __breaker.$v;
           }
 
@@ -58,16 +67,17 @@ module Enumerable
       }
       else {
         proc = function(obj) {
-          if (obj !== false && obj !== nil) {
+          if ((obj !== false && obj !== nil) || arguments.length >= 2) {
             result      = true;
             __breaker.$v = nil;
-
+            
             return __breaker;
           }
         }
       }
 
-      #{self}.$each(proc);
+      #{self}.$each._p = proc;
+      #{self}.$each();
 
       return result;
     }
@@ -87,7 +97,8 @@ module Enumerable
         result.push(value);
       };
 
-      #{self}.$each(proc);
+      #{self}.$each._p = proc;
+      #{self}.$each();
 
       return result;
     }
@@ -110,7 +121,8 @@ module Enumerable
         result = value;
       };
 
-      #{self}.$each(proc);
+      #{self}.$each._p = proc;
+      #{self}.$each();
 
       return result;
     }
@@ -139,7 +151,8 @@ module Enumerable
         }
       }
 
-      #{self}.$each(proc);
+      #{self}.$each._p = proc;
+      #{self}.$each();
 
       return result;
     }
@@ -149,7 +162,7 @@ module Enumerable
     %x{
       var result = nil;
 
-      #{self}.$each(function(obj) {
+      #{self}.$each._p = function(obj) {
         var value;
 
         if ((value = block(obj)) === __breaker) {
@@ -162,7 +175,9 @@ module Enumerable
 
           return __breaker;
         }
-      });
+      };
+
+      #{self}.$each();
 
       if (result !== nil) {
         return result;
@@ -181,13 +196,15 @@ module Enumerable
       var result  = [],
           current = 0;
 
-      #{self}.$each(function(obj) {
+      #{self}.$each._p = function(obj) {
         if (number < current) {
           result.push(e);
         }
 
         current++;
-      });
+      };
+
+      #{self}.$each()
 
       return result;
     }
@@ -197,7 +214,7 @@ module Enumerable
     %x{
       var result = [];
 
-      #{self}.$each(function(obj) {
+      #{self}.$each._p = function(obj) {
         var value;
 
         if ((value = block(obj)) === __breaker) {
@@ -210,7 +227,9 @@ module Enumerable
         }
 
         return __breaker;
-      });
+      };
+
+      #{self}.$each();
 
       return result;
     }
@@ -220,14 +239,16 @@ module Enumerable
     %x{
       var all = [];
 
-      #{self}.$each(function(obj) {
+      #{self}.$each._p = function(obj) {
         all.push(obj);
 
         if (all.length == n) {
           block(all.slice(0));
           all = [];
         }
-      });
+      };
+
+      #{self}.$each();
 
       // our "last" group, if smaller than n then wont have been yielded
       if (all.length > 0) {
@@ -242,7 +263,7 @@ module Enumerable
     %x{
       var index = 0;
 
-      #{self}.$each(function(obj) {
+      #{self}.$each._p = function(obj) {
         var value;
 
         if ((value = block(obj, index)) === __breaker) {
@@ -250,7 +271,8 @@ module Enumerable
         }
 
         index++;
-      });
+      };
+      #{self}.$each();
 
       return nil;
     }
@@ -258,13 +280,15 @@ module Enumerable
 
   def each_with_object(object, &block)
     %x{
-      #{self}.$each(function(obj) {
+      #{self}.$each._p = function(obj) {
         var value;
 
         if ((value = block(obj, object)) === __breaker) {
           return __breaker.$v;
         }
-      });
+      };
+
+      #{self}.$each();
 
       return object;
     }
@@ -274,9 +298,11 @@ module Enumerable
     %x{
       var result = [];
 
-      #{self}.$each(function(obj) {
+      #{self}.$each._p = function(obj) {
         result.push(obj);
-      });
+      };
+
+      #{self}.$each();
 
       return result;
     }
@@ -288,7 +314,7 @@ module Enumerable
     %x{
       var result = [];
 
-      #{self}.$each(function(obj) {
+      #{self}.$each._p = function(obj) {
         var value;
 
         if ((value = block(obj)) === __breaker) {
@@ -298,7 +324,9 @@ module Enumerable
         if (value !== false && value !== nil) {
           result.push(obj);
         }
-      });
+      };
+
+      #{self}.$each();
 
       return result;
     }
@@ -335,7 +363,8 @@ module Enumerable
         };
       }
 
-      #{self}.$each(proc);
+      #{self}.$each._p = proc;
+      #{self}.$each();
 
       return result;
     }
@@ -364,7 +393,8 @@ module Enumerable
           };
       }
 
-      #{self}.$each(proc);
+      #{self}.$each._p = proc;
+      #{self}.$each();
 
       return result;
     }
@@ -374,7 +404,7 @@ module Enumerable
     %x{
       var result = [];
 
-      #{self}.$each(block !== nil
+      #{self}.$each._p = (block !== nil
         ? function(obj) {
             var value = #{pattern === `obj`};
 
@@ -394,6 +424,8 @@ module Enumerable
             }
           });
 
+      #{self}.$each();
+
       return result;
     }
   end
@@ -418,3 +450,4 @@ module Enumerable
 
   alias inject reduce
 end
+

data/opal/opal/error.rb

@@ -43,3 +43,5 @@ class IndexError < Exception; end
 class KeyError < Exception; end
 class RangeError < Exception; end
 class StopIteration < Exception; end
+class SyntaxError < Exception; end
+class SystemExit < Exception; end

data/opal/opal/hash.rb

@@ -312,7 +312,7 @@ class Hash
         return defaults;
       }
 
-      #{ raise "key not found" };
+      #{ raise KeyError, "key not found" };
     }
   end