deface 0.5.6 → 0.5.7

data/README.markdown

@@ -126,6 +126,4 @@ Deface uses the amazing Nokogiri library (and in turn libxml) for parsing HTML /
 
 2. Parsing will fail and result in invalid output if ERB blocks are responsible for closing an HTML tag that was opened normally, i.e. don't do this:
 
-
-      <div <%= ">" %>
-
+      &lt;div <%= ">" %>

data/deface.gemspec

@@ -1,39 +1,20 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
-  s.name = %q{deface}
-  s.version = "0.5.6"
+  s.name = "deface"
+  s.version = "0.5.7"
 
-  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.}
-  s.email = %q{brian@railsdog.com}
+  s.authors = ["Brian D Quinn"]
+  s.description = "Deface is a library that allows you to customize ERB views in a Rails application without editing the underlying view."
+  s.email = "brian@railsdog.com"
   s.extra_rdoc_files = [
     "README.markdown"
   ]
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.homepage = %q{http://github.com/railsdog/deface}
+  s.homepage = "http://github.com/railsdog/deface"
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.summary = %q{Deface is a library that allows you to customize ERB views in Rails}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.summary = "Deface is a library that allows you to customize ERB views in Rails"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<nokogiri>, ["~> 1.5.0"])
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
-    else
-      s.add_dependency(%q<nokogiri>, ["~> 1.5.0"])
-      s.add_dependency(%q<rails>, [">= 3.0.0"])
-    end
-  else
-    s.add_dependency(%q<nokogiri>, ["~> 1.4.3"])
-    s.add_dependency(%q<rails>, [">= 3.0.0"])
-  end
+  s.add_dependency('nokogiri', '~> 1.5.0')
+  s.add_dependency('rails', '>= 3.0.0')
 end
-

data/lib/deface/override.rb

@@ -154,9 +154,14 @@ module Deface
 
     # applies all applicable overrides to given source
     #
-    def self.apply(source, details)
+    def self.apply(source, details, log=true)
       overrides = find(details)
-      @enable_logging ||= defined?(Rails) == "constant"
+
+      if log
+        @enable_logging ||= defined?(Rails) 
+      else
+        @enable_logging = false
+      end
 
       if @enable_logging && overrides.size > 0
         Rails.logger.info "\e[1;32mDeface:\e[0m #{overrides.size} overrides found for '#{details[:virtual_path]}'"

data/lib/deface/parser.rb

@@ -76,8 +76,10 @@ module Deface
     def self.convert(source)
       erb_markup!(source)
 
-      if source =~ /(<html.*?)((?:(?!>)[\s\S])*)(>)/
+      if source =~ /<html.*?(?:(?!>)[\s\S])*>/
         Nokogiri::HTML::Document.parse(source)
+      elsif source =~ /<body.*?(?:(?!>)[\s\S])*>/
+        Nokogiri::HTML::Document.parse(source).css('body').first
       else
         Nokogiri::HTML::DocumentFragment.parse(source)
       end

data/lib/deface/template_helper.rb

@@ -2,7 +2,7 @@ module Deface
   module TemplateHelper
 
     # used to find source for a partial or template using virutal_path
-    def load_template_source(virtual_path, partial)
+    def load_template_source(virtual_path, partial, include_overrides=true)
       parts = virtual_path.split("/")
       prefix = []
       if parts.size == 2
@@ -15,7 +15,13 @@ module Deface
 
       @lookup_context ||= ActionView::LookupContext.new(ActionController::Base.view_paths, {:formats => [:html]})
 
-      @lookup_context.find(name, prefix, partial).source
+      source = @lookup_context.find(name, prefix, partial).source
+
+      if include_overrides
+        Deface::Override.apply(source, {:virtual_path => virtual_path}, false)
+      else
+        source
+      end
     end
 
     #gets source erb for an element

data/spec/deface/parser_spec.rb

@@ -29,6 +29,12 @@ module Deface
         parsed.should == "<html><body><p>test</p></body></html>".split("\n") #ignore doctype added by noko
       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>"
+      end
+
       it "should convert <% ... %>" do
         Deface::Parser.convert("<% method_name %>").to_s.should == "<code erb-silent> method_name </code>"
       end

data/spec/deface/template_helper_spec.rb

@@ -10,20 +10,49 @@ module Deface
         ActionController::Base.stub(:view_paths).and_return([File.join(File.dirname(__FILE__), '..', "assets")])
       end
 
-      it "should return source for partial" do
-        load_template_source("shared/_post", false).should == "<p>I'm from shared/post partial</p>\n<%= \"And I've got ERB\" %>\n"
-      end
+      describe "with no overrides defined" do
+        it "should return source for partial" do
+          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<%= \"I've got ERB too\" %>\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<%= \"I've got ERB too\" %>\n"
+        end
+
+        it "should return source for namespaced template" do
+          load_template_source("admin/posts/index", false).should == "<h1>Manage Posts</h1>\n"
+        end
+
+        it "should raise exception for non-existing file" do
+          lambda { load_template_source("tester/_post", false) }.should raise_error(ActionView::MissingTemplate)
+        end
 
-      it "should return source for namespaced template" do
-        load_template_source("admin/posts/index", false).should == "<h1>Manage Posts</h1>\n"
       end
 
-      it "should raise exception for non-existing file" do
-        lambda { load_template_source("tester/_post", false) }.should raise_error(ActionView::MissingTemplate)
+      describe "with overrides defined" do
+        before(:all) do
+          Deface::Override.all.clear
+          Deface::Override.new(:virtual_path => "shared/_post", :name => "shared#post", :remove => "p")
+          Deface::Override.new(:virtual_path => "shared/person", :name => "shared#person", :replace => "p", :text => "<h1>Argh!</h1>")
+          Deface::Override.new(:virtual_path => "admin/posts/index", :name => "admin#posts#index", :replace => "h1", :text => "<h1>Argh!</h1>")
+        end
+
+        it "should return source for partial including overrides" do
+          load_template_source("shared/_post", false).should == "\n<%= \"And I've got ERB\" %>"
+        end
+
+        it "should return source for partial excluding overrides" do
+          load_template_source("shared/_post", false, false).should == "<p>I'm from shared/post partial</p>\n<%= \"And I've got ERB\" %>\n"
+        end
+
+        it "should return source for template including overrides" do
+          load_template_source("shared/person", false).should == "<h1>Argh!</h1>\n<%= \"I've got ERB too\" %>"
+        end
+
+        it "should return source for namespaced template including overrides" do
+          load_template_source("admin/posts/index", false).should == "<h1>Argh!</h1>"
+        end
+
       end
 
     end

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: deface
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 5
+  prerelease: 
   segments: 
   - 0
   - 5
-  - 6
-  version: 0.5.6
+  - 7
+  version: 0.5.7
 platform: ruby
 authors: 
-- Brian Quinn
+- Brian D Quinn
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-07-04 00:00:00 +01:00
+date: 2011-07-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Deface is a library that allows you to customize ERB views in Rails