erector 0.2.83 → 0.3.105

data/lib/erector/widgets/table.rb

@@ -1,5 +1,5 @@
 module Erector
-  module Widgets
+  module Widgets #:nodoc:
     class Table < Erector::Widget
       ColumnDefinition = Struct.new(:id, :name, :cell_proc)
       class << self

data/spec/erect/erect_spec.rb

@@ -137,9 +137,12 @@ module Erector
       mr_slate_rb = "#{dir}/mr_slate.rb"
       mr_slate_html = "#{dir}/mr_slate.html"
       create(mr_slate_rb, "class MrSlate\nend")
-      erect = Erect.new(["--to-html", mr_slate_rb])
+      erect = Erect.new(["-q", "--to-html", mr_slate_rb])
       erect.run
       File.exist?(mr_slate_html).should be_false
     end
+    
+    it "properly indents lines beginning with for, unless, etc."
+    it "escapes single quotes inside text strings"
   end
 end

data/spec/erect/rhtml_parser_spec.rb

@@ -246,10 +246,10 @@ describe RhtmlParser do
   end
 
   it "parses some scaffolding" do
-    parse("""<p>
+    parse("<p>
   <b>Name:</b>
   <%=h @foo.name %>
-</p>""").convert.should ==
+</p>").convert.should ==
       "p do\n" +
       "  b do\n" +
       "    text 'Name:'\n" +
@@ -259,7 +259,7 @@ describe RhtmlParser do
   end
 
   it "parses edit.erb.html" do
-    parse("""<h1>Editing foo</h1>
+    parse("<h1>Editing foo</h1>
 
 <%= error_messages_for :foo %>
 
@@ -281,11 +281,11 @@ describe RhtmlParser do
 
 <%= link_to 'Show', @foo %> |
 <%= link_to 'Back', foos_path %>
-""")
+")
   end
 
   it "parses show.html.erb" do
-    parse("""<p>
+    parse("<p>
   <b>Name:</b>
   <%=h @foo.name %>
 </p>
@@ -298,7 +298,7 @@ describe RhtmlParser do
 
 <%= link_to 'Edit', edit_foo_path(@foo) %> |
 <%= link_to 'Back', foos_path %>
-""")
+")
   end
 
   it "does meta" do

data/spec/erector/extensions/template_handler_spec.rb

@@ -0,0 +1,29 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../../spec_helper")
+
+module TemplateHandlerSpec
+  
+  class TemplateHandlerSpecController < ActionController::Base
+  end
+  
+  describe ActionView::TemplateHandlers::Erector do
+
+    before do
+      @controller = TemplateHandlerSpecController.new
+      @request = ActionController::TestRequest.new
+      @response = ActionController::TestResponse.new
+      @controller.send(:initialize_template_class, @response)
+      @controller.send(:assign_shortcuts, @request, @response)
+      class << @controller
+        public :rendered_widget, :render
+      end
+      @controller.append_view_path("#{RAILS_ROOT}/app/views")
+    end
+
+    it "assigns locals" do
+      handler = ActionView::TemplateHandlers::Erector.new(@controller)
+      handler.render("class Views::TemplateHandlerSpec::TestPartial", {:foo => "bar"}).should == 
+        "<div class=\"partial\">bar</div>"
+    end
+  end
+
+end

data/spec/erector/rails_helpers_spec.rb

@@ -0,0 +1,147 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+require 'ostruct'
+  
+module RailsHelpersSpec
+  
+  class RailsHelpersSpecController < ActionController::Base
+  end
+  
+  describe "Rails helpers" do
+
+    before do
+      @controller = RailsHelpersSpecController.new
+      @request = ActionController::TestRequest.new
+      @response = ActionController::TestResponse.new
+      @controller.send(:initialize_template_class, @response)
+      @controller.send(:assign_shortcuts, @request, @response)
+      @controller.send(:initialize_current_url)
+      class << @controller
+        public :rendered_widget, :render
+        
+        attr_accessor :user # dummy instance variable for assigns testing
+      end
+      @controller.append_view_path("#{RAILS_ROOT}/app/views")
+    end
+
+    it "image_tag" do
+      class Erector::TestWidget < Erector::Widget
+        def render
+          image_tag("rails.png")
+        end
+      end      
+      @controller.render :widget => Erector::TestWidget
+      @response.body.should == "<img alt=\"Rails\" src=\"/images/rails.png\" />"
+    end
+
+    it "javascript_include_tag" do
+      class Erector::TestWidget < Erector::Widget
+        def render
+          javascript_include_tag("rails")
+        end
+      end      
+      @controller.render :widget => Erector::TestWidget
+      @response.body.should == "<script src=\"/javascripts/rails.js\" type=\"text/javascript\"></script>"
+    end
+    
+    it "define_javascript_functions" do
+      class Erector::TestWidget < Erector::Widget
+        def render
+          define_javascript_functions
+        end
+      end      
+      @controller.render :widget => Erector::TestWidget
+      @response.body.should =~ /^<script type=\"text\/javascript\">\n/
+    end
+    
+    it "stylesheet_link_tag" do
+      class Erector::TestWidget < Erector::Widget
+        def render
+          stylesheet_link_tag("rails")
+        end
+      end      
+      @controller.render :widget => Erector::TestWidget
+      @response.body.should == "<link href=\"/stylesheets/rails.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />"
+    end
+
+    def sortable_js_for(element_id, url)
+      "Sortable.create(\"#{element_id}\", {onUpdate:function(){new Ajax.Request('#{url}', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize(\"#{element_id}\")})}})"
+    end
+
+    it "sortable_element" do
+      class Erector::TestWidget < Erector::Widget
+        def render
+          sortable_element("rails", :url => "/foo")
+        end
+      end      
+      @controller.render :widget => Erector::TestWidget
+      @response.body.should == 
+        "<script type=\"text/javascript\">\n//<![CDATA[\n" + 
+        sortable_js_for("rails", "/foo") +
+        "\n//]]>\n</script>"
+    end
+
+    it "sortable_element_js" do
+      class Erector::TestWidget < Erector::Widget
+        def render
+          sortable_element_js("rails", :url => "/foo")
+        end
+      end      
+      @controller.render :widget => Erector::TestWidget
+      @response.body.should == sortable_js_for("rails", "/foo") + ";"
+      
+    end
+
+    #Note: "text_field_with_auto_complete" is now a plugin, which makes it difficult to test inside the Erector project
+
+    # :link_to_function,
+    # :link_to,
+    # :link_to_remote,
+    # :mail_to,
+    # :button_to,
+    # :submit_tag,
+
+    describe "which html-escape their first parameter:" do
+      it "link_to_function with name" do
+        class Erector::TestWidget < Erector::Widget
+          def render
+            link_to_function("hi", "alert('hi')")
+          end
+        end      
+        @controller.render :widget => Erector::TestWidget
+        @response.body.should == "<a href=\"#\" onclick=\"alert('hi'); return false;\">hi</a>"
+      end
+
+      it "link_to_function with block" do
+        class Erector::TestWidget < Erector::Widget
+          def render
+            link_to_function("Show me more", nil, :id => "more_link") do |page|
+              page[:details].visual_effect  :toggle_blind
+              page[:more_link].replace_html "Show me less"
+            end
+          end
+        end
+        @controller.render :widget => Erector::TestWidget
+        @response.body.should == "<a href=\"#\" id=\"more_link\" onclick=\"$(&quot;details&quot;).visualEffect(&quot;toggle_blind&quot;);\n$(&quot;more_link&quot;).update(&quot;Show me less&quot;);; return false;\">Show me more</a>"
+      end
+    end
+
+    describe "which render to the ERB stream:" do
+      it "error_messages for, with object name" do
+        pending("error_messages_for is broken")
+        class Erector::TestWidget < Erector::Widget
+          def render
+            error_messages_for 'user'
+          end
+        end
+        errors = ActiveRecord::Errors.new(nil)
+        errors.add("name", "must be unpronounceable")
+        @controller.user = OpenStruct.new({:name => 'bob', :errors => errors})
+        @controller.render :widget => Erector::TestWidget
+        @response.body.should == "<a href=\"#\" onclick=\"alert('hi'); return false;\">hi</a>"
+      end
+    end
+
+  end
+  
+
+end

data/spec/erector/widget_spec.rb

@@ -266,6 +266,18 @@ module WidgetSpec
 if (x < y && x > z) alert("don't stop");
 // ]]>
 </script>
+EXPECTED
+      end
+      
+      it "renders the raw content inside script tags when given text" do
+        Erector::Widget.new do
+          javascript('alert("&<>\'hello");')
+        end.to_s.should == <<EXPECTED
+<script type="text/javascript">
+// <![CDATA[
+alert("&<>'hello");
+// ]]>
+</script>
 EXPECTED
       end
 
@@ -304,6 +316,22 @@ EXPECTED
       end
 
     end
+    
+    describe "#css" do
+      it "makes a link when passed a string" do
+        Erector::Widget.new do
+          css "erector.css"
+        end.to_s.should == "<link href=\"erector.css\" rel=\"stylesheet\" type=\"text/css\" />"
+      end
+    end
+    
+    describe "#url" do
+      it "renders an anchor tag with the same href and text" do
+        Erector::Widget.new do
+          url "http://example.com"
+        end.to_s.should == "<a href=\"http://example.com\">http://example.com</a>"
+      end
+    end
 
     describe '#capture' do
       it "should return content rather than write it to the buffer" do
@@ -374,5 +402,48 @@ EXPECTED
         Parent.new.to_s.should == '123'
       end
     end
+    
+    describe '#render_to' do
+      class A < Erector::Widget
+        def render
+          p "A"
+        end
+      end
+
+      it "renders to a doc" do
+        class B < Erector::Widget
+          def render
+            text "B"
+            A.new.render_to(@doc)
+            text "B"
+          end
+        end
+        b = B.new
+        b.to_s.should == "B<p>A</p>B"
+        b.doc.size.should == 5  # B, <p>, A, </p>, B
+      end
+      
+      it "renders to a widget's doc" do
+        class B < Erector::Widget
+          def render
+            text "B"
+            A.new.render_to(self)
+            text "B"
+          end
+        end
+        b = B.new
+        b.to_s.should == "B<p>A</p>B"
+        b.doc.size.should == 5  # B, <p>, A, </p>, B
+      end
+      
+      it "passing a widget to text method renders it" do
+        Erector::Widget.new() do
+          text "B"
+          text A.new()
+          text "B"
+        end.to_s.should == "B<p>A</p>B"
+      end
+
+    end
   end
 end

data/spec/rails/standard_helpers_spec.rb

@@ -0,0 +1,105 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe "a view" do
+  before(:each) do
+    @view = ActionView::Base.new
+    # hook in model and add error messages
+  end
+
+  describe "with errors" do
+    before(:each) do
+      class DummyView < ActionView::Base
+        attr_accessor :model
+      end
+
+      class DummyModel
+        # not sure what the best way is to mock out a model without
+        # needing a database.  But here's my attempt.
+        attr_accessor :errors
+
+        def self.human_attribute_name(attribute)
+          attribute.to_s.capitalize
+        end
+      end
+      
+      @view = DummyView.new()
+      model = DummyModel.new()
+      model.errors = ActiveRecord::Errors.new(model)
+      model.errors.add(:field, 'too silly')
+      @view.model = model
+    end
+    
+    it "was set up correctly" do
+      @view.model.errors.full_messages.join(',').should == "Field too silly"
+    end
+
+    it "renders error messages" do
+      pending("error_messages_for is broken")
+      message = Erector::Widget.new(@view) do
+        error_messages_for(:model)
+      end.to_s
+      message.should include("too silly")
+      message.should include("1 error")
+    end
+    
+  end
+
+  it "renders links" do
+    Erector::Widget.new(@view) do
+      link_to 'This&that', '/foo?this=1&amp;that=1'
+    end.to_s.should == "<a href=\"/foo?this=1&amp;that=1\">This&amp;that</a>"
+  end
+
+  it "#image_tag" do
+    Erector::Widget.new(@view) do
+      image_tag("/foo")
+    end.to_s.should == %{<img alt="Foo" src="/foo" />}
+  end
+
+  it "#image_tag with parameters" do
+    Erector::Widget.new(@view) do
+      image_tag("/foo", :id => "photo_foo", :class => "a_photo_class")
+    end.to_s.should == %{<img alt="Foo" class="a_photo_class" id="photo_foo" src="/foo" />}
+  end
+
+  it "renders non-forgery-protected forms via form_tag" do
+    pending("needs ActionView::capture to work")
+    class << @view
+      def protect_against_forgery?
+        false
+      end
+    end
+
+    Erector::Widget.new(@view) do
+      form_tag("/foo") do
+        p "I'm in a form"
+      end
+    end.to_s.should == "<form action=\"/foo\" method=\"post\"><p>I'm in a form</p></form>"
+  end
+
+  it "renders forgery-protected forms via form_tag" do
+    pending("needs ActionView::capture to work")
+    class << @view
+      def protect_against_forgery?
+        true
+      end
+
+      def request_forgery_protection_token
+
+      end
+
+      def form_authenticity_token
+        "token"
+      end
+    end
+
+    Erector::Widget.new(@view) do
+      puts "starting"
+      form_tag("/foo") do
+        puts "start of block"
+        p "I'm in a form"
+      end
+    end.to_s.should == "<form action=\"/foo\" method=\"post\"><div style=\"margin:0;padding:0\"><input name=\"\" type=\"hidden\" value=\"token\" /></div><p>I'm in a form</p></form>"
+  end
+end
+

data/spec/rails/view_spec.rb

@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe "a view" do
+  before(:each) do
+    @view = ActionView::Base.new
+    # hook in model and add error messages
+  end
+
+  it "can capture with an erector block" do
+    pending("needs some re-work (maybe how haml does it?)")
+    message = Erector::Widget.new(@view) do
+      captured = @helpers.capture do
+        h1 'capture me!'
+      end
+      captured.should == "<h1>capture me!</h1>"
+    end.to_s.should == ""
+  end
+
+end
+
+describe "the case which fake_erbout handles" do
+  it "works" do
+    @view = ActionView::Base.new
+    Erector::Widget.new(@view) do
+      foo = capture() do
+        fake_erbout do
+          helpers.concat('foo')
+        end
+      end
+      foo.should == 'foo'
+    end.to_s.should == ""
+  end
+end