ejs 1.0.0 → 1.1.0

data/README.md

@@ -6,7 +6,7 @@ ERB. This library is a port of
 [Underscore.js](http://documentcloud.github.com/underscore/)'s
 [`_.template`
 function](http://documentcloud.github.com/underscore/#template) to
-Ruby.
+Ruby, and strives to maintain the same syntax and semantics.
 
 Pass an EJS template to `EJS.compile` to generate a JavaScript
 function:
@@ -18,6 +18,13 @@ Invoke the function in a JavaScript environment to produce a string
 value. You can pass an optional object specifying local variables for
 template evaluation.
 
+The EJS tag syntax is as follows:
+
+* `<% ... %>` silently evaluates the statement inside the tags.
+* `<%= ... %>` evaluates the expression inside the tags and inserts
+  its string value into the template output.
+* `<%- ... %>` behaves like `<%= ... %>` but HTML-escapes its output.
+
 If you have the [ExecJS](https://github.com/sstephenson/execjs/)
 library and a suitable JavaScript runtime installed, you can pass a
 template and an optional hash of local variables to `EJS.evaluate`:
@@ -27,6 +34,6 @@ template and an optional hash of local variables to `EJS.evaluate`:
 
 -----
 
-&copy; 2011 Sam Stephenson
+&copy; 2012 Sam Stephenson
 
 Released under the MIT license

data/lib/ejs.rb

@@ -1,6 +1,4 @@
 # EJS (Embedded JavaScript) template compiler for Ruby
-# (c) 2011 Sam Stephenson
-#
 # This is a port of Underscore.js' `_.template` function:
 # http://documentcloud.github.com/underscore/
 
@@ -8,6 +6,7 @@ module EJS
   class << self
     attr_accessor :evaluation_pattern
     attr_accessor :interpolation_pattern
+    attr_accessor :escape_pattern
 
     # Compiles an EJS template to a JavaScript function. The compiled
     # function takes an optional argument, an object specifying local
@@ -23,6 +22,7 @@ module EJS
       source = source.dup
 
       escape_quotes!(source)
+      replace_escape_tags!(source, options)
       replace_interpolation_tags!(source, options)
       replace_evaluation_tags!(source, options)
       escape_whitespace!(source)
@@ -51,9 +51,15 @@ module EJS
         source.gsub!(/'/) { "\\'" }
       end
 
+      def replace_escape_tags!(source, options)
+        source.gsub!(options[:escape_pattern] || escape_pattern) do
+          "',(''+" + $1.gsub(/\\'/, "'") + ")#{escape_function},'"
+        end
+      end
+
       def replace_evaluation_tags!(source, options)
         source.gsub!(options[:evaluation_pattern] || evaluation_pattern) do
-          "');" + $1.gsub(/\\'/, "'").gsub(/[\r\n\t]/, ' ') + "__p.push('"
+          "');" + $1.gsub(/\\'/, "'").gsub(/[\r\n\t]/, ' ') + "; __p.push('"
         end
       end
 
@@ -68,8 +74,18 @@ module EJS
         source.gsub!(/\n/, '\\n')
         source.gsub!(/\t/, '\\t')
       end
+
+      def escape_function
+        ".replace(/&/g, '&amp;')" +
+        ".replace(/</g, '&lt;')" +
+        ".replace(/>/g, '&gt;')" +
+        ".replace(/\"/g, '&quot;')" +
+        ".replace(/'/g, '&#x27;')" +
+        ".replace(/\\//g,'&#x2F;')"
+      end
   end
 
   self.evaluation_pattern = /<%([\s\S]+?)%>/
   self.interpolation_pattern = /<%=([\s\S]+?)%>/
+  self.escape_pattern = /<%-([\s\S]+?)%>/
 end

metadata

@@ -1,84 +1,59 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ejs
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Sam Stephenson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-17 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: execjs
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70242739871960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
-        version: "0.4"
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70242739871960
 description: Compile and evaluate EJS (Embedded JavaScript) templates from Ruby.
-email: 
+email:
 - sstephenson@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - LICENSE
 - lib/ejs.rb
-has_rdoc: true
 homepage: https://github.com/sstephenson/ruby-ejs/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: EJS (Embedded JavaScript) template compiler
 test_files: []
-