smtlaissezfaire-simply 0.1.1 → 0.2.1

data/.gitignore

@@ -0,0 +1 @@
+pkg

data/Rakefile

@@ -5,11 +5,11 @@ PROJECT_NAME = "simply"
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
-    s.name        = "#{PROJECT_NAME}"
-    s.summary     = "TODO"
+    s.name        = "simply"
+    s.summary     = "A minimal markaby-esq ruby templating language"
     s.email       = "scott@railsnewbie.com"
-    s.homepage    = "http://github.com/smtlaissezfaire/#{PROJECT_NAME.downcase}"
-    s.description = "TODO"
+    s.homepage    = "http://github.com/smtlaissezfaire/simply"
+    s.description = "A minimal markaby-esq ruby templating language"
     s.authors     = ["Scott Taylor"]
   end
 rescue LoadError

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:major: 0
-:minor: 1
+:minor: 2
 :patch: 1
+:major: 0

data/benchmarks/001_7a22450a80d6253bf9f0aabb2ee0110c2d67c8a6.out

@@ -0,0 +1,23 @@
+# of iterations = 10000
+Rehearsal ------------------------------------------------------------------------------
+counter time                                 0.000000   0.000000   0.000000 (  0.001091)
+counter time + function call overhead time   0.000000   0.000000   0.000000 (  0.002866)
+tagz                                         2.340000   0.020000   2.360000 (  2.356264)
+markaby                                      8.720000   0.030000   8.750000 (  8.764424)
+builder                                      2.140000   0.010000   2.150000 (  2.154632)
+haml                                         5.620000   0.010000   5.630000 (  5.652289)
+erb                                          2.240000   0.010000   2.250000 (  2.248454)
+erubis                                       0.420000   0.000000   0.420000 (  0.418306)
+simply                                       2.010000   0.000000   2.010000 (  2.018264)
+-------------------------------------------------------------------- total: 23.570000sec
+
+                                                 user     system      total        real
+counter time                                 0.000000   0.000000   0.000000 (  0.001062)
+counter time + function call overhead time   0.000000   0.000000   0.000000 (  0.002849)
+tagz                                         2.220000   0.010000   2.230000 (  2.238662)
+markaby                                      9.210000   0.030000   9.240000 (  9.261845)
+builder                                      1.930000   0.000000   1.930000 (  1.934298)
+haml                                         5.220000   0.010000   5.230000 (  5.235850)
+erb                                          2.330000   0.010000   2.340000 (  2.339981)
+erubis                                       0.430000   0.000000   0.430000 (  0.437849)
+simply                                       2.210000   0.010000   2.220000 (  2.223844)

data/benchmarks/002_e462499cd6bd8dface62e433311b3bc0b0b55a42

@@ -0,0 +1,27 @@
+# of iterations = 10000
+Rehearsal ------------------------------------------------------------------------------
+counter time                                 0.000000   0.000000   0.000000 (  0.001055)
+counter time + function call overhead time   0.010000   0.000000   0.010000 (  0.003877)
+tagz                                         2.620000   0.020000   2.640000 (  2.675130)
+markaby                                     10.220000   0.070000  10.290000 ( 10.403767)
+builder                                      1.070000   0.000000   1.070000 (  1.089509)
+haml                                         5.690000   0.040000   5.730000 (  5.770631)
+erb                                          2.400000   0.010000   2.410000 (  2.436488)
+erubis                                       0.470000   0.000000   0.470000 (  0.476391)
+nokogiri                                     1.930000   0.010000   1.940000 (  1.961594)
+simply                                       1.450000   0.010000   1.460000 (  1.465180)
+erector                                      0.150000   0.000000   0.150000 (  0.155925)
+-------------------------------------------------------------------- total: 26.170000sec
+
+                                                 user     system      total        real
+counter time                                 0.000000   0.000000   0.000000 (  0.001063)
+counter time + function call overhead time   0.000000   0.000000   0.000000 (  0.003963)
+tagz                                         2.630000   0.020000   2.650000 (  2.669872)
+markaby                                     10.200000   0.060000  10.260000 ( 10.367525)
+builder                                      1.070000   0.010000   1.080000 (  1.093933)
+haml                                         5.650000   0.040000   5.690000 (  5.745920)
+erb                                          2.420000   0.020000   2.440000 (  2.462542)
+erubis                                       0.430000   0.000000   0.430000 (  0.439791)
+nokogiri                                     1.930000   0.010000   1.940000 (  1.967485)
+simply                                       1.380000   0.010000   1.390000 (  1.405759)
+erector                                      0.160000   0.000000   0.160000 (  0.155949)

data/benchmarks/003_fd604401b1b03096ec35cdb3036821b92a71791b.out

@@ -0,0 +1,27 @@
+# of iterations = 10000
+Rehearsal ------------------------------------------------------------------------------
+counter time                                 0.000000   0.000000   0.000000 (  0.001055)
+counter time + function call overhead time   0.000000   0.000000   0.000000 (  0.002811)
+tagz                                         2.540000   0.020000   2.560000 (  2.744199)
+markaby                                      9.940000   0.080000  10.020000 ( 10.658650)
+builder                                      1.020000   0.010000   1.030000 (  1.171982)
+haml                                         5.500000   0.050000   5.550000 (  6.917135)
+erb                                          2.270000   0.010000   2.280000 (  2.797811)
+erubis                                       0.430000   0.010000   0.440000 (  0.463208)
+nokogiri                                     1.950000   0.020000   1.970000 (  2.138772)
+simply                                       2.330000   0.020000   2.350000 (  2.550994)
+erector                                      0.220000   0.000000   0.220000 (  0.223103)
+-------------------------------------------------------------------- total: 26.420000sec
+
+                                                 user     system      total        real
+counter time                                 0.000000   0.000000   0.000000 (  0.001063)
+counter time + function call overhead time   0.000000   0.000000   0.000000 (  0.004023)
+tagz                                         2.480000   0.020000   2.500000 (  3.047870)
+markaby                                      9.880000   0.070000   9.950000 ( 10.771271)
+builder                                      1.030000   0.010000   1.040000 (  1.093748)
+haml                                         5.650000   0.040000   5.690000 (  6.100592)
+erb                                          2.370000   0.030000   2.400000 (  2.575887)
+erubis                                       0.400000   0.000000   0.400000 (  0.479711)
+nokogiri                                     1.910000   0.020000   1.930000 (  2.054972)
+simply                                       2.320000   0.020000   2.340000 (  2.604975)
+erector                                      0.150000   0.000000   0.150000 (  0.172422)

data/benchmarks/004_b75e031f96b342559036444f502d44da7e7104f0.out

@@ -0,0 +1,27 @@
+# of iterations = 10000
+Rehearsal ------------------------------------------------------------------------------
+counter time                                 0.000000   0.000000   0.000000 (  0.001575)
+counter time + function call overhead time   0.000000   0.000000   0.000000 (  0.003454)
+tagz                                         2.560000   0.020000   2.580000 (  2.703877)
+markaby                                      9.950000   0.070000  10.020000 ( 10.547215)
+builder                                      1.030000   0.020000   1.050000 (  1.096580)
+haml                                         5.700000   0.030000   5.730000 (  5.992496)
+erb                                          2.400000   0.020000   2.420000 (  2.540554)
+erubis                                       0.420000   0.000000   0.420000 (  0.441572)
+nokogiri                                     1.940000   0.020000   1.960000 (  2.038399)
+simply                                       2.340000   0.010000   2.350000 (  2.482033)
+erector                                      0.210000   0.000000   0.210000 (  0.212933)
+-------------------------------------------------------------------- total: 26.740000sec
+
+                                                 user     system      total        real
+counter time                                 0.000000   0.000000   0.000000 (  0.001111)
+counter time + function call overhead time   0.010000   0.000000   0.010000 (  0.002913)
+tagz                                         2.570000   0.020000   2.590000 (  2.706161)
+markaby                                      9.770000   0.060000   9.830000 ( 10.536178)
+builder                                      1.030000   0.010000   1.040000 (  1.083472)
+haml                                         5.690000   0.040000   5.730000 (  6.061707)
+erb                                          2.380000   0.010000   2.390000 (  2.513181)
+erubis                                       0.420000   0.010000   0.430000 (  0.445088)
+nokogiri                                     1.890000   0.010000   1.900000 (  2.005374)
+simply                                       2.340000   0.020000   2.360000 (  2.466595)
+erector                                      0.160000   0.000000   0.160000 (  0.164743)

data/benchmarks/comparison.rb

@@ -0,0 +1,224 @@
+#!/usr/bin/env ruby
+require 'benchmark'
+require "erb"
+require 'rubygems'
+require 'markaby'
+require 'tagz'
+require 'builder'
+require 'haml'
+require 'erubis'
+require "nokogiri"
+require "erector"
+require File.dirname(__FILE__) + "/../lib/simply"
+
+MAX = (ARGV.shift || 10_000).to_i
+
+def do_nothing
+  # do nothing
+end
+
+def do_erb
+  str = <<-EOF
+<html>
+  <head>
+    <title>happy title</title>
+  </head>
+  <body>
+    <h1>happy heading</h1>
+    <a href='<%= 'url' %>'>a link</a>
+  </body>
+</html>
+EOF
+  ERB.new(str)
+end
+
+def do_erubis
+  str = <<-EOF
+<html>
+  <head>
+    <title>happy title</title>
+  </head>
+  <body>
+    <h1>happy heading</h1>
+    <a href='<%= 'url' %>'>a link</a>
+  </body>
+</html>
+EOF
+  Erubis::Eruby.new(str)
+end
+
+def do_haml
+  str = <<-EOF
+%html
+  %head
+    %title_ "happy title"
+  %body
+    %h1 "happy heading"
+    %a "a link", :href => "url"
+EOF
+  Haml::Engine.new(str)
+end
+
+def do_tagz
+  Tagz {
+    html_ {
+      head_ {
+        title_ "happy title"
+      }
+      body_ {
+        h1_ "happy heading"
+        a_ "a link", :href => "url"
+      }
+    }
+  }
+end
+
+def do_builder
+  Builder::XmlMarkup.new.html do |xm|
+    xm.head do
+      xm.title "happy title"
+    end
+    xm.body do
+      xm.h1 "happy heading"
+      xm.a "a link", :href => "url"
+    end
+  end
+end
+
+def do_markaby
+  mab = Markaby::Builder.new :output_meta_tag => false
+
+  mab.html {
+    head {
+      title "happy title"
+    }
+    body {
+      h1 "happy heading"
+      a "a link", :href => "url"
+    }
+  }.to_s
+end
+
+def do_simply
+  Simply do
+    html do
+      head do
+        title "happy title"
+      end
+
+      body do
+        h1 "happy heading"
+        a "a link", :href => "url"
+      end
+    end
+  end
+end
+
+def do_nokogiri
+  Nokogiri do
+    html do
+      head do
+        title "happy title"
+      end
+
+      body do
+        h1 "happy heading"
+        a :href => "url" do
+          text "a link"
+        end
+      end
+    end
+  end
+end
+
+def do_erector
+  Erector::Widget.new do
+    html do
+      head do
+        title "happy title"
+      end
+
+      body do
+        h1 "happy heading"
+        a "a link", :href => "url"
+      end
+    end
+  end.to_pretty
+end
+
+
+x = do_tagz
+y = do_markaby
+z = do_builder
+
+raise "bad!\n\n#{x}\n\n#{y}" unless x == y
+raise "bad!\n\n#{x}\n\n#{z}" unless x == z
+
+puts "# of iterations = #{MAX}"
+Benchmark.bmbm do |x|
+  x.report("counter time") do
+    for i in 0..MAX
+      # do nothing
+    end
+  end
+
+  x.report("counter time + function call overhead time") do
+    for i in 0..MAX do
+      do_nothing
+    end
+  end
+
+  x.report("tagz") do
+    for i in 0..MAX do
+      do_tagz
+    end
+  end
+
+  x.report("markaby") do
+    for i in 0..MAX do
+      do_markaby
+    end
+  end
+
+  x.report("builder") do
+    for i in 0..MAX do
+      do_builder
+    end
+  end
+
+  x.report("haml") do
+    for i in 0..MAX do
+      do_haml
+    end
+  end
+
+  x.report("erb") do
+    for i in 0..MAX do
+      do_erb
+    end
+  end
+
+  x.report("erubis") do
+    for i in 0..MAX do
+      do_erubis
+    end
+  end
+
+  x.report("nokogiri") do
+    for i in 0..MAX do
+      do_nokogiri
+    end
+  end
+
+  x.report("simply") do
+    for i in 0..MAX do
+      do_simply
+    end
+  end
+
+  x.report("erector") do
+    for i in 0..MAX do
+      do_erector
+    end
+  end
+end

data/lib/simply.rb

@@ -4,8 +4,7 @@ module Simply
   require "#{dir}/version"
   include Version
   
-  require "rubygems"
-  require "builder/xchar"
+  require "#{dir}/escaping"
   require "#{dir}/locals"
   require "#{dir}/indentation"
   require "#{dir}/html_tags"

data/lib/simply/escaping.rb

@@ -0,0 +1,20 @@
+module Simply
+  module Escaping
+    #
+    # A utility method for escaping HTML tag characters in _s_.
+    # 
+    #  Taken from ERB::Util
+    # 	
+    # 	puts html_escape("is a > 0 & a < 10?")
+    # 
+    # _Generates_
+    # 
+    # 	is a &gt; 0 &amp; a &lt; 10?
+    #
+    def html_escape(s)
+      s.to_s.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
+    end
+    
+    alias_method :h, :html_escape
+  end
+end

data/lib/simply/html_builder.rb

@@ -1,6 +1,7 @@
 module Simply
   class HTMLBuilder
     include Locals
+    include Escaping
     
     unless defined?(SELF_CLOSING_TAGS)
       SELF_CLOSING_TAGS = HTMLTags::SELF_CLOSING_TAGS
@@ -14,7 +15,7 @@ module Simply
         self.locals = locals_hash
       end
       
-      @indented = true if options[:indent] == true
+      @indented = options[:indented].equal?(false) ? false : true
       @out.extend Indentation if indented?
       
       instance_eval(&block) if block_given?
@@ -71,17 +72,13 @@ module Simply
     ####################
 
     def text(out)
-      @out << out
+      @out << out.to_s
     end
 
     def clean_text(out)
       text html_escape(out)
     end
 
-    def html_escape(out)
-      out.to_s.to_xs
-    end
-
     def to_s
       @out
     end

data/lib/simply/version.rb

@@ -1,3 +1,5 @@
+require "yaml"
+
 module Simply
   module Version
     unless defined?(Simply::VERSION)
@@ -9,4 +11,4 @@ module Simply
       VERSION = "#{MAJOR}.#{MINOR}.#{TINY}"
     end
   end
-end
+end

data/profiling/run_static.rb

@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + "/../lib/simply"
+
+TIMES = 1000
+
+TIMES.times do
+  Simply do
+    html do
+      head do
+        title "happy title"
+      end
+  
+      body do
+        h1 "happy heading"
+        a "a link", :href => "url"
+      end
+    end
+  end
+end