opal 0.7.0.beta1 → 0.7.0.beta2

data/opal/corelib/string/inheritance.rb

@@ -3,10 +3,10 @@ class String
     replace = Class.new(String::Wrapper)
 
     %x{
-      klass.$$proto        = replace.$$proto;
+      klass.$$proto         = replace.$$proto;
       klass.$$proto.$$class = klass;
-      klass.$$alloc        = replace.$$alloc;
-      klass.$$parent      = #{String::Wrapper};
+      klass.$$alloc         = replace.$$alloc;
+      klass.$$parent        = #{String::Wrapper};
 
       klass.$allocate = replace.$allocate;
       klass.$new      = replace.$new;

data/opal/corelib/struct.rb

@@ -125,7 +125,7 @@ class Struct
     result = "#<struct "
 
     if self.class == Struct
-      result += "#{self.class.name} "
+      result += "#{self.class} "
     end
 
     result += each_pair.map {|name, value|

data/opal/corelib/time.rb

@@ -326,7 +326,7 @@ class Time
 
           case 'C':
             zero    = !blank;
-            result += Match.round(#{year} / 100);
+            result += Math.round(#{year} / 100);
             break;
 
           case 'y':
@@ -455,8 +455,17 @@ class Time
             result += #{wday};
             break;
 
-          // TODO: week year
-          // TODO: week number
+          case 'V':
+            result += #{cweek_cyear[0].to_s.rjust(2, "0")};
+            break;
+
+          case 'G':
+            result += #{cweek_cyear[1]};
+            break;
+
+          case 'g':
+            result += #{cweek_cyear[1][-2..-1]};
+            break;
 
           case 's':
             result += #{to_i};
@@ -581,4 +590,38 @@ class Time
       }
     }
   end
+
+  private :cweek_cyear
+  def cweek_cyear
+    jan01 = Time.new(self.year, 1, 1)
+    jan01_wday = jan01.wday
+    first_monday = 0
+    year = self.year
+    if jan01_wday <= 4 && jan01_wday != 0
+      #Jan 01 is in the first week of the year
+      offset = jan01_wday-1
+    else
+      #Jan 01 is in the last week of the previous year
+      offset = jan01_wday-7-1
+      offset = -1 if offset == -8 #Adjust if Jan 01 is a Sunday
+    end
+
+    week = ((self.yday+offset)/7.00).ceil
+
+    if week <= 0
+      #Get the last week of the previous year
+      return Time.new(self.year-1, 12, 31).cweek_cyear
+    elsif week == 53
+      #Find out whether this is actually week 53 or already week 01 of the following year
+      dec31 = Time.new(self.year, 12, 31)
+      dec31_wday = dec31.wday
+      if dec31_wday <= 3 && dec31_wday != 0
+        week = 1
+        year += 1
+      end
+    end
+
+    [week, year]
+
+  end
 end

data/spec/filters/bugs/date.rb

@@ -0,0 +1,15 @@
+opal_filter "Date" do
+  fails "Date#<< raises an error on non numeric parameters"
+
+  fails "Date#strftime should be able to print the commercial year with leading zeroes"
+  fails "Date#strftime should be able to print the commercial year with only two digits"
+  fails "Date#strftime should be able to print the year day with leading zeroes"
+  fails "Date#strftime should be able to show a full notation"
+  fails "Date#strftime should be able to show the commercial week"
+  fails "Date#strftime should be able to show the timezone of the date with a : separator"
+  fails "Date#strftime should be able to show the timezone of the date with a : separator"
+  fails "Date#strftime should be able to show the commercial week"
+  fails "Date#strftime should be able to show the commercial week day"
+  fails "Date#strftime should be able to show the week number with the week starting on sunday and monday"
+  fails "Date#strftime should be able to show the number of seconds since the unix epoch"
+end

data/spec/filters/bugs/enumerator.rb

@@ -1,3 +1,10 @@
 opal_filter "Enumerator" do
   fails "Enumerator#each requires multiple arguments" # arity issue
+
+  fails "Enumerator#with_index returns the object being enumerated when given a block"
+  fails "Enumerator#with_index numbers indices from the given index when given an offset but no block"
+  fails "Enumerator#with_index numbers indices from the given index when given an offset and block"
+  fails "Enumerator#with_index converts non-numeric arguments to Integer via #to_int"
+  fails "Enumerator#with_index coerces the given numeric argument to an Integer"
+  fails "Enumerator#with_index accepts negative argument"
 end

data/spec/filters/bugs/exception.rb

@@ -0,0 +1,12 @@
+opal_filter "Exception" do
+  fails "Exception#message calls #to_s on self"
+
+  fails "Exception.new returns the exception when it has a custom constructor"
+
+  fails "Exception#to_s returns the self's name if no message is set"
+  fails "Exception#to_s calls #to_s on the message"
+
+  fails "Exception#inspect returns the class name when #to_s returns an empty string"
+  fails "Exception#inspect includes #to_s when the result is non-empty"
+  fails "Exception#inspect returns '#<Exception: Exception>' when no message given"
+end

data/spec/filters/bugs/hash.rb

@@ -55,17 +55,11 @@ opal_filter "Hash" do
   fails "Hash#flatten recursively flattens Array values to the given depth"
   fails "Hash#flatten raises a TypeError if given a non-Integer argument"
 
-  fails "Hash#has_key? compares keys with the same #hash value via #eql?"
-  fails "Hash#has_key? returns true if argument is a key"
-
   fails "Hash#hash returns the same hash for recursive hashes through arrays"
   fails "Hash#hash returns the same hash for recursive hashes"
   fails "Hash#hash generates a hash for recursive hash structures"
   fails "Hash#hash returns a value which doesn't depend on the hash order"
 
-  fails "Hash#include? compares keys with the same #hash value via #eql?"
-  fails "Hash#include? returns true if argument is a key"
-
   fails "Hash#invert compares new keys with eql? semantics"
 
   fails "Hash#initialize_copy does not transfer default values"
@@ -73,14 +67,6 @@ opal_filter "Hash" do
   fails "Hash#initialize_copy tries to convert the passed argument to a hash using #to_hash"
   fails "Hash#initialize_copy replaces the contents of self with other"
 
-  fails "Hash#inspect handles hashes with recursive values"
-
-  fails "Hash#key? compares keys with the same #hash value via #eql?"
-  fails "Hash#key? returns true if argument is a key"
-
-  fails "Hash#member? compares keys with the same #hash value via #eql?"
-  fails "Hash#member? returns true if argument is a key"
-
   fails "Hash#merge returns subclass instance for subclasses"
 
   fails "Hash.new raises an ArgumentError if more than one argument is passed"
@@ -113,10 +99,6 @@ opal_filter "Hash" do
   fails "Hash#sort works when some of the keys are themselves arrays"
   fails "Hash#sort uses block to sort array if passed a block"
 
-  fails "Hash#to_h returns self for Hash instances"
-
-  fails "Hash#to_s handles hashes with recursive values"
-
   fails "Hash.try_convert does not rescue exceptions raised by #to_hash"
   fails "Hash.try_convert sends #to_hash to the argument and raises TypeError if it's not a kind of Hash"
   fails "Hash.try_convert sends #to_hash to the argument and returns the result if it's a kind of Hash"

data/spec/filters/bugs/match_data.rb

@@ -0,0 +1,13 @@
+opal_filter "MatchData" do
+  fails "MatchData#regexp returns the pattern used in the match"
+  fails "MatchData#values_at when passed a Range returns an array of the matching value"
+
+  fails "MatchData#[Symbol] returns the corresponding named match when given a Symbol"
+  fails "MatchData#[Symbol] returns the corresponding named match when given a String"
+  fails "MatchData#[Symbol] returns the matching version of multiple corresponding named match"
+  fails "MatchData#[Symbol] returns the last match when multiple named matches exist with the same name"
+  fails "MatchData#[Symbol] returns nil on non-matching named matches"
+  fails "MatchData#[Symbol] raises an IndexError if there is no named match corresponding to the Symbol"
+  fails "MatchData#[Symbol] raises an IndexError if there is no named match corresponding to the String"
+  fails "MatchData#[Symbol] returns matches in the String's encoding"
+end

data/spec/filters/bugs/module.rb

@@ -11,4 +11,17 @@ opal_filter "Module" do
 
   fails "Module#const_defined? should not search parent scopes of classes and modules if inherit is false"
   fails "Module#const_get should not search parent scopes of classes and modules if inherit is false"
+
+  fails "Module#module_function as a toggle (no arguments) in a Module body functions normally if both toggle and definitions inside a eval"
+  fails "Module#module_function as a toggle (no arguments) in a Module body does not affect definitions when inside an eval even if the definitions are outside of it"
+
+  fails "Module#module_function is a private method"
+  fails "Module#module_function on Class raises a TypeError if calling after rebinded to Class"
+  fails "Module#module_function with specific method names makes the instance methods private"
+  fails "Module#module_function with specific method names makes the new Module methods public"
+  fails "Module#module_function with specific method names tries to convert the given names to strings using to_str"
+  fails "Module#module_function with specific method names raises a TypeError when the given names can't be converted to string using to_str"
+  fails "Module#module_function with specific method names can make accessible private methods"
+  fails "Module#module_function as a toggle (no arguments) in a Module body does not affect module_evaled method definitions also if outside the eval itself"
+  fails "Module#module_function as a toggle (no arguments) in a Module body has no effect if inside a module_eval if the definitions are outside of it"
 end

data/spec/filters/bugs/numeric.rb

@@ -1,5 +1,7 @@
 opal_filter "Fixnum bugs" do
   fails "Integer#downto [stop] when self and stop are Fixnums raises an ArgumentError for invalid endpoints"
+  fails "Integer#upto [stop] when self and stop are Fixnums raises an ArgumentError for non-numeric endpoints"
+  fails "Integer#even? returns true when self is an even number"
 
   fails "Fixnum#to_s when no base given returns self converted to a String using base 10"
 

data/spec/filters/bugs/regexp.rb

@@ -6,6 +6,4 @@ opal_filter "RegExp" do
   fails "Regexp#match matches the input at a given position"
   fails "Regexp#match with [string, position] when given a positive position matches the input at a given position"
   fails "Regexp#match with [string, position] when given a negative position matches the input at a given position"
-  fails "MatchData#regexp returns the pattern used in the match"
-  fails "MatchData#values_at when passed a Range returns an array of the matching value"
 end

data/spec/filters/bugs/stringscanner.rb

@@ -19,4 +19,12 @@ opal_filter "StringScanner" do
 
   fails "StringScanner#pos= can poin position that greater than string length for multibyte string"
   fails "StringScanner#pos= positions from the end if the argument is negative for multibyte string"
+
+  fails "StringScanner#peek taints the returned String if the input was tainted"
+  fails "StringScanner#peek returns an instance of String when passed a String subclass"
+  fails "StringScanner#peek raises a RangeError when the passed argument is a Bignum"
+  fails "StringScanner#peek raises a ArgumentError when the passed argument is negative"
+
+  fails "StringScanner#rest taints the returned String if the input was tainted"
+  fails "StringScanner#rest returns an instance of String when passed a String subclass"
 end

data/spec/filters/bugs/time.rb

@@ -173,5 +173,5 @@ opal_filter "Time" do
   # The following specs fail under certain TZ / DST conditions
   fails "Time.utc accepts various year ranges"
   fails "Time.gm accepts various year ranges"
-
+  fails "Time#yday returns an integer representing the day of the year, 1..366"
 end

data/spec/filters/unsupported/float.rb

@@ -2,4 +2,5 @@ opal_filter "Float" do
   fails "Array#inspect represents a recursive element with '[...]'"
   fails "Array#to_s represents a recursive element with '[...]'"
   fails "Array#eql? returns false if any corresponding elements are not #eql?"
+  fails "Set#eql? returns true when the passed argument is a Set and contains the same elements"
 end

data/spec/filters/unsupported/symbols.rb

@@ -0,0 +1,10 @@
+# These specs fail because Opal does not have a separate Symbol class, and maps
+# them to Strings. Symbol#inspect is expected to != String#inspect.
+opal_filter "Symbols" do
+  fails "A Symbol literal is a ':' followed by any number of valid characters"
+  fails "A Symbol literal is a ':' followed by a single- or double-quoted string that may contain otherwise invalid characters"
+  fails "A Symbol literal is converted to a literal, unquoted representation if the symbol contains only valid characters"
+  fails "A Symbol literal can be created by the %s-delimited expression"
+  fails "A Symbol literal can contain null in the string"
+  fails "A Symbol literal can be an empty string"
+end

data/spec/filters/unsupported/tainted.rb

@@ -152,4 +152,7 @@ opal_filter 'tainted' do
   fails "Enumerable#group_by returns a tainted hash if self is tainted"
 
   fails "Enumerable#to_a returns a tainted array if self is tainted"
+
+  fails "MatchData#post_match keeps taint status from the source string"
+  fails "MatchData#pre_match keeps taint status from the source string"
 end

data/spec/filters/unsupported/trusted.rb

@@ -77,4 +77,7 @@ opal_filter "Object#trusted/untrusted" do
   fails "String#gsub with pattern and Hash untrusts the result if the original string is untrusted"
   fails "String#gsub with pattern and Hash untrusts the result if a hash value is untrusted"
   fails "String#gsub with pattern and block untrusts the result if the original string or replacement is untrusted"
+
+  fails "MatchData#pre_match keeps untrusted status from the source string"
+  fails "MatchData#post_match keeps untrusted status from the source string"
 end

data/spec/lib/compiler_spec.rb

@@ -9,13 +9,13 @@ describe Opal::Compiler do
 
   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

data/spec/lib/parser/call_spec.rb

@@ -137,3 +137,10 @@ describe "Command calls with operators" do
     end
   end
 end
+
+describe "Command calls without a space" do
+  it "correctly parses symbol arguments" do
+    parsed("self.inject:+").should == [:call, [:self], :inject,
+                                       [:arglist, [:sym, :+]]]
+  end
+end

data/spec/opal/core/date_spec.rb

@@ -84,14 +84,6 @@ describe Date do
     end
   end
 
-  describe "#prev" do
-    it "returns the previous date from self" do
-      Date.new(2013, 3, 5).prev.should == Date.new(2013, 3, 4)
-      Date.new(2013, 6, 1).prev.should == Date.new(2013, 5, 31)
-      Date.new(2014, 1, 1).prev.should == Date.new(2013, 12, 31)
-    end
-  end
-
   describe "#prev_month" do
     it "returns the date with the previous calendar month" do
       Date.new(2013, 2, 9).prev_month.should == Date.new(2013, 1, 9)
@@ -100,6 +92,26 @@ describe Date do
     end
   end
 
+  describe '#next_day' do
+    it 'returns a new date the given number of days after self' do
+      Date.new(2014, 4, 5).next_day.should == Date.new(2014, 4, 6)
+      Date.new(2014, 4, 5).next_day(4).should == Date.new(2014, 4, 9)
+    end
+  end
+
+  describe '#prev_day' do
+    it 'returns the date the given number of days before self' do
+      Date.new(2014, 4, 5).prev_day.should == Date.new(2014, 4, 4)
+      Date.new(2014, 4, 5).prev_day(4).should == Date.new(2014, 4, 1)
+    end
+  end
+
+  describe '#succ' do
+    it 'returns the date after the receiver' do
+      Date.new(1986, 5, 26).succ.should == Date.new(1986, 5, 27)
+    end
+  end
+
   describe "#to_s" do
     it "returns an ISO 8601 representation" do
       Date.new(2013, 10, 15).to_s.should == "2013-10-15"
@@ -119,4 +131,33 @@ describe Date do
       Date.new(2013, 2, 9).year.should == 2013
     end
   end
+
+  it 'correctly reports mondays' do
+    Date.new(2015, 4, 6).monday?.should be_true
+  end
+
+  it 'correctly reports tuesdays' do
+    Date.new(2015, 4, 7).tuesday?.should be_true
+  end
+
+  it 'correctly reports wednesdays' do
+    Date.new(2015, 4, 8).wednesday?.should be_true
+  end
+
+  it 'correctly reports thursdays' do
+    Date.new(2015, 4, 9).thursday?.should be_true
+  end
+
+  it 'correctly reports fridays' do
+    Date.new(2015, 4, 10).friday?.should be_true
+  end
+
+  it 'correctly reports saturdays' do
+    Date.new(2015, 4, 11).saturday?.should be_true
+  end
+
+  it 'correctly reports sundays' do
+    Date.new(2015, 4, 12).sunday?.should be_true
+  end
+
 end

data/spec/opal/core/exception_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+class ExceptionSubclassTest < Exception
+  def custom_method
+    42
+  end
+end
+
+describe "Exception" do
+  it "subclasses can have methods defined on them" do
+    ExceptionSubclassTest.new.custom_method.should == 42
+  end
+end

data/spec/opal/core/fixtures/require_tree_files/nested/nested 1.rb

@@ -0,0 +1 @@
+$ScratchPad << File.basename(__FILE__)

data/spec/opal/core/fixtures/require_tree_files/nested/nested 2.rb

@@ -0,0 +1 @@
+$ScratchPad << File.basename(__FILE__)

data/spec/opal/core/fixtures/require_tree_files/other/other 1.rb

@@ -0,0 +1 @@
+$ScratchPad << File.basename(__FILE__)

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

@@ -2,6 +2,8 @@ describe 'Kernel.require_tree' do
   it 'loads all the files in a directory' do
     $ScratchPad = []
     require_tree '../fixtures/require_tree_files'
-    $ScratchPad.sort.should == ['file 1', 'file 2', 'file 3', 'file 4', 'file 5']
+
+    $ScratchPad.sort.should == ['file 1', 'file 2', 'file 3', 'file 4', 'file 5',
+                                'nested 1', 'nested 2', 'other 1']
   end
 end

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

@@ -16,6 +16,49 @@ describe "predefined global $~" do
     /foo/ =~ 'bar'
     $~.nil?.should == true
   end
+
+  it "changes the value of derived capture globals when assigned" do
+    "foo" =~ /(f)oo/
+    foo_match = $~
+    "bar" =~ /(b)ar/
+    $~ = foo_match
+    $1.should == "f"
+  end
+end
+
+describe "Predefined global match $&" do
+  it "is equivalent to MatchData#[0] on the last match $~" do
+    /foo/ =~ 'barfoobaz'
+    $&.should == $~[0]
+    $&.should == 'foo'
+  end
+end
+describe "Predefined global $`" do
+  it "is equivalent to MatchData#pre_match on the last match $~" do
+    /foo/ =~ 'barfoobaz'
+    $`.should == $~.pre_match
+    $`.should == 'bar'
+  end
+end
+
+describe "Predefined global $'" do
+  it "is equivalent to MatchData#post_match on the last match $~" do
+    /foo/ =~ 'barfoobaz'
+    $'.should == $~.post_match
+    $'.should == 'baz'
+  end
+end
+
+describe "predefined globals $1..N" do
+  it "are equivalent to $~[N]" do
+    /(f)(o)(o)/ =~ 'foo'
+    $1.should == $~[1]
+    $2.should == $~[2]
+    $3.should == $~[3]
+    $4.should == $~[4]
+
+    [$1, $2, $3, $4].should == ['f', 'o', 'o', nil]
+  end
 end
 
 describe "predefined global $:" do