opal 0.3.34 → 0.3.35

data/Rakefile

@@ -3,21 +3,21 @@ require 'opal-spec'
 
 desc "Build opal.js into ./build"
 task :opal => [:dir] do
-  File.open('build/opal.js', 'w+') { |o| o.puts Opal.runtime }
+  File.open('build/opal.js', 'w+') { |o| o.puts Opal.process('opal') }
 end
 
 desc "Build opal-parser.js into ./build"
 task :parser => [:dir] do
-  File.open('build/opal-parser.js', 'w+') { |o| o.puts Opal.parser_code }
+  File.open('build/opal-parser.js', 'w+') { |o| o.puts Opal.process('opal-parser') }
 end
 
 desc "Build specs ready to run"
 task :build_specs => [:dir] do
   Opal.append_path File.join(File.dirname(__FILE__), 'spec')
 
-  File.open('build/specs.js', 'w+') do |out|
-    out.puts Opal.process('spec_helper')
-  end
+  File.open('build/core_spec.js', 'w+') { |o| o.puts Opal.process('core_spec') }
+  File.open('build/grammar_spec.js', 'w+') { |o| o.puts Opal.process('grammar_spec') }
+  File.open('build/specs.js', 'w+') { |o| o.puts Opal.process('spec_helper') }
 end
 
 task :default => [:build_specs, :parser, :test]

data/lib/assets/javascripts/opal-parser.js.erb

@@ -3,7 +3,7 @@
 
 // We need (some) of the libs from our real ruby parser (not in sprockets load path)
 <% ['/grammar', '/lexer', '/parser', '/scope', ''].each do |f| %>
-  <%= Opal.parse File.read(File.join Opal.lib_dir, "opal#{f}.rb") %>
+  <%= Opal.parse File.read(File.join Opal.core_dir, '..', '..', "opal#{f}.rb") %>
 <% end %>
 
 (function() {

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

@@ -0,0 +1,37 @@
+#= require_self
+#= 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
+
+# regexp matches
+$~ = nil
+
+$/ = "\n"
+
+RUBY_ENGINE   = 'opal'
+RUBY_PLATFORM = 'opal'
+RUBY_VERSION  = '1.9.2'
+OPAL_VERSION  = `__opal.version`
+
+def to_s
+  'main'
+end
+
+def include(mod)
+  Object.include mod
+end

data/lib/opal.rb

@@ -1,4 +1,5 @@
 require 'opal/parser'
+require 'opal/processor'
 require 'opal/version'
 
 # Opal is a ruby to javascript compiler, with a runtime for running
@@ -17,22 +18,6 @@ module Opal
     Parser.new.parse str, file
   end
 
-  # Returns opal runtime js code (string)
-  #
-  #   Opal.runtime
-  #   # => "(function() { Opal = {}; ... })();"
-  #
-  # @return [String] returns opal runtime/corelib as a string
-  def self.runtime
-    process('opal').rstrip
-  end
-  # Returns parser prebuilt for js-environments.
-  #
-  # @return [String]
-  def self.parser_code
-    process('opal-parser')
-  end
-
   def self.core_dir
     File.join File.dirname(__FILE__), 'assets', 'javascripts'
   end
@@ -41,25 +26,16 @@ module Opal
     paths << path
   end
 
-  def self.lib_dir
-    File.join File.dirname(__FILE__)
-  end
-
-  # Private, don't access these directly
+  # Private, don't add to these directly (use .append_path instead).
   def self.paths
-    @paths ||= []
+    @paths ||= [Opal.core_dir]
   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
-
-# Add corelib to assets path
-Opal.append_path Opal.core_dir

data/lib/opal/processor.rb

@@ -14,6 +14,7 @@ module Opal
     end
 
     def prepare
+      # ...
     end
 
     def evaluate(scope, locals, &block)
@@ -24,3 +25,6 @@ end
 
 Tilt.register 'rb',               Opal::Processor
 Sprockets.register_engine '.rb',  Opal::Processor
+
+Tilt.register 'opal',               Opal::Processor
+Sprockets.register_engine '.opal',  Opal::Processor

data/lib/opal/version.rb

@@ -1,3 +1,3 @@
 module Opal
-  VERSION = '0.3.34'
+  VERSION = '0.3.35'
 end

data/opal.gemspec

@@ -13,5 +13,7 @@ Gem::Specification.new do |s|
   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']  
+  s.require_paths  = ['lib'] 
+
+  s.add_runtime_dependency 'sprockets' 
 end

data/spec/core.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Opal corelib and runtime specs (core)</title>
+</head>
+  <body>
+    <script type="text/javascript" src="../build/specs.js"></script>
+    <script type="text/javascript" src="../build/core_spec.js"></script>
+  </body>
+</html>

data/spec/core_spec.rb

@@ -0,0 +1,2 @@
+#= require_tree ./core
+#= require_tree ./language

data/spec/grammar.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Opal corelib and runtime specs (grammar)</title>
+</head>
+  <body>
+    <script type="text/javascript" src="../build/specs.js"></script>
+    <script type="text/javascript" src="../build/opal-parser.js"></script>
+    <script type="text/javascript" src="../build/grammar_spec.js"></script>
+  </body>
+</html>

data/spec/grammar_spec.rb

@@ -0,0 +1 @@
+#= require_tree ./grammar

data/spec/index.html

@@ -1,10 +1,12 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
 <head>
   <title>Opal corelib and runtime specs</title>
-  <script type="text/javascript" src="../build/specs.js"></script>
-  <script type="text/javascript" src="../build/opal-parser.js"></script>
 </head>
   <body>
+    <script type="text/javascript" src="../build/specs.js"></script>
+    <script type="text/javascript" src="../build/opal-parser.js"></script>
+    <script type="text/javascript" src="../build/core_spec.js"></script>
+    <script type="text/javascript" src="../build/grammar_spec.js"></script>
   </body>
 </html>

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 #= require opal
 #= require opal-spec
-#= require_tree .
 
 module Kernel
   def opal_eval(str)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal
 version: !ruby/object:Gem::Version
-  version: 0.3.34
+  version: 0.3.35
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2013-02-05 00:00:00.000000000Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: &70122599320160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70122599320160
 description: Ruby runtime and core library for javascript.
 email: adam.beynon@gmail.com
 executables:
@@ -28,13 +39,12 @@ files:
 - bin/opal
 - lib/assets/javascripts/opal-parser.js.erb
 - lib/assets/javascripts/opal.js.erb
-- lib/assets/javascripts/opal/alpha.rb
 - lib/assets/javascripts/opal/array.rb
 - lib/assets/javascripts/opal/basic_object.rb
 - lib/assets/javascripts/opal/boolean.rb
 - lib/assets/javascripts/opal/class.rb
 - lib/assets/javascripts/opal/comparable.rb
-- lib/assets/javascripts/opal/core.js
+- lib/assets/javascripts/opal/core.rb
 - lib/assets/javascripts/opal/date.rb
 - lib/assets/javascripts/opal/enumerable.rb
 - lib/assets/javascripts/opal/error.rb
@@ -59,6 +69,7 @@ files:
 - lib/opal/scope.rb
 - lib/opal/version.rb
 - opal.gemspec
+- spec/core.html
 - spec/core/array/allocate_spec.rb
 - spec/core/array/append_spec.rb
 - spec/core/array/assoc_spec.rb
@@ -336,8 +347,6 @@ files:
 - spec/core/string/to_sym_spec.rb
 - spec/core/string/underscore_spec.rb
 - spec/core/string/upcase_spec.rb
-- spec/core/strscan/check_spec.rb
-- spec/core/strscan/scan_spec.rb
 - spec/core/symbol/to_proc_spec.rb
 - spec/core/time/at_spec.rb
 - spec/core/time/day_spec.rb
@@ -348,6 +357,8 @@ files:
 - spec/core/time/month_spec.rb
 - spec/core/time/now_spec.rb
 - spec/core/time/saturday_spec.rb
+- spec/core_spec.rb
+- spec/grammar.html
 - spec/grammar/alias_spec.rb
 - spec/grammar/and_spec.rb
 - spec/grammar/array_spec.rb
@@ -379,10 +390,13 @@ files:
 - spec/grammar/op_asgn1_spec.rb
 - spec/grammar/op_asgn2_spec.rb
 - spec/grammar/or_spec.rb
+- spec/grammar/parser_spec.rb
 - spec/grammar/return_spec.rb
 - spec/grammar/sclass_spec.rb
 - spec/grammar/self_spec.rb
 - spec/grammar/str_spec.rb
+- spec/grammar/strscan/check_spec.rb
+- spec/grammar/strscan/scan_spec.rb
 - spec/grammar/super_spec.rb
 - spec/grammar/true_spec.rb
 - spec/grammar/undef_spec.rb
@@ -390,6 +404,7 @@ files:
 - spec/grammar/while_spec.rb
 - spec/grammar/xstr_spec.rb
 - spec/grammar/yield_spec.rb
+- spec/grammar_spec.rb
 - spec/index.html
 - spec/language/alias_spec.rb
 - spec/language/and_spec.rb
@@ -422,7 +437,6 @@ files:
 - spec/language/variables_spec.rb
 - spec/language/while_spec.rb
 - spec/language/yield_spec.rb
-- spec/parser/simple_spec.rb
 - spec/spec_helper.rb
 homepage: http://opalrb.org
 licenses: []
@@ -449,6 +463,7 @@ signing_key:
 specification_version: 3
 summary: Ruby runtime and core library for javascript
 test_files:
+- spec/core.html
 - spec/core/array/allocate_spec.rb
 - spec/core/array/append_spec.rb
 - spec/core/array/assoc_spec.rb
@@ -726,8 +741,6 @@ test_files:
 - spec/core/string/to_sym_spec.rb
 - spec/core/string/underscore_spec.rb
 - spec/core/string/upcase_spec.rb
-- spec/core/strscan/check_spec.rb
-- spec/core/strscan/scan_spec.rb
 - spec/core/symbol/to_proc_spec.rb
 - spec/core/time/at_spec.rb
 - spec/core/time/day_spec.rb
@@ -738,6 +751,8 @@ test_files:
 - spec/core/time/month_spec.rb
 - spec/core/time/now_spec.rb
 - spec/core/time/saturday_spec.rb
+- spec/core_spec.rb
+- spec/grammar.html
 - spec/grammar/alias_spec.rb
 - spec/grammar/and_spec.rb
 - spec/grammar/array_spec.rb
@@ -769,10 +784,13 @@ test_files:
 - spec/grammar/op_asgn1_spec.rb
 - spec/grammar/op_asgn2_spec.rb
 - spec/grammar/or_spec.rb
+- spec/grammar/parser_spec.rb
 - spec/grammar/return_spec.rb
 - spec/grammar/sclass_spec.rb
 - spec/grammar/self_spec.rb
 - spec/grammar/str_spec.rb
+- spec/grammar/strscan/check_spec.rb
+- spec/grammar/strscan/scan_spec.rb
 - spec/grammar/super_spec.rb
 - spec/grammar/true_spec.rb
 - spec/grammar/undef_spec.rb
@@ -780,6 +798,7 @@ test_files:
 - spec/grammar/while_spec.rb
 - spec/grammar/xstr_spec.rb
 - spec/grammar/yield_spec.rb
+- spec/grammar_spec.rb
 - spec/index.html
 - spec/language/alias_spec.rb
 - spec/language/and_spec.rb
@@ -812,5 +831,4 @@ test_files:
 - spec/language/variables_spec.rb
 - spec/language/while_spec.rb
 - spec/language/yield_spec.rb
-- spec/parser/simple_spec.rb
 - spec/spec_helper.rb

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

@@ -1,17 +0,0 @@
-# regexp matches
-$~ = nil
-
-$/ = "\n"
-
-RUBY_ENGINE   = 'opal'
-RUBY_PLATFORM = 'opal'
-RUBY_VERSION  = '1.9.2'
-OPAL_VERSION  = `__opal.version`
-
-def to_s
-  'main'
-end
-
-def include(mod)
-  Object.include mod
-end

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

@@ -1,18 +0,0 @@
-//= 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