opal-erb 0.0.2 → 0.1.0

data/Gemfile

@@ -1,6 +1,7 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
-gem 'opal', '~> 0.3.37'
 gem 'opal-spec'
+
+gem 'opal', :github => 'opal/opal'

data/README.md

@@ -1,14 +1,42 @@
 # opal-erb: ERB for Opal
 
+Provides an ERB compiler and runtime for opal.
+
+## Installation
+
+Add to your Gemfile:
+
+```ruby
+gem 'opal-erb'
+```
+
+Then require anywhere in your code:
+
+```ruby
+require 'opal-gem' # if you don't Bundler.require
+```
+
 ## Usage
 
-opal-erb will automatically compile erb files using the `.opalerb` extension.
+This gem adds support to sprockets to compile files with `.opalerb` extensions
+automatically, so, if you have:
+
+```erb
+<!-- my_template.opalerb -->
+Hello <%= @name %>!
+```
+
+```ruby
+# my_app.rb
 
-## Running specs
+require "my_template"
 
-You must have phantomjs installed.
+@name = 'Adam'
 
-```text
-$ bundle
-$ bundle exec rake
+Template["my_template"].render self
+# => "Hello Adam!"
 ```
+
+## License
+
+MIT

data/Rakefile

@@ -1,9 +1,5 @@
 require 'bundler'
 Bundler.require
-require File.expand_path('../vendor/opal-spec-ext.rb', __FILE__)
 
-Opal::Spec::RakeTask.new do |t|
-  # t.port = 9999
-end
-
-task :default => ['opal:spec']
+require 'opal/spec/rake_task'
+Opal::Spec::RakeTask.new(:default)

data/lib/opal/erb/version.rb

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

data/lib/opal/erb.rb

@@ -1,6 +1,5 @@
 require 'opal'
-require 'opal/erb/processor'
-require 'opal/erb/version'
+require 'opal/parser'
 
 module Opal
   module ERB
@@ -15,8 +14,30 @@ module Opal
       code = "ERB.new('#{name}') do\nout = []\nout.<<(\"#{ body }\")\nout.join\nend\n"
       Opal.parse code
     end
+
+    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::ERB.parse data, scope.logical_path.sub(/^templates\//, '')
+      end
+    end
   end
 end
 
-# Just register our opal code path with opal build tools
-Opal.append_path File.join(File.dirname(__FILE__), '..', 'assets', 'javascripts')
+Opal.append_path File.expand_path('../../../opal', __FILE__)
+
+Tilt.register 'opalerb',               Opal::ERB::Processor
+Sprockets.register_engine '.opalerb',  Opal::ERB::Processor

data/{lib/assets/javascripts/opal-erb.rb → opal/erb.rb}

@@ -1,5 +1,5 @@
 # Provides Template module for registering erb templates
-require 'opal/template'
+require 'opal-template'
 
 class ERB
   def initialize(name, &body)
@@ -16,3 +16,4 @@ class ERB
     ctx.instance_eval(&@body)
   end
 end
+

data/opal-erb.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version     = Opal::ERB::VERSION
   s.authors     = ['Adam Beynon']
   s.email       = ['adam.beynon@gmail.com']
-  s.homepage    = 'http://opal.github.com/opal-erb'
+  s.homepage    = 'http://github.com/adambeynon/opal-erb'
   s.summary     = %q{ERB for Opal}
   s.description = %q{ERB for Opal}
   s.license     = 'MIT-LICENSE'
@@ -16,5 +16,5 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'opal', '~> 0.3.35'
+  s.add_runtime_dependency 'opal', '~> 0.3.44'
 end

data/spec/{spec.rb → erb_spec.rb}

@@ -1,7 +1,15 @@
+require 'opal'
+require 'erb'
+#require 'opal-spec'
+
+# Our 3 templates we use (we can require them as normal files)
+require 'simple_erb_template'
+require 'templates/prefixed'
+require 'templates/foo/bar'
+
 describe "Opal ERB files" do
   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)
+    Template['simple_erb_template'].should be_kind_of(ERB)
   end
 
   it "should remove 'templates/' path prefix" do
@@ -15,11 +23,11 @@ describe "Opal ERB files" do
 
   it "calling the block with a context should render the block" do
     @some_data = "hello"
-    Template['simple'].render(self).should == "<div>hello</div>\n"
+    Template['simple_erb_template'].render(self).should == "<div>hello</div>\n"
   end
 
   it "should accept quotes in strings" do
     @name = "adam"
-    Template['quoted'].render(self).should == "<div class=\"foo\">hello there adam</div>\n"
+    Template['foo/bar'].render(self).should == "<div class=\"foo\">hello there adam</div>\n"
   end
 end

data/spec/simple_erb_template.opalerb

@@ -0,0 +1 @@
+<div><%= @some_data %></div>

data/spec/templates/foo/bar.opalerb

@@ -1 +1 @@
-Deeply nested!
+<div class="foo">hello <%= "there " + @name %></div>

data/spec/templates/prefixed.opalerb

@@ -1 +1 @@
-Prefixed content.
+Prefixed content.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal-erb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.35
+        version: 0.3.44
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.35
+        version: 0.3.44
 description: ERB for Opal
 email:
 - adam.beynon@gmail.com
@@ -39,22 +39,16 @@ files:
 - 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/quoted.opalerb
-- spec/simple.opalerb
-- spec/spec.rb
-- spec/spec_helper.rb
+- opal/erb.rb
+- spec/erb_spec.rb
+- spec/simple_erb_template.opalerb
 - 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
+homepage: http://github.com/adambeynon/opal-erb
 licenses:
 - MIT-LICENSE
 post_install_message: 
@@ -75,14 +69,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ERB for Opal
 test_files:
-- spec/quoted.opalerb
-- spec/simple.opalerb
-- spec/spec.rb
-- spec/spec_helper.rb
+- spec/erb_spec.rb
+- spec/simple_erb_template.opalerb
 - spec/templates/foo/bar.opalerb
 - spec/templates/prefixed.opalerb

data/lib/opal/erb/processor.rb

@@ -1,28 +0,0 @@
-require 'sprockets'
-
-module Opal
-  module ERB
-    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::ERB.parse data, scope.logical_path.sub(/^templates\//, '')
-      end
-    end
-  end
-end
-
-Tilt.register 'opalerb',               Opal::ERB::Processor
-Sprockets.register_engine '.opalerb',  Opal::ERB::Processor

data/spec/quoted.opalerb

@@ -1 +0,0 @@
-<div class="foo">hello <%= "there " + @name %></div>

data/spec/simple.opalerb

@@ -1 +0,0 @@
-<div><%= @some_data %></div>

data/spec/spec_helper.rb

@@ -1,6 +0,0 @@
-#= require opal
-#= require opal-erb
-#= require opal-spec
-#= require_tree .
-
-Opal::Spec::Runner.autorun

data/vendor/opal-spec-ext.rb

@@ -1,74 +0,0 @@
-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

@@ -1,10 +0,0 @@
-<!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

@@ -1,40 +0,0 @@
-/*
- * 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);
-  }
-});