opal 0.3.33 → 0.3.34

data/{core → lib/assets/javascripts/opal}/array.rb

@@ -463,7 +463,7 @@ class Array < `Array`
   end
 
   def hash
-    `#{self}._id || (#{self}._id = unique_id++)`
+    `#{self}._id || (#{self}._id = Opal.uid())`
   end
 
   def include?(member)
@@ -933,4 +933,17 @@ class Array < `Array`
       return #{self}.sort();
     }
   end
+
+  def shuffle()
+    %x{
+        for (var i = #{self}.length - 1; i > 0; i--) {
+          var j = Math.floor(Math.random() * (i + 1));
+          var tmp = #{self}[i];
+          #{self}[i] = #{self}[j];
+          #{self}[j] = tmp;
+        }
+
+        return #{self};
+    }
+  end
 end

data/{core → lib/assets/javascripts/opal}/class.rb

@@ -2,7 +2,7 @@ class Class
   def self.new(sup = Object, &block)
     %x{
       function AnonClass(){};
-      var klass   = boot_class(sup, AnonClass)
+      var klass   = Opal.boot(sup, AnonClass)
       klass._name = nil;
 
       sup.$inherited(klass);
@@ -21,7 +21,7 @@ class Class
   def allocate
     %x{
       var obj = new #{self};
-      obj._id = unique_id++;
+      obj._id = Opal.uid();
       return obj;
     }
   end
@@ -215,7 +215,7 @@ class Class
     %x{
       var args = __slice.call(arguments);
       var obj = new #{self};
-      obj._id = unique_id++;
+      obj._id = Opal.uid();
 
       obj.$initialize.apply(obj, args);
       return obj;

data/lib/assets/javascripts/opal/core.js

@@ -0,0 +1,18 @@
+//= require opal/class
+//= require opal/basic_object
+//= require opal/kernel
+//= require opal/nil_class
+//= require opal/boolean
+//= require opal/error
+//= require opal/regexp
+//= require opal/comparable
+//= require opal/enumerable
+//= require opal/array
+//= require opal/hash
+//= require opal/string
+//= require opal/numeric
+//= require opal/proc
+//= require opal/range
+//= require opal/time
+//= require opal/date
+//= require opal/json

data/lib/assets/javascripts/opal/date.rb

@@ -0,0 +1,156 @@
+native_date = `Date`
+
+days_of_week = %w[Sunday Monday Tuesday Wednesday Thursday Friday Saturday Sunday]
+short_days = %w[Sun Mon Tue Wed Thu Fri Sat]
+short_months = %w[Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec]
+long_months = %w[January Febuary March April May June July August September October November December]
+
+class Date
+  def self.wrap(native)
+    instance = allocate
+    `#{instance}._date = #{native}`
+    instance
+  end
+
+  def self.parse(string)
+    wrap `native_date.parse(string)`
+  end
+
+  def self.today
+    %x{
+      var date = #{new};
+      date._date = new native_date();
+      return date;
+    }
+  end
+
+  def initialize(year, month, day)
+    `#{self}._date = new native_date(year, month - 1, day)`
+  end
+
+  def -(date)
+    `Math.round((#{self}._date - #{date}._date) / (1000 * 60 * 60 * 24))`
+  end
+
+  def <(other)
+    %x{
+      var a = #{self}._date, b = #{other}._date;
+      a.setHours(0, 0, 0, 0);
+      b.setHours(0, 0, 0, 0);
+      return a < b;
+    }
+  end
+
+  def <=(other)
+    %x{
+      var a = #{self}._date, b = #{other}._date;
+      a.setHours(0, 0, 0, 0);
+      b.setHours(0, 0, 0, 0);
+      return a <= b;
+    }
+  end
+
+  def >(other)
+    %x{
+      var a = #{self}._date, b = #{other}._date;
+      a.setHours(0, 0, 0, 0);
+      b.setHours(0, 0, 0, 0);
+      return a > b;
+    }
+  end
+
+  def >=(other)
+    %x{
+      var a = #{self}._date, b = #{other}._date;
+      a.setHours(0, 0, 0, 0);
+      b.setHours(0, 0, 0, 0);
+      return a >= b;
+    }
+  end
+
+  def ==(other)
+    %x{
+      var a = #{self}._date, b = #{other}._date;
+      a.setHours(0, 0, 0, 0);
+      b.setHours(0, 0, 0, 0);
+      return (a.getFullYear() === b.getFullYear() && a.getMonth() === b.getMonth() && a.getDate() === b.getDate());
+    }
+  end
+
+  def clone
+    Date.wrap(`new native_date(#{self}._date.getTime())`)
+  end
+
+  def day
+    `#{self}._date.getDate()`
+  end
+
+  def month
+    `#{self}._date.getMonth() + 1`
+  end
+
+  def next
+    res = self.clone
+    `res._date.setDate(#{self}._date.getDate() + 1)`
+    res
+  end
+
+  def next_month
+    res = self.clone
+    `res._date.add({months: 1})`
+    res
+  end
+
+  def prev
+    res = self.clone
+    `res._date.setDate(#{self}._date.getDate() - 1)`
+    res
+  end
+
+  def prev_month
+    res = self.clone
+    `res._date.add({months: -1})`
+    res
+  end
+
+  def strftime(format = '')
+    %x{
+      var d = #{self}._date;
+
+      return format.replace(/%(-?.)/g, function(full, m) {
+        switch (m) {
+          case 'a': return short_days[d.getDay()];
+          case 'A': return days_of_week[d.getDay()];
+          case 'b': return short_months[d.getMonth()];
+          case 'B': return long_months[d.getMonth()];
+          case '-d': return d.getDate();
+          case 'Y': return d.getFullYear();
+          default: return m ;
+        }
+      });
+    }
+  end
+
+  def to_s
+    %x{
+      var date = #{self}._date;
+      return date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate();
+    }
+  end
+
+  def to_json
+    to_s.to_json
+  end
+
+  def as_json
+    to_s
+  end
+
+  def wday
+    `#{self}._date.getDay()`
+  end
+
+  def year
+    `#{self}._date.getFullYear()`
+  end
+end

data/{core → lib/assets/javascripts/opal}/json.rb

@@ -1,4 +1,4 @@
-`var json_parse = JSON.parse;`
+`var json_parse = JSON.parse, __hasOwn = Object.prototype.hasOwnProperty`
 
 module JSON
   def self.parse(source)

data/{core → lib/assets/javascripts/opal}/kernel.rb

@@ -302,7 +302,7 @@ module Kernel
   end
 
   def object_id
-    `#{self}._id || (#{self}._id = unique_id++)`
+    `#{self}._id || (#{self}._id = Opal.uid())`
   end
 
   def printf(*args)
@@ -394,7 +394,7 @@ module Kernel
             class_id   = "#<Class:#<" + orig_class._name + ":" + orig_class._id + ">>";
 
         function Singleton() {};
-        var meta = boot_class(orig_class, Singleton);
+        var meta = Opal.boot(orig_class, Singleton);
         meta._name = class_id;
 
         meta.prototype = #{self};

data/lib/opal.rb

@@ -1,6 +1,4 @@
 require 'opal/parser'
-require 'opal/erb'
-require 'opal/builder'
 require 'opal/version'
 
 # Opal is a ruby to javascript compiler, with a runtime for running
@@ -26,73 +24,42 @@ module Opal
   #
   # @return [String] returns opal runtime/corelib as a string
   def self.runtime
-    core_dir   = Opal.core_dir
-    load_order = File.join core_dir, 'load_order'
-    corelib    = File.read(load_order).strip.split.map do |c|
-      file = File.join(core_dir, "#{c}.rb")
-      source = File.read file
-      Opal.parse source, file
-    end
-
-    runtime = File.read(File.join core_dir, 'runtime.js')
-    corelib = corelib.join("\n")
-
-    [
-      "// Opal v#{Opal::VERSION}",
-      "// http://opalrb.org",
-      "// Copyright 2013, Adam Beynon",
-      "// Released under the MIT License",
-      "(function(undefined) {",
-      runtime,
-      "Opal.version = #{ Opal::VERSION.inspect };",
-      corelib,
-      "}).call(this);"
-    ].join("\n")
+    process('opal').rstrip
   end
-
   # Returns parser prebuilt for js-environments.
   #
   # @return [String]
   def self.parser_code
-    [
-      Builder.new(:files => %w(racc.rb strscan.rb), :dir => File.join(self.core_dir, 'parser')).build,
-      self.build_gem('opal'),
-      File.read(File.join self.core_dir, 'parser', 'browser.js')
-    ].join("\n")
+    process('opal-parser')
   end
 
-  # Build gem with given name to a string.
-  #
-  #   Opal.build_gem 'opal-spec'
-  #   # => "... javascript code ..."
-  #
-  # If the given gem name cannot be found, then an error will be
-  # raised
-  #
-  # @param [String] name the name of the gem
-  # @return [String] returns built gem
-  def self.build_gem(name)
-    spec = Gem::Specification.find_by_name name
-    Builder.new(:files => spec.require_paths, :dir => spec.full_gem_path).build
+  def self.core_dir
+    File.join File.dirname(__FILE__), 'assets', 'javascripts'
   end
 
-  # Build the given files. Files should be a string of either a full
-  # filename, a directory name or even a glob of files to build.
-  #
-  #   Opal.build_files 'spec'
-  #   # => all spec files in spec dir
-  #
-  # @param [String] files files to build
-  # @return [String]
-  def self.build_files(files, dir=nil)
-    Builder.new(:files => files, :dir => dir).build
+  def self.append_path(path)
+    paths << path
   end
 
-  def self.opal_dir
-    File.expand_path '../..', __FILE__
+  def self.lib_dir
+    File.join File.dirname(__FILE__)
   end
 
-  def self.core_dir
-    File.join opal_dir, 'core'
+  # Private, don't access these directly
+  def self.paths
+    @paths ||= []
+  end
+
+  # Build ruby/opal file at fname
+  def self.process(fname)
+    require 'opal/processor'
+
+    env = Sprockets::Environment.new
+    paths.each { |p| env.append_path p }
+
+    env[fname].to_s
   end
-end
+end
+
+# Add corelib to assets path
+Opal.append_path Opal.core_dir

data/lib/opal/lexer.rb

@@ -1377,7 +1377,7 @@ module Opal
             @lex_state = :expr_end
           end
 
-          return [matched =~ /[A-Z]/ ? :CONSTANT : :IDENTIFIER, matched]
+          return [matched =~ /^[A-Z]/ ? :CONSTANT : :IDENTIFIER, matched]
 
         end
         return [false, false] if scanner.eos?

data/lib/opal/parser.rb

@@ -189,7 +189,7 @@ module Opal
         code = INDENT + @scope.to_vars + "\n" + code
       end
 
-      "(function() {\n#{ code }\n})();"
+      "(function() {\n#{ code }\n})();\n"
     end
 
     # Every time the parser enters a new scope, this is called with

data/lib/opal/processor.rb

@@ -0,0 +1,26 @@
+require 'opal'
+require 'sprockets'
+
+module Opal
+  class Processor < Tilt::Template
+    self.default_mime_type = 'application/javascript'
+
+    def self.engine_initialized?
+      true
+    end
+
+    def initialize_engine
+      require_template_library 'opal'
+    end
+
+    def prepare
+    end
+
+    def evaluate(scope, locals, &block)
+      Opal.parse data
+    end
+  end
+end
+
+Tilt.register 'rb',               Opal::Processor
+Sprockets.register_engine '.rb',  Opal::Processor