opal 0.8.0.beta1 → 0.8.0.rc1

data/spec/lib/builder_spec.rb

@@ -11,12 +11,8 @@ describe Opal::Builder do
   end
 
   it 'respect #require_tree calls' do
-    begin
-      Opal.append_path(File.expand_path('..', __FILE__))
-      expect(builder.build('fixtures/require_tree_test').to_s).to include('Opal.modules["fixtures/required_tree_test/required_file1"]')
-    ensure
-      Opal.instance_variable_set('@paths', nil)
-    end
+    builder.append_paths(File.expand_path('..', __FILE__))
+    expect(builder.build('fixtures/require_tree_test').to_s).to include('Opal.modules["fixtures/required_tree_test/required_file1"]')
   end
 
   describe ':stubs' do
@@ -52,6 +48,16 @@ describe Opal::Builder do
     end
   end
 
+  describe 'dup' do
+    it 'duplicates internal structures' do
+      b2 = builder.dup
+      b2.should_not equal(builder)
+      [:stubs, :preload, :processors, :path_reader, :prerequired, :compiler_options, :processed].each do |m|
+        b2.send(m).should_not equal(builder.send(m))
+      end
+    end
+  end
+
   describe 'requiring a native .js file' do
     it 'can be required without specifying extension' do
       builder.build_str('require "corelib/runtime"', 'foo')

data/spec/lib/cli_spec.rb

@@ -82,12 +82,12 @@ describe Opal::CLI do
       let(:options)  { {:gems => [gem_name], :evals => ['']} }
 
       it "adds the gem's lib paths to Opal.path" do
-        cli.run
+        builder = cli.build
 
         spec = Gem::Specification.find_by_name(gem_name)
         spec.require_paths.each do |require_path|
           require_path = File.join(spec.gem_dir, require_path)
-          expect(Opal.paths).to include(require_path)
+          expect(builder.path_reader.send(:file_finder).paths).to include(require_path)
         end
       end
     end

data/spec/lib/path_reader_spec.rb

@@ -20,5 +20,17 @@ describe Opal::PathReader do
   include_examples :path_finder
   include_examples :path_reader do
     let(:path_reader) { file_reader }
+
+    it 'works with absolute paths' do
+      expect(path_reader.read(File.expand_path(__FILE__))).not_to be_nil
+    end
+
+    it 'works with relative paths starting with ./' do
+      expect(path_reader.read('./spec/lib/shared/path_reader_shared.rb')).not_to be_nil
+    end
+
+    it 'works with absolute paths' do
+      expect(path_reader.read("../#{File.basename(Dir.pwd)}/spec/lib/shared/path_reader_shared.rb")).not_to be_nil
+    end
   end
 end

data/spec/lib/sprockets/server_spec.rb

@@ -45,13 +45,13 @@ describe Opal::Server do
       get '/assets/source_map.js'
       expect(last_response).to be_ok
 
-      get maps_prefix+'/source_map.map'
+      get maps_prefix+'/source_map.self.map'
       expect(last_response).to be_ok
     end
 
     it 'serves map on a subfolder file' do
-      js_path = '/assets/source_map/subfolder/other_file.js'
-      map_path = maps_prefix+'/source_map/subfolder/other_file.map'
+      js_path = '/assets/source_map/subfolder/other_file.self.js'
+      map_path = maps_prefix+'/source_map/subfolder/other_file.self.map'
 
       get js_path
 
@@ -59,13 +59,13 @@ describe Opal::Server do
       received_map_path = extract_map_path(last_response)
       expect(expand_path(received_map_path, js_path+'/..')).to eq(map_path)
 
-      get maps_prefix+'/source_map/subfolder/other_file.map'
+      get maps_prefix+'/source_map/subfolder/other_file.self.map'
       expect(last_response).to be_ok
     end
 
     it 'serves map on a subfolder file' do
-      js_path = '/assets/source_map/subfolder/other_file.js'
-      map_path = maps_prefix+'/source_map/subfolder/other_file.map'
+      js_path = '/assets/source_map/subfolder/other_file.self.js'
+      map_path = maps_prefix+'/source_map/subfolder/other_file.self.map'
 
       get js_path
 
@@ -73,8 +73,7 @@ describe Opal::Server do
       received_map_path = extract_map_path(last_response)
       expect(expand_path(received_map_path, js_path+'/..')).to eq(map_path)
 
-
-      get maps_prefix+'/source_map/subfolder/other_file.map'
+      get maps_prefix+'/source_map/subfolder/other_file.self.map'
       expect(last_response).to be_ok
       map = ::SourceMap::Map.from_json(last_response.body)
       expect(map.sources).to include(maps_prefix+'/source_map/subfolder/other_file.rb')

data/spec/lib/tilt/opal_spec.rb

@@ -16,4 +16,22 @@ describe Opal::TiltTemplate do
       end
     end
   end
+
+  it "support :build option" do
+    template = described_class.new('./spec/lib/fixtures/opal_file.rb', :build=>true)
+    output = template.render
+    expect(output).to include('"hi from opal!"')
+    expect(output).to include('self.$require("corelib/runtime");')
+  end
+
+  it "support :builder option" do
+    builder = Opal::Builder.new(:stubs=>['opal'])
+    template = described_class.new('./spec/lib/fixtures/opal_file.rb', :builder=>builder)
+
+    2.times do
+      output = template.render
+      expect(output.scan(/hi from opal!/).length).to eql(1)
+      expect(output).not_to include('self.$require("corelib/runtime");')
+    end
+  end
 end

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

@@ -17,4 +17,4 @@ describe "Regexps with interpolation" do
     str = "a"
     /[#{str}-z]/.should == /[a-z]/
   end
-end
+end

data/spec/opal/core/runtime/bridged_classes_spec.rb

@@ -4,7 +4,6 @@ require 'spec_helper'
   var bridge_class_demo = function(){};
   bridge_class_demo.prototype.$foo = function() { return "bar" };
 }
-
 class TopBridgedClassDemo < `bridge_class_demo`
   def some_bridged_method
     [1, 2, 3]
@@ -62,3 +61,51 @@ describe "Bridged Classes" do
     end
   end
 end
+
+class ModularizedBridgeClass
+  def something
+    'different module'
+  end
+end
+
+%x{
+  var bridge_class_demo_module = function(){};
+  bridge_class_demo_module.prototype.$foo = function() { return "foobar" };
+}
+
+module BridgeModule
+  class ModularizedBridgeClass < `bridge_class_demo_module`
+    def some_bridged_method
+      [4, 5, 6]
+    end
+  end
+end
+
+describe 'Bridged classes in different modules' do
+  before do
+    @bridged = BridgeModule::ModularizedBridgeClass
+    @instance = `new bridge_class_demo_module`
+  end
+  
+  it "should expose the given class not at the top level scope" do
+    @bridged.should be_kind_of(Class)
+  end
+  
+  it 'should not disturb an existing class at the top level scope' do
+    ModularizedBridgeClass.new.something.should == 'different module'
+  end
+
+  it "gives the class the correct name" do
+    @bridged.name.should == "BridgeModule::ModularizedBridgeClass"
+  end
+
+  it "instances of class should be able to call native ruby methods" do
+    @instance.foo.should == "foobar"
+    @bridged.new.foo.should == "foobar"
+  end
+
+  it "allows new methods to be defined on the bridged prototype" do
+    @instance.some_bridged_method.should == [4, 5, 6]
+    @bridged.new.some_bridged_method.should == [4, 5, 6]
+  end
+end

data/spec/rubyspecs

@@ -55,7 +55,7 @@ corelib/core/kernel/eql_spec
 corelib/core/kernel/equal_spec
 corelib/core/kernel/equal_value_spec
 corelib/core/kernel/format_spec
-corelib/core/kernel/hash_spec
+corelib/core/kernel/Hash_spec
 corelib/core/kernel/Integer_spec
 corelib/core/kernel/Float_spec
 corelib/core/kernel/sprintf_spec
@@ -72,6 +72,7 @@ corelib/core/module/module_function_spec
 corelib/core/module/const_get_spec
 corelib/core/module/include_spec
 corelib/core/module/instance_methods_spec
+corelib/core/module/define_method_spec
 
 corelib/core/range/begin_spec
 corelib/core/range/case_compare_spec
@@ -129,6 +130,9 @@ corelib/core/regexp/escape_spec
 corelib/core/regexp/last_match_spec
 corelib/core/regexp/match_spec
 corelib/core/regexp/quote_spec
+corelib/core/regexp/options_spec
+corelib/core/regexp/union_spec
+corelib/core/regexp/new_spec
 
 corelib/language/BEGIN_spec
 corelib/language/alias_spec
@@ -139,7 +143,7 @@ corelib/language/array_spec
 corelib/language/case_spec
 corelib/language/class_spec
 corelib/language/class_variable_spec
-corelib/language/constants_spec
+# corelib/language/constants_spec - throw exception - NameError: uninitialized constant X::CS_SINGLETON4_CLASSES
 # corelib/language/def_spec - can't parse f('key'=>'value', *[5, 'string'])
 corelib/language/defined_spec
 # corelib/language/encoding_spec - can't parse encodings
@@ -147,7 +151,7 @@ corelib/language/ensure_spec
 # corelib/language/execution_spec - can't parse x-strings with shell commands
 corelib/language/file_spec
 corelib/language/for_spec
-corelib/language/hash_spec
+# corelib/language/hash_spec - parse error on value "**" (tPOW) :corelib/language/hash_spec:82
 corelib/language/if_spec
 # corelib/language/line_spec - $LOADED_FEATURES not present
 # corelib/language/lambda_spec - Can't parse literal {} in parenthesized argument list
@@ -155,7 +159,7 @@ corelib/language/loop_spec
 corelib/language/magic_comment_spec
 # corelib/language/match_spec - generates invalid regexp
 corelib/language/metaclass_spec
-corelib/language/module_spec
+# corelib/language/module_spec - infinite loop in "The module keyword sets the name of contained modules when assigning a toplevel anonymous module"
 # corelib/language/next_spec - can't parse break expr with block
 corelib/language/not_spec
 corelib/language/numbers_spec
@@ -175,89 +179,95 @@ corelib/language/singleton_class_spec
 # corelib/language/splat_spec - can't parse all splats
 # corelib/language/string_spec - can't parse strings using control-characters
 corelib/language/super_spec
-corelib/language/symbol_spec
+# corelib/language/symbol_spec - parse error on value "}" (tRCURLY) :corelib/language/symbol_spec:89
 # corelib/language/throw_spec - unsupported
 corelib/language/undef_spec
 corelib/language/unless_spec
 corelib/language/until_spec
 # corelib/language/variables_spec - can't parse whole file
-corelib/language/while_spec
+# corelib/language/while_spec - infinite loops in:
+# it "stops running body if interrupted by break in a begin ... end element op-assign-or value" do
+# it "stops running body if interrupted by break in a parenthesized attribute op-assign-or value" do
+# it "stops running body if interrupted by break in a begin ... end attribute op-assign-or value" do
+# it "stops running body if interrupted by break in a parenthesized attribute op-assign-or value" do
+# it "stops running body if interrupted by break in a begin ... end attribute op-assign-or value" do
+
 # corelib/language/yield_spec - can't parse destructuring argument list, see block_spec
 
-stdlib/rubysl-singleton/spec
-stdlib/rubysl-observer/spec
-stdlib/rubysl-pathname/spec
+corelib/library/singleton
+corelib/library/observer
+corelib/library/pathname
 
-stdlib/rubysl-strscan/spec/beginning_of_line_spec
-stdlib/rubysl-strscan/spec/bol_spec
-stdlib/rubysl-strscan/spec/check_spec
-stdlib/rubysl-strscan/spec/element_reference_spec
-stdlib/rubysl-strscan/spec/eos_spec
-stdlib/rubysl-strscan/spec/get_byte_spec
-stdlib/rubysl-strscan/spec/peek_spec
-stdlib/rubysl-strscan/spec/pos_spec
-stdlib/rubysl-strscan/spec/reset_spec
-stdlib/rubysl-strscan/spec/rest_spec
-stdlib/rubysl-strscan/spec/scan_spec
-stdlib/rubysl-strscan/spec/skip_spec
-stdlib/rubysl-strscan/spec/terminate_spec
+corelib/library/stringscanner/beginning_of_line_spec
+corelib/library/stringscanner/bol_spec
+corelib/library/stringscanner/check_spec
+corelib/library/stringscanner/element_reference_spec
+corelib/library/stringscanner/eos_spec
+corelib/library/stringscanner/get_byte_spec
+corelib/library/stringscanner/peek_spec
+corelib/library/stringscanner/pos_spec
+corelib/library/stringscanner/reset_spec
+corelib/library/stringscanner/rest_spec
+corelib/library/stringscanner/scan_spec
+corelib/library/stringscanner/skip_spec
+corelib/library/stringscanner/terminate_spec
 
-stdlib/rubysl-delegate/spec/delegator/send_spec
+corelib/library/delegate/delegator/send_spec
 
-stdlib/rubysl-erb/spec/util/h_spec
-stdlib/rubysl-erb/spec/util/html_escape_spec
+corelib/library/erb/util/h_spec
+corelib/library/erb/util/html_escape_spec
 
-stdlib/rubysl-set/spec/add_spec
-stdlib/rubysl-set/spec/append_spec
-stdlib/rubysl-set/spec/classify_spec
-stdlib/rubysl-set/spec/clear_spec
-stdlib/rubysl-set/spec/collect_spec
-stdlib/rubysl-set/spec/constructor_spec
-stdlib/rubysl-set/spec/delete_if_spec
-stdlib/rubysl-set/spec/delete_spec
-stdlib/rubysl-set/spec/difference_spec
-stdlib/rubysl-set/spec/each_spec
-stdlib/rubysl-set/spec/empty_spec
-stdlib/rubysl-set/spec/enumerable/to_set_spec
-stdlib/rubysl-set/spec/eql_spec
-stdlib/rubysl-set/spec/equal_value_spec
-stdlib/rubysl-set/spec/include_spec
-stdlib/rubysl-set/spec/initialize_spec
-stdlib/rubysl-set/spec/length_spec
-stdlib/rubysl-set/spec/map_spec
-stdlib/rubysl-set/spec/member_spec
-stdlib/rubysl-set/spec/merge_spec
-stdlib/rubysl-set/spec/minus_spec
-stdlib/rubysl-set/spec/replace_spec
-stdlib/rubysl-set/spec/size_spec
-stdlib/rubysl-set/spec/subtract_spec
-stdlib/rubysl-set/spec/to_a_spec
-# stdlib/rubysl-set/spec/divide_spec
-# stdlib/rubysl-set/spec/exclusion_spec
-# stdlib/rubysl-set/spec/flatten_merge_spec
-# stdlib/rubysl-set/spec/flatten_spec
-# stdlib/rubysl-set/spec/hash_spec
-# stdlib/rubysl-set/spec/initialize_copy_spec
-# stdlib/rubysl-set/spec/inspect_spec
-# stdlib/rubysl-set/spec/intersection_spec
-# stdlib/rubysl-set/spec/keep_if_spec
-# stdlib/rubysl-set/spec/plus_spec
-# stdlib/rubysl-set/spec/pretty_print_cycle_spec
-# stdlib/rubysl-set/spec/pretty_print_spec
-# stdlib/rubysl-set/spec/proper_subset_spec
-# stdlib/rubysl-set/spec/proper_superset_spec
-# stdlib/rubysl-set/spec/reject_spec
-# stdlib/rubysl-set/spec/select_spec
-# stdlib/rubysl-set/spec/subset_spec
-# stdlib/rubysl-set/spec/superset_spec
-# stdlib/rubysl-set/spec/union_spec
+corelib/library/set/add_spec
+corelib/library/set/append_spec
+corelib/library/set/classify_spec
+corelib/library/set/clear_spec
+corelib/library/set/collect_spec
+corelib/library/set/constructor_spec
+corelib/library/set/delete_if_spec
+corelib/library/set/delete_spec
+corelib/library/set/difference_spec
+corelib/library/set/each_spec
+corelib/library/set/empty_spec
+corelib/library/set/enumerable/to_set_spec
+corelib/library/set/eql_spec
+corelib/library/set/equal_value_spec
+corelib/library/set/include_spec
+corelib/library/set/initialize_spec
+corelib/library/set/length_spec
+corelib/library/set/map_spec
+corelib/library/set/member_spec
+corelib/library/set/merge_spec
+corelib/library/set/minus_spec
+corelib/library/set/replace_spec
+corelib/library/set/size_spec
+corelib/library/set/subtract_spec
+corelib/library/set/to_a_spec
+corelib/library/set/plus_spec
+corelib/library/set/union_spec
+# corelib/library/set/divide_spec
+# corelib/library/set/exclusion_spec
+# corelib/library/set/flatten_merge_spec
+# corelib/library/set/flatten_spec
+# corelib/library/set/hash_spec
+# corelib/library/set/initialize_copy_spec
+# corelib/library/set/inspect_spec
+# corelib/library/set/intersection_spec
+# corelib/library/set/keep_if_spec
+# corelib/library/set/pretty_print_cycle_spec
+# corelib/library/set/pretty_print_spec
+# corelib/library/set/proper_subset_spec
+# corelib/library/set/proper_superset_spec
+# corelib/library/set/reject_spec
+# corelib/library/set/select_spec
+# corelib/library/set/subset_spec
+# corelib/library/set/superset_spec
 
-stdlib/rubysl-date/spec/date/add_month_spec
-stdlib/rubysl-date/spec/date/add_spec
-stdlib/rubysl-date/spec/date/append_spec
-stdlib/rubysl-date/spec/date/case_compare_spec
-stdlib/rubysl-date/spec/date/eql_spec
-stdlib/rubysl-date/spec/date/minus_month_spec
-stdlib/rubysl-date/spec/date/minus_spec
-stdlib/rubysl-date/spec/date/plus_spec
-stdlib/rubysl-date/spec/date/strftime_spec
+corelib/library/date/add_month_spec
+corelib/library/date/add_spec
+corelib/library/date/append_spec
+corelib/library/date/case_compare_spec
+corelib/library/date/eql_spec
+corelib/library/date/minus_month_spec
+corelib/library/date/minus_spec
+corelib/library/date/plus_spec
+corelib/library/date/strftime_spec

data/stdlib/encoding.rb

@@ -67,6 +67,9 @@ class Encoding
   def bytesize(*)
     raise NotImplementedError
   end
+
+  class EncodingError < StandardError; end
+  class CompatibilityError < EncodingError; end
 end
 
 Encoding.register "UTF-8", aliases: ["CP65001"], ascii: true do

data/stdlib/native.rb

@@ -492,7 +492,7 @@ class Hash
           keys   = self.keys,
           _map   = self.map,
           smap   = self.smap,
-          map, khash, value;
+          map, khash, value, key;
 
       for (var i = 0, length = keys.length; i < length; i++) {
         key   = keys[i];

data/stdlib/pp.rb

@@ -3,12 +3,33 @@ module Kernel
     inspect
   end
 
-  if `(typeof(console) === "undefined" || typeof(console.log) === "undefined")`
-    alias pp p
-  else
-    def pp(*args)
-      args.each { |obj| `console.log(obj)` }
-      args.length <= 1 ? args[0] : args
+  def pp(*objs)
+    objs.each {|obj|
+      PP.pp(obj)
+    }
+    objs.size <= 1 ? objs.first : objs
+  end
+  module_function :pp
+end
+
+class PP
+  class << self
+    if `(typeof(console) === "undefined" || typeof(console.log) === "undefined")`
+      def pp(obj, out=$stdout, width=79)
+        p(*args)
+      end
+    else
+      def pp(obj, out=`console`, width=79)
+        if `#{out} === console`
+          `console.log(obj)`
+        elsif String === out
+          out + obj.inspect + "\n"
+        else
+          out << obj.inspect + "\n"
+        end
+      end
     end
+
+    alias :singleline_pp :pp
   end
 end