simply 0.1.3 → 0.2.3

data/Rakefile

@@ -5,11 +5,11 @@ PROJECT_NAME = "simply"
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
-    s.name        = PROJECT_NAME
-    s.summary     = "A markaby-like html builder"
+    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 = "Cleaner + smaller markaby clone."
+    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,5 +1,5 @@
 --- 
-:minor: 1
+:minor: 2
 :patch: 3
 :major: 0
 :build: 

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

@@ -143,7 +143,7 @@ def do_erector
         a "a link", :href => "url"
       end
     end
-  end
+  end.to_pretty
 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?
@@ -78,10 +79,6 @@ module Simply
       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/simply.gemspec

@@ -2,53 +2,67 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simply}
-  s.version = "0.1.1"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Taylor"]
-  s.date = %q{2009-05-07}
-  s.description = %q{TODO}
+  s.date = %q{2009-07-29}
+  s.description = %q{A minimal markaby-esq ruby templating language}
   s.email = %q{scott@railsnewbie.com}
   s.extra_rdoc_files = [
     "README"
   ]
   s.files = [
-    "Rakefile",
-    "VERSION.yml",
-    "lib/simply.rb",
-    "lib/simply/html_builder.rb",
-    "lib/simply/html_tags.rb",
-    "lib/simply/indentation.rb",
-    "lib/simply/locals.rb",
-    "lib/simply/version.rb",
-    "spec/simply/html_builder/indentation_spec.rb",
-    "spec/simply/html_builder/locals_spec.rb",
-    "spec/simply/html_builder_spec.rb",
-    "spec/simply/indentation_spec.rb",
-    "spec/simply/simply_spec.rb",
-    "spec/simply/version_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb"
+    ".gitignore",
+     "README",
+     "Rakefile",
+     "VERSION.yml",
+     "benchmarks/001_7a22450a80d6253bf9f0aabb2ee0110c2d67c8a6.out",
+     "benchmarks/002_e462499cd6bd8dface62e433311b3bc0b0b55a42",
+     "benchmarks/003_fd604401b1b03096ec35cdb3036821b92a71791b.out",
+     "benchmarks/004_b75e031f96b342559036444f502d44da7e7104f0.out",
+     "benchmarks/comparison.rb",
+     "lib/simply.rb",
+     "lib/simply/escaping.rb",
+     "lib/simply/html_builder.rb",
+     "lib/simply/html_tags.rb",
+     "lib/simply/indentation.rb",
+     "lib/simply/locals.rb",
+     "lib/simply/version.rb",
+     "profiling/run_static.rb",
+     "profiling/run_static_001_0e246c3de41a891c206c8cb5a552d17d78e4b8ec.out",
+     "reference/ABOUT",
+     "reference/xhtml1-frameset.xsd",
+     "reference/xhtml1-strict.xsd",
+     "reference/xhtml1-transitional.xsd",
+     "simply.gemspec",
+     "spec/simply/html_builder/indentation_spec.rb",
+     "spec/simply/html_builder/locals_spec.rb",
+     "spec/simply/html_builder_spec.rb",
+     "spec/simply/indentation_spec.rb",
+     "spec/simply/simply_spec.rb",
+     "spec/simply/version_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/smtlaissezfaire/simply}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{TODO}
+  s.rubygems_version = %q{1.3.4}
+  s.summary = %q{A minimal markaby-esq ruby templating language}
   s.test_files = [
     "spec/simply/html_builder/indentation_spec.rb",
-    "spec/simply/html_builder/locals_spec.rb",
-    "spec/simply/html_builder_spec.rb",
-    "spec/simply/indentation_spec.rb",
-    "spec/simply/simply_spec.rb",
-    "spec/simply/version_spec.rb",
-    "spec/spec_helper.rb"
+     "spec/simply/html_builder/locals_spec.rb",
+     "spec/simply/html_builder_spec.rb",
+     "spec/simply/indentation_spec.rb",
+     "spec/simply/simply_spec.rb",
+     "spec/simply/version_spec.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else

data/spec/simply/html_builder/indentation_spec.rb

@@ -3,22 +3,22 @@ require File.dirname(__FILE__) + "/../../spec_helper"
 module Simply
   describe HTMLBuilder, "with indentation" do
     before(:each) do
-      @builder = HTMLBuilder.new(:indent => true)
+      @builder = HTMLBuilder.new(:indented => true)
     end
     
-    it "should be indented when passed :indent => true" do
-      builder = HTMLBuilder.new(:indent => true)
+    it "should be indented when passed :indented => true" do
+      builder = HTMLBuilder.new(:indented => true)
       builder.should be_indented
     end
     
-    it "should not be indented when passed :indent => false" do
-      builder = HTMLBuilder.new(:indent => false)
+    it "should not be indented when passed :indented => false" do
+      builder = HTMLBuilder.new(:indented => false)
       builder.should_not be_indented
     end
     
-    it "should not be indented by default" do
+    it "should be indented by default" do
       builder = HTMLBuilder.new
-      builder.should_not be_indented
+      builder.should be_indented
     end
     
     it "should indent html when indented = true, and given a block structure" do

data/spec/simply/html_builder/locals_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + "/../../spec_helper"
 module Simply
   describe HTMLBuilder, "with locals" do
     before(:each) do
-      @builder = HTMLBuilder.new
+      @builder = HTMLBuilder.new(:indented => false)
     end
     
     it "should have access to a variables value" do
@@ -36,7 +36,7 @@ module Simply
     end
 
     it "should take locals in the constructor" do
-      builder = HTMLBuilder.new(:locals => { :foo => "bar", :bar => "baz" }) do
+      builder = HTMLBuilder.new(:locals => { :foo => "bar", :bar => "baz" }, :indented => false) do
         ul do
           li foo
           li bar
@@ -47,7 +47,7 @@ module Simply
     end
     
     it "should be able to pass in several sets of locals at different times" do
-      builder = HTMLBuilder.new(:locals => {:foo => "1"})
+      builder = HTMLBuilder.new(:locals => {:foo => "1"}, :indented => false)
       builder.locals = {:bar => "2"}
       builder.ul do
         li foo
@@ -57,4 +57,4 @@ module Simply
       builder.to_s.should == "<ul><li>1</li><li>2</li></ul>"
     end
   end
-end
+end

data/spec/simply/html_builder_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + "/../spec_helper"
 module Simply
   describe HTMLBuilder do
     before(:each) do
-      @builder = HTMLBuilder.new
+      @builder = HTMLBuilder.new(:indented => false)
     end
 
     it "should create a self-closing hr tag" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simply
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Scott Taylor
@@ -13,7 +13,7 @@ date: 2009-11-09 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: Cleaner + smaller markaby clone.
+description: A minimal markaby-esq ruby templating language
 email: scott@railsnewbie.com
 executables: []
 
@@ -28,8 +28,11 @@ files:
 - VERSION.yml
 - benchmarks/001_7a22450a80d6253bf9f0aabb2ee0110c2d67c8a6.out
 - benchmarks/002_e462499cd6bd8dface62e433311b3bc0b0b55a42
+- benchmarks/003_fd604401b1b03096ec35cdb3036821b92a71791b.out
+- benchmarks/004_b75e031f96b342559036444f502d44da7e7104f0.out
 - benchmarks/comparison.rb
 - lib/simply.rb
+- lib/simply/escaping.rb
 - lib/simply/html_builder.rb
 - lib/simply/html_tags.rb
 - lib/simply/indentation.rb
@@ -77,7 +80,7 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: A markaby-like html builder
+summary: A minimal markaby-esq ruby templating language
 test_files: 
 - spec/simply/html_builder/indentation_spec.rb
 - spec/simply/html_builder/locals_spec.rb