jadeite 0.0.2 → 0.0.6

data/.gitignore

@@ -25,3 +25,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.jadeite-cache

data/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/benchmarks/benchmarks.rb

@@ -0,0 +1,68 @@
+require 'benchmark'
+require '../lib/jadeite'
+require '../lib/jadeite/environment'
+
+TEMPLATES = {
+  :form => {
+    :user => {}
+  },
+  :"include-mixin" => {
+
+  },
+  :includes => {
+
+  }
+}
+OPTIONS = [
+  {
+    cache: true
+  },
+  {
+    cache: false
+  }
+]
+
+def measure(times, title, &blk)
+  puts
+  puts "=== #{title} - #{times} times each"
+  OPTIONS.each do |opts|
+    puts "--- Options: #{opts}"
+    TEMPLATES.each do |name, data|
+      file = "./templates/#{name}.jade"
+      puts "=> #{name} (#{file})"
+      blk.call(times, file, data, opts)
+      puts
+    end
+  end
+end
+
+measure 10000, "Render precompiled templates" do |times, file, data, options|
+  puts Benchmark.measure {
+    env = Jadeite::Environment.new(options)
+    compiled = env.compile_file(file)
+    times.times do
+      compiled.render data
+    end
+  }
+end
+
+measure 10000, "Compile and render" do |times, file, data|
+  puts Benchmark.measure {
+    env = Jadeite::Environment.new
+    times.times do
+      compiled = env.compile_file(file)
+      compiled.render data
+    end
+  }
+end
+
+measure 10, "Initialize environment, compile and render" do |times, file, data|
+  puts Benchmark.measure {
+    times.times do
+      env = Jadeite::Environment.new
+
+      compiled = env.compile_file(file)
+      compiled.render data
+    end
+  }
+end

data/benchmarks/templates/auxiliary/escapes.html

@@ -0,0 +1,3 @@
+<script>
+  console.log("foo\nbar")
+</script>

data/benchmarks/templates/auxiliary/layout.jade

@@ -0,0 +1,6 @@
+html
+  head
+    title My Application
+    block head
+  body
+    block content

data/benchmarks/templates/auxiliary/mixins.jade

@@ -0,0 +1,3 @@
+
+mixin foo()
+  p bar

data/benchmarks/templates/auxiliary/smile.html

@@ -0,0 +1 @@
+<p>:)</p>

data/benchmarks/templates/form.jade

@@ -0,0 +1,29 @@
+form(method="post")
+  fieldset
+    legend General
+    p
+      label(for="user[name]") Username:
+        input(type="text", name="user[name]", value=user.name)
+    p
+      label(for="user[email]") Email:
+        input(type="text", name="user[email]", value=user.email)
+        .tip.
+          Enter a valid 
+          email address 
+          such as <em>tj@vision-media.ca</em>.
+  fieldset
+    legend Location
+    p
+      label(for="user[city]") City:
+        input(type="text", name="user[city]", value=user.city)
+    p
+      select(name="user[province]")
+        option(value="") -- Select Province --
+        option(value="AB") Alberta
+        option(value="BC") British Columbia
+        option(value="SK") Saskatchewan
+        option(value="MB") Manitoba
+        option(value="ON") Ontario
+        option(value="QC") Quebec
+  p.buttons
+    input(type="submit", value="Save")

data/benchmarks/templates/include-mixin.jade

@@ -0,0 +1,11 @@
+
+extend auxiliary/layout
+
+mixin article(title)
+  if title
+    h1= title
+  block
+
+block content
+  +article("The meaning of life")
+    p Foo bar baz!

data/benchmarks/templates/includes.jade

@@ -0,0 +1,7 @@
+include auxiliary/mixins
+
++foo
+
+body
+  include auxiliary/smile.html
+  include auxiliary/escapes.html

data/jadeite.gemspec

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
 require File.expand_path('../lib/jadeite/version', __FILE__)
 
 Gem::Specification.new do |gem|

data/lib/jadeite.rb

@@ -1,6 +1,5 @@
-require "jadeite/version"
-require "jadeite/environment"
-
 module Jadeite
-  
 end
+
+require "jadeite/version"
+require "jadeite/environment"

data/lib/jadeite/environment.rb

@@ -1,33 +1,85 @@
 require 'v8'
 require "nodejs"
+require "fileutils"
+require "digest"
 
 module Jadeite
   class Environment
-    def initialize
-      context = V8::Context.new
-      context.eval("var process = {env: {}}")
-      context.load(File.expand_path(File.join('../../../', 'node_modules/jade/runtime.js'), __FILE__))
 
-      node_env = NodeJS::Environment.new(context, File.expand_path('../../', __FILE__))
+    DEFAULT_OPTIONS = {
+      cache: true,
+      cache_dir: ".jadeite-cache",
+      compile_options: {
+        client: false,
+        compileDebug: true
+      }
+    }.freeze
+
+    def initialize(options={})
+      @options = DEFAULT_OPTIONS.merge(options)
+
+      FileUtils.mkdir_p(cache_dir) if cache? and !File.directory?(cache_dir)
+
+      # Setup V8 context
+      @context = V8::Context.new
+
+      # Load jade-runtime
+      node_env = NodeJS::Environment.new(@context, File.expand_path('../../', __FILE__))
+      @context['jade'] = node_env.require('jade-runtime').runtime
       @jade = node_env.require('jade')
     end
 
     def compile(template_str, opts={})
-      Template.new(@jade.compile(template_str.strip, opts))
+      opts = compile_options.merge(opts)
+      compiled = if cache?
+        cached = cached_read(template_str, opts) do
+          @jade.compile(template_str, opts.merge(client: true))
+        end
+        @context.eval(cached)
+      else
+        @jade.compile(template_str.strip, compile_options.merge(opts))
+      end
+      Template.new(compiled)
     end
 
     def render(template_str, data={}, opts={})
-      compile(template_str, opts).render(data)
+      compile(template_str, compile_options.merge(opts)).render(data)
     end
-  
+
     def compile_file(file, opts = {})
-      opts.merge!(:filename => File.expand_path(file))
-      compile(File.read(file), opts)
+      compile(File.read(file), opts.merge(filename: File.expand_path(file)))
     end
 
     def render_file(file, data={}, opts = {})
       compile_file(file, opts).render(data)
     end
+
+    def compile_options
+      @options[:compile_options]
+    end
+
+    def cache?
+      !!@options[:cache]
+    end
+
+    def cache_dir
+      @options[:cache_dir]
+    end
+
+    private
+
+    def cached_read(template_str, opts, &blk)
+      cache_file = File.join(cache_dir, "#{Digest::MD5.hexdigest("#{template_str}#{opts.inspect}")}.jade.js")
+      if File.exists?(cache_file)
+        File.read(cache_file)
+      else
+        File.open(cache_file, "w") do |f|
+          cached = "(#{blk.call});"
+          f.write(cached)
+          cached
+        end
+      end
+    end
   end
 
   private
@@ -35,9 +87,11 @@ module Jadeite
     def initialize(compiled)
       @compiled = compiled
     end
+
     def render(data={})
       @compiled.call data
     end
+
     def to_s
       @compiled.to_s
     end

data/lib/jadeite/version.rb

@@ -1,3 +1,3 @@
 module Jadeite
-  VERSION = "0.0.2"
+  VERSION = "0.0.6"
 end

data/lib/nodejs/environment.rb

@@ -2,14 +2,15 @@ require 'json'
 require 'pathname'
 module NodeJS
   class Environment
-    def initialize(runtime, base_path)
-      @runtime = runtime
+    def initialize(context, base_path)
+      @context = context
       @base_path = Pathname(base_path)
       @cache = {}
+      @context.eval("var process = {env: {}}")
     end
 
     def new_object
-      @runtime['Object'].new
+      @context['Object'].new
     end
 
     def require(module_or_path)
@@ -22,7 +23,7 @@ module NodeJS
 
       mod = @cache[file] = Module.new(self, file)
 
-      loader = @runtime.eval("(function(module, require, exports) {#{File.read(file)}});", file.to_s)
+      loader = @context.eval("(function(module, require, exports) {#{File.read(file)}});", file.to_s)
       loader.call(mod, mod.require_function, mod.exports)
       mod.exports
     end

data/package.json

@@ -2,6 +2,7 @@
   "name": "jadeite",
   "version": "0.0.0",
   "dependencies": {
+    "jade-runtime": "git://github.com/bjoerge/jade-runtime",
     "jade": "latest"
   },
   "engines": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jadeite
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: therubyracer
@@ -72,6 +72,15 @@ files:
 - Gemfile
 - LICENSE
 - README.md
+- Rakefile
+- benchmarks/benchmarks.rb
+- benchmarks/templates/auxiliary/escapes.html
+- benchmarks/templates/auxiliary/layout.jade
+- benchmarks/templates/auxiliary/mixins.jade
+- benchmarks/templates/auxiliary/smile.html
+- benchmarks/templates/form.jade
+- benchmarks/templates/include-mixin.jade
+- benchmarks/templates/includes.jade
 - extconf.rb
 - jadeite.gemspec
 - lib/jadeite.rb