opal 0.4.1 → 0.4.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 21f31bff5e89852e9643aec27ca8a41008a42130
+  data.tar.gz: 5958461f09fa61100fd1c3b8a95aed70705687bc
+SHA512:
+  metadata.gz: 2825d7fea9566cf8e272099bb73e902575aa0ae64aa8e81bde751f5ddbd5d5a0a6150c2faaea775308b666e5bc0925a190d92c05d58b011626967bb7ea457978
+  data.tar.gz: 0a0d9f6d6759512726088751d88518f75041b6c890d9f76a316a7dc75bb74e97bf37aaa250d640eba4e053078fe42d2c3a2a38f1025310fdb96c23fb14c3f5de

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## edge
+
+## 0.4.2 2013-07-03
+
+*   Added `Kernel#rand`. (fntzr)
+
+*   Restored the `bin/opal` executable in gemspec.
+
+*   Now `.valueOf()` is used in `#to_n` of Boolean, Numeric, Regexp and String
+    to return the naked JavaScript value instead of a wrapping object.
+
+*   Parser now wraps or-ops in paranthesis to stop variable order from
+    leaking out when minified by uglify. We now have code in this
+    format: `(((tmp = lhs) !== false || !==nil) ? tmp : rhs)`.
+
 ## 0.4.1 2013-06-16
 
 *   Move sprockets logic out to external opal-sprockets gem. That now

data/Rakefile

@@ -1,5 +1,6 @@
 require 'bundler'
 Bundler.require
+Bundler::GemHelper.install_tasks
 
 require 'rack'
 require 'webrick'
@@ -11,19 +12,19 @@ class RunSpec
 
     ENV['OPAL_SPEC'] = file.nil? ? ["#{Dir.pwd}/spec/"].join(',') : file.join(',')
 
+    build_specs
+
     server = fork do
-      serv = Opal::Server.new { |s|
-        s.append_path 'spec' # before mspec, so we use our overrides
-        s.use_gem 'mspec'
-        s.debug = false
-        s.main = 'ospec/main'
-      }
-
-      Rack::Server.start(:app => serv, :Port => 9999, :AccessLog => [],
+      app = Rack::Builder.app do
+        use Rack::ShowExceptions
+        run Rack::Directory.new('.')
+      end
+
+      Rack::Server.start(:app => app, :Port => 9999, :AccessLog => [],
         :Logger => WEBrick::Log.new("/dev/null"))
     end
 
-    system "phantomjs \"spec/ospec/sprockets.js\" \"http://localhost:9999/\""
+    system "phantomjs \"spec/ospec/sprockets.js\" \"http://localhost:9999/spec/index.html\""
     success = $?.success?
 
     exit 1 unless success
@@ -32,6 +33,29 @@ class RunSpec
     Process.kill(:SIGINT, server)
     Process.wait
   end
+
+  def build_specs
+    env = Opal::Environment.new
+    env.append_path 'spec'
+    env.use_gem 'mspec'
+
+    FileUtils.mkdir_p 'build'
+    puts " * build/specs.js"
+
+    specs = uglify(env['ospec/main'].to_s)
+    File.open('build/specs.js', 'w+') { |o| o << specs }
+  end
+
+  # Only if OPAL_UGLIFY is set
+  def uglify(str)
+    if ENV['OPAL_UGLIFY']
+      require 'uglifier'
+      puts " * uglifying"
+      Uglifier.compile(str)
+    else
+      str
+    end
+  end
 end
 
 desc "Run tests through mspec"
@@ -55,7 +79,7 @@ task :build_specs do
   puts " * build/specs.js"
   specs = env['ospec/main'].to_s
 
-#  puts " * build/specs.min.js"
+  puts " * build/specs.min.js"
 #  min = Uglifier.compile(specs)
 
   File.open('build/specs.js', 'w+') { |o| o << specs }

data/config.ru

@@ -1,5 +1,6 @@
 require 'bundler'
 Bundler.require
+require 'opal-sprockets'
 
 ENV['OPAL_SPEC'] = ["#{Dir.pwd}/spec/"].join(',')
 
@@ -11,4 +12,5 @@ run Opal::Server.new { |s|
 
   s.debug = false
   s.main = 'ospec/main'
+  s.index_path = 'spec/index.html'
 }

data/lib/opal/cli.rb

@@ -1,10 +1,22 @@
 require 'opal'
 
+begin
+  require 'opal-sprockets'
+rescue LoadError
+  $stderr.puts 'Opal executable requires opal-sprockets to be fully functional.'
+  $stderr.puts 'You can install it with rubygems:'
+  $stderr.puts ''
+  $stderr.puts '    gem install opal-sprockets'
+  exit -1
+end
+
 module Opal
   class CLI
     attr_reader :options, :filename
 
     def initialize _filename, options
+      require 'rack'
+
       @options = options
       @filename = _filename
 

data/lib/opal/parser.rb

@@ -198,7 +198,7 @@ module Opal
         @scope.add_temp "__scope = __opal"
         @scope.add_temp "$mm = __opal.mm"
         @scope.add_temp "nil = __opal.nil"
-        @scope.add_temp "def = #{current_self}.constructor.prototype" if @scope.defines_defn
+        @scope.add_temp "def = __opal.Object.prototype" if @scope.defines_defn
         @helpers.keys.each { |h| @scope.add_temp "__#{h} = __opal.#{h}" }
 
         vars = [fragment(INDENT, sexp), @scope.to_vars, fragment("\n", sexp)]
@@ -1210,7 +1210,7 @@ module Opal
       elsif @scope.type == :iter
         [fragment("def#{jsid} = ", sexp), result]
       elsif @scope.type == :top
-        [fragment("#{ current_self }#{ jsid } = ", sexp), *result]
+        [fragment("def#{ jsid } = ", sexp), *result]
       else
         [fragment("def#{jsid} = ", sexp), result]
       end
@@ -1804,7 +1804,7 @@ module Opal
       with_temp do |tmp|
         lhs = process lhs, :expr
         rhs = process rhs, :expr
-      [fragment("(#{tmp} = ", sexp), lhs, fragment(", #{tmp} !== false && #{tmp} !== nil ? #{tmp} : ", sexp), rhs, fragment(")", sexp)]
+        [fragment("(((#{tmp} = ", sexp), lhs, fragment(") !== false && #{tmp} !== nil) ? #{tmp} : ", sexp), rhs, fragment(")", sexp)]
       end
     end
 

data/lib/opal/version.rb

@@ -1,3 +1,3 @@
 module Opal
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/opal.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.description  = 'Ruby runtime and core library for javascript.'
 
   s.files          = `git ls-files`.split("\n")
+  s.executables    = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.test_files     = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths  = ['lib']
 

data/opal/opal.rb

@@ -47,10 +47,10 @@ RUBY_ENGINE   = 'opal'
 RUBY_VERSION  = '1.9.3'
 RUBY_RELEASE_DATE = '2013-05-02'
 
-def to_s
+def self.to_s
   'main'
 end
 
-def include(mod)
+def self.include(mod)
   Object.include mod
 end

data/opal/opal/array.rb

@@ -8,28 +8,71 @@ class Array
     objects
   end
 
+  def initialize(*args)
+    self.class.new(*args)
+  end
+
   def self.new(size = undefined, obj = nil, &block)
     %x{
-      var arr = [];
+      
+      if (arguments.length > 2)
+        #{raise ArgumentError.new("wrong number of arguments. Array#new")};
+      
+      if (arguments.length == 0) 
+        return [];
+
+      var size, 
+          obj = arguments[1], 
+          arr = [];
 
-      if (size && size._isArray) {
-        for (var i = 0; i < size.length; i++) {
-          arr[i] = size[i];
+      if (!obj) {
+        if (size['$to_ary'] && typeof(size['$to_ary']) == 'function'){
+          if (size['$is_a?'](Array))
+            return size;
+          return size['$to_ary']();
         }
       }
+
+      if (typeof(arguments[0]) == 'number')
+        size = arguments[0];
       else {
-        if (block === nil) {
-          for (var i = 0; i < size; i++) {
-            arr[i] = obj;
+        if (arguments[0]['$to_int'] && typeof(arguments[0]['$to_int']) == 'function' ) {
+          size = arguments[0]['$to_int']();
+          if (typeof(size) == 'number') {
+            if (size % 1 !== 0) {
+              #{raise TypeError.new("can't convert to Integer. Array#new")};
+            }
+          } else {
+            #{raise TypeError.new("can't convert to Integer. Array#new")};
           }
+        } else {         
+          #{raise TypeError.new("can't convert to Integer. Array#new")};
         }
-        else {
-          for (var i = 0; i < size; i++) {
-            arr[i] = block(i);
+      }
+      
+      if (size < 0) {
+        #{raise ArgumentError.new("negative array size")};
+      }
+      
+      if (obj == undefined) {
+        obj = nil;
+      }
+      
+      
+      if (block === nil)
+        for (var i = 0; i < size; i++) {
+          arr.push(obj);
+        }
+      else {
+        for (var i = 0, value; i < size; i++) {
+          value = block(i);
+          if (value === __breaker) {
+            return __breaker.$v;
           }
+          arr[i] = block(i);
         }
-      }
-
+      }  
+      
       return arr;
     }
   end

data/opal/opal/boolean.rb

@@ -32,7 +32,7 @@ class Boolean
   end
 
   def to_n
-    self
+    `#{self}.valueOf()`
   end
 end
 

data/opal/opal/kernel.rb

@@ -378,14 +378,26 @@ module Kernel
   end
 
   def rand(max = undefined)
-    `max == null ? Math.random() : Math.floor(Math.random() * max)`
+    %x{
+      if(!max) {
+        return Math.random();
+      } else {
+        if (max._isRange) {
+          var arr = max.$to_a();
+          return arr[#{rand(`arr.length`)}];
+        } else {
+          return Math.floor(Math.random() * Math.abs(parseInt(max)));
+        }
+      }
+    }
   end
 
   def respond_to?(name)
     `!!#{self}['$' + name]`
   end
 
-  alias send __send__
+  alias send        __send__
+  alias public_send __send__
 
   def singleton_class
     %x{

data/opal/opal/numeric.rb

@@ -190,7 +190,7 @@ class Numeric
   end
 
   def to_n
-    self
+    `#{self}.valueOf()`
   end
 
   def upto(finish, &block)

data/opal/opal/regexp.rb

@@ -77,6 +77,6 @@ class Regexp
   alias to_s source
 
   def to_n
-    self
+    `#{self}.valueOf()`
   end
 end

data/opal/opal/string.rb

@@ -1062,7 +1062,7 @@ class MatchData < Array
   end
 
   def to_n
-    self
+    `#{self}.valueOf()`
   end
 
   def values_at(*indexes)

data/spec/index.html

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Opal Specs</title>
+  </head>
+  <body>
+    <script src="/build/specs.js"></script>
+  </body>
+</html>

data/spec/opal/kernel/rand_spec.rb

@@ -7,6 +7,15 @@ describe "Kernel.rand" do
     rand(77).should be_kind_of(Integer)
   end
 
+  it "return member from range" do 
+    r = (1..10)
+    r.to_a.include?(rand(r)).should == true
+  end
+
+  it "should convert negative number and convert to integer" do 
+    rand(-0.1).should == 0
+  end
+  
   it "returns a numeric in opal" do
     rand.should be_kind_of(Numeric)
     rand(77).should be_kind_of(Numeric)

data/spec/opal/runtime/main_methods_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+$OPAL_TOP_LEVEL_OBJECT = self
+
+def self.some_main_method
+  3.142
+end
+
+def some_top_level_method_is_defined
+  42
+end
+
+describe "Defining normal methods at the top level" do
+  it "should define them on Object, not main" do
+    Object.new.some_top_level_method_is_defined.should == 42
+  end
+end
+
+describe "Defining singleton methods on main" do
+  it "should define it on main directly" do
+    $OPAL_TOP_LEVEL_OBJECT.some_main_method.should == 3.142
+  end
+
+  it "should not define the method for all Objects" do
+    lambda { Object.new.some_main_method }.should raise_error(NoMethodError)
+  end
+end

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

@@ -10,9 +10,9 @@ describe "Array.new" do
     ArraySpecs::MyArray.new(1, 2).should be_an_instance_of(ArraySpecs::MyArray)
   end
 
-  pending "raise an ArgumentError if passed 3 or more arguments" do
+  it "raise an ArgumentError if passed 3 or more arguments" do
     lambda do
-      [1, 2].send :initialize, 1, 'x', true
+      Array.new(1, 'x', true)
     end.should raise_error(ArgumentError)
     lambda do
       [1, 2].send(:initialize, 1, 'x', true) {}
@@ -21,7 +21,7 @@ describe "Array.new" do
 end
 
 describe "Array.new with no arguments" do
-  pending "returns an empty array" do
+  it "returns an empty array" do
     Array.new.should be_empty
   end
 
@@ -40,20 +40,19 @@ describe "Array.new with (array)" do
     lambda{ Array.new([1, 2]) { raise } }.should_not raise_error
   end
 
-  pending "calls #to_ary to convert the value to an array" do
+  it "calls #to_ary to convert the value to an array" do
     a = mock("array")
-    a.should_receive(:to_ary).and_return([1, 2])
-    a.should_not_receive(:to_int)
+    def a.to_ary; [1,2]; end
     Array.new(a).should == [1, 2]
   end
 
-  pending "does not call #to_ary on instances of Array or subclasses of Array" do
+  it "does not call #to_ary on instances of Array or subclasses of Array" do
     a = [1, 2]
-    a.should_not_receive(:to_ary)
-    Array.new(a)
+    def a.to_ary; [1,2,3]; end
+    Array.new(a).should == [1,2]
   end
 
-  pending "raises a TypeError if an Array type argument and a default object" do
+  it "raises a TypeError if an Array type argument and a default object" do
     lambda { Array.new([1, 2], 1) }.should raise_error(TypeError)
   end
 end
@@ -67,11 +66,11 @@ describe "Array.new with (size, object=nil)" do
     a[1].should equal(obj)
   end
 
-  it "returns an array of size filled with nil when object is omitted" do
+  it "returns an array of size filled with nil when object is omitted" do    
     Array.new(3).should == [nil, nil, nil]
   end
 
-  pending "raises an ArgumentError if size is negative" do
+  it "raises an ArgumentError if size is negative" do
     lambda { Array.new(-1, :a) }.should raise_error(ArgumentError)
     lambda { Array.new(-1) }.should raise_error(ArgumentError)
   end
@@ -92,22 +91,30 @@ describe "Array.new with (size, object=nil)" do
   end
   end
 
-  pending "calls #to_int to convert the size argument to an Integer when object is given" do
+  it "calls #to_int to convert the size argument to an Integer when object is given" do
     obj = mock('1')
-    obj.should_receive(:to_int).and_return(1)
+    def obj.to_int; 1; end
     Array.new(obj, :a).should == [:a]
   end
 
-  pending "calls #to_int to convert the size argument to an Integer when object is not given" do
+  it "calls #to_int to convert the size argument to an Integer when object is not given" do
     obj = mock('1')
-    obj.should_receive(:to_int).and_return(1)
+    def obj.to_int; 1; end
     Array.new(obj).should == [nil]
   end
 
-  pending "raises a TypeError if the size argument is not an Integer type" do
-    obj = mock('nonnumeric')
-    obj.stub!(:to_ary).and_return([1, 2])
-    lambda{ Array.new(obj, :a) }.should raise_error(TypeError)
+  it "raises a TypeError if the size argument is not an Integer type" do
+    obj1 = mock('nonnumeric')
+    def obj1.to_int; [1,2]; end
+    lambda{ Array.new(obj1, :a) }.should raise_error(TypeError)
+
+    obj2 = mock('nonnumeric')
+    def obj2.to_int; "123"; end
+    lambda{ Array.new(obj2, :a) }.should raise_error(TypeError)
+    
+    obj3 = mock('nonnumeric')
+    def obj3.to_int; 1.2; end
+    lambda{ Array.new(obj3, :a) }.should raise_error(TypeError)
   end
 
   it "yields the index of the element and sets the element to the value of the block" do
@@ -118,12 +125,15 @@ describe "Array.new with (size, object=nil)" do
     Array.new(3, :obj) { |i| i.to_s }.should == ['0', '1', '2']
   end
 
-  pending "returns the value passed to break" do
-    a = Array.new(3) do |i|
+  it "returns the value passed to break" do
+    Array.new(3) do |i|
       break if i == 2
       i.to_s
-    end
+    end.should == nil
 
-    a.should == nil
+    Array.new(3) do |i|
+      break 3 if i == 2
+      i.to_s
+    end.should == 3
   end
 end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: opal
 version: !ruby/object:Gem::Version
-  version: 0.4.1
-  prerelease: 
+  version: 0.4.2
 platform: ruby
 authors:
 - Adam Beynon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2013-07-03 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
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -46,55 +41,48 @@ 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
@@ -102,14 +90,14 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.0
 description: Ruby runtime and core library for javascript.
 email: adam.beynon@gmail.com
-executables: []
+executables:
+- opal
 extensions: []
 extra_rdoc_files: []
 files:
@@ -190,6 +178,7 @@ files:
 - opal/source_map/vlq.rb
 - opal/strscan.rb
 - opal/yaml.rb
+- spec/index.html
 - spec/mspec/guards/block_device.rb
 - spec/mspec/guards/endian.rb
 - spec/mspec/helpers/environment.rb
@@ -243,10 +232,10 @@ files:
 - spec/opal/proc/proc_tricks_spec.rb
 - spec/opal/runtime/block_send_spec.rb
 - spec/opal/runtime/eval_spec.rb
+- spec/opal/runtime/main_methods_spec.rb
 - spec/opal/runtime/send_spec.rb
 - spec/opal/runtime2/call_spec.rb
 - spec/opal/runtime2/class_hierarchy_spec.rb
-- spec/opal/runtime2/def_spec.rb
 - spec/opal/runtime2/defined_spec.rb
 - spec/opal/runtime2/super_spec.rb
 - spec/opal/source_map_spec.rb
@@ -715,29 +704,29 @@ files:
 - spec/spec_helper.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: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby runtime and core library for javascript
 test_files:
+- spec/index.html
 - spec/mspec/guards/block_device.rb
 - spec/mspec/guards/endian.rb
 - spec/mspec/helpers/environment.rb
@@ -791,10 +780,10 @@ test_files:
 - spec/opal/proc/proc_tricks_spec.rb
 - spec/opal/runtime/block_send_spec.rb
 - spec/opal/runtime/eval_spec.rb
+- spec/opal/runtime/main_methods_spec.rb
 - spec/opal/runtime/send_spec.rb
 - spec/opal/runtime2/call_spec.rb
 - spec/opal/runtime2/class_hierarchy_spec.rb
-- spec/opal/runtime2/def_spec.rb
 - spec/opal/runtime2/defined_spec.rb
 - spec/opal/runtime2/super_spec.rb
 - spec/opal/source_map_spec.rb

data/spec/opal/runtime2/def_spec.rb

@@ -1,23 +0,0 @@
-def def_test_bar
-  42
-end
-
-def self.def_test_foo
-  "bar"
-end
-
-$top_level_object = self
-
-describe "Defining top level methods" do
-  it "should work with def self.x" do
-    $top_level_object.def_test_foo.should == "bar"
-  end
-
-  it "should work with def x" do
-    $top_level_object.def_test_bar.should == 42
-  end
-
-  it "defines methods on singleton class" do
-    Object.new.respond_to?(:def_test_bar).should == false
-  end
-end