opal 0.3.38 → 0.3.39

data/CHANGELOG.md

@@ -1,4 +1,16 @@
-## Edge ##
+## 0.3.39 2013-02-20
+
+*   Fix bug where methods defined on a parent class after subclass was defined
+    would not given subclass access to method. Subclasses are now also tracked
+    by superclass, by a private '_inherited' property.
+
+*   Fix bug where classes defined by `Class.new` did not have a constant scope.
+
+*   Move Date out of opal.rb loading, as it is part of stdlib not corelib.
+
+*   Fix for defining methods inside metaclass, or singleton_class scopes.
+
+## 0.3.38 2013-02-13
 
 *   Add Native module used for wrapping objects to forward calls as native
     calls.

data/Gemfile

@@ -2,3 +2,5 @@ source :rubygems
 gemspec
 
 gem 'rake'
+gem 'racc'
+gem 'opal-spec', '~> 0.2.12'

data/lib/assets/javascripts/opal.rb

@@ -15,7 +15,6 @@ require 'opal/numeric'
 require 'opal/proc'
 require 'opal/range'
 require 'opal/time'
-require 'opal/date'
 require 'opal/json'
 
 # regexp matches

data/lib/assets/javascripts/opal/class.rb

@@ -4,6 +4,7 @@ class Class
       function AnonClass(){};
       var klass   = Opal.boot(sup, AnonClass)
       klass._name = nil;
+      klass._scope = sup._scope;
 
       sup.$inherited(klass);
 
@@ -77,7 +78,7 @@ class Class
       }
 
       if (prototype._smethods) {
-        prototype._sdonate(methods);
+        prototype._smethods.push.apply(prototype._smethods, methods);  
       }
 
       if (klass.$included_in) {

data/lib/assets/javascripts/opal/runtime.js

@@ -131,6 +131,7 @@
     prototype._isObject   = true;
     prototype._klass      = constructor;
 
+    constructor._inherited    = [];
     constructor._included_in  = [];
     constructor._isClass      = true;
     constructor._name         = id;
@@ -140,7 +141,7 @@
     constructor._isObject     = false;
 
     constructor._donate = __donate;
-    constructor._sdonate = __sdonate;
+    constructor._defs = __defs;
 
     constructor['$==='] = module_eqq;
     constructor.$to_s = module_to_s;
@@ -162,6 +163,7 @@
     prototype._klass      = constructor;
     prototype.constructor = constructor;
 
+    constructor._inherited    = [];
     constructor._included_in  = [];
     constructor._isClass      = true;
     constructor._super        = superklass;
@@ -169,7 +171,7 @@
     constructor._isObject     = false;
     constructor._klass        = Class;
     constructor._donate       = __donate
-    constructor._sdonate      = __sdonate;
+    constructor._defs = __defs;
 
     constructor['$==='] = module_eqq;
     constructor.$to_s = module_to_s;
@@ -185,12 +187,15 @@
       constructor[m] = superklass[m];
     }
 
+    superklass._inherited.push(constructor);
+
     return constructor;
   };
 
   var bridge_class = function(constructor) {
     constructor.prototype._klass = constructor;
 
+    constructor._inherited    = [];
     constructor._included_in  = [];
     constructor._isClass      = true;
     constructor._super        = Object;
@@ -200,7 +205,7 @@
     constructor._isObject     = false;
 
     constructor._donate = function(){};
-    constructor._sdonate = __sdonate;
+    constructor._defs = __defs;
 
     constructor['$==='] = module_eqq;
     constructor.$to_s = module_to_s;
@@ -296,9 +301,20 @@
     }
   }
 
-  // Donator for singleton (class) methods
-  function __sdonate(defined) {
-    this._smethods = this._smethods.concat(defined);
+  // Define a singleton method on a class
+  function __defs(mid, body) {
+    this._smethods.push(mid);
+    this[mid] = body;
+
+    var inherited = this._inherited;
+    if (inherited.length) {
+      for (var i = 0, length = inherited.length, subclass; i < length; i++) {
+        subclass = inherited[i];
+        if (!subclass[mid]) {
+          subclass._defs(mid, body);
+        }
+      }
+    }
   }
 
   var bridged_classes = Object.$included_in = [];

data/lib/opal/parser.rb

@@ -952,7 +952,9 @@ module Opal
       code = nil
 
       in_scope(:sclass) do
-        @scope.add_temp '__scope = self._scope'
+        @scope.add_temp "__scope = #{current_self}._scope"
+        @scope.add_temp "def = #{current_self}.prototype"
+
         code = @scope.to_vars + process(body, :stmt)
       end
 
@@ -1143,8 +1145,7 @@ module Opal
 
       if recvr
         if smethod
-          @scope.smethods << "$#{mid}"
-          "#{ @scope.name }#{jsid} = #{defcode}"
+          "#{ @scope.name }._defs('$#{mid}', #{defcode})"
         else
           "#{ recv }#{ jsid } = #{ defcode }"
         end

data/lib/opal/scope.rb

@@ -27,9 +27,6 @@ module Opal
       # used by modules to know what methods to donate to includees
       attr_reader :methods
 
-      # singleton methods defined on classes/modules
-      attr_reader :smethods
-
       # uses parents super method
       attr_accessor :uses_super
 
@@ -49,7 +46,6 @@ module Opal
         @defines_defn = false
 
         @methods  = []
-        @smethods = []
 
         @uses_block = false
 
@@ -118,20 +114,11 @@ module Opal
 
       # Generates code for this module to donate methods
       def to_donate_methods
-        out = ""
-
         if should_donate? and !@methods.empty?
-        # unless @methods.empty?
-          out += "%s;#{@name}._donate([%s]);" %
-            [@parser.parser_indent, @methods.map(&:inspect).join(', ')]
-        end
-
-        unless @smethods.empty?
-          out += "%s;#{@name}._sdonate([%s]);" %
-            [@parser.parser_indent, @smethods.map(&:inspect).join(', ')]
+          "%s;#{@name}._donate([%s]);" % [@parser.parser_indent, @methods.map(&:inspect).join(', ')]
+        else
+          ""
         end
-
-        out
       end
 
       def add_ivar(ivar)

data/lib/opal/version.rb

@@ -1,3 +1,3 @@
 module Opal
-  VERSION = '0.3.38'
+  VERSION = '0.3.39'
 end

data/opal.gemspec

@@ -16,7 +16,4 @@ Gem::Specification.new do |s|
   s.require_paths  = ['lib'] 
 
   s.add_runtime_dependency 'sprockets' 
-
-  s.add_development_dependency 'opal-spec', '~> 0.2.10'
-  s.add_development_dependency 'racc'
 end

data/spec/core_ext/class/_inherited_spec.rb

@@ -0,0 +1,32 @@
+require "spec_helper"
+
+class Class
+  def get_inherited_classes
+    `#{self}._inherited`
+  end
+end
+
+module ClassInheritedSpecs
+  class None
+  end
+
+  class A
+  end
+
+  class B < A
+  end
+
+  class C < A
+  end
+
+  class D < C
+  end
+end
+
+describe "Class '_inherited' variable" do
+  it "contains an array of all subclasses of class" do
+    ClassInheritedSpecs::None.get_inherited_classes.should eq([])
+    ClassInheritedSpecs::A.get_inherited_classes.should eq([ClassInheritedSpecs::B, ClassInheritedSpecs::C])
+    ClassInheritedSpecs::C.get_inherited_classes.should eq([ClassInheritedSpecs::D])
+  end
+end

data/spec/core_ext/class/singleton_methods_spec.rb

@@ -0,0 +1,41 @@
+require "spec_helper"
+
+module ClassSingletonSpecs
+  class A
+    def self.foo; :foo; end
+    def self.bar; :bar; end
+  end
+
+  class B < A
+    def self.bar; :baz; end
+  end
+
+  class C < B
+  end
+
+  class A
+    def self.woosh; :kapow; end
+  end
+end
+
+describe "Class singleton methods" do
+  it "should be inherited by subclasses" do
+    ClassSingletonSpecs::B.foo.should eq(:foo)
+  end
+
+  it "should be inherited by subclasses of subclasses" do
+    ClassSingletonSpecs::C.foo.should eq(:foo)
+  end
+
+  it "subclasses can override inherited methods" do
+    ClassSingletonSpecs::A.bar.should eq(:bar)
+    ClassSingletonSpecs::B.bar.should eq(:baz)
+    ClassSingletonSpecs::C.bar.should eq(:baz)
+  end
+
+  it "subclasses inherit additional methods defined on superclass after they are defined" do
+    ClassSingletonSpecs::A.woosh.should eq(:kapow)
+    ClassSingletonSpecs::B.woosh.should eq(:kapow)
+    ClassSingletonSpecs::C.woosh.should eq(:kapow)
+  end
+end

data/spec/grammar/parser_spec.rb

@@ -22,7 +22,7 @@ describe "Opal::Parser" do
   it "should parse constant lookups" do
     opal_eval("Object").should == Object
     opal_eval("Array").should == Array
-    opal_eval("Spec::ExampleGroup").should == Spec::ExampleGroup
+    opal_eval("Opal::Parser").should == Opal::Parser
   end
 
   it "should parse class and module definitions" do

data/spec/language/def_spec.rb

@@ -0,0 +1,48 @@
+class DefSpecSingleton
+  class << self
+    def a_class_method;self;end
+  end
+end
+
+describe "A method definition inside a metaclass scope" do
+  it "can create a class method" do
+    DefSpecSingleton.a_class_method.should == DefSpecSingleton
+    lambda { Object.a_class_method }.should raise_error(NoMethodError)
+  end
+
+  it "can create a singleton method" do
+    obj = Object.new
+    class << obj
+      def a_singleton_method;self;end
+    end
+
+    obj.a_singleton_method.should == obj
+    lambda { Object.new.a_singleton_method }.should raise_error(NoMethodError)
+  end
+end
+
+describe "A method definition inside an instance_eval" do
+  it "creates a singleton method" do
+    obj = Object.new
+    obj.instance_eval do
+      def an_instance_eval_method;self;end
+    end
+    obj.an_instance_eval_method.should == obj
+
+    other = Object.new
+    lambda { other.an_instance_eval_method }.should raise_error(NoMethodError)
+  end
+
+  it "creates a singleton method when evaluated inside a metaclass" do
+    obj = Object.new
+    obj.instance_eval do
+      class << self
+        def a_metaclass_eval_method;self;end
+      end
+    end
+    obj.a_metaclass_eval_method.should == obj
+
+    other = Object.new
+    lambda { other.a_metaclass_eval_method }.should raise_error(NoMethodError)
+  end
+end

data/spec/language/singleton_class_spec.rb

@@ -1,3 +1,8 @@
+
+module ClassSpecs
+  class A; end
+end
+
 describe "A singleton class" do
   it "is NilClass for nil" do
     nil.singleton_class.should == NilClass
@@ -14,6 +19,15 @@ describe "A singleton class" do
   end
 end
 
-module ClassSpecs
-  class A; end
-end
+describe "Defining instance methods on a singleton class" do
+  before do
+    @object = Object.new
+    class << @object
+      def singleton_method; 1 end
+    end
+  end
+
+  it "defines public methods" do
+    @object.singleton_method.should eq(1)
+  end
+end

data/spec/{core → library}/date/new_spec.rb

@@ -1,3 +1,5 @@
+require "spec_helper"
+
 describe "Date.new" do
   it "creates a date with arguments" do
     d = Date.new(2000, 3, 5)

data/spec/{core → library}/date/to_s_spec.rb

@@ -1,3 +1,5 @@
+require "spec_helper"
+
 describe "Date#to_s" do
   it "returns a string representation of date (YYYY-MM-DD)" do
     Date.new(2012, 10, 26).to_s.should == "2012-10-26"

data/spec/{core → library}/date/today_spec.rb

@@ -1,3 +1,5 @@
+require "spec_helper"
+
 describe "Date.today" do
   it "creates a new instance for current date" do
     Date.today.should be_kind_of(Date)

data/spec/spec_helper.rb

@@ -2,6 +2,9 @@ require 'opal'
 require 'opal-parser'
 require 'opal-spec'
 
+# stdlib
+require 'opal/date'
+
 module Kernel
   def opal_eval(str)
     code = Opal::Parser.new.parse str

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal
 version: !ruby/object:Gem::Version
-  version: 0.3.38
+  version: 0.3.39
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -27,38 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: opal-spec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.10
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.10
-- !ruby/object:Gem::Dependency
-  name: racc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Ruby runtime and core library for javascript.
 email: adam.beynon@gmail.com
 executables:
@@ -188,9 +156,6 @@ files:
 - spec/core/class/instance_methods_spec.rb
 - spec/core/class/last_value_spec.rb
 - spec/core/class/new_spec.rb
-- spec/core/date/new_spec.rb
-- spec/core/date/to_s_spec.rb
-- spec/core/date/today_spec.rb
 - spec/core/enumerable/all_spec.rb
 - spec/core/enumerable/any_spec.rb
 - spec/core/enumerable/collect_spec.rb
@@ -407,6 +372,8 @@ files:
 - spec/core/time/now_spec.rb
 - spec/core/time/saturday_spec.rb
 - spec/core_ext/array/to_json_spec.rb
+- spec/core_ext/class/_inherited_spec.rb
+- spec/core_ext/class/singleton_methods_spec.rb
 - spec/core_ext/method_missing_spec.rb
 - spec/core_ext/native/fixtures/classes.rb
 - spec/core_ext/native/initialize_spec.rb
@@ -463,6 +430,7 @@ files:
 - spec/language/block_spec.rb
 - spec/language/break_spec.rb
 - spec/language/case_spec.rb
+- spec/language/def_spec.rb
 - spec/language/defined_spec.rb
 - spec/language/ensure_spec.rb
 - spec/language/fixtures/next.rb
@@ -488,6 +456,9 @@ files:
 - spec/language/variables_spec.rb
 - spec/language/while_spec.rb
 - spec/language/yield_spec.rb
+- spec/library/date/new_spec.rb
+- spec/library/date/to_s_spec.rb
+- spec/library/date/today_spec.rb
 - spec/spec_helper.rb
 homepage: http://opalrb.org
 licenses: []
@@ -590,9 +561,6 @@ test_files:
 - spec/core/class/instance_methods_spec.rb
 - spec/core/class/last_value_spec.rb
 - spec/core/class/new_spec.rb
-- spec/core/date/new_spec.rb
-- spec/core/date/to_s_spec.rb
-- spec/core/date/today_spec.rb
 - spec/core/enumerable/all_spec.rb
 - spec/core/enumerable/any_spec.rb
 - spec/core/enumerable/collect_spec.rb
@@ -809,6 +777,8 @@ test_files:
 - spec/core/time/now_spec.rb
 - spec/core/time/saturday_spec.rb
 - spec/core_ext/array/to_json_spec.rb
+- spec/core_ext/class/_inherited_spec.rb
+- spec/core_ext/class/singleton_methods_spec.rb
 - spec/core_ext/method_missing_spec.rb
 - spec/core_ext/native/fixtures/classes.rb
 - spec/core_ext/native/initialize_spec.rb
@@ -865,6 +835,7 @@ test_files:
 - spec/language/block_spec.rb
 - spec/language/break_spec.rb
 - spec/language/case_spec.rb
+- spec/language/def_spec.rb
 - spec/language/defined_spec.rb
 - spec/language/ensure_spec.rb
 - spec/language/fixtures/next.rb
@@ -890,4 +861,7 @@ test_files:
 - spec/language/variables_spec.rb
 - spec/language/while_spec.rb
 - spec/language/yield_spec.rb
+- spec/library/date/new_spec.rb
+- spec/library/date/to_s_spec.rb
+- spec/library/date/today_spec.rb
 - spec/spec_helper.rb