deface 1.0.0.rc3 → 1.0.0.rc4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a72a852dcfe7cec6de674b4596fe8cea3f350937
+  data.tar.gz: bf66b21acd0eb5da511d76c8c785d47cb57004ff
+SHA512:
+  metadata.gz: 5bad01645ba75cdb71f60615ba287993c92eb5fa8b302384e9343abca8535eac8436baba79e65f72071f2f4252e35d67bb623dc13e4e4dedecb25d7312c90497
+  data.tar.gz: da65449721be0849dbb1cfe001af8cd591e74dc3d87e2d767d4dd302e585d15be48381a78de5643f32d2e562a780d909f5662abb088abbaac4d10baab5fea096

data/CHANGELOG.markdown

@@ -0,0 +1,4 @@
+## 1.0.0.rc4 (2013-09-04)
+
+* [BREAKING CHANGE] ERB blocks are no longer converted into <code erb-loud|erb-silent>, now they are <erb loud|silent> [jhawthorn]
+* Lots of other changes too numerous to list here in the first changelog entry, will get better going forward :)

data/README.markdown

@@ -144,7 +144,7 @@ Removes any ERB block containing the string `helper_method` in the `posts/new.ht
 ```ruby
 Deface::Override.new(:virtual_path => "posts/new", 
                      :name => "example-4", 
-                     :remove => "code[erb-loud]:contains('helper_method')",
+                     :remove => "erb[loud]:contains('helper_method')",
                      :original => "<%= helper_method %>")
 ```
 
@@ -171,8 +171,8 @@ Remove an entire ERB if statement (and all it's contents) in the 'admin/products
 ```ruby
 Deface::Override.new(:virtual_path => 'admin/products/index',
                      :name => "remove_if_statement",
-                     :remove => "code[erb-silent]:contains('if @product.sold?')",
-                     :closing_selector => "code[erb-silent]:contains('end')"
+                     :remove => "erb[silent]:contains('if @product.sold?')",
+                     :closing_selector => "erb[silent]:contains('end')"
 ```
 
 ### Scope
@@ -244,9 +244,12 @@ and including haml source:
 You can include all the additional options you can normally use when defining a Deface::Override manually, a more complex example:
 
 ```html
-<!-- replace_contents 'h1' closing_selector 'div#intro' disabled -->
+<!-- replace_contents 'h1' closing_selector 'div#intro' 
+  sequence :before => 'my_other_override'
+  disabled -->
 <p>This is a complicated example</p>
 ```
+Note options requiring a hash should be on a separate line.
 
 #### Disabled / Enabled
 
@@ -351,7 +354,7 @@ Deface temporarily converts ERB files into a pseudo HTML markup that can be pars
 becomes:
 
 ```html
-<code erb-loud> some ruby code </code>
+<erb loud> some ruby code </erb>
 ```
 
 and 
@@ -363,7 +366,7 @@ and
 becomes:
 
 ```html
-<code erb-silent> other ruby code </code>
+<erb silent> other ruby code </erb>
 ```
 
 ERB that is contained inside a HTML tag definition is converted slightly differently to ensure a valid HTML document that Nokogiri can parse:

data/deface.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = "deface"
-  s.version = "1.0.0.rc3"
+  s.version = "1.0.0.rc4"
 
   s.authors = ["Brian D Quinn"]
   s.description = "Deface is a library that allows you to customize ERB, Haml and Slim views in a Rails application without editing the underlying view."
   s.email = "brian@spreecommerce.com"
   s.extra_rdoc_files = [
-    "README.markdown"
+    "README.markdown", "CHANGELOG.markdown"
   ]
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/deface/actions/surround_action.rb

@@ -6,10 +6,10 @@ module Deface
       end
 
       def original_placeholders
-        @original_placeholders ||= source_element.css("code:contains('render_original')")
+        @original_placeholders ||= source_element.css("erb:contains('render_original')")
         raise(DefaceError, "The surround action couldn't find <%= render_original %> in your template") unless @original_placeholders.first
         @original_placeholders
       end
     end
   end
-end
+end

data/lib/deface/applicator.rb

@@ -32,6 +32,12 @@ module Deface
 
             if log
               Rails.logger.send(matches.size == 0 ? :error : :debug, "\e[1;32mDeface:\e[0m '#{override.name}' matched #{matches.size} times with '#{override.selector}'")
+
+              # temporarily check and notify on use of old selector styles.
+              #
+              if matches.empty? && override.selector.match(/code|erb-loud|erb-silent/)
+                Rails.logger.error "\e[1;32mDeface: [WARNING]\e[0m Override '#{override.name}' may be using an invalid selector of '#{override.selector}', <code erb-loud|silent> tags are now <erb loud|silent>"
+              end
             end
 
             if matches.empty?

data/lib/deface/parser.rb

@@ -34,13 +34,13 @@ module Deface
       end
 
       #replaces all <% %> not inside opening html tags
-      replacements = [ {"<%=" => "<code erb-loud>"},
-                       {"<%"  => "<code erb-silent>"},
-                       {"%>"  => "</code>"} ]
+      replacements = [ {"<%=" => "<erb loud>"},
+                       {"<%"  => "<erb silent>"},
+                       {"%>"  => "</erb>"} ]
 
       replacements.each{ |h| h.each { |replace, with| source.gsub! replace, with } }
 
-      source.scan(/(<code.*?>)((?:(?!<\/code>)[\s\S])*)(<\/code>)/).each do |match|
+      source.scan(/(<erb.*?>)((?:(?!<\/erb>)[\s\S])*)(<\/erb>)/).each do |match|
         source.sub!("#{match[0]}#{match[1]}#{match[2]}") { |m| m = "#{match[0]}#{CGI.escapeHTML(match[1])}#{match[2]}" }
       end
 
@@ -50,11 +50,11 @@ module Deface
     # undoes ERB markup generated by Deface::Parser::ERB
     #
     def self.undo_erb_markup!(source)
-      replacements = [ {"<code erb-silent>"      => '<%'},
-                       {"<code erb-silent=\"\">" => '<%'},
-                       {"<code erb-loud>"        => '<%='},
-                       {"<code erb-loud=\"\">"   => '<%='},
-                       {"</code>"                => '%>'}]
+      replacements = [ {"<erb silent>"      => '<%'},
+                       {"<erb silent=\"\">" => '<%'},
+                       {"<erb loud>"        => '<%='},
+                       {"<erb loud=\"\">"   => '<%='},
+                       {"</erb>"                => '%>'}]
 
       replacements.each{ |h| h.each { |replace, with| source.gsub! replace, with } }
 

data/spec/deface/applicator_spec.rb

@@ -31,7 +31,7 @@ module Deface
 
     describe "with a single :copy using :start and :end" do
       before { Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :insert_before => "h1", 
-                                    :copy => {:start => "code:contains('if true')", :end => "code:contains('end')"}) }
+                                    :copy => {:start => "erb:contains('if true')", :end => "erb:contains('end')"}) }
       let(:source) { "<h1>World</h1><% if true %><p>True that!</p><% end %><p>Hello</p>" }
 
 
@@ -52,7 +52,7 @@ module Deface
 
     describe "with a single :cut using :start and :end" do
       before { Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :replace => "h1", 
-                                    :cut => {:start => "code:contains('if true')", :end => "code:contains('end')"}) }
+                                    :cut => {:start => "erb:contains('if true')", :end => "erb:contains('end')"}) }
       let(:source) { "<h1>World</h1><% if true %><p>True that!</p><% end %><p>Hello</p>" }
 
 

data/spec/deface/dsl/context_spec.rb

@@ -37,7 +37,7 @@ describe Deface::DSL::Context do
       it 'should generate a warning if two action values are specified' do
         subject.insert_top('selector')
 
-        logger = mock('logger')
+        logger = double('logger')
         Rails.should_receive(:logger).and_return(logger)
         logger.should_receive(:error).with("\e[1;32mDeface: [WARNING]\e[0m Multiple action methods have been called. The last one will be used.")
 
@@ -67,7 +67,7 @@ describe Deface::DSL::Context do
       it 'should generate a warning if two sources are specified' do
         subject.partial('partial name')
 
-        logger = mock('logger')
+        logger = double('logger')
         Rails.should_receive(:logger).and_return(logger)
         logger.should_receive(:error).with("\e[1;32mDeface: [WARNING]\e[0m Multiple source methods have been called. The last one will be used.")
 

data/spec/deface/dsl/loader_spec.rb

@@ -6,7 +6,7 @@ describe Deface::DSL::Loader do
   context '.load' do
     context 'extension check' do
       it 'should succeed if file ends with .deface' do
-        file = mock('deface file')
+        file = double('deface file')
         filename = 'app/overrides/example_name.deface'
 
         lambda { Deface::DSL::Loader.load(filename) }.should_not raise_error(
@@ -14,7 +14,7 @@ describe Deface::DSL::Loader do
       end
 
       it 'should succeed if file ends with .html.erb.deface' do
-        file = mock('deface file')
+        file = double('deface file')
         filename = 'app/overrides/example_name.html.erb.deface'
 
         lambda { Deface::DSL::Loader.load(filename) }.should_not raise_error(
@@ -22,7 +22,7 @@ describe Deface::DSL::Loader do
       end
 
       it 'should succeed if file ends with .html.haml.deface' do
-        file = mock('deface file')
+        file = double('deface file')
         filename = 'app/overrides/example_name.html.haml.deface'
 
         lambda { Deface::DSL::Loader.load(filename) }.should_not raise_error(
@@ -30,7 +30,7 @@ describe Deface::DSL::Loader do
       end
 
       it 'should succeed if file ends with .html.slim.deface' do
-        file = mock('deface file')
+        file = double('deface file')
         filename = 'app/overrides/example_name.html.slim.deface'
 
         lambda { Deface::DSL::Loader.load(filename) }.should_not raise_error(
@@ -38,7 +38,7 @@ describe Deface::DSL::Loader do
       end
 
       it 'should fail if file ends with .blargh.deface' do
-        file = mock('deface file')
+        file = double('deface file')
         filename = 'app/overrides/example_name.blargh.deface'
 
         lambda { Deface::DSL::Loader.load(filename) }.should raise_error(
@@ -46,7 +46,7 @@ describe Deface::DSL::Loader do
       end
 
       it "should suceed if parent directory has a dot(.) in it's name" do
-        file = mock('deface file')
+        file = double('deface file')
         filename = 'app/overrides/parent.dir.with.dot/example_name.html.haml.deface'
 
         lambda { Deface::DSL::Loader.load(filename) }.should_not raise_error(
@@ -55,7 +55,7 @@ describe Deface::DSL::Loader do
     end
 
     it 'should fail if .html.erb.deface file is in the root of app/overrides' do
-      file = mock('html/erb/deface file')
+      file = double('html/erb/deface file')
       filename = 'app/overrides/example_name.html.erb.deface'
 
       lambda { Deface::DSL::Loader.load(filename) }.should raise_error(
@@ -63,16 +63,16 @@ describe Deface::DSL::Loader do
     end
 
     it 'should set the virtual_path for a .deface file in a directory below overrides' do
-      file = mock('deface file')
+      file = double('deface file')
       filename = 'app/overrides/path/to/view/example_name.deface'
       File.should_receive(:open).with(filename).and_yield(file)
 
       override_name = 'example_name'
-      context = mock('dsl context')
+      context = double('dsl context')
       Deface::DSL::Context.should_receive(:new).with(override_name).
         and_return(context)
 
-      file_contents = mock('file contents')
+      file_contents = double('file contents')
       file.should_receive(:read).and_return(file_contents)
 
       context.should_receive(:virtual_path).with('path/to/view').ordered
@@ -83,16 +83,16 @@ describe Deface::DSL::Loader do
     end
 
     it 'should set the virtual_path for a .html.erb.deface file in a directory below overrides' do
-      file = mock('html/erb/deface file')
+      file = double('html/erb/deface file')
       filename = 'app/overrides/path/to/view/example_name.html.erb.deface'
       File.should_receive(:open).with(filename).and_yield(file)
 
       override_name = 'example_name'
-      context = mock('dsl context')
+      context = double('dsl context')
       Deface::DSL::Context.should_receive(:new).with(override_name).
         and_return(context)
 
-      file_contents = mock('file contents')
+      file_contents = double('file contents')
       file.should_receive(:read).and_return(file_contents)
 
       Deface::DSL::Loader.should_receive(:extract_dsl_commands_from_erb).
@@ -108,16 +108,16 @@ describe Deface::DSL::Loader do
     end
 
     it 'should set the virtual_path for a .html.haml.deface file in a directory below overrides' do
-      file = mock('html/haml/deface file')
+      file = double('html/haml/deface file')
       filename = 'app/overrides/path/to/view/example_name.html.haml.deface'
       File.should_receive(:open).with(filename).and_yield(file)
 
       override_name = 'example_name'
-      context = mock('dsl context')
+      context = double('dsl context')
       Deface::DSL::Context.should_receive(:new).with(override_name).
         and_return(context)
 
-      file_contents = mock('file contents')
+      file_contents = double('file contents')
       file.should_receive(:read).and_return(file_contents)
 
       Deface::DSL::Loader.should_receive(:extract_dsl_commands_from_haml).
@@ -133,16 +133,16 @@ describe Deface::DSL::Loader do
     end
 
     it 'should set the virtual_path for a .html.slim.deface file in a directory below overrides' do
-      file = mock('html/slim/deface file')
+      file = double('html/slim/deface file')
       filename = 'app/overrides/path/to/view/example_name.html.slim.deface'
       File.should_receive(:open).with(filename).and_yield(file)
 
       override_name = 'example_name'
-      context = mock('dsl context')
+      context = double('dsl context')
       Deface::DSL::Context.should_receive(:new).with(override_name).
         and_return(context)
 
-      file_contents = mock('file contents')
+      file_contents = double('file contents')
       file.should_receive(:read).and_return(file_contents)
 
       Deface::DSL::Loader.should_receive(:extract_dsl_commands_from_slim).

data/spec/deface/environment_spec.rb

@@ -54,7 +54,7 @@ module Deface
         end
 
         it "should enumerate_and_load nil when railtie has no app/overrides path set" do
-          Rails.application.stub_chain :railties, railties_collection_accessor => [mock('railtie', :root => "/some/path")]
+          Rails.application.stub_chain :railties, railties_collection_accessor => [double('railtie', :root => "/some/path")]
 
           Rails.application.config.deface.overrides.should_receive(:enumerate_and_load).with(nil, Rails.application.root)
           Rails.application.config.deface.overrides.should_receive(:enumerate_and_load).with(nil, "/some/path")
@@ -62,7 +62,7 @@ module Deface
         end
 
         it "should enumerate_and_load path when railtie has app/overrides path set" do
-          Rails.application.stub_chain :railties, railties_collection_accessor => [ mock('railtie', :root => "/some/path", :paths => {"app/overrides" => ["app/some_path"] } )]
+          Rails.application.stub_chain :railties, railties_collection_accessor => [ double('railtie', :root => "/some/path", :paths => {"app/overrides" => ["app/some_path"] } )]
 
           Rails.application.config.deface.overrides.should_receive(:enumerate_and_load).with(nil, Rails.application.root)
           Rails.application.config.deface.overrides.should_receive(:enumerate_and_load).with(["app/some_path"] , "/some/path")
@@ -70,7 +70,7 @@ module Deface
         end
 
         it "should enumerate_and_load railties first, followed by the application iteslf" do
-          Rails.application.stub_chain :railties, railties_collection_accessor => [ mock('railtie', :root => "/some/path", :paths => {"app/overrides" => ["app/some_path"] } )]
+          Rails.application.stub_chain :railties, railties_collection_accessor => [ double('railtie', :root => "/some/path", :paths => {"app/overrides" => ["app/some_path"] } )]
 
           Rails.application.config.deface.overrides.should_receive(:enumerate_and_load).with(["app/some_path"] , "/some/path").ordered
           Rails.application.config.deface.overrides.should_receive(:enumerate_and_load).with(nil, Rails.application.root).ordered
@@ -78,7 +78,7 @@ module Deface
         end
 
         it "should ignore railtie with no root" do
-          railtie = mock('railtie')
+          railtie = double('railtie')
           Rails.application.stub_chain :railties, railties_collection_accessor => [railtie]
 
           railtie.should_receive(:respond_to?).with(:root)
@@ -96,7 +96,7 @@ module Deface
 
       describe 'load_overrides' do
         let(:assets_path) { Pathname.new(File.join(File.dirname(__FILE__), '..', "assets")) }
-        let(:engine) { mock('railtie', :root => assets_path, :class => "DummyEngine", :paths => {"app/overrides" => ["dummy_engine"]}) }
+        let(:engine) { double('railtie', :root => assets_path, :class => "DummyEngine", :paths => {"app/overrides" => ["dummy_engine"]}) }
         before { Rails.application.stub(:class => 'RailsAppl') }
 
         it "should keep a reference to which railtie/app defined the override" do

data/spec/deface/override_spec.rb

@@ -38,9 +38,9 @@ module Deface
         @original.original_source.should be_an_instance_of Nokogiri::HTML::DocumentFragment
 
         if RUBY_PLATFORM == 'java'
-          @original.original_source.to_s.should == "<p><code erb-loud=\"\"> something </code></p>"
+          @original.original_source.to_s.should == "<p><erb loud=\"\"> something </erb></p>"
         else
-          @original.original_source.to_s.should == "<p><code erb-loud> something </code></p>"
+          @original.original_source.to_s.should == "<p><erb loud> something </erb></p>"
         end
       end
     end
@@ -64,11 +64,11 @@ module Deface
 
       it "should return true when input contains similar (ignoring whitespace)" do
         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
+          @original.validate_original("<p><erb loud=\"\"> something </erb></p>").should be_true
+          @original.validate_original("<p><erb loud=\"\">something\n</erb>  </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
+          @original.validate_original("<p><erb loud> something </erb></p>").should be_true
+          @original.validate_original("<p><erb loud>something\n</erb>  </p>").should be_true
         end
       end
 
@@ -117,11 +117,11 @@ module Deface
 
       before(:each) do
         @override = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :replace => "h1",
-                                         :haml => %q{%strong{:class => "code", :id => "message"}= 'Hello, World!'})
+                                         :haml => %q{%strong{:class => "erb", :id => "message"}= 'Hello, World!'})
       end
 
       it "should return erb converted from haml as source" do
-        @override.source.should == "<strong class='code' id='message'><%= 'Hello, World!' %>\n</strong>\n"
+        @override.source.should == "<strong class='erb' id='message'><%= 'Hello, World!' %>\n</strong>\n"
 
         @override.source_argument.should == :haml
       end
@@ -131,11 +131,11 @@ module Deface
 
       before(:each) do
         @override = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :replace => "h1",
-                                         :slim => %q{strong class="code" id="message"= 'Hello, World!'})
+                                         :slim => %q{strong class="erb" id="message"= 'Hello, World!'})
       end
 
       it "should return erb converted from slim as source" do
-        @override.source.should == "<strong class=\"code\" id=\"message\"><%= ::Temple::Utils.escape_html_safe(('Hello, World!')) %><%\n%></strong>"
+        @override.source.should == "<strong class=\"erb\" id=\"message\"><%= ::Temple::Utils.escape_html_safe(('Hello, World!')) %><%\n%></strong>"
 
         @override.source_argument.should == :slim
       end
@@ -189,9 +189,9 @@ module Deface
         @override.source
 
         if RUBY_PLATFORM == 'java'
-          parsed.to_s.gsub(/\n/,'').should == "<div><h1>Manage Posts</h1><code erb-loud=\"\"> some_method </code></div>"
+          parsed.to_s.gsub(/\n/,'').should == "<div><h1>Manage Posts</h1><erb loud=\"\"> some_method </erb></div>"
         else
-          parsed.to_s.gsub(/\n/,'').should == "<div><h1>Manage Posts</h1><code erb-loud> some_method </code></div>"
+          parsed.to_s.gsub(/\n/,'').should == "<div><h1>Manage Posts</h1><erb loud> some_method </erb></div>"
         end
 
         @override.source_argument.should == :copy
@@ -202,7 +202,7 @@ module Deface
       end
 
       it "should return unescaped content for source document" do
-        @override = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :insert_after => "h1", :copy => "code[erb-loud]:contains('some_method')")
+        @override = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :insert_after => "h1", :copy => "erb[loud]:contains('some_method')")
         @override.stub(:parsed_document).and_return(parsed)
         @override.source.should == "<%= some_method %>"
       end
@@ -215,7 +215,7 @@ module Deface
 
       before(:each) do
         @override = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :insert_after => "h1",
-                                         :copy => {:start => "code:contains('if true')", :end => "code:contains('end')"})
+                                         :copy => {:start => "erb:contains('if true')", :end => "erb:contains('end')"})
 
         @override.stub(:parsed_document).and_return(parsed)
       end
@@ -224,9 +224,9 @@ module Deface
         @override.source
 
         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>"
+          parsed.to_s.gsub(/\n/,'').should == "<h1>World</h1><erb silent=\"\"> if true </erb><p>True that!</p><erb silent=\"\"> end </erb><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>"
+          parsed.to_s.gsub(/\n/,'').should == "<h1>World</h1><erb silent> if true </erb><p>True that!</p><erb silent> end </erb><p>Hello</p>"
         end
 
         @override.source_argument.should == :copy
@@ -247,9 +247,9 @@ module Deface
       it "should remove cut element from original parsed source" do
         @override.source
         if RUBY_PLATFORM == 'java'
-          parsed.to_s.gsub(/\n/,'').should == "<div><code erb-loud=\"\"> some_method </code></div>"
+          parsed.to_s.gsub(/\n/,'').should == "<div><erb loud=\"\"> some_method </erb></div>"
         else
-          parsed.to_s.gsub(/\n/,'').should == "<div><code erb-loud> some_method </code></div>"
+          parsed.to_s.gsub(/\n/,'').should == "<div><erb loud> some_method </erb></div>"
         end
 
         @override.source_argument.should == :cut
@@ -260,7 +260,7 @@ module Deface
       end
 
       it "should return unescaped content for source document" do
-        @override = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :insert_after => "h1", :cut => "code[erb-loud]:contains('some_method')")
+        @override = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :insert_after => "h1", :cut => "erb[loud]:contains('some_method')")
         @override.stub(:parsed_document).and_return(parsed)
         @override.source.should == "<%= some_method %>"
       end
@@ -274,7 +274,7 @@ module Deface
 
       before(:each) do
         @override = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :insert_after => "h1",
-                                         :cut => {:start => "code:contains('if true')", :end => "code:contains('end')"})
+                                         :cut => {:start => "erb:contains('if true')", :end => "erb:contains('end')"})
 
         @override.stub(:parsed_document).and_return(parsed)
       end
@@ -282,9 +282,9 @@ module Deface
       it "should remove cut element from original parsed source" do
         @override.source
         if RUBY_PLATFORM == 'java'
-          parsed.to_s.gsub(/\n/,'').should == "<h1>World</h1><code erb-loud=\"\"> hello </code>"
+          parsed.to_s.gsub(/\n/,'').should == "<h1>World</h1><erb loud=\"\"> hello </erb>"
         else
-          parsed.to_s.gsub(/\n/,'').should == "<h1>World</h1><code erb-loud> hello </code>"
+          parsed.to_s.gsub(/\n/,'').should == "<h1>World</h1><erb loud> hello </erb>"
         end
 
         @override.source_argument.should == :cut
@@ -342,12 +342,12 @@ module Deface
         @override.source_element.should be_an_instance_of Nokogiri::HTML::DocumentFragment
 
         if RUBY_PLATFORM == 'java'
-          source = "<code erb-loud=\"\"> method :opt =&gt; 'x' &amp; 'y' </code>"
+          source = "<erb loud=\"\"> method :opt =&gt; 'x' &amp; 'y' </erb>"
           @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>"
+          source = "<erb loud> method :opt =&gt; 'x' &amp; 'y' </erb>"
           @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
@@ -497,7 +497,7 @@ module Deface
         Deface::Override.all.clear
 
         @override = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :replace => "h1", :text => "<h1>Argh!</h1>")
-        @second = Deface::Override.new(:virtual_path => "posts/index", :name => "second", :insert_after => "p", :text => "<pre>this is code?</pre>")
+        @second = Deface::Override.new(:virtual_path => "posts/index", :name => "second", :insert_after => "p", :text => "<pre>this is erb?</pre>")
 
         @digest = Deface::Override.digest(:virtual_path =>  "posts/index")
       end
@@ -513,7 +513,7 @@ module Deface
         @override = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :replace => "h1", :text => "<h1>Argh!</h1>")
         Deface::Override.digest(:virtual_path =>  "posts/index").should == @digest
 
-        @second = Deface::Override.new(:virtual_path => "posts/index", :name => "2nd", :insert_after => "p", :text => "<pre>this is code?</pre>")
+        @second = Deface::Override.new(:virtual_path => "posts/index", :name => "2nd", :insert_after => "p", :text => "<pre>this is erb?</pre>")
         Deface::Override.digest(:virtual_path =>  "posts/index").should_not == @digest
       end
 

data/spec/deface/parser_spec.rb

@@ -58,6 +58,20 @@ module Deface
         end
       end
 
+      # Regression test for #84, #100
+      it "should parse html document with erb in the head" do
+        parsed = Deface::Parser.convert("<html><head><%= method_name %></head><body></body></html>")
+        parsed.should be_an_instance_of(Nokogiri::HTML::Document)
+        parsed = parsed.to_s.split("\n")
+
+        if RUBY_PLATFORM == 'java'
+          parsed.should == ["<html><head><erb loud=\"\"> method_name </erb></head><body></body></html>"]
+        else
+          parsed = parsed[1..-1]
+          parsed.should == "<html>\n<head>\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n<erb loud> method_name </erb>\n</head>\n<body></body>\n</html>".split("\n")
+        end
+      end
+
       it "should parse body tag" do
         tag = Deface::Parser.convert("<body id=\"body\" <%= something %>>test</body>")
         tag.should be_an_instance_of(Nokogiri::XML::Element)
@@ -68,14 +82,14 @@ module Deface
 
       it "should convert <% ... %>" do
         tag = Deface::Parser.convert("<% method_name %>")
-        tag = tag.css('code').first
-        tag.attributes['erb-silent'].value.should eq ''
+        tag = tag.css('erb').first
+        tag.attributes['silent'].value.should eq ''
       end
 
       it "should convert <%= ... %>" do
         tag = Deface::Parser.convert("<%= method_name %>")
-        tag = tag.css('code').first
-        tag.attributes['erb-loud'].value.should eq ''
+        tag = tag.css('erb').first
+        tag.attributes['loud'].value.should eq ''
       end
 
       it "should convert first <% ... %> inside html tag" do
@@ -129,23 +143,23 @@ module Deface
         tag.text.should eq 'A Link'
       end
 
-      it "should escape contents code tags" do
+      it "should escape contents erb tags" do
         tag = Deface::Parser.convert("<% method_name :key => 'value' %>")
-        tag = tag.css('code').first
-        tag.attributes.key?('erb-silent').should be_true
+        tag = tag.css('erb').first
+        tag.attributes.key?('silent').should be_true
         tag.text.should eq " method_name :key => 'value' "
       end
 
-      it "should handle round brackets in code tags" do
+      it "should handle round brackets in erb 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 = tag.css('erb').first
+        tag.attributes.key?('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 = tag.css('erb').first
+        tag.attributes.key?('silent').should be_true
         tag.text.should eq " method_name( :key => 'value' ) "
       end
 
@@ -169,12 +183,12 @@ module Deface
     end
 
     describe "#undo_erb_markup" do
-      it "should revert <code erb-silent>" do
-        Deface::Parser.undo_erb_markup!("<code erb-silent> method_name </code>").should == "<% method_name %>"
+      it "should revert <erb silent>" do
+        Deface::Parser.undo_erb_markup!("<erb silent> method_name </erb>").should == "<% method_name %>"
       end
 
-      it "should revert <code erb-loud>" do
-        Deface::Parser.undo_erb_markup!("<code erb-loud> method_name </code>").should == "<%= method_name %>"
+      it "should revert <erb loud>" do
+        Deface::Parser.undo_erb_markup!("<erb loud> method_name </erb>").should == "<%= method_name %>"
       end
 
       it "should revert data-erb-x attrs inside html tag" do
@@ -195,7 +209,7 @@ module Deface
         end
       end
 
-      it "should unescape contents of code tags" do
+      it "should unescape contents of erb tags" do
         Deface::Parser.undo_erb_markup!("<% method(:key =&gt; 'value' %>").should == "<% method(:key => 'value' %>"
         Deface::Parser.undo_erb_markup!("<% method(:key =&gt; 'value'\n %>").should == "<% method(:key => 'value'\n %>"
       end

data/spec/spec_helper.rb

@@ -44,13 +44,13 @@ shared_context "mock Rails" do
 
     # mock rails to keep specs FAST!
     unless defined? Rails
-      Rails = mock 'Rails'
+      Rails = double 'Rails'
     end
 
     Rails.stub :version => rails_version
 
-    Rails.stub :application => mock('application')
-    Rails.application.stub :config => mock('config')
+    Rails.stub :application => double('application')
+    Rails.application.stub :config => double('config')
     Rails.application.config.stub :cache_classes => true
     Rails.application.config.stub :deface => ActiveSupport::OrderedOptions.new
     Rails.application.config.deface.enabled = true
@@ -61,13 +61,13 @@ shared_context "mock Rails" do
 
     Rails.stub :root => Pathname.new('spec/dummy')
 
-    Rails.stub :logger => mock('logger')
+    Rails.stub :logger => double('logger')
     Rails.logger.stub(:error)
     Rails.logger.stub(:warning)
     Rails.logger.stub(:info)
     Rails.logger.stub(:debug)
 
-    Time.stub :zone => mock('zone')
+    Time.stub :zone => double('zone')
     Time.zone.stub(:now).and_return Time.parse('1979-05-25')
 
     require "haml/template/plugin"

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: deface
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
-  prerelease: 6
+  version: 1.0.0.rc4
 platform: ruby
 authors:
 - Brian D Quinn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,103 +27,90 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.8
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.4
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -146,10 +129,12 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - README.markdown
+- CHANGELOG.markdown
 files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG.markdown
 - Gemfile
 - MIT-LICENSE
 - README.markdown
@@ -249,28 +234,27 @@ files:
 - tasks/utils.rake
 homepage: https://github.com/spree/deface
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Deface is a library that allows you to customize ERB, Haml and Slim views
   in Rails
 test_files:
@@ -311,4 +295,3 @@ test_files:
 - spec/deface/utils/failure_finder_spec.rb
 - spec/generators/deface/override_generator_spec.rb
 - spec/spec_helper.rb
-has_rdoc: