reco 0.1.1 → 0.1.2

data/README.md

@@ -6,3 +6,16 @@ Eco is a wonderful javascript template system by [Sam Stephenson](http://twitter
 Reco let you compile Eco templates into Javascript through Ruby like this:
 
     javascript = Reco.compile File.read('some_template')
+
+With Rails 3.1 you can serve Eco templates i.e. like this:
+
+    // app/assets/javascripts/templates.js.erb
+    window.templates = {};
+    <% for template_name in [:user, :post] do %>
+      <% template_path = File.join Rails.root, 'app', 'assets', 'templates', "#{template_name}.eco" %>
+      <%= Reco.compile File.read(template_path), identifier: "window.templates.#{template_name}" %>
+    <% end %>
+
+Javascript that are run after templates.js.erb will now be able to do this:
+
+    window.templates.user({ name: 'Rasmus' }); // returns the rendered HTML

data/lib/reco/compiler.rb

@@ -7,15 +7,15 @@ module Reco
     end
   
     def self.compile(source, options = {})
-      compiled_javascript = CoffeeScript.compile preprocess(source), noWrap: true
+      compiled_javascript = CoffeeScript.compile preprocess(source), :noWrap => true
       identifier = options[:identifier] || 'module.exports'
       identifier = "var #{identifier}" unless identifier.include? '.'
       
-      wrapper % { compiled_javascript: compiled_javascript, identifier: identifier }
+      wrapper % [identifier, compiled_javascript]
     end
   
     def self.wrapper
-      File.read File.join(File.dirname(__FILE__), 'wrapper.js')
+      @wrapper ||= File.read File.join(File.dirname(__FILE__), 'wrapper.js')
     end
     
   end

data/lib/reco/scanner.rb

@@ -2,8 +2,9 @@ require 'strscan'
 
 class Reco::Scanner
   MODE_PATTERNS = {
-    data: /(.*?)(<%%|<%(([=-])?)|\n|$)/,
-    code: /(.*?)(((:|(->|=>))\s*)?%>|\n|$)/
+    :data => /(.*?)(<%%|<%\s*(\#)|<%(([=-])?)|\n|$)/,
+    :code => /(.*?)((((:|(->|=>))\s*))?%>|\n|$)/,
+    :comment => /(.*?)(%>|\n|$)/
   }
   DEDENTABLE_PATTERN = /^(end|when|else|catch|finally)(?:\W|$)/
   
@@ -30,7 +31,15 @@ class Reco::Scanner
       callback.call @mode == :data ? ["print_string", flush] : ["fail", "unexpected end of template"]
     else
       advance
-      @mode == :data ? scan_data(callback) : scan_code(callback)
+      
+      case @mode
+      when :data
+        scan_data callback
+      when :code
+        scan_code callback
+      when :comment
+        scan_comment callback
+      end
     end
   end
   
@@ -38,8 +47,9 @@ class Reco::Scanner
     @scanner.scan_until MODE_PATTERNS[@mode]
     @buffer += @scanner[1]
     @tail = @scanner[2]
-    @directive = @scanner[4]
-    @arrow = @scanner[5]
+    @comment = @scanner[3]
+    @directive = @scanner[5]
+    @arrow = @scanner[6]
   end
   
   def scan_data(callback)
@@ -50,9 +60,14 @@ class Reco::Scanner
       @buffer += @tail
       scan callback
     elsif @tail
-      @mode = :code
       callback.call ["print_string", flush]
-      callback.call ["begin_code", print: !!@directive, safe: @directive == '-']
+      
+      if @comment
+        @mode = :comment
+      else
+        @mode = :code
+        callback.call ["begin_code", {:print => !!@directive, :safe => @directive == '-'}]
+      end
     end
   end
   
@@ -70,6 +85,15 @@ class Reco::Scanner
     end
   end
   
+  def scan_comment(callback)
+    if @tail == "\n"
+      callback.call ['fail', 'unexpected newline in code block']
+    elsif @tail
+      @mode = :data
+      @buffer = ''
+    end
+  end
+  
   def is_dedentable?(code)
     code.match DEDENTABLE_PATTERN
   end

data/lib/reco/wrapper.js

@@ -1,4 +1,4 @@
-%{identifier} = function(__obj) {
+%s = function(__obj) {
   if (!__obj) __obj = {};
   var __out = [], __capture = function(callback) {
     var out = __out, result;
@@ -36,7 +36,7 @@
     };
   }
   (function() {
-    %{compiled_javascript}
+    %s
   }).call(__obj);
   __obj.safe = __objSafe, __obj.escape = __escape;
   return __out.join('');

metadata

@@ -2,7 +2,7 @@
 name: reco
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - "Rasmus R\xC3\xB8nn Nielsen"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 +02:00
+date: 2011-06-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,6 +24,17 @@ dependencies:
         version: "2.0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: Reco let you compile Eco templates into Javascript through Ruby.
 email: rasmusrnielsen@gmail.com
 executables: []