deface 0.7.1 → 0.7.2

data/.travis.yml

@@ -0,0 +1,6 @@
+script: "bundle exec rake"
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ree

data/README.markdown

@@ -99,6 +99,14 @@ Replaces all instances of `h1` in the `posts/_form.html.erb` partial with `<h1>N
                           :replace => "h1", 
                           :text => "<h1>New Post</h1>")
 
+Alternatively pass it a block of code to run:
+
+     Deface::Override.new(:virtual_path => "posts/_form",
+                          :name => "example-1",
+                          :replace => "h1") do
+       "<h1>New Post</h1>"
+     end
+
 Inserts `<%= link_to "List Comments", comments_url(post) %>` before all instances of `p` with css class `comment` in `posts/index.html.erb`
 
      Deface::Override.new(:virtual_path => "posts/index", 

data/deface.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "deface"
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   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."

data/lib/deface/override.rb

@@ -60,7 +60,7 @@ module Deface
     #   :sequence => {:after => "override_name") - the current override will be applied after the named override passed.
     # * <tt>:attributes</tt> - A hash containing all the attributes to be set on the matched elements, eg: :attributes => {:class => "green", :title => "some string"}
     #
-    def initialize(args)
+    def initialize(args, &content)
       unless Rails.application.try(:config).respond_to?(:deface) and Rails.application.try(:config).deface.try(:overrides)
         @@_early << args
         warn "[WARNING] Deface railtie has not initialized yet, override '#{args[:name]}' is being declared too early."
@@ -70,6 +70,8 @@ module Deface
       raise(ArgumentError, ":name must be defined") unless args.key? :name
       raise(ArgumentError, ":virtual_path must be defined") if args[:virtual_path].blank?
 
+      args[:text] = content.call if block_given?
+
       virtual_key = args[:virtual_path].to_sym
       name_key = args[:name].to_s.parameterize 
 
@@ -336,7 +338,7 @@ module Deface
       virtual_path = details[:virtual_path]
       return [] if virtual_path.nil?
 
-      virtual_path = virtual_path[1..-1] if virtual_path.first == '/'
+      virtual_path = virtual_path.gsub(/^\//, '')
 
       result = []
       result << self.all[virtual_path.to_sym].try(:values)

data/lib/deface/parser.rb

@@ -74,6 +74,21 @@ module Deface
     end
 
     def self.convert(source)
+      if source.encoding_aware?
+        # Look for # encoding: *. If we find one, we'll encode the
+        # String in that encoding, otherwise, we'll use the
+        # default external encoding.
+        encoding = source.scan(/#{ActionView::Template::Handlers::ERB.const_get(:ENCODING_TAG)}/).first.try(:last) || Encoding.default_external
+
+        # Tag the source with the default external encoding
+        # or the encoding specified in the file
+        source.force_encoding(encoding)
+
+        unless source.valid_encoding?
+          raise ActionView::WrongEncodingError.new(source, encoding)
+        end
+      end
+
       erb_markup!(source)
 
       if source =~ /<html.*?(?:(?!>)[\s\S])*>/

data/lib/deface/railtie.rb

@@ -16,7 +16,7 @@ module Deface
 
     config.to_prepare &method(:activate).to_proc
 
-    # configures basic deface environment, with gets replaced
+    # configures basic deface environment, which gets replaced
     # with real environment if deface is not disabled
     #
     initializer "deface.add_configuration", :before => :load_environment_config do |app|

data/spec/deface/override_spec.rb

@@ -118,6 +118,21 @@ module Deface
 
     end
 
+    describe "with block" do
+      before(:each) do
+        #stub view paths to be local spec/assets directory
+        ActionController::Base.stub(:view_paths).and_return([File.join(File.dirname(__FILE__), '..', "assets")])
+
+        @override = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :replace => "h1") do
+          "This is replacement text for the h1"
+        end
+      end
+
+      it "should set source to block content" do
+        @override.source.should == "This is replacement text for the h1"
+      end
+    end
+
     describe "#source_element" do
       before(:each) do
         @override = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :replace => "h1", :text => "<%= method :opt => 'x' & 'y' %>")

data/spec/deface/parser_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+ 
 require 'spec_helper'
 
 module Deface
@@ -19,7 +21,7 @@ module Deface
         if 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=US-ASCII\">\n<title>Hello</title>\n</head>\n<body>test</body>\n</html>".split("\n")
+          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")
         end
 
         parsed = Deface::Parser.convert("<html><title>test</title></html>")
@@ -28,7 +30,7 @@ module Deface
         if RUBY_VERSION < "1.9"
           parsed.should == ["<html><head><title>test</title></head></html>"]
         else
-          parsed.should == "<html><head>\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=US-ASCII\">\n<title>test</title>\n</head></html>".split("\n")
+          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")
         end
 
         parsed = Deface::Parser.convert("<html><p>test</p></html>")
@@ -84,6 +86,27 @@ module Deface
       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>"
       end
+
+      if "".encoding_aware?
+        it "should respect valid encoding tag" do
+          source = %q{<%# encoding: ISO-8859-1 %>Can you say ümlaut?}
+          Deface::Parser.convert(source)
+          source.encoding.name.should == 'ISO-8859-1'
+        end
+
+        it "should force default encoding" do
+          source = %q{Can you say ümlaut?}
+          source.force_encoding('ISO-8859-1')
+          Deface::Parser.convert(source)
+          source.encoding.should == Encoding.default_external
+        end
+
+        it "should force default encoding" do
+          source = %q{<%# encoding: US-ASCII %>Can you say ümlaut?}
+          lambda { Deface::Parser.convert(source) }.should raise_error(ActionView::WrongEncodingError)
+        end
+      end
+
     end
 
     describe "#undo_erb_markup" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deface
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Brian D Quinn
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-27 00:00:00 Z
+date: 2011-11-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -75,6 +75,7 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - .gitignore
+- .travis.yml
 - Gemfile
 - MIT-LICENSE
 - README.markdown