undies 2.1.0 → 2.2.0

data/Gemfile

@@ -5,3 +5,5 @@ gemspec
 
 gem 'rake', '~>0.9.2'
 gem 'ruby-prof'
+gem 'erubis'
+gem 'ansi'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    undies (2.1.0)
+    undies (2.2.0)
 
 GEM
   remote: http://rubygems.org/
@@ -12,6 +12,7 @@ GEM
     assert-view (0.5.0)
       ansi (~> 1.3)
       undies (~> 2.0)
+    erubis (2.7.0)
     rake (0.9.2)
     ruby-prof (0.10.8)
 
@@ -19,8 +20,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  ansi
   assert (~> 0.7.3)
   bundler (~> 1.0)
+  erubis
   rake (~> 0.9.2)
   ruby-prof
   undies!

data/Rakefile

@@ -4,4 +4,26 @@ Assert::RakeTasks.for(:test)
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-task :default => :build
+task :default => :run_all
+
+desc "Run the profiler on the large bench template."
+task :run_profiler do
+  require 'bench/profiler_runner'
+  UndiesProfilerRunner.new('large').print_flat(STDOUT, :min_percent => 3)
+end
+
+desc "Run the benchmark script."
+task :run_bench do
+  require 'bench/bench_runner'
+  UndiesBenchRunner.new
+end
+
+desc "Run all the tests, then the profiler, then the bench."
+task :run_all do
+  Rake::Task['test'].invoke
+  puts
+  Rake::Task['run_profiler'].invoke
+  puts
+  Rake::Task['run_bench'].invoke
+end
+

data/bench/bench

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'bench/bench_runner'
+
+UndiesBenchRunner.new

data/bench/bench_runner.rb

@@ -0,0 +1,118 @@
+require 'benchmark'
+require 'stringio'
+require 'ansi'
+
+require 'undies'
+require 'erb'
+require 'erubis'
+
+class BenchResults
+
+  attr_reader :user, :system, :total, :real
+  attr_accessor :name, :ext, :size, :out, :outstream
+
+  def initialize(name, ext, size)
+    @name = name.to_s
+    @ext = ext.to_s
+    @size = size.to_s
+    @user, @system, @total, @real = 0
+    @outstream = StringIO.new(@out = "")
+  end
+
+  def file
+    File.expand_path("bench/#{@size}.html#{@ext}")
+  end
+
+  def user=(value_in_secs);   @user   = value_in_secs.to_f * 1000; end
+  def system=(value_in_secs); @system = value_in_secs.to_f * 1000; end
+  def total=(value_in_secs);  @total  = value_in_secs.to_f * 1000; end
+  def real=(value_in_secs);   @real   = value_in_secs.to_f * 1000; end
+
+  def to_s(meas=:real, basis=nil)
+    "#{name_s} (#{size_s}):  #{time_s(meas)} ms  #{"(#{basis_s(meas, basis)})" if basis}"
+  end
+
+  protected
+
+  def measure(&block)
+    Benchmark.measure(&block).to_s.strip.gsub(/[^\s|0-9|\.]/, '').split(/\s+/).tap do |values|
+      self.user, self.system, self.total, self.real = values
+    end
+  end
+
+  def name_s; @name.ljust(6); end
+  def size_s; @size.to_s; end
+  def time_s(meas); self.send(meas).to_s.rjust(7); end
+
+  def basis_s(meas, time)
+    diff = (time - self.send(meas))
+    perc = ((diff / time) * 100).round
+    if diff >= 0
+      ANSI.green + "+#{diff} ms, +#{perc}%" + ANSI.reset
+    else
+      ANSI.red + "#{diff} ms, #{perc}%" + ANSI.reset
+    end
+  end
+
+end
+
+class UndiesResults < BenchResults
+
+  def initialize(size='large')
+    super(:undies, '.rb', size)
+    measure do
+      Undies::Template.new(
+        Undies::Source.new(self.file),
+        {},
+        Undies::Output.new(self.outstream, :pp => 2)
+      )
+    end
+  end
+
+end
+
+class ErbResults < BenchResults
+
+  def initialize(size='large')
+    super(:erb, '.erb', size)
+    measure do
+      self.out = ERB.new(File.read(self.file), 0, "%<>").result(binding)
+    end
+  end
+
+end
+
+class ErubisResults < BenchResults
+
+  def initialize(size='large')
+    super(:erubis, '.erb', size)
+    measure do
+      self.out = Erubis::Eruby.new(File.read(self.file)).result(binding)
+    end
+  end
+
+end
+
+class UndiesBenchRunner
+
+  SIZES = {
+    :small => "~20 nodes",
+    :large => "~2000 nodes",
+    :verylarge => "~20000 nodes"
+  }
+
+  def initialize
+    puts "Benchmark Results:"
+    puts
+    [:small, :large, :verylarge].each do |size|
+      puts "#{size.to_s.upcase} (#{SIZES[size]})"
+      puts '-'*(size.to_s.length+3+SIZES[size].length)
+      basis = UndiesResults.new(size)
+      puts basis.to_s(:real)
+      puts ErbResults.new(size).to_s(:real, basis.real)
+      puts ErubisResults.new(size).to_s(:real, basis.real)
+      puts
+    end
+  end
+
+end

data/bench/large.html.erb

@@ -0,0 +1,19 @@
+<html>
+  <head></head>
+  <body>
+    <% 100.times do %>
+      <% 5.times do %>
+        Yo
+      <% end %>
+      <% 5.times do %>
+        YoYo
+      <% end %>
+      <% 5.times do %>
+        <br />
+      <% end %>
+      <% 5.times do %>
+        <div>Hi</div>
+      <% end %>
+    <% end %>
+  </body>
+</html>

data/bench/large.html.rb

@@ -1,32 +1,19 @@
 _html {
   _head {}
   _body {
-
-    10.times do
-      _ "Yo"
-      _ "Yo"
-      _ "Yo"
-      _ "Yo"
-      _ "Yo"
-
-      __ "YoYo"
-      __ "YoYo"
-      __ "YoYo"
-      __ "YoYo"
-      __ "YoYo"
-
-      _br
-      _br
-      _br
-      _br
-      _br
-
-      _div { _ "Hi" }
-      _div { _ "Hi" }
-      _div { _ "Hi" }
-      _div { _ "Hi" }
-      _div { _ "Hi" }
+    100.times do
+      5.times do
+        _ "Yo"
+      end
+      5.times do
+        __ "YoYo"
+      end
+      5.times do
+        _br
+      end
+      5.times do
+        _div { _ "Hi" }
+      end
     end
-
   }
 }

data/bench/profiler

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require 'bench/profiler_runner'
+
+runner = UndiesProfilerRunner.new(ARGV[0] || 'large')
+runner.print_flat(STDOUT, :min_percent => 1)

data/bench/profiler_runner.rb

@@ -0,0 +1,32 @@
+require 'stringio'
+require 'ruby-prof'
+require 'undies'
+require 'bench/procs'
+
+class UndiesProfilerRunner
+
+  attr_reader :result
+
+  def initialize(size)
+    file = "bench/#{size || 'large'}.html.rb"
+    @source = Undies::Source.new(File.expand_path(file))
+    @data = {}
+    @output = Undies::Output.new(StringIO.new(@out = ""))
+
+    @result = RubyProf.profile do
+      10.times do
+        Undies::Template.new(@source, @data, @output)
+      end
+    end
+
+  end
+
+  def print_flat(outstream, opts={})
+    RubyProf::FlatPrinter.new(@result).print(outstream, opts)
+  end
+
+  def print_graph(outstream, opts={})
+    RubyProf::GraphPrinter.new(@result).print(outstream, opts)
+  end
+
+end

data/bench/small.html.erb

@@ -0,0 +1,19 @@
+<html>
+  <head></head>
+  <body>
+    <% 1.times do %>
+      <% 5.times do %>
+        Yo
+      <% end %>
+      <% 5.times do %>
+        YoYo
+      <% end %>
+      <% 5.times do %>
+        <br />
+      <% end %>
+      <% 5.times do %>
+        <div>Hi</div>
+      <% end %>
+    <% end %>
+  </body>
+</html>

data/bench/small.html.rb

@@ -1,32 +1,19 @@
 _html {
   _head {}
   _body {
-
     1.times do
-      _ "Yo"
-      _ "Yo"
-      _ "Yo"
-      _ "Yo"
-      _ "Yo"
-
-      __ "YoYo"
-      __ "YoYo"
-      __ "YoYo"
-      __ "YoYo"
-      __ "YoYo"
-
-      _br
-      _br
-      _br
-      _br
-      _br
-
-      _div { _ "Hi" }
-      _div { _ "Hi" }
-      _div { _ "Hi" }
-      _div { _ "Hi" }
-      _div { _ "Hi" }
+      5.times do
+        _ "Yo"
+      end
+      5.times do
+        __ "YoYo"
+      end
+      5.times do
+        _br
+      end
+      5.times do
+        _div { _ "Hi" }
+      end
     end
-
   }
 }

data/bench/verylarge.html.erb

@@ -0,0 +1,19 @@
+<html>
+  <head></head>
+  <body>
+    <% 1000.times do %>
+      <% 5.times do %>
+        Yo
+      <% end %>
+      <% 5.times do %>
+        YoYo
+      <% end %>
+      <% 5.times do %>
+        <br />
+      <% end %>
+      <% 5.times do %>
+        <div>Hi</div>
+      <% end %>
+    <% end %>
+  </body>
+</html>

data/bench/verylarge.html.rb

@@ -1,32 +1,19 @@
 _html {
   _head {}
   _body {
-
     1000.times do
-      _ "Yo"
-      _ "Yo"
-      _ "Yo"
-      _ "Yo"
-      _ "Yo"
-
-      __ "YoYo"
-      __ "YoYo"
-      __ "YoYo"
-      __ "YoYo"
-      __ "YoYo"
-
-      _br
-      _br
-      _br
-      _br
-      _br
-
-      _div { _ "Hi" }
-      _div { _ "Hi" }
-      _div { _ "Hi" }
-      _div { _ "Hi" }
-      _div { _ "Hi" }
+      5.times do
+        _ "Yo"
+      end
+      5.times do
+        __ "YoYo"
+      end
+      5.times do
+        _br
+      end
+      5.times do
+        _div { _ "Hi" }
+      end
     end
-
   }
 }

data/lib/undies/element.rb

@@ -16,11 +16,19 @@ module Undies
         html + if k_v.last.kind_of?(::Hash)
           hash_attrs(k_v.last, k_v.first)
         else
-          " #{k_v.first}=\"#{k_v.last.gsub('"', '&quot;').gsub('<', '&lt;')}\""
+          " #{k_v.first}=\"#{escape_attr_value(k_v.last)}\""
         end
       end
     end
 
+    def self.escape_attr_value(value)
+      value.
+        to_s.
+        gsub('&', '&amp;').
+        gsub('<', '&lt;').
+        gsub('"', '&quot;')
+    end
+
     def self.content(element)
       nil
     end

data/lib/undies/template.rb

@@ -19,6 +19,23 @@ module Undies
       template.instance_variable_get("@_undies_output").flush
     end
 
+    # Ripped from Rack v1.3.0 ======================================
+    # => ripped b/c I don't want a dependency on Rack for just this
+    ESCAPE_HTML = {
+      "&" => "&",
+      "<" => "&lt;",
+      ">" => "&gt;",
+      "'" => "&#x27;",
+      '"' => "&quot;",
+      "/" => "&#x2F;"
+    }
+    ESCAPE_HTML_PATTERN = Regexp.union(*ESCAPE_HTML.keys)
+    # Escape ampersands, brackets and quotes to their HTML/XML entities.
+    def self.escape_html(string)
+      string.to_s.gsub(ESCAPE_HTML_PATTERN){|c| ESCAPE_HTML[c] }
+    end
+    # end Rip from Rack v1.3.0 =====================================
+
     def initialize(*args)
       output = if args.last.kind_of?(Output)
         args.pop
@@ -67,7 +84,7 @@ module Undies
     end
 
     # Add a text node (data escaped) to the nodes of the current node
-    def _(data=""); self.__ self.escape_html(data.to_s); end
+    def _(data=""); self.__ self.class.escape_html(data.to_s); end
 
     # Add a text node with the data un-escaped
     def __(data=""); @_undies_output.node(Node.new(data.to_s)); end
@@ -99,22 +116,5 @@ module Undies
     end
     # ==============================================================
 
-    # Ripped from Rack v1.3.0 ======================================
-    # => ripped b/c I don't want a dependency on Rack for just this
-    ESCAPE_HTML = {
-      "&" => "&amp;",
-      "<" => "&lt;",
-      ">" => "&gt;",
-      "'" => "&#x27;",
-      '"' => "&quot;",
-      "/" => "&#x2F;"
-    }
-    ESCAPE_HTML_PATTERN = Regexp.union(*ESCAPE_HTML.keys)
-    # Escape ampersands, brackets and quotes to their HTML/XML entities.
-    def escape_html(string)
-      string.to_s.gsub(ESCAPE_HTML_PATTERN){|c| ESCAPE_HTML[c] }
-    end
-    # end Rip from Rack v1.3.0 =====================================
-
   end
 end

data/lib/undies/version.rb

@@ -1,3 +1,3 @@
 module Undies
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/test/element_test.rb

@@ -56,6 +56,11 @@ class Undies::Element
       assert_includes 'escaped="not < escaped"', attrs
     end
 
+    should "escape '&' in attr values" do
+      attrs = Undies::Element.hash_attrs('escaped' => 'not & escaped')
+      assert_includes 'escaped="not & escaped"', attrs
+    end
+
     should "convert a nested hash to element attrs" do
       attrs = Undies::Element.hash_attrs({
         :class => "testing", :id => "test_2",

data/test/template_test.rb

@@ -16,9 +16,8 @@ class Undies::Template
     end
     subject { @t }
 
-    should have_class_method :output, :flush
-    should have_instance_method  :to_s
-    should have_instance_methods :element, :tag, :escape_html
+    should have_class_method :output, :flush, :escape_html
+    should have_instance_methods :to_s, :element, :tag
     should have_instance_methods :_, :__, :___
     should have_instance_methods :__yield, :__partial
 
@@ -88,7 +87,7 @@ class Undies::Template
       Undies::Template.new(Undies::Source.new do
         _ data
       end, {:data => @data}, @output)
-      assert_equal subject.send(:escape_html, @data), @out
+      assert_equal subject.class.escape_html(@data), @out
     end
 
     should "add the text un-escaped using the '__' method" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: undies
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: 
   segments: 
   - 2
-  - 1
+  - 2
   - 0
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-10 00:00:00 Z
+date: 2012-02-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -63,10 +63,16 @@ files:
 - Gemfile.lock
 - README.rdoc
 - Rakefile
+- bench/bench
+- bench/bench_runner.rb
+- bench/large.html.erb
 - bench/large.html.rb
 - bench/procs.rb
-- bench/profiler.rb
+- bench/profiler
+- bench/profiler_runner.rb
+- bench/small.html.erb
 - bench/small.html.rb
+- bench/verylarge.html.erb
 - bench/verylarge.html.rb
 - lib/undies.rb
 - lib/undies/element.rb

data/bench/profiler.rb

@@ -1,25 +0,0 @@
-require 'ruby-prof'
-require 'undies'
-require 'bench/procs'
-
-file = "bench/#{ARGV[0] || 'large'}.html.rb"
-proc = eval("@#{ARGV[0] || 'large'}_proc")
-result = nil
-
-File.open('bench/output.txt', 'a+') do |outstream|
-
-  output = Undies::Output.new(outstream, :pp => 2)
-
-  result = RubyProf.profile do
-    50.times do
-      Undies::Template.new(Undies::Source.new(File.expand_path(file)), {}, output)
-    end
-    50.times do
-      Undies::Template.new(Undies::Source.new(proc), {}, output)
-    end
-  end
-
-end
-
-printer = RubyProf::FlatPrinter.new(result).print(STDOUT, :min_percent => 1)
-# printer = RubyProf::GraphPrinter.new(result).print(STDOUT)