deface 1.0.0.rc1 → 1.0.0.rc2

data/.travis.yml

@@ -3,7 +3,15 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - jruby-18mode
+  - jruby-19mode
 gemfile:
   - gemfiles/rails3_1.gemfile
   - gemfiles/rails3_2.gemfile
-  - gemfiles/haml3_2.gemfile
+  - gemfiles/haml4_0.gemfile
+
+notifications:
+  email:
+    - brian@spreecommerce.com
+    - ryan@spreecommerce.com

data/Gemfile

@@ -1,3 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
+

data/README.markdown

@@ -1,6 +1,6 @@
 <p style="float:right;">
-  <a href="http://travis-ci.org/#!/railsdog/deface">
-    <img src="http://travis-ci.org/railsdog/deface.png">
+  <a href="http://secure.travis-ci.org/spree/deface">
+    <img src="https://secure.travis-ci.org/spree/deface.png?branch=master">
   </a>
 </p>
 
@@ -185,9 +185,9 @@ You can redefine an existing override by simply declaring a new override with th
 You do not need to resupply all the values originally used, just the ones you want to change:
 
 ```ruby
-    Deface::Override.new(:virtual_path => 'posts/index',
-                        :name => 'add_attrs_to_a_link',
-                        :disabled => true)
+Deface::Override.new(:virtual_path => 'posts/index',
+                     :name => 'add_attrs_to_a_link',
+                     :disabled => true)
 ```
 
 ### Namespacing
@@ -196,9 +196,9 @@ If you want to avoid inadvertently redefining overrides in other engines, you ca
 an override automatically be namespaced to the engine in which it was defined:
 
 ```ruby
-    Deface::Override.new(:virtual_path => 'posts/index',
-                        :name => 'add_link',
-                        :namespaced => true)
+Deface::Override.new(:virtual_path => 'posts/index',
+                     :name => 'add_link',
+                     :namespaced => true)
 ```
 
 So for example if the above override was defined in `MyEngine` it would be automatically named `my_engine_add_link`.
@@ -327,7 +327,9 @@ Deface now supports precompiling where all overrides are loaded and applied to t
 
 It's important to disable Deface once precompiling is used to prevent overrides getting applied twice. To disable add the following line to your application's `production.rb` file:
 
-     config.deface.enabled = false
+```ruby
+config.deface.enabled = false
+```
 
 NOTE: You can also use precompiling in development mode.
 

data/deface.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "deface"
-  s.version = "1.0.0.rc1"
+  s.version = "1.0.0.rc2"
 
   s.authors = ["Brian D Quinn"]
   s.description = "Deface is a library that allows you to customize ERB & HAML views in a Rails application without editing the underlying view."
@@ -15,11 +15,12 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.summary = "Deface is a library that allows you to customize ERB & HAML views in Rails"
 
-  s.add_dependency('nokogiri', '~> 1.5.0')
+  s.add_dependency('nokogiri', '~> 1.5.9')
   s.add_dependency('rails', '~> 3.1')
   s.add_dependency('colorize', '>= 0.5.8')
 
   s.add_development_dependency('rspec', '>= 2.11.0')
   s.add_development_dependency('haml', '>= 3.1.4')
   s.add_development_dependency('simplecov', '>= 0.6.4')
+  s.add_development_dependency('generator_spec', '~> 0.8.5')
 end

data/gemfiles/haml4_0.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'haml', '~> 4.0.0'
+
+gemspec :path=>"../"

data/gemfiles/rails3_1.gemfile

@@ -1,5 +1,5 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem "rails", "~> 3.1.0"
 
-gemspec :path=>"../"
+gemspec :path=>"../"

data/gemfiles/rails3_2.gemfile

@@ -1,5 +1,5 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem "rails", "~> 3.2.0"
 
-gemspec :path=>"../"
+gemspec :path=>"../"

data/lib/deface.rb

@@ -34,6 +34,7 @@ require "deface/actions/remove_from_attributes"
 require "deface/matchers/element"
 require "deface/matchers/range"
 require "deface/environment"
+require "deface/precompiler"
 require "colorize"
 
 module Deface

data/lib/deface/applicator.rb

@@ -7,7 +7,7 @@ module Deface
         overrides = find(details)
 
         if log && overrides.size > 0
-          Rails.logger.info "\e[1;32mDeface:\e[0m #{overrides.size} overrides found for '#{details[:virtual_path]}'"
+          Rails.logger.debug "\e[1;32mDeface:\e[0m #{overrides.size} overrides found for '#{details[:virtual_path]}'"
         end
 
         unless overrides.empty?
@@ -20,7 +20,7 @@ module Deface
 
           overrides.each do |override|
             if override.disabled?
-              Rails.logger.info("\e[1;32mDeface:\e[0m '#{override.name}' is disabled") if log
+              Rails.logger.debug("\e[1;32mDeface:\e[0m '#{override.name}' is disabled") if log
               next
             end
 
@@ -28,7 +28,7 @@ module Deface
             matches = override.matcher.matches(doc, log)
 
             if log
-              Rails.logger.send(matches.size == 0 ? :error : :info, "\e[1;32mDeface:\e[0m '#{override.name}' matched #{matches.size} times with '#{override.selector}'")
+              Rails.logger.send(matches.size == 0 ? :error : :debug, "\e[1;32mDeface:\e[0m '#{override.name}' matched #{matches.size} times with '#{override.selector}'")
             end
 
             if matches.empty?

data/lib/deface/dsl/loader.rb

@@ -62,7 +62,8 @@ module Deface
           end
 
           comment.gsub('<!--', '').gsub('-->', '').strip.scan(/[^\s"']+|"[^"]*"|'[^']*'/).each do |part|
-            dsl_commands =~ /('|")\z/ || part =~ /\w\z/ ? dsl_commands << "\n" : dsl_commands << ' '
+
+            dsl_commands =~ /('|")\z/ || part =~ /\A[^\d:='"%]/ ? dsl_commands << "\n" : dsl_commands << ' '
             dsl_commands << part
           end
 

data/lib/deface/parser.rb

@@ -24,7 +24,6 @@ module Deface
           replace_line
         end
 
-
         i = -1
         #catch all <% %> inside tags id <p <%= test %>> , not inside attrs
         replace_line.scan(/(<%.*?%>)/m).each do |match|
@@ -51,9 +50,11 @@ module Deface
     # undoes ERB markup generated by Deface::Parser::ERB
     #
     def self.undo_erb_markup!(source)
-      replacements = [ {"<code erb-silent>" => '<%'},
-                       {"<code erb-loud>"   => '<%='},
-                       {"</code>"           => '%>'}]
+      replacements = [ {"<code erb-silent>"      => '<%'},
+                       {"<code erb-silent=\"\">" => '<%'},
+                       {"<code erb-loud>"        => '<%='},
+                       {"<code erb-loud=\"\">"   => '<%='},
+                       {"</code>"                => '%>'}]
 
       replacements.each{ |h| h.each { |replace, with| source.gsub! replace, with } }
 

data/lib/deface/precompiler.rb

@@ -0,0 +1,33 @@
+module Deface
+  class Precompiler
+
+    extend Deface::TemplateHelper
+
+    def self.precompile
+      base_path = Rails.root.join("app/compiled_views")
+      # temporarily configures deface env and loads
+      # all overrides so we can precompile
+      unless Rails.application.config.deface.enabled
+        Rails.application.config.deface = Deface::Environment.new
+        Rails.application.config.deface.overrides.early_check
+        Rails.application.config.deface.overrides.load_all Rails.application
+      end
+
+      Rails.application.config.deface.overrides.all.each do |virtual_path,overrides|
+        template_path = base_path.join( "#{virtual_path}.html.erb")
+
+        FileUtils.mkdir_p template_path.dirname
+        begin
+          source = load_template_source(virtual_path.to_s, false, true)
+          if source.blank?
+            raise "Compiled source was blank for '#{virtual_path}'"
+          end
+          File.open(template_path, 'w') {|f| f.write source } 
+        rescue Exception => e
+          puts "Unable to precompile '#{virtual_path}' due to: "
+          puts e.message
+        end
+      end
+    end
+  end
+end

data/lib/deface/template_helper.rb

@@ -1,7 +1,7 @@
 module Deface
   module TemplateHelper
 
-    # used to find source for a partial or template using virutal_path
+    # used to find source for a partial or template using virtual_path
     def load_template_source(virtual_path, partial, apply_overrides=true)
       parts = virtual_path.split("/")
       prefix = []

data/lib/generators/deface/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Generate a deface override
+
+Example:
+    rails generate deface:override posts/_post add_headline
+
+    This will create:
+        app/overrides/posts/_post/add_headline.html.{erb|haml}.deface

data/lib/generators/deface/override_generator.rb

@@ -0,0 +1,16 @@
+module Deface
+  module Generators
+    class OverrideGenerator < Rails::Generators::Base
+      desc "Generates deface overrides"
+      source_root File.expand_path("../templates", __FILE__)
+      class_option :template_engine, :desc => 'Template engine to be invoked (erb or haml).'
+      argument :view, :type => :string
+      argument :name, :type => :string, :default => 'override'
+
+      def copy_template
+        engine = options[:template_engine]
+        copy_file "override.html.#{engine}.deface", "app/overrides/#{view}/#{name}.html.#{engine}.deface"
+      end
+    end
+  end
+end

data/lib/generators/deface/templates/override.html.erb.deface

@@ -0,0 +1,2 @@
+<!-- insert_after 'h1' -->
+<h2>These robots are awesome.</h2>

data/lib/generators/deface/templates/override.html.haml.deface

@@ -0,0 +1,3 @@
+/
+  insert_after 'h1'
+%h2 These robots are awesome.

data/spec/assets/dummy_app/overrides/posts/precompileme/precompileme.html.erb.deface

@@ -0,0 +1,2 @@
+<!-- insert_bottom 'li' -->
+Added to li!

data/spec/assets/posts/precompileme.html.erb

@@ -0,0 +1,2 @@
+<p>I'm from shared/precompileme template</p>
+<%= "I've got ERB too" %>

data/spec/deface/actions/set_attributes_spec.rb

@@ -54,7 +54,10 @@ module Deface
         let(:source) { "<div><img class=\"<%= hello_moon %>\" src=\"path/to/button.png\"></div>" }
 
         it "should return modified source" do
-          Dummy.apply(source, {:virtual_path => "posts/index"}).gsub("\n", "").should == "<div><img src=\"path/to/button.png\" class=\"<%= hello_world %>\"></div>"
+          tag = Nokogiri::HTML::DocumentFragment.parse(Dummy.apply(source, {:virtual_path => "posts/index"}).gsub("\n", ""))
+          tag = tag.css('img').first
+          tag.attributes['src'].value.should eq "path/to/button.png"
+          tag.attributes['class'].value.should eq "<%= hello_world %>"
         end
       end
     end

data/spec/deface/dsl/loader_spec.rb

@@ -53,7 +53,7 @@ describe Deface::DSL::Loader do
       lambda { Deface::DSL::Loader.load(filename) }.should raise_error(
         "Deface::DSL overrides must be in a sub-directory that matches the views virtual path. Move 'app/overrides/example_name.html.erb.deface' into a sub-directory.")
     end
- 
+
     it 'should set the virtual_path for a .deface file in a directory below overrides' do
       file = mock('deface file')
       filename = 'app/overrides/path/to/view/example_name.deface'
@@ -177,6 +177,26 @@ describe Deface::DSL::Loader do
       the_rest.should == "<h1>Wow!</h1>"
     end
 
+    it 'should work with multiple commands on one line when command argument is not a normal string' do
+      example = %q{<!-- replace_contents 'h1 .title' closing_selector %q{div#intro} disabled namespaced --><h1>Wow!</h1>}
+      dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_erb(example)
+      dsl_commands.should == "\nreplace_contents 'h1 .title'\nclosing_selector %q{div#intro}\ndisabled\nnamespaced"
+      the_rest.should == "<h1>Wow!</h1>"
+    end
+
+    it 'should work with multiple commands on one line when command argument is an integer' do
+      example = %q{<!-- replace_contents 'h1 .title' disabled sequence 2 namespaced --><h1>Wow!</h1>}
+      dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_erb(example)
+      dsl_commands.should == "\nreplace_contents 'h1 .title'\ndisabled\nsequence 2\nnamespaced"
+      the_rest.should == "<h1>Wow!</h1>"
+    end
+
+    it 'should work with multiple commands on one line when command argument is a hash' do
+      example = %q{<!-- add_to_attributes 'h1 .title' attributes :class => 'pretty'--><h1>Wow!</h1>}
+      dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_erb(example)
+      dsl_commands.should == "\nadd_to_attributes 'h1 .title'\nattributes :class => 'pretty'"
+      the_rest.should == "<h1>Wow!</h1>"
+    end
   end
 
   context '.extract_dsl_commands_from_haml' do
@@ -202,4 +222,4 @@ describe Deface::DSL::Loader do
     end
 
   end
-end
+end

data/spec/deface/override_spec.rb

@@ -36,7 +36,12 @@ module Deface
       it "should return parsed nokogiri document when present" do
         @original = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :replace => "h1", :text => "<h1>Argh!</h1>", :original => "<p><%= something %></p>")
         @original.original_source.should be_an_instance_of Nokogiri::HTML::DocumentFragment
-        @original.original_source.to_s.should == "<p><code erb-loud> something </code></p>"
+
+        if RUBY_PLATFORM == 'java'
+          @original.original_source.to_s.should == "<p><code erb-loud=\"\"> something </code></p>"
+        else
+          @original.original_source.to_s.should == "<p><code erb-loud> something </code></p>"
+        end
       end
     end
 
@@ -58,8 +63,13 @@ module Deface
       end
 
       it "should return true when input contains similar (ignoring whitespace)" do
-        @original.validate_original("<p><code erb-loud> something </code></p>").should be_true
-        @original.validate_original("<p><code erb-loud>something\n</code>  </p>").should be_true
+        if RUBY_PLATFORM == 'java'
+          @original.validate_original("<p><code erb-loud=\"\"> something </code></p>").should be_true
+          @original.validate_original("<p><code erb-loud=\"\">something\n</code>  </p>").should be_true
+        else
+          @original.validate_original("<p><code erb-loud> something </code></p>").should be_true
+          @original.validate_original("<p><code erb-loud>something\n</code>  </p>").should be_true
+        end
       end
 
       it "should return false when and input contains different string" do
@@ -163,13 +173,18 @@ module Deface
 
       it "should not change original parsed source" do
         @override.source
-        parsed.to_s.gsub(/\n/,'').should == "<div><h1>Manage Posts</h1><code erb-loud> some_method </code></div>"
+
+        if RUBY_PLATFORM == 'java'
+          parsed.to_s.gsub(/\n/,'').should == "<div><h1>Manage Posts</h1><code erb-loud=\"\"> some_method </code></div>"
+        else
+          parsed.to_s.gsub(/\n/,'').should == "<div><h1>Manage Posts</h1><code erb-loud> some_method </code></div>"
+        end
 
         @override.source_argument.should == :copy
       end
 
       it "should return copy of content from source document" do
-        @override.source.should == "<h1>Manage Posts</h1>\n"
+        @override.source.to_s.strip.should == "<h1>Manage Posts</h1>"
       end
 
       it "should return unescaped content for source document" do
@@ -193,7 +208,12 @@ module Deface
 
       it "should not change original parsed source" do
         @override.source
-        parsed.to_s.gsub(/\n/,'').should == "<h1>World</h1><code erb-silent> if true </code><p>True that!</p><code erb-silent> end </code><p>Hello</p>"
+
+        if RUBY_PLATFORM == 'java'
+          parsed.to_s.gsub(/\n/,'').should == "<h1>World</h1><code erb-silent=\"\"> if true </code><p>True that!</p><code erb-silent=\"\"> end </code><p>Hello</p>"
+        else
+          parsed.to_s.gsub(/\n/,'').should == "<h1>World</h1><code erb-silent> if true </code><p>True that!</p><code erb-silent> end </code><p>Hello</p>"
+        end
 
         @override.source_argument.should == :copy
       end
@@ -212,7 +232,11 @@ module Deface
 
       it "should remove cut element from original parsed source" do
         @override.source
-        parsed.to_s.gsub(/\n/,'').should == "<div><code erb-loud> some_method </code></div>"
+        if RUBY_PLATFORM == 'java'
+          parsed.to_s.gsub(/\n/,'').should == "<div><code erb-loud=\"\"> some_method </code></div>"
+        else
+          parsed.to_s.gsub(/\n/,'').should == "<div><code erb-loud> some_method </code></div>"
+        end
 
         @override.source_argument.should == :cut
       end
@@ -243,7 +267,11 @@ module Deface
 
       it "should remove cut element from original parsed source" do
         @override.source 
-        parsed.to_s.gsub(/\n/,'').should == "<h1>World</h1><code erb-loud> hello </code>"
+        if RUBY_PLATFORM == 'java'
+          parsed.to_s.gsub(/\n/,'').should == "<h1>World</h1><code erb-loud=\"\"> hello </code>"
+        else
+          parsed.to_s.gsub(/\n/,'').should == "<h1>World</h1><code erb-loud> hello </code>"
+        end
 
         @override.source_argument.should == :cut
       end
@@ -298,9 +326,18 @@ module Deface
 
       it "should return escaped source" do
         @override.source_element.should be_an_instance_of Nokogiri::HTML::DocumentFragment
-        @override.source_element.to_s.should == "<code erb-loud> method :opt =&gt; 'x' &amp; 'y' </code>"
-        #do it twice to ensure it doesn't change as it's destructive
-        @override.source_element.to_s.should == "<code erb-loud> method :opt =&gt; 'x' &amp; 'y' </code>"
+
+        if RUBY_PLATFORM == 'java'
+          source = "<code erb-loud=\"\"> method :opt =&gt; 'x' &amp; 'y' </code>"
+          @override.source_element.to_s.should ==  source
+          #do it twice to ensure it doesn't change as it's destructive
+          @override.source_element.to_s.should == source
+        else
+          source = "<code erb-loud> method :opt =&gt; 'x' &amp; 'y' </code>"
+          @override.source_element.to_s.should == source
+          #do it twice to ensure it doesn't change as it's destructive
+          @override.source_element.to_s.should == source
+        end
       end
     end
 

data/spec/deface/parser_spec.rb

@@ -16,9 +16,16 @@ module Deface
       it "should parse html document" do
         parsed = Deface::Parser.convert("<html><head><title>Hello</title></head><body>test</body>")
         parsed.should be_an_instance_of(Nokogiri::HTML::Document)
-        parsed = parsed.to_s.split("\n")[1..-1] #ignore doctype added by noko
+        parsed = parsed.to_s.split("\n")
 
-        if RUBY_VERSION < "1.9"
+        unless RUBY_PLATFORM == 'java'
+          parsed = parsed[1..-1] #ignore doctype added by nokogiri
+        end
+
+        #accounting for qwerks in Nokogir between ruby versions / platforms
+        if RUBY_PLATFORM == 'java'
+          parsed.should == ["<html><head><title>Hello</title></head><body>test</body></html>"]
+        elsif RUBY_VERSION < "1.9"
           parsed.should == "<html>\n<head><title>Hello</title></head>\n<body>test</body>\n</html>".split("\n")
         else
           parsed.should == "<html>\n<head>\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n<title>Hello</title>\n</head>\n<body>test</body>\n</html>".split("\n")
@@ -26,8 +33,14 @@ module Deface
 
         parsed = Deface::Parser.convert("<html><title>test</title></html>")
         parsed.should be_an_instance_of(Nokogiri::HTML::Document)
-        parsed = parsed.to_s.split("\n")[1..-1] #ignore doctype added by noko
-        if RUBY_VERSION < "1.9"
+        parsed = parsed.to_s.split("\n")
+
+        unless RUBY_PLATFORM == 'java'
+          parsed = parsed[1..-1] #ignore doctype added by nokogiri
+        end
+
+        #accounting for qwerks in Nokogir between ruby versions / platforms
+        if RUBY_VERSION < "1.9" || RUBY_PLATFORM == 'java'
           parsed.should == ["<html><head><title>test</title></head></html>"]
         else
           parsed.should == "<html><head>\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n<title>test</title>\n</head></html>".split("\n")
@@ -35,22 +48,34 @@ module Deface
 
         parsed = Deface::Parser.convert("<html><p>test</p></html>")
         parsed.should be_an_instance_of(Nokogiri::HTML::Document)
-        parsed = parsed.to_s.split("\n")[1..-1] #ignore doctype added by noko
-        parsed.should == "<html><body><p>test</p></body></html>".split("\n") 
+        parsed = parsed.to_s.split("\n")
+
+        if RUBY_PLATFORM == 'java'
+          parsed.should eq ["<html><head></head><body><p>test</p></body></html>"]
+        else
+          parsed = parsed[1..-1]
+          parsed.should eq ["<html><body><p>test</p></body></html>"]
+        end
       end
 
       it "should parse body tag" do
-        parsed = Deface::Parser.convert("<body id=\"body\" <%= something %>>test</body>")
-        parsed.should be_an_instance_of(Nokogiri::XML::Element)
-        parsed.to_s.should == "<body id=\"body\" data-erb-0=\"&lt;%= something %&gt;\">test</body>"
+        tag = Deface::Parser.convert("<body id=\"body\" <%= something %>>test</body>")
+        tag.should be_an_instance_of(Nokogiri::XML::Element)
+        tag.text.should eq 'test'
+        tag.attributes['id'].value.should eq 'body'
+        tag.attributes['data-erb-0'].value.should eq '<%= something %>'
       end
 
       it "should convert <% ... %>" do
-        Deface::Parser.convert("<% method_name %>").to_s.should == "<code erb-silent> method_name </code>"
+        tag = Deface::Parser.convert("<% method_name %>")
+        tag = tag.css('code').first
+        tag.attributes['erb-silent'].value.should eq ''
       end
 
       it "should convert <%= ... %>" do
-        Deface::Parser.convert("<%= method_name %>").to_s.should == "<code erb-loud> method_name </code>"
+        tag = Deface::Parser.convert("<%= method_name %>")
+        tag = tag.css('code').first
+        tag.attributes['erb-loud'].value.should eq ''
       end
 
       it "should convert first <% ... %> inside html tag" do
@@ -70,21 +95,52 @@ module Deface
       end
 
       it "should convert <% ... %> inside non-quoted attr value" do
-        Deface::Parser.convert("<p id=<% method_name %>></p>").to_s.should == "<p data-erb-id=\"&lt;% method_name %&gt;\"></p>"
-        Deface::Parser.convert("<p id=<% method_name %> alt=\"test\"></p>").to_s.should == "<p data-erb-id=\"&lt;% method_name %&gt;\" alt=\"test\"></p>"
+        tag = Deface::Parser.convert("<p id=<% method_name %>></p>")
+        tag = tag.css('p').first
+        tag.attributes['data-erb-id'].value.should eq '<% method_name %>'
+
+        tag = Deface::Parser.convert("<p id=<% method_name %> alt=\"test\"></p>")
+        tag = tag.css('p').first
+        tag.attributes['data-erb-id'].value.should eq '<% method_name %>'
+        tag.attributes['alt'].value.should eq 'test'
       end
 
       it "should convert multiple <% ... %> inside html tag" do
-        Deface::Parser.convert(%q{<p <%= method_name %> alt="<% x = 'y' + 
-                               \"2\" %>" title='<% method_name %>' <%= other_method %></p>}).to_s.should == "<p data-erb-0=\"&lt;%= method_name %&gt;\" data-erb-alt=\"&lt;% x = 'y' + \n                               \\&quot;2\\&quot; %&gt;\" data-erb-title=\"&lt;% method_name %&gt;\" data-erb-1=\"&lt;%= other_method %&gt;\"></p>"
+        tag = Deface::Parser.convert(%q{<p <%= method_name %> alt="<% x = 'y' + 
+                               \"2\" %>" title='<% method_name %>' <%= other_method %></p>})
+
+        tag = tag.css('p').first
+        tag.attributes['data-erb-0'].value.should == "<%= method_name %>"
+        tag.attributes['data-erb-1'].value.should == "<%= other_method %>"
+        tag.attributes['data-erb-alt'].value.should == "<% x = 'y' + \n                               \\\"2\\\" %>"
+        tag.attributes['data-erb-title'].value.should == "<% method_name %>"
       end
 
       it "should convert <%= ... %> including href attribute" do
-        Deface::Parser.convert(%(<a href="<%= x 'y' + "z" %>">A Link</a>)).to_s.should == "<a data-erb-href=\"&lt;%= x 'y' + &quot;z&quot; %&gt;\">A Link</a>"
+        tag = Deface::Parser.convert(%(<a href="<%= x 'y' + "z" %>">A Link</a>))
+        tag = tag.css('a').first
+        tag.attributes['data-erb-href'].value.should eq "<%= x 'y' + \"z\" %>"
+        tag.text.should eq 'A Link'
       end
 
       it "should escape contents code tags" do
-        Deface::Parser.convert("<% method_name(:key => 'value') %>").to_s.should == "<code erb-silent> method_name(:key =&gt; 'value') </code>"
+        tag = Deface::Parser.convert("<% method_name :key => 'value' %>")
+        tag = tag.css('code').first
+        tag.attributes.key?('erb-silent').should be_true
+        tag.text.should eq " method_name :key => 'value' "
+      end
+
+      it "should handle round brackets in code tags" do
+        # commented out line below will fail as : adjacent to ( causes Nokogiri parser issue on jruby
+        tag = Deface::Parser.convert("<% method_name(:key => 'value') %>")
+        tag = tag.css('code').first
+        tag.attributes.key?('erb-silent').should be_true
+        tag.text.should eq " method_name(:key => 'value') "
+
+        tag = Deface::Parser.convert("<% method_name( :key => 'value' ) %>")
+        tag = tag.css('code').first
+        tag.attributes.key?('erb-silent').should be_true
+        tag.text.should eq " method_name( :key => 'value' ) "
       end
 
       if "".encoding_aware?