opal 0.4.2 → 0.4.3

data/spec/opal/kernel/to_json_spec.rb

@@ -1,5 +1,7 @@
+require 'json'
+
 describe "Kernel#to_json" do
   it "returns an escaped #to_s of the receiver" do
     self.to_json.should be_kind_of(String)
   end
-end
+end

data/spec/opal/nil/to_json_spec.rb

@@ -1,5 +1,7 @@
+require 'json'
+
 describe "NilClass#to_json" do
   it "returns 'null'" do
     nil.to_json.should == "null"
   end
-end
+end

data/spec/opal/string/to_json_spec.rb

@@ -1,6 +1,8 @@
+require 'json'
+
 describe "String#to_json" do
   it "returns an escaped string" do
     "foo".to_json.should == "\"foo\""
     "bar\nbaz".to_json.should == "\"bar\\nbaz\""
   end
-end
+end

data/spec/parser/int_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe "Parsing integers" do
+  it "parses integers as a s(:int) sexp" do
+    opal_parse("32").should == [:int, 32]
+  end
+end
+
+describe "Parsing floats" do
+  it "parses floats as a s(:float)" do
+    opal_parse("3.142").should == [:float, 3.142]
+  end
+end

data/spec/parser/regexp_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe "Regexps" do
+  it "parses a regexp as a s(:lit)" do
+    opal_parse("/lol/").should == [:lit, /lol/]
+  end
+
+  it "parses regexp options" do
+    opal_parse("/lol/i").should == [:lit, /lol/i]
+  end
+
+  it "can parse regexps using %r notation" do
+    opal_parse('%r(foo)').should == [:lit, /foo/]
+    opal_parse('%r(foo)i').should == [:lit, /foo/i]
+  end
+end

data/spec/parser/str_spec.rb

@@ -104,4 +104,15 @@ describe "Strings" do
       opal_parse("foo ?a").should == [:call, nil, :foo, [:arglist, [:str, "a"]]]
     end
   end
+
+  describe "parsing heredocs" do
+    it "parses as a s(:str)" do
+      opal_parse("a = <<-FOO\nbar\nFOO")[2].should == [:str, "bar\n"]
+    end
+
+    it "allows start marker to be wrapped in quotes" do
+      opal_parse("a = <<-'FOO'\nbar\nFOO")[2].should == [:str, "bar\n"]
+      opal_parse("a = <<-\"FOO\"\nbar\nFOO")[2].should == [:str, "bar\n"]
+    end
+  end
 end

data/spec/rubyspec/core/array/plus_spec.rb

@@ -14,12 +14,17 @@ describe "Array#+" do
     (ary + ary).should == [1, 2, 3, 1, 2, 3]
   end
 
-  pending "tries to convert the passed argument to an Array using #to_ary" do
+  it "tries to convert the passed argument to an Array using #to_ary" do
     obj = mock('["x", "y"]')
-    obj.should_receive(:to_ary).and_return(["x", "y"])
+    def obj.to_ary ; ["x", "y"] ; end
+
     ([1, 2, 3] + obj).should == [1, 2, 3, "x", "y"]
   end
 
+  it "raise TypeError when not convert to array" do 
+    lambda { [1] + mock('["x", "y"]') }.should raise_error(TypeError)
+  end
+
   it "properly handles recursive arrays" do
     empty = ArraySpecs.empty_recursive_array
     (empty + empty).should == [empty, empty]

data/spec/rubyspec/core/hash/to_json_spec.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 describe "Hash#to_json" do
   it "returns a string of all key and value pairs" do
     {}.to_json.should == "{}"
@@ -6,4 +8,4 @@ describe "Hash#to_json" do
     hash = {"a" => 1, "b" => false, "c" => nil, "d" => true}
     JSON.parse(hash.to_json).should == hash
   end
-end
+end

data/spec/rubyspec/core/numeric/to_json_spec.rb

@@ -1,6 +1,8 @@
+require 'json'
+
 describe "Numeric#to_json" do
   it "returns a string representing the number" do
     42.to_json.should == "42"
     3.142.to_json.should == "3.142"
   end
-end
+end

data/spec/rubyspec/language/defined_spec.rb

@@ -96,3 +96,12 @@ describe "The defined? keyword for ivars" do
   end
 end
 
+describe "The defined? keyword for root constants (colon3)" do
+  it "returns 'constant' if assigned" do
+    defined?(::Object).should == "constant"
+  end
+
+  it "returns nil if not assigned" do
+    defined?(::DOES_NOT_EXIST).should be_nil
+  end
+end

data/spec/rubyspec/library/stringscanner/pos_spec.rb

@@ -0,0 +1,20 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'strscan'
+
+describe "StringScanner#pos=" do
+  before :each do
+    @s = StringScanner.new("This is a test")
+    @m = StringScanner.new("colourful")
+  end
+
+  it "modify the scan pointer" do
+    @s.pos = 5
+    @s.rest.should == "is a test"
+  end
+
+  it "positions from the end if the argument is negative" do
+    @s.pos = -2
+    @s.rest.should == "st"
+    @s.pos.should == 12
+  end
+end

data/stdlib/erb.rb

@@ -0,0 +1,26 @@
+module Template
+  @_cache = {}
+  def self.[](name)
+    @_cache[name]
+  end
+
+  def self.[]=(name, instance)
+    @_cache[name] = instance
+  end
+end
+
+class ERB
+  def initialize(name, &body)
+    @body = body
+    @name = name
+    Template[name] = self
+  end
+
+  def inspect
+    "#<ERB: name=#{@name.inspect}>"
+  end
+
+  def render(ctx = self)
+    ctx.instance_exec([], &@body)
+  end
+end

data/{opal → stdlib}/opal-browser/script_loader.rb

@@ -31,5 +31,5 @@ end
 
 if $global.respond_to? :document
   BrowserScriptLoader.new.run
-end
+end if false
 

data/{opal → stdlib}/opal-parser.js.erb

@@ -4,7 +4,7 @@
 
 // We need (some) of the libs from our real ruby parser (not in sprockets load path)
 <% %w(opal/version opal/grammar opal/lexer opal/parser opal/target_scope opal/core_ext opal/lexer_scope opal/grammar_helpers opal/parser opal).each do |f| %>
-<%= Opal::SprocketsParser.parse File.read(File.join Opal.core_dir, '..', 'lib', "#{f}.rb") %>
+<%= Opal::RequireParser.parse File.read(File.join Opal.core_dir, '..', 'lib', "#{f}.rb") %>
 <% end %>
 
 Opal.eval = function(str) {

data/{opal → stdlib}/source_map.rb

@@ -1,4 +1,4 @@
-require 'opal/json'
+require 'json'
 
 require 'source_map/vlq.rb'
 require 'source_map/generator.rb'

data/{opal → stdlib}/strscan.rb

@@ -112,4 +112,19 @@ class StringScanner
 
   # not exactly, but for now...
   alias getch get_byte
+
+  def pos=(pos)
+    %x{
+      if (pos < 0) {
+        pos += #{@string.length};
+      }
+    }
+
+    @pos = pos
+    @working = `#{@string}.slice(pos)`
+  end
+
+  def rest
+    @working
+  end
 end

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: opal
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
+  prerelease: 
 platform: ruby
 authors:
 - Adam Beynon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: source_map
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -41,59 +46,67 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uglifier
   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'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !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'
 - !ruby/object:Gem::Dependency
   name: opal-sprockets
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
 description: Ruby runtime and core library for javascript.
 email: adam.beynon@gmail.com
 executables:
@@ -103,81 +116,49 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
-- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/opal
-- config.ru
-- examples/native/Gemfile
-- examples/native/README.md
-- examples/native/app/app.rb
-- examples/native/config.ru
-- examples/native/index.html.erb
-- examples/rack/Gemfile
-- examples/rack/README.md
-- examples/rack/app/app.rb
-- examples/rack/config.ru
-- examples/rack/index.html
-- examples/server/Gemfile
-- examples/server/README.md
-- examples/server/app/app.rb
-- examples/server/config.ru
-- examples/server/index.html.erb
+- corelib/opal.rb
+- corelib/opal/array.rb
+- corelib/opal/basic_object.rb
+- corelib/opal/boolean.rb
+- corelib/opal/class.rb
+- corelib/opal/comparable.rb
+- corelib/opal/enumerable.rb
+- corelib/opal/enumerator.rb
+- corelib/opal/error.rb
+- corelib/opal/hash.rb
+- corelib/opal/kernel.rb
+- corelib/opal/native.rb
+- corelib/opal/nil_class.rb
+- corelib/opal/numeric.rb
+- corelib/opal/proc.rb
+- corelib/opal/range.rb
+- corelib/opal/regexp.rb
+- corelib/opal/runtime.js
+- corelib/opal/string.rb
+- corelib/opal/time.rb
 - lib/opal.rb
+- lib/opal/builder.rb
 - lib/opal/cli.rb
 - lib/opal/core_ext.rb
+- lib/opal/erb.rb
 - lib/opal/grammar.rb
 - lib/opal/grammar.y
 - lib/opal/grammar_helpers.rb
 - lib/opal/lexer.rb
 - lib/opal/lexer_scope.rb
 - lib/opal/parser.rb
+- lib/opal/require_parser.rb
 - lib/opal/source_map.rb
 - lib/opal/target_scope.rb
 - lib/opal/version.rb
 - opal.gemspec
-- opal/date.rb
-- opal/fileutils.rb
-- opal/iconv.rb
-- opal/observer.rb
-- opal/opal-browser/local_storage.rb
-- opal/opal-browser/script_loader.rb
-- opal/opal-parser.js.erb
-- opal/opal-source-maps.js.erb
-- opal/opal-template.rb
-- opal/opal.rb
-- opal/opal/array.rb
-- opal/opal/basic_object.rb
-- opal/opal/boolean.rb
-- opal/opal/class.rb
-- opal/opal/comparable.rb
-- opal/opal/enumerable.rb
-- opal/opal/enumerator.rb
-- opal/opal/error.rb
-- opal/opal/hash.rb
-- opal/opal/json.rb
-- opal/opal/kernel.rb
-- opal/opal/native.rb
-- opal/opal/nil_class.rb
-- opal/opal/numeric.rb
-- opal/opal/proc.rb
-- opal/opal/range.rb
-- opal/opal/regexp.rb
-- opal/opal/runtime.js
-- opal/opal/string.rb
-- opal/opal/time.rb
-- opal/pp.rb
-- opal/racc.rb
-- opal/rbconfig.rb
-- opal/source_map.rb
-- opal/source_map/generator.rb
-- opal/source_map/parser.rb
-- opal/source_map/vlq.rb
-- opal/strscan.rb
-- opal/yaml.rb
+- spec/config.ru
 - spec/index.html
 - spec/mspec/guards/block_device.rb
 - spec/mspec/guards/endian.rb
@@ -193,15 +174,16 @@ files:
 - spec/opal/boolean/singleton_class_spec.rb
 - spec/opal/boolean/to_json_spec.rb
 - spec/opal/browser/local_storage_spec.rb
-- spec/opal/class/_inherited_spec.rb
 - spec/opal/class/bridge_class_spec.rb
 - spec/opal/class/extend_spec.rb
 - spec/opal/class/instance_methods_spec.rb
 - spec/opal/class/last_value_spec.rb
-- spec/opal/class/new_spec.rb
 - spec/opal/class/proc_methods_spec.rb
 - spec/opal/class/singleton_methods_spec.rb
 - spec/opal/constants_spec.rb
+- spec/opal/erb/erb_spec.rb
+- spec/opal/erb/quoted.opalerb
+- spec/opal/erb/simple.opalerb
 - spec/opal/json/parse_spec.rb
 - spec/opal/kernel/block_given_spec.rb
 - spec/opal/kernel/class_spec.rb
@@ -262,6 +244,7 @@ files:
 - spec/parser/hash_spec.rb
 - spec/parser/iasgn_spec.rb
 - spec/parser/if_spec.rb
+- spec/parser/int_spec.rb
 - spec/parser/iter_spec.rb
 - spec/parser/ivar_spec.rb
 - spec/parser/lambda_spec.rb
@@ -277,6 +260,7 @@ files:
 - spec/parser/op_asgn2_spec.rb
 - spec/parser/or_spec.rb
 - spec/parser/parser_spec.rb
+- spec/parser/regexp_spec.rb
 - spec/parser/return_spec.rb
 - spec/parser/sclass_spec.rb
 - spec/parser/self_spec.rb
@@ -700,32 +684,54 @@ files:
 - spec/rubyspec/library/observer/notify_observers_spec.rb
 - spec/rubyspec/library/rbconfig/config_spec.rb
 - spec/rubyspec/library/stringscanner/element_reference_spec.rb
+- spec/rubyspec/library/stringscanner/pos_spec.rb
 - spec/rubyspec/spec_helper.rb
 - spec/spec_helper.rb
+- stdlib/date.rb
+- stdlib/erb.rb
+- stdlib/fileutils.rb
+- stdlib/iconv.rb
+- stdlib/json.rb
+- stdlib/observer.rb
+- stdlib/opal-browser/local_storage.rb
+- stdlib/opal-browser/script_loader.rb
+- stdlib/opal-parser.js.erb
+- stdlib/opal-source-maps.js.erb
+- stdlib/pp.rb
+- stdlib/racc.rb
+- stdlib/rbconfig.rb
+- stdlib/source_map.rb
+- stdlib/source_map/generator.rb
+- stdlib/source_map/parser.rb
+- stdlib/source_map/vlq.rb
+- stdlib/strscan.rb
+- stdlib/yaml.rb
 homepage: http://opalrb.org
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ruby runtime and core library for javascript
 test_files:
+- spec/config.ru
 - spec/index.html
 - spec/mspec/guards/block_device.rb
 - spec/mspec/guards/endian.rb
@@ -741,15 +747,16 @@ test_files:
 - spec/opal/boolean/singleton_class_spec.rb
 - spec/opal/boolean/to_json_spec.rb
 - spec/opal/browser/local_storage_spec.rb
-- spec/opal/class/_inherited_spec.rb
 - spec/opal/class/bridge_class_spec.rb
 - spec/opal/class/extend_spec.rb
 - spec/opal/class/instance_methods_spec.rb
 - spec/opal/class/last_value_spec.rb
-- spec/opal/class/new_spec.rb
 - spec/opal/class/proc_methods_spec.rb
 - spec/opal/class/singleton_methods_spec.rb
 - spec/opal/constants_spec.rb
+- spec/opal/erb/erb_spec.rb
+- spec/opal/erb/quoted.opalerb
+- spec/opal/erb/simple.opalerb
 - spec/opal/json/parse_spec.rb
 - spec/opal/kernel/block_given_spec.rb
 - spec/opal/kernel/class_spec.rb
@@ -810,6 +817,7 @@ test_files:
 - spec/parser/hash_spec.rb
 - spec/parser/iasgn_spec.rb
 - spec/parser/if_spec.rb
+- spec/parser/int_spec.rb
 - spec/parser/iter_spec.rb
 - spec/parser/ivar_spec.rb
 - spec/parser/lambda_spec.rb
@@ -825,6 +833,7 @@ test_files:
 - spec/parser/op_asgn2_spec.rb
 - spec/parser/or_spec.rb
 - spec/parser/parser_spec.rb
+- spec/parser/regexp_spec.rb
 - spec/parser/return_spec.rb
 - spec/parser/sclass_spec.rb
 - spec/parser/self_spec.rb
@@ -1248,5 +1257,6 @@ test_files:
 - spec/rubyspec/library/observer/notify_observers_spec.rb
 - spec/rubyspec/library/rbconfig/config_spec.rb
 - spec/rubyspec/library/stringscanner/element_reference_spec.rb
+- spec/rubyspec/library/stringscanner/pos_spec.rb
 - spec/rubyspec/spec_helper.rb
 - spec/spec_helper.rb