opal 0.10.0.beta2 → 0.10.0.beta3

data/spec/lib/compiler_spec.rb

@@ -1,4 +1,5 @@
 require 'lib/spec_helper'
+require 'support/match_helpers'
 
 describe Opal::Compiler do
   describe 'requiring' do
@@ -20,6 +21,10 @@ describe Opal::Compiler do
     end
   end
 
+  it 'raises syntax errors properly' do
+    expect(lambda {Opal::Compiler.new('def foo').compile}).to raise_error SyntaxError, /An error occurred while compiling:.*false/m
+  end
+
   it "should compile simple ruby values" do
     expect_compiled("3.142").to include("return 3.142")
     expect_compiled("123e1").to include("return 1230")
@@ -143,9 +148,10 @@ describe Opal::Compiler do
 
     describe '#require_tree' do
       require 'pathname'
-      let(:file) { Pathname(__FILE__).join('../fixtures/require_tree_test.rb') }
 
       it 'parses and resolve #require argument' do
+        file = Pathname(__FILE__).join('../fixtures/require_tree_test.rb')
+
         compiler = compiler_for(file.read)
         expect(compiler.required_trees).to eq(['../fixtures/required_tree_test'])
       end

data/spec/opal/core/kernel/instance_variables_spec.rb

@@ -11,6 +11,12 @@ describe "Kernel#instance_variables" do
     end
   end
 
+  context 'for non-empty string' do
+    it 'returns blank array' do
+      expect('test'.instance_variables).to eq([])
+    end
+  end
+
   context 'for hash' do
     it 'returns blank array' do
       expect({}.instance_variables).to eq([])
@@ -31,6 +37,24 @@ describe "Kernel#instance_variables" do
     end
   end
 
+  context 'for non-empty hash' do
+    it 'returns blank array' do
+      expect({ 1 => 2 }.instance_variables).to eq([])
+    end
+  end
+
+  context 'for array' do
+    it 'returns blank array' do
+      expect([].instance_variables).to eq([])
+    end
+  end
+
+  context 'for non-empty array' do
+    it 'returns blank array' do
+      expect((1..20).to_a.instance_variables).to eq([])
+    end
+  end
+
   context 'for object' do
     it 'returns blank array' do
       expect(Object.new.instance_variables).to eq([])
@@ -67,4 +91,20 @@ describe "Kernel#instance_variables" do
       end
     end
   end
+
+  context 'for a class' do
+    it 'returns blank array' do
+      expect(Class.new.instance_variables).to eq([])
+    end
+  end
+
+  context 'for a class with nested constant' do
+    class ClassWithConstantWithoutIvar
+      A = 1
+    end
+
+    it 'returns blank array' do
+      expect(ClassWithConstantWithoutIvar.instance_variables).to eq([])
+    end
+  end
 end

data/spec/opal/core/language/ternary_operator_spec.rb

@@ -11,4 +11,10 @@ describe "Ternary condition operator" do
     # this could be interpreted as a Ruby 1.9 symbol hash key
     (true ?'str':'another str').should == 'str'
   end
+
+  it "doesn't interpret ?? as an identifier" do
+    obj = mock("object with a query method")
+    obj.should_receive("m?").and_return(true)
+    (obj.m?? 1 : 2).should == 1
+  end
 end

data/spec/opal/core/marshal/dump_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+module MarshalExtension
+end
+
+class MarshalUserRegexp < Regexp
+end
+
+class UserMarshal
+  attr_reader :data
+
+  def initialize
+    @data = 'stuff'
+  end
+  def marshal_dump() 'data' end
+  def marshal_load(data) @data = data end
+  def ==(other) self.class === other and @data == other.data end
+end
+
+describe 'Marshal.dump' do
+  it 'dumps non-empty Array' do
+    expect(Marshal.dump(['a', 1, 2])).to eq("\u0004\b[\b\"\u0006ai\u0006i\a")
+  end
+
+  it 'dumps case-sensitive regexp' do
+    expect(Marshal.dump(/\w+/)).to eq("\u0004\b/\b\\w+\u0000")
+  end
+
+  it 'dumps case-insensitive regexp' do
+    expect(Marshal.dump(/\w+/i)).to eq("\u0004\b/\b\\w+\u0001")
+  end
+
+  it "dumps a Float" do
+    Marshal.dump(123.4567).should == "\004\bf\r123.4567"
+    Marshal.dump(-0.841).should == "\x04\bf\v-0.841"
+    Marshal.dump(9876.345).should == "\004\bf\r9876.345"
+    Marshal.dump(Float::INFINITY).should == "\004\bf\binf"
+    Marshal.dump(-Float::INFINITY).should == "\004\bf\t-inf"
+    Marshal.dump(Float::NAN).should == "\004\bf\bnan"
+  end
+
+  it "dumps a Regexp with flags" do
+    Marshal.dump(/\w/im).should == "\x04\b/\a\\w\u0005"
+  end
+
+  it 'dumps an extended Regexp' do
+    Marshal.dump(/\w/.extend(MarshalExtension)).should == "\x04\be:\u0015MarshalExtension/\a\\w\u0000"
+  end
+
+  it 'dumps object#marshal_dump when object responds to #marshal_dump' do
+    Marshal.dump(UserMarshal.new).should == "\u0004\bU:\u0010UserMarshal\"\tdata"
+  end
+end

data/spec/opal/core/marshal/load_spec.rb

@@ -0,0 +1,7 @@
+describe "Marshal.load" do
+  it 'loads array with instance variable' do
+    a = Marshal.load("\x04\bI[\bi\x06i\ai\b\x06:\n@ivari\x01{")
+    a.should == [1, 2, 3]
+    a.instance_variable_get(:@ivar).should == 123
+  end
+end

data/spec/opal/core/source_map_spec.rb

@@ -4,12 +4,46 @@ require 'opal-source-maps'
 describe Opal::SourceMap do
   before do
     pathname = 'foo.rb'
-    compiler = Opal::Compiler.new("1 + 1", :file => pathname)
+    compiler = Opal::Compiler.new("def foo\n123\nend", :file => pathname)
     @source  = compiler.compile
     @map     = Opal::SourceMap.new(compiler.fragments, pathname)
   end
 
+  def js_line_for(code)
+    index = @source.split("\n").index {|line| line.include?(code)}
+    # 1 based line numbers
+    index + 1
+  end
+
+  def parsed_map
+    SourceMap::Map.from_json(@map.as_json.to_json)
+  end
+
+  def mappings
+    mappings = []
+    # mappings is not exposed on the ext library
+    parsed_map.each do |mapping|
+      mappings << mapping
+    end
+    mappings
+  end
+
   it 'does not blow while generating the map' do
     lambda { @map.as_json }.should_not raise_error
   end
+
+  it 'parses the map without error' do
+    parsed_map.should_not be_nil
+  end
+
+  it 'identifies line numbers' do
+    match = mappings.find {|map| map.original.line == 2 }
+    # as of Opal 0.10
+    match.generated.line.should == js_line_for('return 123')
+  end
+
+  it 'uses method names' do
+    match = mappings.find {|map| map.original.line == 2 }
+    match.name.should == 'foo'
+  end
 end

data/spec/opal/javascript_api_spec.rb

@@ -0,0 +1,16 @@
+module JavaScriptAPIFixtures
+  class A
+  end
+
+  class A::B
+  end
+end
+
+require 'spec_helper'
+require 'native'
+
+describe "JavaScript API" do
+  it "allows to acces scopes on `Opal` with dots (regression for #1418)" do
+    `Opal.JavaScriptAPIFixtures.A.B`.should == JavaScriptAPIFixtures::A::B
+  end
+end

data/spec/opal/stdlib/source_map_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+require 'source_map'
+
+describe 'SourceMap::VLQ' do
+  it 'encodes properly' do
+    SourceMap::VLQ.encode([0]).should == 'A'
+  end
+end

data/spec/ruby_specs

@@ -15,12 +15,12 @@ ruby/core/exception
 
 ruby/core/false
 ruby/core/fixnum
+ruby/core/file/basename_spec
+ruby/core/file/dirname_spec
 ruby/core/file/extname_spec
 ruby/core/float
 ruby/core/hash
-
 ruby/core/integer
-!ruby/core/integer/times_spec
 
 ruby/core/kernel
 !ruby/core/kernel/abort_spec
@@ -69,6 +69,11 @@ ruby/core/method
 
 ruby/core/module
 
+ruby/core/marshal/load_spec
+ruby/core/marshal/dump_spec
+ruby/core/marshal/major_version_spec
+ruby/core/marshal/minor_version_spec
+
 ruby/core/nil
 ruby/core/numeric
 
@@ -95,10 +100,8 @@ ruby/core/unboundmethod
 ruby/language
 !ruby/language/constants_spec
 !ruby/language/execution_spec
-!ruby/language/hash_spec
 !ruby/language/next_spec
 !ruby/language/return_spec
-!ruby/language/send_spec
 !ruby/language/yield_spec
 
 ruby/library/base64

data/spec/support/match_helpers.rb

@@ -0,0 +1,57 @@
+module MatchHelpers
+  class MatchMatcher
+    def initialize(expected)
+      fail "Expected #{expected} to be a Regexp!" unless expected.is_a?(Regexp)
+      @expected = expected
+    end
+
+    def matches?(actual)
+      @actual = actual
+      @expected.match(@actual)
+    end
+
+    def failure_message
+      ["Expected #{@actual.inspect} (#{@actual.class})",
+       "to match #{@expected}"]
+    end
+
+    def negative_failure_message
+      ["Expected #{@actual.inspect} (#{@actual.class})",
+       "not to match #{@expected}"]
+    end
+  end
+
+  class EndWithHelper
+    def initialize(expected)
+      @expected = expected
+    end
+
+    def matches?(actual)
+      @actual = actual
+      @actual.end_with?(@expected)
+    end
+
+    def failure_message
+      ["Expected #{@actual.inspect} (#{@actual.class})",
+       "to end with #{@expected}"]
+    end
+
+    def negative_failure_message
+      ["Expected #{@actual.inspect} (#{@actual.class})",
+       "not to end with #{@expected}"]
+    end
+  end
+end
+
+if !defined? RSpec
+  class Object
+    def match(expected)
+      MatchHelpers::MatchMatcher.new(expected)
+    end
+
+    def end_with(expected)
+      MatchHelpers::EndWithHelper.new(expected)
+    end
+  end
+end
+

data/spec/support/mspec_rspec_adapter.rb

@@ -23,7 +23,7 @@ module MSpecRSpecAdapter
       end
     end
 
-    def not_to
+    def not_to(expectation)
       apply_expectation(:should_not, expectation)
     end
     alias to_not not_to

data/stdlib/opal-parser.rb

@@ -5,7 +5,9 @@ require 'opal/version'
 module Kernel
   def eval(str)
     str = Opal.coerce_to!(str, String, :to_str)
-    code = Opal.compile str, file: '(eval)', eval: true
+    default_eval_options = { file: '(eval)', eval: true }
+    compiling_options = __OPAL_COMPILER_CONFIG__.merge(default_eval_options)
+    code = Opal.compile str, compiling_options
     %x{
       return (function(self) {
         return eval(#{code});

data/stdlib/pathname.rb

@@ -1,7 +1,23 @@
+require 'corelib/comparable'
+
+# Portions from Author:: Tanaka Akira <akr@m17n.org>
 class Pathname
+  include Comparable
+  SEPARATOR_PAT = /#{Regexp.quote File::SEPARATOR}/
+
   def initialize(path)
-    raise ArgumentError if path == "\0"
-    @path = path
+    if Pathname === path
+      @path = path.path.to_s
+    elsif path.respond_to?(:to_path)
+      @path = path.to_path
+    elsif path.is_a?(String)
+      @path = path
+    elsif path.nil?
+      raise TypeError, 'no implicit conversion of nil into String'
+    else
+      raise TypeError, "no implicit conversion of #{path.class} into String"
+    end
+    raise ArgumentError if @path == "\0"
   end
 
   attr_reader :path
@@ -11,11 +27,25 @@ class Pathname
   end
 
   def absolute?
-    @path.start_with? '/'
+    !relative?
   end
 
   def relative?
-    !absolute?
+    path = @path
+    while r = chop_basename(path)
+      path, = r
+    end
+    path == ''
+  end
+
+  def chop_basename(path) # :nodoc:
+    base = File.basename(path)
+    # ruby uses /^#{SEPARATOR_PAT}?$/o but having issues with interpolation
+    if Regexp.new("^#{Pathname::SEPARATOR_PAT.source}?$") =~ base
+      return nil
+    else
+      return path[0, path.rindex(base)], base
+    end
   end
 
   def root?
@@ -50,11 +80,52 @@ class Pathname
 
   def +(other)
     other = Pathname.new(other) unless Pathname === other
-    Pathname.new(File.join(@path, other.to_path))
+    Pathname.new(plus(@path, other.to_s))
+  end
+
+  def plus(path1, path2) # -> path # :nodoc:
+    prefix2 = path2
+    index_list2 = []
+    basename_list2 = []
+    while r2 = chop_basename(prefix2)
+      prefix2, basename2 = r2
+      index_list2.unshift prefix2.length
+      basename_list2.unshift basename2
+    end
+    return path2 if prefix2 != ''
+    prefix1 = path1
+    while true
+      while !basename_list2.empty? && basename_list2.first == '.'
+        index_list2.shift
+        basename_list2.shift
+      end
+      break unless r1 = chop_basename(prefix1)
+      prefix1, basename1 = r1
+      next if basename1 == '.'
+      if basename1 == '..' || basename_list2.empty? || basename_list2.first != '..'
+        prefix1 = prefix1 + basename1
+        break
+      end
+      index_list2.shift
+      basename_list2.shift
+    end
+    r1 = chop_basename(prefix1)
+    if !r1 && /#{SEPARATOR_PAT}/o =~ File.basename(prefix1)
+      while !basename_list2.empty? && basename_list2.first == '..'
+        index_list2.shift
+        basename_list2.shift
+      end
+    end
+    if !basename_list2.empty?
+      suffix2 = path2[index_list2.first..-1]
+      r1 ? File.join(prefix1, suffix2) : prefix1 + suffix2
+    else
+      r1 ? prefix1 : File.dirname(prefix1)
+    end
   end
 
   def join(*args)
-    args.unshift self
+    return self if args.empty?
     result = args.pop
     result = Pathname.new(result) unless Pathname === result
     return result if result.absolute?
@@ -63,9 +134,36 @@ class Pathname
       result = arg + result
       return result if result.absolute?
     }
-    result
+    self + result
+  end
+
+  def split
+    [ dirname, basename ]
+  end
+
+  def dirname
+    Pathname.new(File.dirname(@path))
   end
 
+  def basename
+    Pathname.new(File.basename(@path))
+  end
+
+  def directory?
+    File.directory?(@path)
+  end
+
+  def extname
+    File.extname(@path)
+  end
+
+  def <=>(other)
+    self.path <=> other.path
+  end
+
+  alias eql? ==
+  alias === ==
+
   alias :to_str :to_path
   alias :to_s :to_path
 end