Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: opal/opal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dc8f5fa5545c
Choose a base ref
...
head repository: opal/opal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 266b44ed3690
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 26, 2014

  1. Exclude stubs and non-functions from Module#instance_methods

    @meh
    meh committed Oct 26, 2014
    Copy the full SHA
    8ff89b9 View commit details

  2. Update compiler specs

    @meh
    meh committed Oct 26, 2014
    Copy the full SHA
    266b44e View commit details
Showing with 10 additions and 2 deletions.
  1. +8 −0 opal/corelib/module.rb
  2. +2 −2 spec/lib/compiler_spec.rb
8 changes: 8 additions & 0 deletions opal/corelib/module.rb
View file
Original file line number Diff line number Diff line change
@@ -313,6 +313,14 @@ def instance_methods(include_super = false)
continue;
}
if (typeof(proto[prop]) !== "function") {
continue;
}
if (proto[prop].$$stub) {
continue;
}
if (!self.$$is_mod) {
if (self !== Opal.BasicObject && proto[prop] === Opal.BasicObject.$$proto[prop]) {
continue;
4 changes: 2 additions & 2 deletions spec/lib/compiler_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -9,13 +9,13 @@

describe 'requirable' do
it 'executes the file' do
expect_compiled("").to include('(function($opal) {')
expect_compiled("").to include('(function(Opal) {')
expect_compiled("").to end_with("})(Opal);\n")
end

it 'puts the compiled into "Opal.modules"' do
options = { :requirable => true, :file => "pippo" }
expect_compiled("", options).to include('Opal.modules["pippo"] = function($opal) {')
expect_compiled("", options).to include('Opal.modules["pippo"] = function(Opal) {')
expect_compiled("", options).to end_with("};\n")
end
end