opal 0.9.4 → 0.10.0.beta1

data/opal/corelib/enumerator.rb

@@ -67,23 +67,12 @@ class Enumerator
         var param = #{Opal.destructure(`arguments`)},
             value = block(param, index);
 
-        if (value === $breaker) {
-          result = $breaker.$v;
-          return $breaker;
-        }
-
         index++;
 
         return value;
       }
 
-      self.$each();
-
-      if (result !== undefined) {
-        return result;
-      }
-
-      return self.object;
+      return self.$each();
     }
   end
 
@@ -115,9 +104,7 @@ class Enumerator
         try {
           args.unshift(#{yielder});
 
-          if (Opal.yieldX(#@block, args) === $breaker) {
-            return $breaker.$v;
-          }
+          Opal.yieldX(#@block, args);
         }
         catch (e) {
           if (e === $breaker) {
@@ -173,9 +160,7 @@ class Enumerator
             %x{
               args.unshift(#{yielder});
 
-              if (Opal.yieldX(block, args) === $breaker) {
-                return $breaker;
-              }
+              Opal.yieldX(block, args);
             }
           }
         rescue Exception
@@ -199,10 +184,6 @@ class Enumerator
         %x{
           var value = Opal.yieldX(block, args);
 
-          if (value === $breaker) {
-            return $breaker;
-          }
-
           #{enum.yield `value`};
         }
       }
@@ -217,10 +198,6 @@ class Enumerator
         %x{
           var value = Opal.yieldX(block, args);
 
-          if (value === $breaker) {
-            return $breaker;
-          }
-
           if (#{`value`.respond_to? :force} && #{`value`.respond_to? :each}) {
             #{`value`.each { |v| enum.yield v }}
           }
@@ -273,10 +250,6 @@ class Enumerator
           %x{
             var value = Opal.yieldX(block, args);
 
-            if (value === $breaker) {
-              return $breaker;
-            }
-
             if (#{Opal.falsy?(`value`)}) {
               succeeding = false;
 
@@ -302,10 +275,6 @@ class Enumerator
         %x{
           var value = Opal.yieldX(block, args);
 
-          if (value === $breaker) {
-            return $breaker;
-          }
-
           if (#{Opal.truthy?(`value`)}) {
             #{enum.yield(*args)};
           }
@@ -325,10 +294,6 @@ class Enumerator
             if (#{Opal.truthy?(`value`)}) {
               value = Opal.yield1(block, param);
 
-              if (value === $breaker) {
-                return $breaker;
-              }
-
               #{enum.yield `Opal.yield1(block, param)`};
             }
           }
@@ -360,10 +325,6 @@ class Enumerator
         %x{
           var value = Opal.yieldX(block, args);
 
-          if (value === $breaker) {
-            return $breaker;
-          }
-
           if (#{Opal.falsy?(`value`)}) {
             #{enum.yield(*args)};
           }
@@ -405,10 +366,6 @@ class Enumerator
         %x{
           var value = Opal.yieldX(block, args);
 
-          if (value === $breaker) {
-            return $breaker;
-          }
-
           if (#{Opal.truthy?(`value`)}) {
             #{enum.yield(*args)};
           }

data/opal/corelib/error.rb

@@ -118,14 +118,14 @@ class NameError
   
   def initialize(message, name=nil)
     super message
-    @name = name  
+    @name = name
   end
 end
 
 class NoMethodError
   attr_reader :args
   
-  def initialize(message, name, args=[])
+  def initialize(message, name=nil, args=[])
     super message, name
     @args = args
   end

data/opal/corelib/file.rb

@@ -9,6 +9,7 @@ class File < IO
       parts = path.split(SEPARATOR)
       new_parts = []
       parts[0] = Dir.home if parts.first == '~'
+      parts[0] = Dir.pwd if parts.first == '.'
 
       parts.each do |part|
         if part == '..'
@@ -22,13 +23,24 @@ class File < IO
     alias realpath expand_path
 
     def dirname(path)
-      split(path)[0..-2]
+      split(path)[0..-2].join(SEPARATOR)
     end
 
     def basename(path)
       split(path)[-1]
     end
 
+    def extname(path)
+      raise TypeError, 'no implicit conversion of nil into String' if path.nil?
+      path = path.to_path if path.respond_to?(:to_path)
+      raise TypeError, "no implicit conversion of #{path.class} into String" unless path.is_a?(String)
+      filename = basename(path)
+      return '' if filename.nil?
+      last_dot_idx = filename[1..-1].rindex('.')
+      # extension name must contains at least one character .(something)
+      (last_dot_idx.nil? || last_dot_idx + 1 == filename.length - 1) ? '' : filename[(last_dot_idx + 1)..-1]
+    end
+
     def exist? path
       `Opal.modules[#{path}] != null`
     end

data/opal/corelib/hash.rb

@@ -61,8 +61,8 @@ class Hash
 
       Opal.hash_init(hash);
 
-      hash.none = nil;
-      hash.proc = nil;
+      hash.$$none = nil;
+      hash.$$proc = nil;
 
       return hash;
     }
@@ -77,8 +77,8 @@ class Hash
       if (defaults !== undefined && block !== nil) {
         #{raise ArgumentError, 'wrong number of arguments (1 for 0)'}
       }
-      self.none = (defaults === undefined ? nil : defaults);
-      self.proc = block;
+      self.$$none = (defaults === undefined ? nil : defaults);
+      self.$$proc = block;
     }
     self
   end
@@ -175,25 +175,33 @@ class Hash
   end
 
   def default(key = undefined)
-    %x{
-      if (key !== undefined && #@proc !== nil) {
-        return #@proc.$call(self, key);
+     %x{
+      if (key !== undefined && self.$$proc !== nil && self.$$proc !== undefined) {
+        return self.$$proc.$call(self, key);
+      }
+      if (self.$$none === undefined) {
+        return nil;
       }
-      return #@none;
+      return self.$$none;
     }
   end
 
   def default=(object)
     %x{
-      self.proc = nil;
-      self.none = object;
+      self.$$proc = nil;
+      self.$$none = object;
 
       return object;
     }
   end
 
   def default_proc
-    @proc
+     %x{
+       if (self.$$proc !== undefined) {
+         return self.$$proc;
+       }
+       return nil;
+     }
   end
 
   def default_proc=(proc)
@@ -206,8 +214,8 @@ class Hash
         }
       }
 
-      self.none = nil;
-      self.proc = proc;
+      self.$$none = nil;
+      self.$$proc = proc;
 
       return proc;
     }
@@ -245,10 +253,6 @@ class Hash
 
         obj = block(key, value);
 
-        if (obj === $breaker) {
-          return $breaker.$v;
-        }
-
         if (obj !== false && obj !== nil) {
           if (Opal.hash_delete(self, key) !== undefined) {
             length--;
@@ -267,7 +271,7 @@ class Hash
     return enum_for(:each){self.size} unless block
 
     %x{
-      for (var i = 0, keys = self.$$keys, length = keys.length, key, value, obj; i < length; i++) {
+      for (var i = 0, keys = self.$$keys, length = keys.length, key, value; i < length; i++) {
         key = keys[i];
 
         if (key.$$is_string) {
@@ -277,11 +281,7 @@ class Hash
           key = key.key;
         }
 
-        obj = Opal.yield1(block, [key, value]);
-
-        if (obj === $breaker) {
-          return $breaker.$v;
-        }
+        Opal.yield1(block, [key, value]);
       }
 
       return self;
@@ -295,9 +295,7 @@ class Hash
       for (var i = 0, keys = self.$$keys, length = keys.length, key; i < length; i++) {
         key = keys[i];
 
-        if (block(key.$$is_string ? key : key.key) === $breaker) {
-          return $breaker.$v;
-        }
+        block(key.$$is_string ? key : key.key);
       }
 
       return self;
@@ -313,9 +311,7 @@ class Hash
       for (var i = 0, keys = self.$$keys, length = keys.length, key; i < length; i++) {
         key = keys[i];
 
-        if (block(key.$$is_string ? self.$$smap[key] : key.value) === $breaker) {
-          return $breaker.$v;
-        }
+        block(key.$$is_string ? self.$$smap[key] : key.value);
       }
 
       return self;
@@ -337,13 +333,7 @@ class Hash
       }
 
       if (block !== nil) {
-        value = block(key);
-
-        if (value === $breaker) {
-          return $breaker.$v;
-        }
-
-        return value;
+        return block(key);
       }
 
       if (defaults !== undefined) {
@@ -578,10 +568,6 @@ class Hash
 
         obj = block(key, value);
 
-        if (obj === $breaker) {
-          return $breaker.$v;
-        }
-
         if (obj === false || obj === nil) {
           if (Opal.hash_delete(self, key) !== undefined) {
             length--;
@@ -721,10 +707,6 @@ class Hash
 
         obj = block(key, value);
 
-        if (obj === $breaker) {
-          return $breaker.$v;
-        }
-
         if (obj === false || obj === nil) {
           Opal.hash_put(hash, key, value);
         }
@@ -752,10 +734,6 @@ class Hash
 
         obj = block(key, value);
 
-        if (obj === $breaker) {
-          return $breaker.$v;
-        }
-
         if (obj !== false && obj !== nil) {
           if (Opal.hash_delete(self, key) !== undefined) {
             changes_were_made = true;
@@ -816,10 +794,6 @@ class Hash
 
         obj = block(key, value);
 
-        if (obj === $breaker) {
-          return $breaker.$v;
-        }
-
         if (obj !== false && obj !== nil) {
           Opal.hash_put(hash, key, value);
         }
@@ -847,10 +821,6 @@ class Hash
 
         obj = block(key, value);
 
-        if (obj === $breaker) {
-          return $breaker.$v;
-        }
-
         if (obj === false || obj === nil) {
           if (Opal.hash_delete(self, key) !== undefined) {
             length--;

data/opal/corelib/helpers.rb

@@ -113,4 +113,14 @@ module Opal
 
     name
   end
+
+  def self.const_name!(const_name)
+    const_name = Opal.coerce_to!(const_name, String, :to_str)
+
+    if const_name[0] != const_name[0].upcase
+      raise NameError, "wrong constant name #{const_name}"
+    end
+
+    const_name
+  end
 end

data/opal/corelib/kernel.rb

@@ -971,9 +971,7 @@ module Kernel
   def loop(&block)
     %x{
       while (true) {
-        if (block() === $breaker) {
-          return $breaker.$v;
-        }
+        block()
       }
     }
 
@@ -1175,6 +1173,11 @@ module Kernel
   def throw(*args)
     raise UncaughtThrowError.new(args)
   end
+
+  # basic implementation of open, delegate to File.open
+  def open(*args, &block)
+    File.open(*args, &block)
+  end
 end
 
 class Object

data/opal/corelib/module.rb

@@ -1,27 +1,18 @@
 class Module
-  def self.new(&block)
+  def self.allocate
     %x{
-      var klass         = Opal.boot_module_object();
-      klass.$$name      = nil;
-      klass.$$class     = Opal.Module;
-      klass.$$dep       = []
-      klass.$$is_module = true;
-      klass.$$proto     = {};
-
-      // inherit scope from parent
-      Opal.create_scope(Opal.Module.$$scope, klass);
-
-      if (block !== nil) {
-        var block_self = block.$$s;
-        block.$$s = null;
-        block.call(klass);
-        block.$$s = block_self;
-      }
+      var module;
 
-      return klass;
+      module = Opal.module_allocate();
+      Opal.create_scope(Opal.Module.$$scope, module, null);
+      return module;
     }
   end
 
+  def initialize(&block)
+    `Opal.module_initialize(self, block)`
+  end
+
   def ===(object)
     return false if `object == null`
 
@@ -227,7 +218,9 @@ class Module
   # check for constant within current scope
   # if inherit is true or self is Object, will also check ancestors
   def const_defined?(name, inherit = true)
-    raise NameError.new("wrong constant name #{name}", name) unless name =~ /^[A-Z]\w*$/
+    name = Opal.const_name!(name)
+
+    raise NameError.new("wrong constant name #{name}", name) unless name =~ Opal::CONST_NAME_REGEXP
 
     %x{
       var scopes = [self.$$scope];
@@ -253,11 +246,19 @@ class Module
   end
 
   def const_get(name, inherit = true)
+    name = Opal.const_name!(name)
+
+    %x{
+      if (name.indexOf('::') === 0 && name !== '::'){
+        name = name.slice(2);
+      }
+    }
+
     if `name.indexOf('::') != -1 && name != '::'`
       return name.split('::').inject(self) { |o, c| o.const_get(c) }
     end
 
-    raise NameError.new("wrong constant name #{name}", name) unless `/^[A-Z]\w*$/.test(name)`
+    raise NameError.new("wrong constant name #{name}", name) unless name =~ Opal::CONST_NAME_REGEXP
 
     %x{
       var scopes = [self.$$scope];
@@ -295,16 +296,16 @@ class Module
       }
     }
 
-    raise NameError.new("uninitialized constant #{self}::#{name}", name)
+    full_const_name = self == Object ? name : "#{self}::#{name}"
+
+    raise NameError.new("uninitialized constant #{full_const_name}", name)
   end
 
   def const_set(name, value)
-    raise NameError.new("wrong constant name #{name}", name) unless name =~ /^[A-Z]\w*$/
+    name = Opal.const_name!(name)
 
-    begin
-      name = name.to_str
-    rescue
-      raise TypeError, 'conversion with #to_str failed'
+    if !(name =~ Opal::CONST_NAME_REGEXP) || name.start_with?('::')
+      raise NameError.new("wrong constant name #{name}", name)
     end
 
     `Opal.casgn(self, name, value)`
@@ -337,9 +338,10 @@ class Module
     %x{
       var id = '$' + name;
 
-      block.$$jsid = name;
-      block.$$s    = null;
-      block.$$def  = block;
+      block.$$jsid        = name;
+      block.$$s           = null;
+      block.$$def         = block;
+      block.$$define_meth = true;
 
       Opal.defn(self, id, block);
 
@@ -381,6 +383,35 @@ class Module
 
     self
   end
+  
+  def included_modules
+    %x{
+      var results;
+      
+      var module_chain = function(klass) {
+        var included = [];
+        
+        for (var i = 0; i != klass.$$inc.length; i++) {
+          var mod_or_class = klass.$$inc[i];
+          included.push(mod_or_class);
+          included = included.concat(module_chain(mod_or_class));
+        }
+        
+        return included;
+      };
+              
+      results = module_chain(self);
+      
+      // need superclass's modules
+      if (self.$$is_class) {
+          for (var cls = self; cls; cls = cls.$$super) {
+            results = results.concat(module_chain(cls));
+          }
+      }
+      
+      return results;
+    }
+  end
 
   def include?(mod)
     %x{
@@ -449,7 +480,7 @@ class Module
 
   def included(mod)
   end
-
+  
   def extended(mod)
   end
 
@@ -470,7 +501,7 @@ class Module
           result;
 
       block.$$s = null;
-      result = block.call(self);
+      result = block.apply(self, [self]);
       block.$$s = old;
 
       return result;