opal 0.3.18 → 0.3.19

data/core/string.rb

@@ -1,14 +1,19 @@
-class String
+class String < `String`
+  %x{
+    def._isString = true;
+    var string_class = this;
+  }
+
   include Comparable
 
   def self.try_convert(what)
     what.to_str
   rescue
-    null
+    nil
   end
 
   def self.new(str = '')
-    str.to_s
+    allocate str.to_s
   end
 
   def %(data)
@@ -43,7 +48,7 @@ class String
   def <=>(other)
     %x{
       if (typeof other !== 'string') {
-        return null;
+        return nil;
       }
 
       return this > other ? 1 : (this < other ? -1 : 0);
@@ -75,7 +80,7 @@ class String
   def =~(other)
     %x{
       if (typeof other === 'string') {
-        throw RubyTypeError.$new(null, 'string given');
+        throw RubyTypeError.$new('string given');
       }
 
       return #{other =~ self};
@@ -85,7 +90,29 @@ class String
   # TODO: implement range based accessors
   # TODO: implement regex based accessors
   def [](index, length = undefined)
-    `this.substr(index, length)`
+    %x{
+      if (length == null) {
+        if (index < 0) {
+          index += this.length;
+        }
+
+        if (index >= this.length || index < 0) {
+          return nil;
+        }
+
+        return this.substr(index, 1);
+      }
+
+      if (index < 0) {
+        index += this.length + 1;
+      }
+
+      if (index > this.length || index < 0) {
+        return nil;
+      }
+
+      return this.substr(index, length);
+    }
   end
 
   def capitalize
@@ -116,11 +143,15 @@ class String
   end
 
   def chomp(separator = $/)
-    if separator == "\n"
-      sub(/(\n|\r|\r\n)$/, '')
-    else
-      sub(/#{Regexp.escape(separator)}$/, '')
-    end
+    %x{
+      if (separator === "\\n") {
+        return this.replace(/(\\n|\\r|\\r\\n)$/, '');
+      }
+      else if (separator === "") {
+        return this.replace(/(\\n|\\r\\n)+$/, '');
+      }
+      return this.replace(new RegExp(separator + '$'), '');
+    }
   end
 
   def chop
@@ -131,18 +162,6 @@ class String
     `this.charAt(0)`
   end
 
-  def count (*sets)
-    raise NotImplementedError
-  end
-
-  def crypt
-    raise NotImplementedError
-  end
-
-  def delete (*sets)
-    raise NotImplementedErrois
-  end
-
   def downcase
     `this.toLowerCase()`
   end
@@ -181,6 +200,10 @@ class String
 
   alias eql? ==
 
+  def equal?(val)
+    `this.toString() === val.toString()`
+  end
+
   def getbyte(index)
     `this.charCodeAt(index)`
   end
@@ -246,7 +269,7 @@ class String
         }
       }
 
-      return result === -1 ? null : result;
+      return result === -1 ? nil : result;
     }
   end
 
@@ -289,7 +312,7 @@ class String
   end
 
   def lstrip
-    `this.replace(/^\s*/, '')`
+    `this.replace(/^\\s*/, '')`
   end
 
   def match(pattern, pos = undefined, &block)
@@ -297,22 +320,28 @@ class String
   end
 
   def next
-    `String.fromCharCode(this.charCodeAt(0) + 1)`
-  end
+    %x{
+      if (this.length === 0) {
+        return "";
+      }
+
+      var initial = this.substr(0, this.length - 1);
+      var last    = String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
 
-  def oct
-    to_i 8
+      return initial + last;
+    }
   end
 
   def ord
     `this.charCodeAt(0)`
   end
 
-  def partition(what)
+  def partition(str)
     %x{
-      var result = this.split(what);
+      var result = this.split(str);
+      var splitter = (result[0].length === this.length ? "" : str);
 
-      return [result[0], what.toString(), result.slice(1).join(what.toString())];
+      return [result[0], splitter, result.slice(1).join(str.toString())];
     }
   end
 
@@ -320,42 +349,8 @@ class String
     `this.split('').reverse().join('')`
   end
 
-  def rpartition(what)
-    raise NotImplementedError
-  end
-
   def rstrip
-    `this.replace(/\s*$/, '')`
-  end
-
-  def scan(pattern)
-    if pattern.is_a?(String)
-      pattern = /#{Regexp.escape(pattern)}/
-    end
-
-    result   = []
-    original = pattern
-
-    %x{
-      var pattern = pattern.toString(),
-          options = pattern.substr(pattern.lastIndexOf('/') + 1) + 'g',
-          regexp  = pattern.substr(1, pattern.lastIndexOf('/') - 1);
-
-      var matches = this.match(pattern);
-
-      for (var i = 0, length = matches.length; i < length; i++) {
-        var current = matches[i].match(/^\\(|[^\\\\]\\(/) ? matches[i] : matches[i].match(original);
-
-        if (#{block_given?}) {
-          #{yield current};
-        }
-        else {
-          result.push(current);
-        }
-      }
-    }
-
-    block_given? ? self : result
+    `this.replace(/\\s*$/, '')`
   end
 
   alias size length
@@ -363,11 +358,7 @@ class String
   alias slice []
 
   def split(pattern = $; || ' ', limit = undefined)
-    `this.split(pattern === ' ' ? strip : this, limit)`
-  end
-
-  def squeeze(*sets)
-    raise NotImplementedError
+    `this.split(pattern, limit)`
   end
 
   def start_with?(*prefixes)
@@ -383,19 +374,22 @@ class String
   end
 
   def strip
-    lstrip.rstrip
+    `this.replace(/^\\s*/, '').replace(/\\s*$/, '')`
   end
 
   def sub(pattern, replace = undefined, &block)
     %x{
-      if (block !== null) {
+      if (typeof(replace) === 'string') {
+        return this.replace(pattern, replace);
+      }
+      if (block !== nil) {
         return this.replace(pattern, function(str) {
-          $opal.match_data = arguments
+          //$opal.match_data = arguments
 
-          return $yielder.call($context, null, str);
+          return block.call(__context, str);
         });
       }
-      else if (#{Object === replace}) {
+      else if (replace != null) {
         if (#{replace.is_a?(Hash)}) {
           return this.replace(pattern, function(str) {
             var value = #{replace[str]};
@@ -426,7 +420,7 @@ class String
       var result = 0;
 
       for (var i = 0, length = this.length; i < length; i++) {
-        result += this.charCodeAt(i) % ((1 << n) - 1);
+        result += (this.charCodeAt(i) % ((1 << n) - 1));
       }
 
       return result;
@@ -435,14 +429,38 @@ class String
 
   def swapcase
     %x{
-      return this.replace(/([a-z]+)|([A-Z]+)/g, function($0,$1,$2) {
+      var str = this.replace(/([a-z]+)|([A-Z]+)/g, function($0,$1,$2) {
         return $1 ? $0.toUpperCase() : $0.toLowerCase();
       });
+
+      if (this._klass === string_class) {
+        return str;
+      }
+
+      return this._klass.$new(str);
+    }
+  end
+
+  def to_a
+    %x{
+      if (this.length === 0) {
+        return [];
+      }
+
+      return [this];
     }
   end
 
   def to_f
-    `parseFloat(this)`
+    %x{
+      var result = parseFloat(this);
+
+      if (isNaN(result)) {
+        return 0;
+      }
+
+      return result;
+    }
   end
 
   def to_i(base = 10)
@@ -459,9 +477,9 @@ class String
 
   def to_proc
     %x{
-      var self = this;
+      var self = this, jsid = mid_to_jsid(self);
 
-      return function(iter, arg) { return arg[mid_to_jsid(self)](); };
+      return function(arg) { return arg[jsid](); };
     }
   end
 
@@ -473,37 +491,9 @@ class String
 
   alias to_sym intern
 
-  def tr(from, to)
-    raise NotImplementedError
-  end
-
-  def tr_s(from, to)
-    raise NotImplementedError
-  end
-
-  def unpack(format)
-    raise NotImplementedError
-  end
-
   def upcase
     `this.toUpperCase()`
   end
-
-  def upto(other, exclusive = false)
-    return enum_for :upto, other, exclusive unless block_given?
-
-    current = self
-
-    until current == other
-      yield current
-
-      current = current.next
-    end
-
-    yield current unless exclusive
-
-    self
-  end
 end
 
 Symbol = String

data/docs/CNAME

@@ -0,0 +1 @@
+opalrb.org

data/docs/Rakefile

@@ -0,0 +1,55 @@
+desc "Clone repo"
+task :clone do
+  if File.exists? 'gh-pages'
+   Dir.chdir('gh-pages') { sh 'git pull origin gh-pages' }
+  else
+    FileUtils.mkdir_p 'gh-pages'
+    Dir.chdir('gh-pages') do
+      sh 'git clone git@github.com:/adambeynon/opal.git .'
+      sh 'git checkout gh-pages'
+    end
+  end
+end
+
+desc "Copy files"
+task :build do
+  files = {
+    '../build/opal.js'  => 'gh-pages/opal.js',
+    'CNAME'             => 'gh-pages/CNAME',
+    'css/styles.css'    => 'gh-pages/css/styles.css',
+    'css/syntax.css'    => 'gh-pages/css/syntax.css'
+  }
+
+  files.each do |src, dest|
+    puts dest
+    FileUtils.mkdir_p File.dirname(dest)
+    FileUtils.cp src, dest
+  end
+
+  require 'redcarpet'
+  require 'albino'
+
+  klass = Class.new(Redcarpet::Render::HTML) do
+    def block_code(code, language)
+      Albino.new(code, language || :text).colorize
+    end
+  end
+
+  puts 'gh-pages/index.html'
+  markdown = Redcarpet::Markdown.new(klass, :fenced_code_blocks => true)
+
+  File.open('gh-pages/index.html', 'w+') do |o|
+    o.write File.read('layout/pre.html')
+    o.write markdown.render(File.read "../README.md")
+    o.write File.read('layout/post.html')
+  end
+end
+
+desc "commit and push"
+task :push do
+  Dir.chdir('gh-pages') do
+    sh "git add ."
+    sh "git commit -a -m \"Documentation update #{Time.new}\""
+    sh "git push origin gh-pages"
+  end
+end

data/docs/css/styles.css

@@ -0,0 +1,50 @@
+body {
+  line-height: 22px;
+  font-size: 14px;
+  font-family: 'Palatino Linotype', 'Book Antiqua', Palatino, FreeSerif, serif;
+}
+
+.content {
+  padding: 50px 50px 50px 50px;
+  width: 650px;
+}
+
+p {
+  width: 650px;
+}
+
+pre, code {
+  font-family: Menlo, Monaco, Consolas, "Lucida Console", monospace;
+  font-size: 12px;
+}
+
+pre {
+  line-height: 17px;
+  color: #444444;
+  white-space: pre;
+  padding: 3px 0px 3px 12px;
+  margin: 0px 0px 8px;
+
+  background: #FAFAFA;
+  -webkit-box-shadow: rgba(0,0,0,0.07) 0 1px 2px inset;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  border: 1px solid #DDDDDD;
+}
+
+code {
+  background-color: #FAFAFA;
+  padding: 1px;
+  color: #444444;
+  border: 1px solid #DEDEDE;
+}
+
+pre code {
+  border: none;
+  padding: 0px;
+}
+
+a {
+  color: #212121;
+}