amrita2 2.0.1 → 2.0.2

data/sample/login_engine/public/robots.txt

@@ -0,0 +1 @@
+# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file

data/sample/login_engine/public/stylesheets/login_engine.css

@@ -0,0 +1,81 @@
+/*
+
+  This CSS file is basically the scaffold.css file, and is only
+  included here to demonstrate using CSS files with Engines.
+
+*/
+
+body { background-color: #fff; color: #333; }
+
+body, p, ol, ul, td {
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size:   13px;
+  line-height: 18px;
+}
+
+pre {
+  background-color: #eee;
+  padding: 10px;
+  font-size: 11px;
+}
+
+a { color: #000; }
+a:visited { color: #666; }
+a:hover { color: #fff; background-color:#000; }
+
+.fieldWithErrors {
+  padding: 2px;
+  background-color: red;
+  display: table;
+}
+
+#ErrorExplanation {
+  width: 400px;
+  border: 2px solid red;
+  padding: 7px;
+  padding-bottom: 12px;
+  margin-bottom: 20px;
+  background-color: #f0f0f0;
+}
+
+#ErrorExplanation h2 {
+  text-align: left;
+  font-weight: bold;
+  padding: 5px 5px 5px 15px;
+  font-size: 12px;
+  margin: -7px;
+  background-color: #c00;
+  color: #fff;
+}
+
+#ErrorExplanation p {
+  color: #333;
+  margin-bottom: 0;
+  padding: 5px;
+}
+
+#ErrorExplanation ul li {
+  font-size: 12px;
+  list-style: square;
+}
+
+div.uploadStatus {
+  margin: 5px;
+}
+
+div.progressBar {
+  margin: 5px;
+}
+
+div.progressBar div.border {
+  background-color: #fff;
+  border: 1px solid grey;
+  width: 100%;
+}
+
+div.progressBar div.background {
+  background-color: #333;
+  height: 18px;
+  width: 0%;
+}
+

data/sample/login_engine/script/about

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/about'

data/sample/login_engine/script/breakpointer

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/breakpointer'

data/sample/login_engine/script/console

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/console'

data/sample/login_engine/script/destroy

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/destroy'

data/sample/login_engine/script/generate

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/generate'

data/sample/login_engine/script/performance/benchmarker

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/performance/benchmarker'

data/sample/login_engine/script/performance/profiler

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/performance/profiler'

data/sample/login_engine/script/plugin

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/plugin'

data/sample/login_engine/script/process/inspector

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/inspector'

data/sample/login_engine/script/process/reaper

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/reaper'

data/sample/login_engine/script/process/spawner

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/spawner'

data/sample/login_engine/script/runner

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/runner'

data/sample/login_engine/script/server

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/server'

data/sample/login_engine/test/fixtures/users.yml

@@ -0,0 +1,41 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+bob:
+  id: 1000001
+  login: bob
+  salted_password: b1de1d1d2aec05df2be6f02995537c1783f08490 # atest
+  salt: bf3c47e71c0bfeb6288c9b6b5e24e15256a0e407
+  email: bob@test.com
+  verified: 1
+  
+existingbob:
+  id: 1000002
+  login: existingbob
+  salted_password: b1de1d1d2aec05df2be6f02995537c1783f08490 # atest
+  salt: bf3c47e71c0bfeb6288c9b6b5e24e15256a0e407
+  email: existingbob@test.com
+  verified: 1  
+
+longbob:
+  id: 1000003
+  login: longbob
+  salted_password: 53427dca242488e885216a579e362ee888c3ebc1 # alongtest
+  salt: d35a9cc89af83799d9a938a74cb06a11d295aa9c
+  email: longbob@test.com
+  verified: 1
+
+deletebob1:
+  id: 1000004
+  login: deletebob1
+  salted_password: 53427dca242488e885216a579e362ee888c3ebc1 # alongtest
+  salt: d35a9cc89af83799d9a938a74cb06a11d295aa9c
+  email: deletebob1@test.com
+  verified: 1
+
+deletebob2:
+  id: 1000005
+  login: deletebob2
+  salted_password: 53427dca242488e885216a579e362ee888c3ebc1 # alongtest
+  salt: d35a9cc89af83799d9a938a74cb06a11d295aa9c
+  email: deletebob2@test.com
+  verified: 1

data/specs/erb_cdata.rb

@@ -185,3 +185,14 @@ context "amxml cdata_erb block(keep cdata)" do
     end
   end
 end
+
+context "erb in amxml " do
+  include Amrita2::Runtime
+  specify " " do
+    text = "<<p %= 1+2 >>"
+    t = Amrita2::Template.new(text, :inline_ruby)
+    t.test_with(binding) do |result|
+      result.should == "<p>3</p>"
+    end
+  end
+end

data/specs/filters.rb

@@ -2,6 +2,7 @@
 require 'rexml/document'
 require 'amrita2'
 require 'amrita2/testsupport'
+require 'time'
 
 include Amrita2
 include Amrita2::Runtime
@@ -13,7 +14,7 @@ context "Repeat Filter" do
 
   specify "with string" do
     #t = Amrita2::Template.new('<div><span am:src="aaa|Repeat[5]" /></div>')
-    
+
     t = Amrita2::Template.new('<div><<:aaa | Repeat[5] >></div>')
     t.render_with(:aaa => "A").should_be_samexml_as '<div>AAAAA</div>'
   end
@@ -27,7 +28,7 @@ context "Default Filter" do
   specify "with not nil data" do
     begin
       #t = Amrita2::Template.new('<div><span am:src="aaa|Default[123]">aaa</span></div>')
-      
+
       t = Amrita2::Template.new('<div><<:aaa | Default[123] >></div>')
       t.test_with(:aaa => "xyz") do |result|
         result.should_be_samexml_as '<div>xyz</div>'
@@ -82,7 +83,7 @@ context "Format Filter" do
 
   specify "Integer" do
     #t = Amrita2::Template.new(%q[<span><span am:src="aaa|Format['(%s)']">aaa</span></span>])
-    
+
     t = Amrita2::Template.new(%q[<span><<:aaa | Format['(%s)']>></span>])
     t.test_with(:aaa => 123) do |result|
       result.should_be_samexml_as '(123)'
@@ -499,7 +500,7 @@ context "ToHash Filter" do
 
     t.render_with(:a => "A").should_be_samexml_as 'A'
   end
-  
+
   specify "many keys" do
     t = Amrita2::Template.new <<-END
      <<:time | ToHash[:h=>:hour, :m=>:min, :s=>:sec] <

data/specs/gettext/static_text.rb

@@ -22,15 +22,15 @@ context "gettext static element" do
     Locale.set_current("ja", "JP", "utf8")
     test_gettext("test1",
                  TEMPFILE,
-                 "<span>test message</span>", 
+                 "<span>test message</span>",
                  [
                    %r[#: /tmp/test.a2html:-],
                    %r[msgid "test message"],
                  ],
-                 {}, 
+                 {},
                  "テストメッセージ"
                  ) do |l|
-      l.sub!(%r[msgid "test message"\nmsgstr ""]m, 
+      l.sub!(%r[msgid "test message"\nmsgstr ""]m,
               %[msgid "test message"\nmsgstr "テストメッセージ"])
       l
     end
@@ -40,15 +40,15 @@ context "gettext static element" do
     Locale.set_current("ja", "JP", "utf8")
     test_gettext("test1",
                  TEMPFILE,
-                 "<span> test message </span>", 
+                 "<span> test message </span>",
                  [
                    %r[#: /tmp/test.a2html:-],
                    %r[msgid "test message"],
                  ],
-                 {}, 
+                 {},
                  "テストメッセージ"
                  ) do |l|
-      l.sub!(%r[msgid "test message"\nmsgstr ""]m, 
+      l.sub!(%r[msgid "test message"\nmsgstr ""]m,
               %[msgid "test message"\nmsgstr "テストメッセージ"])
       l
     end
@@ -57,23 +57,40 @@ context "gettext static element" do
   specify "two messages" do
     test_gettext("test3",
                  TEMPFILE,
-                 "<div><span> test message1 </span><span>test message2</span></div>", 
+                 "<div><span> test message1 </span><span>test message2</span></div>",
                  [
                    %r[#: /tmp/test.a2html:-],
                    %r[msgid "test message1"],
                    %r[msgid "test message2"],
                  ],
-                 {}, 
+                 {},
                  "<div>あああいいい</div>"
                  ) do |l|
-      l.sub!(%r[msgid "test message1"\nmsgstr ""]m, 
+      l.sub!(%r[msgid "test message1"\nmsgstr ""]m,
               %[msgid "test message1"\nmsgstr "あああ"])
-      l.sub!(%r[msgid "test message2"\nmsgstr ""]m, 
+      l.sub!(%r[msgid "test message2"\nmsgstr ""]m,
               %[msgid "test message2"\nmsgstr "いいい"])
       l
     end
   end
 
+  specify "text with html comment" do
+    Locale.set_current("ja", "JP", "utf8")
+    test_gettext("test1",
+                 TEMPFILE,
+                 "<!-- comment --><span>test message</span>",
+                 [
+                   %r[#: /tmp/test.a2html:-],
+                   %r[msgid "test message"],
+                 ],
+                 {},
+                 "<!-- comment -->\nテストメッセージ"
+                 ) do |l|
+      l.sub!(%r[msgid "test message"\nmsgstr ""]m,
+              %[msgid "test message"\nmsgstr "テストメッセージ"])
+      l
+    end
+  end
 end
 
 context "format with gettext" do
@@ -84,18 +101,18 @@ context "format with gettext" do
     test_gettext(
                  "format1",
                  TEMPFILE,
-                 "<span>%{filename} is %{filesize} byte</span>", 
+                 "<span>%{filename} is %{filesize} byte</span>",
                  [
                    %r[#: #{TEMPFILE}:-],
                    %r[msgid "%\{filename\} is %\{filesize\} byte"],
                  ],
                  {
-                   :filename => "foo.rb", 
+                   :filename => "foo.rb",
                    :filesize => 100
                  },
                  "foo.rbの大きさは100バイトです"
                  ) do |l|
-      l.sub!(%r[msgid "%\{filename\} is %\{filesize\} byte"\nmsgstr ""]m, 
+      l.sub!(%r[msgid "%\{filename\} is %\{filesize\} byte"\nmsgstr ""]m,
               %[msgid "%\{filename\} is %\{filesize\} byte"\nmsgstr "%{filename}の大きさは%{filesize}バイトです"])
       l
     end

data/specs/impl/preprocess.rb

@@ -1,11 +1,9 @@
-
-require 'rexml/element'
 require 'amrita2'
 require 'amrita2/testsupport'
 
 context "amxml parser" do
   include Amrita2
-  
+
   it "tag only" do
     amxml = Amrita2::Core::PreProcessor::AmXml
     a = amxml.parse(%[a])
@@ -13,26 +11,26 @@ context "amxml parser" do
     a.attr.should == ""
     a.should_not be_has_amxml_attrs
   end
-  
+
   specify "tag with namespace only" do
     amxml = Amrita2::Core::PreProcessor::AmXml
     a = amxml.parse(%[xx:a/])
     a.tag.should == "xx:a"
     a.attr.should == ""
     a.should_not be_has_amxml_attrs
-    
+
     a = amxml.parse(%[xx:a])
     a.tag.should == "xx"
     a.attr.should == ""
     a.should be_has_amxml_attrs
     a.src_name.should == "a"
-    
+
     a = amxml.parse(%[xx:a b="c"])
     a.tag.should == "xx:a"
     a.attr.should == ' b="c"'
     a.should_not be_has_amxml_attrs
   end
-  
+
   specify "tag and attrs" do
     amxml = Amrita2::Core::PreProcessor::AmXml
     a = amxml.parse(%[a href="http://amrita2.rubyforge.org/"])
@@ -59,7 +57,7 @@ context "amxml parser" do
     a.attr.should == %[ y:href='http://amrita2.rubyforge.org/' zz:class="xxx"]
     a.should_not be_has_amxml_attrs
   end
-  
+
   specify "src" do
     amxml = Amrita2::Core::PreProcessor::AmXml
     a = amxml.parse(%[:xxx])
@@ -67,14 +65,14 @@ context "amxml parser" do
     a.attr.should == ""
     a.should be_has_amxml_attrs
     a.src_name.should == "xxx"
-    
+
     a = amxml.parse(%[a:xxx])
     a.tag.should == "a"
     a.attr.should == ""
     a.should be_has_amxml_attrs
     a.src_name.should == "xxx"
   end
-  
+
   specify "src and filters" do
     amxml = Amrita2::Core::PreProcessor::AmXml
     a = amxml.parse(%[a:xxx|Attr])
@@ -83,7 +81,7 @@ context "amxml parser" do
     a.should be_has_amxml_attrs
     a.src_name.should == "xxx"
     a.filters.should == "Attr"
-    
+
     a = amxml.parse(%[a:xxx| \n Attr])
     a.tag.should == "a"
     a.attr.should == ""
@@ -91,7 +89,7 @@ context "amxml parser" do
     a.src_name.should == "xxx"
     a.filters.should == "Attr"
   end
-  
+
   specify "loop" do
     amxml = Amrita2::Core::PreProcessor::AmXml
     a = amxml.parse(%[ [1..5] ])
@@ -110,7 +108,7 @@ context "amxml parser" do
     a.filters.should == nil
     a.for.should == %[1..5]
   end
-  
+
   specify "cond" do
     amxml = Amrita2::Core::PreProcessor::AmXml
     '?![a == 1]'.should match(%r[#{ amxml::S_AMVARS}])
@@ -121,7 +119,7 @@ context "amxml parser" do
     a.src_name.should == nil
     a.filters.should == nil
     a.skipif.should == "a == 1"
-    
+
     a = amxml.parse(%[a  ?[ b == 1 ]  ])
     a.tag.should == "a"
     a.attr.should == ""
@@ -131,7 +129,7 @@ context "amxml parser" do
     a.skipif.should == nil
     a.skipunless.should == "b == 1"
   end
-  
+
   specify "value" do
     amxml = Amrita2::Core::PreProcessor::AmXml
     a = amxml.parse(%[a { :xxx=>1 }])
@@ -176,7 +174,7 @@ context "preprocessor" do
     $3.should == "bbb"
   end
 
-  specify "check regexp"do 
+  specify "check regexp"do
     tag = %r[\w*]
     attr = %r[(?:\s*\w+=(?:".*?"|'.*?'))*] #"
     src_start = %r[(?::| \[|\?\[|\{)]
@@ -208,7 +206,7 @@ context "preprocessor" do
     ret = p.process("aaa<![CDATA[bbb]]>cccAAA<![CDATA[BBB]]>CCC")
     ret.should == "aaa<![CDATA[bbb]]>cccAAA<![CDATA[BBB]]>CCC"
   end
-  
+
   specify "replace <% %>" do
     p = Amrita2::Core::PreProcessor.new
     ret = p.process("<%aaa%>")
@@ -216,7 +214,7 @@ context "preprocessor" do
     ret = p.process("a<%b%>c<%d%>e")
     ret.should == "a<![CDATA[<%b%>]]>c<![CDATA[<%d%>]]>e"
   end
-  
+
   specify "replace <%= %>" do
     p = Amrita2::Core::PreProcessor.new
     ret = p.process("<%=aaa%>")
@@ -224,14 +222,14 @@ context "preprocessor" do
     ret = p.process("a<%b%>c<%=d%>e")
     ret.should == "a<![CDATA[<%b%>]]>c<![CDATA[<%=d%>]]>e"
   end
-  
+
   specify "don't replace <%= %> in cdata" do
     p = Amrita2::Core::PreProcessor.new
     ret = p.process("<![CDATA[<%=aaa%>]]>")
     ret.should == "<![CDATA[<%=aaa%>]]>"
     ret = p.process("a<%=b%>c<![CDATA[<%d%>]]>e")
     ret.should == "a<![CDATA[<%=b%>]]>c<![CDATA[<%d%>]]>e"
-    
+
     s = <<-END
       <![CDATA[
         <% a = 1 %>
@@ -240,7 +238,7 @@ context "preprocessor" do
     END
     p.process(s).should == s
   end
-  
+
   specify "not replace <%= %> in cdata in real" do
     text = <<-'END'
     <ul>
@@ -259,21 +257,21 @@ context "preprocessor" do
 
     text.should == ret
   end
-  
+
   specify "section" do
     pp = Amrita2::Core::PreProcessor.new
     ret = pp.process("aaa<%(Section1)xxx%>bbb")
     ret.should == "aaabbb"
     pp.sections[:Section1].should == "xxx"
   end
-  
+
   specify "section and cdata" do
     pp = Amrita2::Core::PreProcessor.new
     ret = pp.process("aaa<%(Section1)xxx%>bbb<%ccc%>ddd")
     ret.should == "aaabbb<![CDATA[<%ccc%>]]>ddd"
     pp.sections[:Section1].should == "xxx"
   end
-  
+
   specify "two sections and cdata" do
     pp = Amrita2::Core::PreProcessor.new
     ret = pp.process("aaa<%(Section1)xxx%>bbb<%ccc%>ddd<%(Section2)yyy%>eee")
@@ -281,7 +279,7 @@ context "preprocessor" do
     pp.sections[:Section1].should == "xxx"
     pp.sections[:Section2].should == "yyy"
   end
-  
+
   specify "two sections and cdata with nest" do
     pp = Amrita2::Core::PreProcessor.new
     ret = pp.process("aaa<%(Section1)<%=1%>xxx%>bbb<%%<%=2%>ccc%>ddd<%(Section2)<%=3%>yyy%>eee")
@@ -289,7 +287,7 @@ context "preprocessor" do
     pp.sections[:Section1].should == "<%=1%>xxx"
     pp.sections[:Section2].should == "<%=3%>yyy"
   end
-  
+
   specify "nbsp" do
     pp = Amrita2::Core::PreProcessor.new
     ret = pp.process("&nbsp; &amp;")
@@ -300,11 +298,11 @@ end
 
 context "amxml inline" do
   include Amrita2
-  
+
   specify "inline" do
     p = Amrita2::Core::PreProcessor.new
     ret = p.process("<<a>>") #"
-    ret.should == "<a />" 
+    ret.should == "<a />"
     ret = p.process("<<a:xxx>>")
     ret.should == "<a am:src='xxx' />"
     ret = p.process("<<p class='text':aaa>>")
@@ -317,21 +315,21 @@ context "amxml inline" do
     p.process("<<h3:title>>").should == "<h3 am:src='title' />"
     p.process("<<h3 class='title':title>>").should == "<h3 am:src='title' class='title' />"
   end
-  
+
   specify "inline skipif" do
     p = Amrita2::Core::PreProcessor.new
-    ret = p.process("<<a ?[a == 1]>>") 
+    ret = p.process("<<a ?[a == 1]>>")
     ret.should == "<a am:skipif='not(a == 1)' />"
-    ret = p.process("<<a ?![a == 1]>>") 
+    ret = p.process("<<a ?![a == 1]>>")
     ret.should == "<a am:skipif='a == 1' />"
   end
-  
+
   specify "inline anonymous tag" do
     p = Amrita2::Core::PreProcessor.new
     ret = p.process("<<:xxx>>")
     ret.should == "<_ am:src='xxx' />"
   end
-  
+
   specify "inline filter" do
     r = %r[#{Amrita2::Core::PreProcessor::AmXml::S_SRC_AND_FILTERS }]
     ":a|A|B".should match(r)
@@ -347,15 +345,15 @@ context "amxml inline" do
 
     ret = p.process(%[<<a:|Attr[:href=>:url, :body=>:description]>>])
     ret.should == %[<a am:filter='Attr[:href=>:url, :body=>:description]' />]
-    
+
     ret = p.process(%[<<:|Each[:class=>[:odd, :even]]|Attr[:class,:body=>:no]>>])
     ret.should == %[<_ am:filter='Each[:class=>[:odd, :even]]|Attr[:class,:body=>:no]' />]
     ret = p.process(%[<<:|Each[:class=>[:odd, :even]]|\nAttr[:class,:body=>:no]>>])
     ret.should == %[<_ am:filter='Each[:class=>[:odd, :even]]|\nAttr[:class,:body=>:no]' />]
     ret = p.process(%[<<a:website\|Attr>>])
     ret.should == %[<a am:src='website|Attr' />]
-  end 
-  
+  end
+
   specify "css selecter like" do
     p = Amrita2::Core::PreProcessor.new
 
@@ -372,24 +370,30 @@ context "amxml inline" do
     ret = p.process("<<div.cart-title>>")
     ret.should == '<div class="cart-title" />'
   end
+  specify "css selecter like" do
+    p = Amrita2::Core::PreProcessor.new
+
+    ret = p.process("<<p %= 1+2 >>")
+    ret.should == '<p><![CDATA[<%= 1+2 %>]]></p>'
+  end
 end
 
 context "amxml block" do
   include Amrita2
-  
+
   specify "simple" do
 
     p = Amrita2::Core::PreProcessor.new
     p.process(<<-END).should_be_samexml_as("<_ am:src='title' /> ")
       <<:title>>
     END
-    
+
     p = Amrita2::Core::PreProcessor.new
     p.process(<<-END).should_be_samexml_as("<html>test</html>")
       <<html<
         test
     END
-    
+
     p = Amrita2::Core::PreProcessor.new
     p.process(<<-END).should_be_samexml_as('<div class="cart-title">test</div>')
       <<div.cart-title<
@@ -497,7 +501,7 @@ context "amxml block" do
             :style => @cart.items.empty? ? "display: none" : nil
           } <
           %= render(:partial => "cart", :object => @cart)
-       
+
     END
 <div am:v='HashDelegator.new($_) { {:style => @cart.items.empty? ? "display: none" : nil} }' id="cart">
 <![CDATA[<%
@@ -512,7 +516,7 @@ END
 
     p.process(<<-END).should_be_samexml_as(<<-END)
     <<table<
-      <<tr:clients  
+      <<tr:clients
           |NVar[:surname, :firstname, :email]<
         <td>$1, $2</td>
         <td><a href="mailto:$3">$3</a></td>
@@ -558,16 +562,16 @@ END
     END
 
     a = p.process(<<-END)
-      << 
-        [1..5] < 
+      <<
+        [1..5] <
         <<?[ ($_%2) == 0
-          
+
            ] <
           << {
                :no => $_,
                :square=> $_*$_
              } <
-            
+
             <<li<
               <<:no>> * <<:no>> = <<:square>>
     END
@@ -585,25 +589,25 @@ end
 
 context "amxml erb" do
   include Amrita2
-  
+
   specify "simple" do
     p = Amrita2::Core::PreProcessor.new
 
-    p.process(<<-END).should == (<<-END).strip
+    p.process(<<-END).gsub("% ", '%').should == (<<-END).strip
       <<div<
         % a = 1
     END
-<div ><![CDATA[<% 
+<div ><![CDATA[<%
 a = 1
 %>]]>
 </div>
     END
-    p.process(<<-END).should == (<<-END).strip
+    p.process(<<-END).gsub("% ", '%').gsub(" \n", "\n").should == (<<-END).strip
       <<div<
         %= a + 1
     END
-<div ><![CDATA[<% 
- _erbout.concat(eval(%{ a + 1}).to_s) 
+<div ><![CDATA[<%
+ _erbout.concat(eval(%{ a + 1}).to_s)
 %>]]>
 </div>
     END
@@ -611,12 +615,12 @@ a = 1
     p.process(<<-END).should_be_samexml_as(<<-END)
       <<div<
         %  form_remote_tag :url => { :action => :add_to_cart, :id => $_ } do
-        %=   submit_tag "Add to Cart" 
+        %=   submit_tag "Add to Cart"
         %  end
     END
 <div>
 <% form_remote_tag :url => {  :action => :add_to_cart, :id => $_ } do
-_erbout.concat(eval(%{ submit_tag "Add to Cart" }).to_s)
+_erbout.concat(eval(%{ submit_tag "Add to Cart"}).to_s)
 end %>
 </div>
     END
@@ -625,7 +629,7 @@ end
 
 context "cell processor" do
   include Amrita2
-  
+
   specify "not cell" do
     l = Amrita2::Core::PreProcessor::LineProcessor.new do |s|
      s