erector 0.7.1 → 0.7.2

data/spec/erector/indentation_spec.rb

@@ -7,8 +7,8 @@ describe "indentation" do
     widget.instance_eval do 
       @prettyprint = true
     end
-    widget.newliney("i").should == false
-    widget.newliney("table").should == true
+    widget.send(:newliney?, "i").should == false
+    widget.send(:newliney?, "table").should == true
   end
 
   it "should not add newline for non-newliney tags" do

data/spec/erector/inline_spec.rb

@@ -1,51 +1,83 @@
 require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
-require 'benchmark'
-
-describe "passing in a block" do
-  describe Erector::Widget do
-    it "'s block is evaluated in the calling object's context" do
-      
-      @sample_instance_variable = "yum"
-      sample_bound_variable = "yay"
-      Erector::Widget.new do
-        @sample_instance_variable.should == "yum"
-        sample_bound_variable.should == "yay"
-        lambda {text "you can't call Erector methods from in here"}.should raise_error(NoMethodError)
-        # puts "uncomment this to prove this is being executed"
-      end.to_s
-      
-    end
+
+describe Erector::Widget do
+  it "provides access to instance variables from the calling context" do
+    @var = "yay"
+    Erector::Widget.new { @var.should == "yay"; @var = "yum" }.to_s
+    @var.should == "yum"
+  end
+
+  it "provides access to bound variables from the calling context" do
+    var = "yay"
+    Erector::Widget.new { var.should == "yay"; var = "yum" }.to_s
+    var.should == "yum"
+  end
+
+  it "doesn't provide access to Erector methods" do
+    Erector::Widget.new { lambda { text "yay" }.should raise_error(NoMethodError) }.to_s
+  end
+end
+
+describe Erector::Inline do
+  it "returns an InlineWidget" do
+    Erector.inline.should be_a_kind_of(Erector::InlineWidget)
+  end
+
+  it "doesn't provide access to instance variables from the calling context" do
+    @var = "yay"
+    Erector.inline { text @var }.to_s.should == ""
+  end
+
+  it "provides access to bound variables from the calling context" do
+    var = "yay"
+    Erector.inline { text var }.to_s.should == "yay"
+  end
+
+  it "provides access to explicit assigns" do
+    Erector.inline(:var => "yay") { text @var }.to_s.should == "yay"
   end
 
-  describe Erector::Inline do
-    it "'s block is evaluated in the widget's context" do
-      
-      @sample_instance_variable = "yum"
-      sample_bound_variable = "yay"
-      Erector.inline do
-        @sample_instance_variable.should be_nil
-        sample_bound_variable.should == "yay"
-        text "you can call Erector methods from in here"
-        # puts "uncomment this to prove this is being executed"
-      end.to_s
-      
+  it "provides access to methods from the calling context" do
+    def helper
+      "yay"
     end
+
+    Erector.inline { text helper }.to_s.should == "yay"
   end
-  
-  describe Erector::Mixin do
-    include Erector::Mixin
-    it "'s block is evaluated in the parent widget's context" do
-      
-      @sample_instance_variable = "yum"
-      sample_bound_variable = "yay"
-      erector do
-        @sample_instance_variable.should be_nil
-        sample_bound_variable.should == "yay"
-        text "you can call Erector methods from in here"
-        # puts "uncomment this to prove this is being executed"
+
+  describe "#call_block" do
+    it "calls the block with a pointer to self" do
+      x = Erector::InlineWidget.new do |y|
+        element "arg", y.object_id
+        element "self", self.object_id
       end
-      
+
+      # inside the block...
+      x.to_s.should == 
+        "<arg>#{x.object_id}</arg>" + # the argument is the child
+        "<self>#{x.object_id}</self>" # and self is also the child
+    end
+  end
+end
+
+describe Erector::Mixin do
+  include Erector::Mixin
+
+  it "doesn't provide access to instance variables from the calling context" do
+    @var = "yay"
+    erector { text @var }.should == ""
+  end
+
+  it "provides access to bound variables from the calling context" do
+    var = "yay"
+    erector { text var }.should == "yay"
+  end
+
+  it "provides access to methods from the calling context" do
+    def helper
+      "yay"
     end
+
+    erector { text helper }.should == "yay"
   end
-    
 end

data/spec/erector/mixin_spec.rb

@@ -2,15 +2,13 @@ require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
 require 'benchmark'
 
 module MixinSpec
-  class Thing
-    include Erector::Mixin
-  end
   
   describe Erector::Mixin do
     describe "#erector" do
       it "renders its block to a string" do
         
-        class MixinSpec::Thing
+        class Thing
+          include Erector::Mixin
           def name
             erector do
               span :class => "name" do
@@ -26,7 +24,8 @@ module MixinSpec
       end
       
       it "passes its parameters to to_s" do
-        class MixinSpec::Thing
+        class Thing
+          include Erector::Mixin
           def pretty_name
             erector(:prettyprint => true) do
               div :class => "name" do
@@ -49,6 +48,18 @@ module MixinSpec
         "  </ul>\n" +
         "</div>\n"
       end
+
+      it "passes its parameters to the widget too" do
+        class Thing
+          include Erector::Mixin
+          def foo
+            erector(:foo => "bar") do
+              div @foo
+            end
+          end
+        end
+        Thing.new.foo.should == "<div>bar</div>"
+      end
     end
   end
 end

data/spec/erector/widget_spec.rb

@@ -190,6 +190,40 @@ module WidgetSpec
           end
 
         end
+        
+        it "passes a pointer to the child object back into the parent object's block" do
+          child_widget = Erector::Widget.new
+          
+          class Parent < Erector::Widget 
+            needs :child_widget
+            def content
+              div do
+                widget @child_widget do |child|
+                  b child.dom_id
+                end
+              end
+            end
+          end
+          
+          Parent.new(:child_widget => child_widget).to_s.should == "<div><b>#{child_widget.dom_id}</b></div>"
+          
+        end
+        
+      end
+    end
+    
+    describe "#call_block" do
+      it "calls the block with a pointer to self" do
+        inside_arg = nil
+        inside_self = nil
+        x = Erector::Widget.new do |y|
+          inside_arg = y.object_id
+          inside_self = self.object_id
+        end
+        x.call_block
+        # inside the block...
+        inside_arg.should == x.object_id # the argument is the child
+        inside_self.should == self.object_id # and self is the parent
       end
     end
 
@@ -244,6 +278,14 @@ module WidgetSpec
         end
       end
 
+      context "with an empty array of CSS classes" do
+        it "does not emit a class attribute" do
+          Erector.inline do
+            element('div', :class => [])
+          end.to_s.should == "<div></div>"
+        end
+      end
+
       context "with many attributes" do
         it "alphabetize them" do
             Erector.inline do
@@ -441,17 +483,34 @@ module WidgetSpec
     end
 
     describe "#comment" do
-      it "emits an HTML comment" do
+      it "emits a single line comment when receiving a string" do
         Erector.inline do
           comment "foo"
-        end.to_s.should == "<!--foo-->"
+        end.to_s.should == "<!--foo-->\n"
       end
-      
+
+      it "emits a multiline comment when receiving a block" do
+        Erector.inline do
+          comment do
+            text "Hello"
+            text " world!"
+          end
+        end.to_s.should == "<!--\nHello world!\n-->\n"
+      end
+
+      it "emits a multiline comment when receiving a string and a block" do
+        Erector.inline do
+          comment "Hello" do
+            text " world!"
+          end
+        end.to_s.should == "<!--Hello\n world!\n-->\n"
+      end
+
       # see http://www.w3.org/TR/html4/intro/sgmltut.html#h-3.2.4
       it "does not HTML-escape character references" do
         Erector.inline do
           comment "&nbsp;"
-        end.to_s.should == "<!--&nbsp;-->"
+        end.to_s.should == "<!--&nbsp;-->\n"
       end
       
       # see http://www.w3.org/TR/html4/intro/sgmltut.html#h-3.2.4
@@ -460,10 +519,25 @@ module WidgetSpec
         capturing_output do
           Erector.inline do
             comment "he was -- awesome!"
-          end.to_s.should == "<!--he was -- awesome!-->"
+          end.to_s.should == "<!--he was -- awesome!-->\n"
         end.should == "Warning: Authors should avoid putting two or more adjacent hyphens inside comments.\n"
-      end     
-    end  
+      end
+
+      it "renders an IE conditional comment with endif when receiving an if IE" do
+        Erector.inline do
+          comment "[if IE]" do
+            text "Hello IE!"
+          end
+        end.to_s.should == "<!--[if IE]>\nHello IE!\n<![endif]-->\n"
+      end
+
+      it "doesn't render an IE conditional comment if there's just some text in brackets" do
+        Erector.inline do
+          comment "[puppies are cute]"
+        end.to_s.should == "<!--[puppies are cute]-->\n"
+      end
+
+    end
 
     describe "#nbsp" do
       it "turns consecutive spaces into consecutive non-breaking spaces" do
@@ -590,6 +664,37 @@ module WidgetSpec
       end
     end
 
+    describe 'escaping' do
+      plain = 'if (x < y && x > z) alert("don\'t stop");'
+      escaped = "if (x &lt; y &amp;&amp; x &gt; z) alert(&quot;don't stop&quot;);"
+
+      describe "#text" do
+        it "does HTML escape its param" do
+          Erector.inline { text plain }.to_s.should == escaped
+        end
+      end
+      describe "#rawtext" do
+        it "doesn't HTML escape its param" do
+          Erector.inline { rawtext plain }.to_s.should == plain
+        end
+      end
+      describe "#text!" do
+        it "doesn't HTML escape its param" do
+          Erector.inline { text! plain }.to_s.should == plain
+        end
+      end
+      describe "#element" do
+        it "does HTML escape its param" do
+          Erector.inline { element "foo", plain }.to_s.should == "<foo>#{escaped}</foo>"
+        end
+      end
+      describe "#element!" do
+        it "doesn't HTML escape its param" do
+          Erector.inline { element! "foo", plain }.to_s.should == "<foo>#{plain}</foo>"
+        end
+      end
+    end
+
     describe "#javascript" do
       context "when receiving a block" do
         it "renders the content inside of script text/javascript tags" do
@@ -662,6 +767,45 @@ module WidgetSpec
           css "erector.css"
         end.to_s.should == "<link href=\"erector.css\" rel=\"stylesheet\" type=\"text/css\" />"
       end
+
+      it "accepts a media attribute" do
+        Erector.inline do
+          css "print.css", :media => "print"
+        end.to_s.should == "<link href=\"print.css\" media=\"print\" rel=\"stylesheet\" type=\"text/css\" />"
+      end
+    end
+
+    describe "#to_text" do
+      it "strips tags" do
+        Erector.inline do
+          div "foo"
+        end.to_text.should == "foo"
+      end
+
+      it "unescapes named entities" do
+        s = "my \"dog\" has fleas & <ticks>"
+        Erector.inline do
+          text s
+        end.to_text.should == s
+      end
+
+      it "ignores >s inside attribute strings" do
+        Erector.inline do
+          a "foo", :href => "http://example.com/x>y"
+        end.to_text.should == "foo"
+      end
+
+      it "doesn't inherit unwanted pretty-printed whitespace (i.e. it turns off prettyprinting)" do
+        old_default = Erector::Widget.new.prettyprint_default
+        begin
+          Erector::Widget.prettyprint_default = true
+          Erector.inline do
+            div { div { div "foo" } }
+          end.to_text.should == "foo"
+        ensure
+          Erector::Widget.prettyprint_default = old_default
+        end
+      end
     end
 
     describe "#url" do
@@ -670,6 +814,12 @@ module WidgetSpec
           url "http://example.com"
         end.to_s.should == "<a href=\"http://example.com\">http://example.com</a>"
       end
+
+      it "accepts extra attributes" do
+        Erector.inline do
+          url "http://example.com", :onclick=>"alert('foo')"
+        end.to_s.should == "<a href=\"http://example.com\" onclick=\"alert('foo')\">http://example.com</a>"
+      end
     end
 
     describe '#capture' do
@@ -685,6 +835,14 @@ module WidgetSpec
         widget.to_s.should == '<div><p>Captured Content</p></div>'
       end
 
+      it "returns a RawString" do
+        captured = nil
+        Erector.inline do
+          captured = capture {}
+        end.to_s.should == ""
+        captured.should be_a_kind_of Erector::RawString
+      end
+
       it "works with nested captures" do
         widget = Erector.inline do
           captured = capture do
@@ -888,5 +1046,24 @@ module WidgetSpec
         Erector.inline { close_tag :foo; close_tag :bar }.to_s.should == "</foo></bar>"
       end
     end
+    
+    describe "#dom_id" do
+      class NiceWidget < Erector::Widget
+        def content
+          div :id => dom_id
+        end
+      end
+
+      it "makes a unique id based on the widget's class name and object id" do
+        widget = NiceWidget.new
+        widget.dom_id.should include("#{widget.object_id}")
+        widget.dom_id.should include("NiceWidget")
+      end
+      
+      it "can be used as an HTML id" do
+        widget = NiceWidget.new
+        widget.to_s.should == "<div id=\"#{widget.dom_id}\"></div>"
+      end
+    end
   end
 end

data/spec/erector/widgets/form_spec.rb

@@ -0,0 +1,31 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../../spec_helper")
+
+describe Form do
+
+  include Erector::Mixin
+
+  it "defaults to POST, with no magic hidden method param" do
+    Form.new(:action => "/foo").to_s.should == "<form action=\"/foo\" method=\"post\"></form>"
+  end
+
+  it "works plainly with GET too" do
+    Form.new(:action => "/foo", :method => "get").to_s.should == "<form action=\"/foo\" method=\"get\"></form>"
+  end
+  
+  it "uses POST and adds a magic hidden field with a _method param for DELETE" do
+    Form.new(:action => "/foo", :method => "delete").to_s.should == 
+      "<form action=\"/foo\" method=\"post\">"+
+      "<input name=\"_method\" type=\"hidden\" value=\"delete\" />"+
+      "</form>"
+  end
+
+  it "executes its block in the caller's 'self' context" do
+    erector {
+      @pet = "dog"
+      widget(Form.new(:action => "/foo") do
+        p @pet
+      end)  
+    }.should == "<form action=\"/foo\" method=\"post\"><p>dog</p></form>"
+  end
+
+end