<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>public/javascripts/ruby.js</filename>
    </added>
    <added>
      <filename>red/application.red</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,10 +1,10 @@
 h1. New York
 
-Easy website wireframing with HAML, SASS, Compass, jQuery and Polypage.
+Easy website wireframing with HAML, SASS, Compass, Red, jQuery and Polypage.
 
 h1. Download
 
-&quot;http://boldr.fr/downloads/newyork/newyork-1.0.zip&quot;:http://boldr.fr/downloads/newyork/newyork-1.0.zip
+&quot;http://boldr.fr/downloads/newyork/newyork-1.0.1.zip&quot;:http://boldr.fr/downloads/newyork/newyork-1.0.1.zip
 
 h1. Run
 
@@ -16,7 +16,7 @@ h1. Installation from sources
 
 First install the required gems:
 
-&lt;pre&gt;&lt;code&gt;sudo gem install mongrel sinatra extlib
+&lt;pre&gt;&lt;code&gt;sudo gem install mongrel sinatra extlib red
 git clone git://github.com/nex3/haml.git
 cd compass
 rake install
@@ -35,11 +35,34 @@ h1. What's included?
 * &quot;HAML&quot;:http://haml.hamptoncatlin.com
 * &quot;SASS&quot;:http://haml.hamptoncatlin.com
 * &quot;Compass&quot;:http://github.com/chriseppstein/compass/wikis
+* &quot;Red&quot;:http://github.com/jessesielaff/red
 * &quot;jQuery&quot;:http://jquery.com
 * &quot;Polypage&quot;:http://code.new-bamboo.co.uk/polypage/
 
 h1. And after?
 
-Just add your HAML files in views/, your SASS files in sass/ and all your static files in public/.
+Just add your HAML files in views/, your SASS files in sass/, your Red files in red/ and all your static files in public/.
 
-To access to your pages type the following URL: http://localhost:4567/mypage
\ No newline at end of file
+To access to your pages type the following URL: http://localhost:4567/mypage
+
+h1. Use ERB
+
+In @main.rb@, change this:
+
+&lt;pre&gt;&lt;code&gt;get '/' do
+  haml :index
+end
+
+get '/:name' do
+  haml params[:name].to_sym
+end&lt;/code&gt;&lt;/pre&gt;
+
+Into this:
+
+&lt;pre&gt;&lt;code&gt;get '/' do
+  erb :index
+end
+
+get '/:name' do
+  erb params[:name].to_sym
+end&lt;/code&gt;&lt;/pre&gt;
\ No newline at end of file</diff>
      <filename>README.textile</filename>
    </modified>
    <modified>
      <diff>@@ -12,8 +12,9 @@ end
 require 'sinatra'
 require 'extlib'
 
-class Sinatra::EventContext
-  module SassExtension
+module Sinatra
+  
+  module Sass
     def sass(content, options = {})
       require 'sass'
       require 'compass'
@@ -37,7 +38,36 @@ class Sinatra::EventContext
       end
   end
   
-  include SassExtension
+  unless RUBY_PLATFORM == 'java'
+    module Red
+      def red(content, options = {})
+        require 'red'
+      
+        options[:views_directory] = 'red'
+      
+        render(:red, content, options)
+      end
+    
+      private
+
+        def render_red(content, options = {})
+          meta_class.__send__ :include, ::Red
+          ::Red.__send__ :attr_accessor, :content
+        
+          ::Red.content = content
+        
+          class &lt;&lt; ::Red
+            ::Red.init
+            ::Red.content.translate_to_sexp_array.red!
+          end
+        end
+    end
+  
+    class EventContext
+      include Red
+    end
+  end
+  
 end
 
 helpers do
@@ -49,7 +79,7 @@ helpers do
   
   def js_include_tag(*javascripts)
     javascripts.map do |javascript|
-      &quot;&lt;script type='text/javascript' src='/javascripts/#{javascript}.css'&gt;&lt;/script&gt;\n&quot;
+      &quot;&lt;script type='text/javascript' src='/javascripts/#{javascript}.js'&gt;&lt;/script&gt;\n&quot;
     end
   end
 end
@@ -65,4 +95,11 @@ end
 get '/stylesheets/:name.css' do
   content_type 'text/css', :charset =&gt; 'utf-8'
   sass params[:name].to_sym
+end
+
+unless RUBY_PLATFORM == 'java'
+  get '/javascripts/:name.js' do
+    content_type 'text/javascript', :charset =&gt; 'utf-8'
+    red params[:name].to_sym
+  end
 end
\ No newline at end of file</diff>
      <filename>main.rb</filename>
    </modified>
    <modified>
      <diff>@@ -4,6 +4,6 @@
   %head
     %title Wireframe
     = css_include_tag 'main'
-    = js_include_tag 'jquery', 'cookie.jquery', 'polypage.jquery'
+    = js_include_tag 'ruby', 'application', 'jquery', 'cookie.jquery', 'polypage.jquery'
   %body
     = yield
\ No newline at end of file</diff>
      <filename>views/layout.haml</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>a6fb2beac0fc9dd635ae46bda37af1f4d963bc14</id>
    </parent>
  </parents>
  <author>
    <name>Nicolas M&#233;rouze</name>
    <email>nicolas.merouze@gmail.com</email>
  </author>
  <url>http://github.com/nmerouze/newyork/commit/cc826e803bea96e88b5cb3b0491f45437c8f3708</url>
  <id>cc826e803bea96e88b5cb3b0491f45437c8f3708</id>
  <committed-date>2008-11-09T06:58:52-08:00</committed-date>
  <authored-date>2008-11-09T06:58:52-08:00</authored-date>
  <message>Fix bugs. Add Red support (doesn't work with JRuby).</message>
  <tree>5c4e4a15126b5a46aa899abef2f98b1223ed564d</tree>
  <committer>
    <name>Nicolas M&#233;rouze</name>
    <email>nicolas.merouze@gmail.com</email>
  </committer>
</commit>
