opal-erb 0.0.1 → 0.0.2

data/.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 Gemfile.lock
 /build
+/*.gem

data/Gemfile

@@ -2,4 +2,5 @@ source :rubygems
 gemspec
 
 gem 'rake'
+gem 'opal', '~> 0.3.37'
 gem 'opal-spec'

data/README.md

@@ -1 +1,14 @@
 # opal-erb: ERB for Opal
+
+## Usage
+
+opal-erb will automatically compile erb files using the `.opalerb` extension.
+
+## Running specs
+
+You must have phantomjs installed.
+
+```text
+$ bundle
+$ bundle exec rake
+```

data/Rakefile

@@ -1,18 +1,9 @@
 require 'bundler'
 Bundler.require
+require File.expand_path('../vendor/opal-spec-ext.rb', __FILE__)
 
-desc "Build example specs ready to run"
-task :build_specs do
-  FileUtils.mkdir_p 'build'
-  Opal.append_path File.join(File.dirname(__FILE__), 'spec')
-
-  File.open('build/specs.js', 'w+') do |file|
-    file << Opal.process('spec_helper')
-  end
-end
-
-task :test do
-  Opal::Spec.runner
+Opal::Spec::RakeTask.new do |t|
+  # t.port = 9999
 end
 
-task :default => [:build_specs, :test]
+task :default => ['opal:spec']

data/config.ru

@@ -0,0 +1,5 @@
+require 'bundler'
+Bundler.require
+require File.expand_path('../vendor/opal-spec-ext.rb', __FILE__)
+
+run Opal::Spec::Server.new

data/lib/assets/javascripts/opal-erb.rb

@@ -1,20 +1,18 @@
-class ERB
-  @_cache = {}
-  def self.[](name)
-    @_cache[name]
-  end
-
-  def self.[]=(name, instance)
-    @_cache[name] = instance
-  end
+# Provides Template module for registering erb templates
+require 'opal/template'
 
+class ERB
   def initialize(name, &body)
     @body = body
     @name = name
-    ERB[name] = self
+    Template[name] = self
+  end
+
+  def inspect
+    "#<ERB: name=#{@name.inspect}>"
   end
 
-  def render(ctx=self)
+  def render(ctx = self)
     ctx.instance_eval(&@body)
   end
 end

data/lib/opal/erb/processor.rb

@@ -18,7 +18,7 @@ module Opal
       end
 
       def evaluate(scope, locals, &block)
-        Opal::ERB.parse data, scope.logical_path
+        Opal::ERB.parse data, scope.logical_path.sub(/^templates\//, '')
       end
     end
   end

data/lib/opal/erb/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module ERB
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

data/lib/opal/erb.rb

@@ -13,7 +13,7 @@ module Opal
       end
 
       code = "ERB.new('#{name}') do\nout = []\nout.<<(\"#{ body }\")\nout.join\nend\n"
-      "// #{ name } (erb)\n#{ Opal.parse(code) }\n"
+      Opal.parse code
     end
   end
 end

data/spec/spec.rb

@@ -1,16 +1,25 @@
 describe "Opal ERB files" do
-  it "should be defined by their filename" do
-    ERB['simple'].should be_kind_of(ERB)
-    ERB['quoted'].should be_kind_of(ERB)
+  it "should be defined by their filename on Template namespace" do
+    Template['simple'].should be_kind_of(ERB)
+    Template['quoted'].should be_kind_of(ERB)
+  end
+
+  it "should remove 'templates/' path prefix" do
+    Template['templates/prefixed'].should be_nil
+    Template['prefixed'].should be_kind_of(ERB)
+  end
+
+  it "should maintain '/' in template paths" do
+    Template['foo/bar'].should be_kind_of(ERB)
   end
 
   it "calling the block with a context should render the block" do
     @some_data = "hello"
-    ERB['simple'].render(self).should == "<div>hello</div>\n"
+    Template['simple'].render(self).should == "<div>hello</div>\n"
   end
 
   it "should accept quotes in strings" do
     @name = "adam"
-    ERB['quoted'].render(self).should == "<div class=\"foo\">hello there adam</div>\n"
+    Template['quoted'].render(self).should == "<div class=\"foo\">hello there adam</div>\n"
   end
 end

data/spec/templates/foo/bar.opalerb

@@ -0,0 +1 @@
+Deeply nested!

data/spec/templates/prefixed.opalerb

@@ -0,0 +1 @@
+Prefixed content.

data/vendor/opal-spec-ext.rb

@@ -0,0 +1,74 @@
+module Opal
+  module Spec
+    class Server
+      class IndexHandler
+        def initialize(app)
+          @app = app
+        end
+
+        def call(env)
+          if env['PATH_INFO'] == '/'
+            [200, {'Content-Type' => 'text/html'}, [File.read('vendor/opal-spec-runner.html')]]
+          else
+            @app.call(env)
+          end
+        end
+      end
+
+      def initialize
+        @app = Rack::Builder.app do
+          map '/assets' do
+            env = Sprockets::Environment.new
+            Opal.paths.each { |p| env.append_path p }
+            env.append_path 'spec'
+            run env
+          end
+
+          use IndexHandler
+          run Rack::Directory.new('.')
+        end
+      end
+      
+      def call(env)
+        @app.call(env)
+      end
+    end
+  end
+end
+
+module Opal
+  module Spec
+    class RakeTask
+      include Rake::DSL if defined? Rake::DSL
+
+      def initialize(name = "opal:spec")
+        @name = name
+        define
+      end
+
+      def define
+        desc "Run opal specs"
+        task @name do
+          require 'rack'
+          require 'webrick'
+          
+          server = fork do
+            Rack::Server.start(:config    => 'config.ru',
+                               :Port      => 9999,
+                               :Logger    => WEBrick::Log.new("/dev/null"),
+                               :AccessLog => [])
+          end
+
+          system("phantomjs vendor/opal-spec-runner.js \"http://localhost:9999/\"")
+
+          success = $?.success?
+
+          Process.kill(:SIGINT, server)
+          Process.wait
+
+          exit(1) unless success
+        end
+      end
+    end
+  end
+end

data/vendor/opal-spec-runner.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>opal-spec: specs</title>
+  
+</head>
+<body>
+  <script src="/assets/spec_helper.js"></script>
+</body>
+</html>

data/vendor/opal-spec-runner.js

@@ -0,0 +1,40 @@
+/*
+ * Test runner for phantomjs
+ */
+var args = phantom.args;
+var page = require('webpage').create();
+
+page.onConsoleMessage = function(msg) {
+  console.log(msg);
+};
+
+page.onInitialized = function() {
+  page.evaluate(function () {
+    window.OPAL_SPEC_PHANTOM = true;
+  });
+};
+
+page.open(args[0], function(status) {
+  if (status !== 'success') {
+    console.error("Cannot load: " + args[0]);
+    phantom.exit(1);
+  } else {
+    var timeout = parseInt(args[1] || 60000, 10);
+    var start = Date.now();
+    var interval = setInterval(function() {
+      if (Date.now() > start + timeout) {
+        console.error("Specs timed out");
+        phantom.exit(124);
+      } else {
+        var code = page.evaluate(function() {
+          return window.OPAL_SPEC_CODE;
+        });
+
+        if (code === 0 || code === 1) {
+          clearInterval(interval);
+          phantom.exit(code);
+        }
+      }
+    }, 500);
+  }
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal-erb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -38,17 +38,22 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- config.ru
 - lib/assets/javascripts/opal-erb.rb
 - lib/opal-erb.rb
 - lib/opal/erb.rb
 - lib/opal/erb/processor.rb
 - lib/opal/erb/version.rb
 - opal-erb.gemspec
-- spec/index.html
 - spec/quoted.opalerb
 - spec/simple.opalerb
 - spec/spec.rb
 - spec/spec_helper.rb
+- spec/templates/foo/bar.opalerb
+- spec/templates/prefixed.opalerb
+- vendor/opal-spec-ext.rb
+- vendor/opal-spec-runner.html
+- vendor/opal-spec-runner.js
 homepage: http://opal.github.com/opal-erb
 licenses:
 - MIT-LICENSE
@@ -70,13 +75,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ERB for Opal
 test_files:
-- spec/index.html
 - spec/quoted.opalerb
 - spec/simple.opalerb
 - spec/spec.rb
 - spec/spec_helper.rb
+- spec/templates/foo/bar.opalerb
+- spec/templates/prefixed.opalerb

data/spec/index.html

@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>opal-erb specs</title>
-  
-</head>
-<body>
-  <script src="../build/specs.js"></script>
-</body>
-</html>