garterbelt 0.0.6 → 0.0.7

data/TODO

@@ -1,5 +1,11 @@
 increase performance ~10%
 partial passes down params from parent view
-anonymous view
+anonymous views
 
-Rails Helpers
+rails style helpers
+
+render styles
+  - pretty: current and default
+  - compact: argument content in the tags, not new line
+  - minified: no new lines or indenting
+  - text only: no tags, appropriate new lines according to tag type

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/garterbelt.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{garterbelt}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kane Baccigalupi"]
@@ -44,12 +44,14 @@ Gem::Specification.new do |s|
     "lib/view.rb",
     "spec/garterbelt_spec.rb",
     "spec/integration/expectations/general_view.html",
+    "spec/integration/expectations/unescaping_view.html",
     "spec/integration/expectations/variables/view_with_user_and_params.html",
     "spec/integration/expectations/variables/view_with_user_email.html",
     "spec/integration/expectations/view_partial_nest.html",
     "spec/integration/expectations/view_with_forms.html",
     "spec/integration/expectations/view_with_tags.html",
     "spec/integration/templates/form.rb",
+    "spec/integration/templates/unescaping_view.rb",
     "spec/integration/templates/view_partial_nest.rb",
     "spec/integration/templates/view_with_cache.rb",
     "spec/integration/templates/view_with_forms.rb",
@@ -87,6 +89,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/garterbelt_spec.rb",
     "spec/integration/templates/form.rb",
+    "spec/integration/templates/unescaping_view.rb",
     "spec/integration/templates/view_partial_nest.rb",
     "spec/integration/templates/view_with_cache.rb",
     "spec/integration/templates/view_with_forms.rb",

data/lib/renderers/text.rb

@@ -1,11 +1,12 @@
 module Garterbelt
   class Text < Renderer
-    attr_accessor :content
+    attr_accessor :content, :escape
     
     def initialize(opts)
       super
       raise ArgumentError, ":content option required for #{self.class} initialization" unless opts[:content]
       self.content = opts[:content]
+      self.escape = view.escape
     end
     
     def raise_with_block_content
@@ -18,11 +19,7 @@ module Garterbelt
     end
     
     def escaped_content
-      escape? ? ERB::Util.h(content) : content
-    end
-    
-    def escape?
-      !!view.escape
+      escape ? ERB::Util.h(content) : content
     end
   end
 end

data/spec/integration/expectations/unescaping_view.html

@@ -0,0 +1,3 @@
+You should check out my rad new site:<br>
+<a class="user_generated_link" href="http://foo.com">http://foo.com</a><br>
+It will blow your mind!

data/spec/integration/templates/unescaping_view.rb

@@ -0,0 +1,12 @@
+class UnescapingView < Garterbelt::View
+  requires :format_text
+  
+  def content
+    format_text.gsub!(/<[^>]*>/, '')
+    format_text.gsub!(/\b((https?|mailto):(\/\/)?\S+)/, "<a class=\"user_generated_link\" href=\"\\1\">\\1</a>")
+    format_text.gsub!("\n", "<br>\n")
+    format_text.gsub!(/ {2,1000}/, '')
+    
+    raw_text format_text
+  end
+end

data/spec/integration/view_spec.rb

@@ -9,6 +9,13 @@ describe Garterbelt::View, "Integration" do
     ViewWithContentTags.new.render.should == file("view_with_tags")
   end
   
+  it 'properly unescapes text' do
+    format_text = "You should check out my rad new site:
+      http://foo.com
+      It will blow your mind!"
+    UnescapingView.new(:format_text => format_text).render.should == file('unescaping_view')
+  end
+  
   describe 'variables' do
     it 'calls methods on passed objects' do
       user =  Hashie::Mash.new(:email => 'foo@example.com')

data/spec/performance/vs_erector.rb

@@ -10,7 +10,7 @@ require File.dirname(__FILE__) + "/../../lib/garterbelt"
 require File.dirname(__FILE__) + '/templates/garterbelt'
 require File.dirname(__FILE__) + '/templates/erector'
 
-TIMES = 10_000
+TIMES = 500_000
 
 RBench.run(TIMES) do
   column :garterbelt
@@ -27,13 +27,31 @@ RBench.run(TIMES) do
     garterbelt { GarterbeltTemplate.new(:user => user).render }
     erector { ErectorTemplate.new(:user => user).to_html }
   end
-  
-  report "Simple Page, class level rendering" do
-    garterbelt { GarterbeltTemplate.render(:user => user) }
-    erector { ErectorTemplate.new(:user => user).to_html }
-  end
 end
 
+# 4/13/2011, more stuff checking for 0.0.6
+# 10_000                           GARTERBELT | ERECTOR | PERCENT DIFFERENCE
+# --------------------------------------------------------------------------
+# Simple Page Initializing              0.178 |   0.170 | 4.5% slower
+# Simple Page Rendering                 6.971 |   6.613 | 5.1% slower
+#
+# 50_000                           GARTERBELT | ERECTOR | PERCENT DIFFERENCE
+# --------------------------------------------------------------------------
+# Simple Page Initializing              0.856 |   1.016 | 15.7% faster
+# Simple Page Rendering                34.804 |  33.547 | 3.6% slower
+#
+# 100_000                          GARTERBELT | ERECTOR | PERCENT DIFFERENCE
+# --------------------------------------------------------------------------
+# Simple Page Initializing              1.678 |   1.911 | 12% faster
+# Simple Page Rendering                69.654 |  67.422 | 3.2% slower
+# 
+# 500_0000                         GARTERBELT | ERECTOR | PERCENT DIFFERENCE
+# --------------------------------------------------------------------------
+# Simple Page Initializing              8.465 |   9.656 | 12.4% faster
+# Simple Page Rendering               350.409 | 338.026 | 3.5% slower
+
+
+
 # 4/13/2011, version 0.0.4, Removing RuPol from the lib, totally a flacid chick :(
 # more work on performance later
 #                                            GARTERBELT | ERECTOR |

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: garterbelt
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Kane Baccigalupi
@@ -241,12 +241,14 @@ files:
 - lib/view.rb
 - spec/garterbelt_spec.rb
 - spec/integration/expectations/general_view.html
+- spec/integration/expectations/unescaping_view.html
 - spec/integration/expectations/variables/view_with_user_and_params.html
 - spec/integration/expectations/variables/view_with_user_email.html
 - spec/integration/expectations/view_partial_nest.html
 - spec/integration/expectations/view_with_forms.html
 - spec/integration/expectations/view_with_tags.html
 - spec/integration/templates/form.rb
+- spec/integration/templates/unescaping_view.rb
 - spec/integration/templates/view_partial_nest.rb
 - spec/integration/templates/view_with_cache.rb
 - spec/integration/templates/view_with_forms.rb
@@ -312,6 +314,7 @@ summary: Garterbelt is a Ruby HTML/XML markup framework. It is san DSL. Just all
 test_files: 
 - spec/garterbelt_spec.rb
 - spec/integration/templates/form.rb
+- spec/integration/templates/unescaping_view.rb
 - spec/integration/templates/view_partial_nest.rb
 - spec/integration/templates/view_with_cache.rb
 - spec/integration/templates/view_with_forms.rb