curly-templates 0.10.0 → 0.10.1

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ### Unreleased
 
+### Curly 0.10.1 (July 11, 2013)
+
+* Fix a bug in the compiler that caused some templates to be erroneously HTML
+  escaped.
+
+  *Daniel Schierbeck*
+
 ### Curly 0.10.0 (July 11, 2013)
 
 * Allow comments in Curly templates using the `{{! ... }}` syntax:

data/curly-templates.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'curly-templates'
-  s.version           = '0.10.0'
+  s.version           = '0.10.1'
   s.date              = '2013-07-11'
 
   s.summary     = "Free your views!"

data/lib/curly.rb

@@ -26,7 +26,7 @@
 # See Curly::Presenter for more information on presenters.
 #
 module Curly
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 
   # Compiles a Curly template to Ruby code.
   #

data/lib/curly/compiler.rb

@@ -51,7 +51,11 @@ module Curly
         send("compile_#{type}", value)
       end
 
-      parts.join(" << ")
+      <<-RUBY
+        buffer = ActiveSupport::SafeBuffer.new
+        #{parts.join("\n")}
+        buffer
+      RUBY
     end
 
     private
@@ -74,19 +78,19 @@ module Curly
         RUBY
       end
 
-      'ERB::Util.html_escape(%s)' % code.strip
+      'buffer.concat(%s)' % code.strip
     end
 
     def compile_text(text)
-      text.inspect
+      'buffer.safe_concat(%s)' % text.inspect
     end
 
     def compile_comment_line(comment)
-      "''" # Replace the content with an empty string.
+      "" # Replace the content with an empty string.
     end
 
     def compile_comment(comment)
-      "''" # Replace the content with an empty string.
+      "" # Replace the content with an empty string.
     end
   end
 end

data/spec/compiler_spec.rb

@@ -95,6 +95,10 @@ describe Curly::Compiler do
       evaluate("{{dirty}}").should == "<p>dirty</p>"
     end
 
+    it "does not escape HTML in the template itself" do
+      evaluate("<div>").should == "<div>"
+    end
+
     it "removes comments from the output" do
       evaluate("HELO{{! I'm a comment, yo }}WORLD").should == "HELOWORLD"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curly-templates
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -150,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4015061898851795676
+      hash: 658747487634727033
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: