Bumped version, reminified, added test for single quotes

crux · Jun 8, 2009 · b708761 · b708761
1 parent 30c4167
commit b708761
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/Rakefile b/Rakefile
@@ -1,7 +1,7 @@
 desc 'Pulls the current version from lib/sammy.js'
 task :version do
   f = File.read('lib/sammy.js')
-  @version = f.match(/Sammy.VERSION \= \'([\d\.]+)\'/)[1]
+  @version = f.match(/Sammy.VERSION \= \'([\d\w\.]+)\'/)[1]
   puts "VERSION: " + @version
 end
 

diff --git a/lib/sammy.js b/lib/sammy.js
@@ -61,6 +61,7 @@
       // Convert the template into pure JavaScript
       template
         .replace(/[\r\t\n]/g, " ")
+        // .replace(/\'/g,'\\\'')
         .split("<%").join("\t")
         .replace(/((^|%>)[^\t]*)'/g, "$1\r")
         .replace(/\t=(.*?)%>/g, "',$1,'")
@@ -85,7 +86,7 @@
 
   Sammy = {};
 
-  Sammy.VERSION = '0.1.4';
+  Sammy.VERSION = '0.2.0pre';
 
   // == Sammy.Object
   //

diff --git a/lib/sammy.min.js b/lib/sammy.min.js
diff --git a/test/test_sammy_event_context.js b/test/test_sammy_event_context.js
@@ -101,6 +101,10 @@
         this.context.blurgh = 'boosh';
         var rendered = this.context.template('<div class="test_class"><%= text %> <%= blurgh %></div>', {text: 'TEXT!'});
         equals(rendered, '<div class="test_class">TEXT! boosh</div>');
+      })
+      .should('render templates with a lot of single quotes', function() {
+        var rendered = this.context.template("<div class='test_class' id='test'>I'm <%= text %></div>", {text: 'TEXT!'});
+        equals(rendered, "<div class='test_class' id='test'>I'm TEXT!</div>");
       });