deface 0.4.0 → 0.5.0

data/deface.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{deface}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.authors = ["Brian Quinn"]
   s.description = %q{Deface is a library that allows you to customize ERB views in a Rails application without editing the underlying view.}

data/lib/deface/override.rb

@@ -71,12 +71,10 @@ module Deface
       elsif @args.key? :text
         @args[:text]
       end
-
-      Deface::Parser.erb_markup!(erb)
     end
 
     def source_element
-      @converted_source ||= Deface::Parser.convert(source.clone).to_s
+      Deface::Parser.convert(source.clone)
     end
 
     def disabled?

data/spec/assets/shared/_post.html.erb

@@ -1 +1,2 @@
 <p>I'm from shared/post partial</p>
+<%= "And I've got ERB" %>

data/spec/assets/shared/person.html.erb

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

data/spec/deface/override_spec.rb

@@ -39,11 +39,11 @@ module Deface
     describe "with :text" do
 
       before(:each) do
-        @override = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :replace => "h1", :text => "<h1>Argh!</h1>")
+        @override = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :replace => "h1", :text => "<h1 id=\"<%= dom_id @pirate %>\">Argh!</h1>")
       end
 
-      it "should return text as source" do
-        @override.source.should == "<h1>Argh!</h1>"
+      it "should return un-convert text as source" do
+        @override.source.should == "<h1 id=\"<%= dom_id @pirate %>\">Argh!</h1>"
       end
     end
 
@@ -56,8 +56,8 @@ module Deface
         @override = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :replace => "h1", :partial => "shared/post")
       end
 
-      it "should return partial contents as source" do
-        @override.source.should == "<p>I'm from shared/post partial</p>\n"
+      it "should return un-convert partial contents as source" do
+        @override.source.should == "<p>I'm from shared/post partial</p>\n<%= \"And I've got ERB\" %>\n"
       end
 
     end
@@ -71,20 +71,22 @@ module Deface
         @override = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :replace => "h1", :template => "shared/person")
       end
 
-      it "should return template contents as source" do
-        @override.source.should == "<p>I'm from shared/person template</p>\n"
+      it "should return un-convert template contents as source" do
+        @override.source.should == "<p>I'm from shared/person template</p>\n<%= \"I've got ERB too\" %>\n"
       end
 
     end
 
     describe "#source_element" do
       before(:each) do
-        @override = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :replace => "h1", :text => "<%= method 'x' & 'y' %>")
+        @override = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :replace => "h1", :text => "<%= method :opt => 'x' & 'y' %>")
       end
 
-      it "should return memoized escaped source" do
-        @override.source_element
-        @override.source_element.should == "<code erb-loud> method 'x' &amp;amp; 'y' </code>"
+      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>"
       end
     end
 

data/spec/deface/template_helper_spec.rb

@@ -11,11 +11,11 @@ module Deface
       end
 
       it "should return source for partial" do
-        load_template_source("shared/_post", false).should == "<p>I'm from shared/post partial</p>\n"
+        load_template_source("shared/_post", false).should == "<p>I'm from shared/post partial</p>\n<%= \"And I've got ERB\" %>\n"
       end
 
       it "should return source for template" do
-        load_template_source("shared/person", false).should == "<p>I'm from shared/person template</p>\n"
+        load_template_source("shared/person", false).should == "<p>I'm from shared/person template</p>\n<%= \"I've got ERB too\" %>\n"
       end
 
       it "should return source for namespaced template" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deface
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Brian Quinn
@@ -63,7 +63,6 @@ files:
 - MIT-LICENSE
 - README.markdown
 - Rakefile
-- VERSION
 - deface.gemspec
 - init.rb
 - lib/deface.rb
@@ -109,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Deface is a library that allows you to customize ERB views in Rails

data/VERSION

@@ -1 +0,0 @@
-0.2.0