erector 0.3.105 → 0.3.110

data/lib/erector.rb

@@ -12,5 +12,5 @@ require "erector/widgets"
 ##
 # Erector view framework
 module Erector
-  VERSION = "0.3.105"
+  VERSION = "0.3.110"
 end

data/lib/erector/extensions/action_view_template_handler.rb

@@ -25,6 +25,8 @@ module ActionView #:nodoc:
           full_path = "#{view_path}/#{template_path}.rb"
           if File.exists?(full_path)
             require_dependency full_path
+            found = true
+            break
           else
             partial_file_path = full_path.gsub(/\/([^\/]*)$/, '/_\1')
             if File.exists?(partial_file_path)
@@ -61,3 +63,4 @@ ActionView::Base.instance_eval do
     register_template_handler :rb, ActionView::TemplateHandlers::Erector
   end
 end
+# ActionMailer::Base.register_template_extension('rb')

data/lib/erector/helpers.rb

@@ -47,8 +47,6 @@ module Erector
     # return text, take block
     [
       :link_to_function,
-      :form_for, 
-      :form_tag, 
       :text_field_tag, 
       :password_field_tag, 
       :check_box_tag
@@ -63,7 +61,9 @@ module Erector
 
     # render text, take block
     [
-      :error_messages_for, 
+      :error_messages_for,
+      :form_tag, 
+      :form_for,
     ].each do |method_to_proxy_with_block|
       method_def =<<-METHOD_DEF
       def #{method_to_proxy_with_block}(*args, &block)

data/lib/erector/widget.rb

@@ -312,20 +312,24 @@ protected
       # override concat on the helpers object (which is usually a Rails view object)
       unless @helpers.respond_to?(:concat_without_erector)
         @helpers.metaclass.class_eval do
-#          alias_method :capture_without_erector, :capture
-#          define_method :capture do |*args|
-#            result = nil
-#            widget = @erector_widget_stack.first
-#            begin
-#              original_doc = widget.doc
-#              widget.doc = HtmlParts.new
-#              capture_without_erector(*args)
-#              result = raw(widget.doc.to_s)
-#            ensure
-#              widget.doc = original_doc
-#            end
-#            result
-#          end
+          alias_method :capture_without_erector, :capture
+          def capture(*args, &block)
+            result = nil
+            widget = @erector_widget_stack.first
+            begin
+              original_doc = widget.doc
+              widget.instance_eval do
+                @doc = HtmlParts.new
+              end
+              captured = capture_without_erector(*args, &block)
+              result = widget.raw(widget.doc.to_s)
+            ensure
+              widget.instance_eval do
+                @doc = original_doc
+              end
+            end
+            result
+          end
 
           alias_method :concat_without_erector, :concat
           define_method :concat do |*args|

data/spec/erector/rails_helpers_spec.rb

@@ -23,76 +23,78 @@ module RailsHelpersSpec
       @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
+    describe "returning raw text" do
+      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 "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
+      it "define_javascript_functions" do
+        class Erector::TestWidget < Erector::Widget
+          def render
+            define_javascript_functions
+          end
         end
-      end      
-      @controller.render :widget => Erector::TestWidget
-      @response.body.should =~ /^<script type=\"text\/javascript\">\n/
-    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
+      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
+      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" 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") + ";"
+      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
+      end
 
+      #Note: "text_field_with_auto_complete" is now a plugin, which makes it difficult to test inside the Erector project
+    end
+    
     # :link_to_function,
     # :link_to,
     # :link_to_remote,

data/spec/rails/standard_helpers_spec.rb

@@ -34,12 +34,13 @@ describe "a view" do
     end
 
     it "renders error messages" do
-      pending("error_messages_for is broken")
+     pending("error_messages_for is broken") do
       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
     
   end
@@ -63,7 +64,6 @@ describe "a view" do
   end
 
   it "renders non-forgery-protected forms via form_tag" do
-    pending("needs ActionView::capture to work")
     class << @view
       def protect_against_forgery?
         false
@@ -78,7 +78,6 @@ describe "a view" do
   end
 
   it "renders forgery-protected forms via form_tag" do
-    pending("needs ActionView::capture to work")
     class << @view
       def protect_against_forgery?
         true
@@ -94,9 +93,7 @@ describe "a view" do
     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>"

data/spec/spec_helper.rb

@@ -19,3 +19,22 @@ module Views
   module TemplateHandlerSpec
   end
 end
+
+
+# uncomment this to find leftover debug putses
+#
+# alias :original_puts :puts
+# def puts(string ="")
+#   super string.to_s + "\s(#{caller.first.match(/(\w+\.\w+:\d+)|Rakefile:\d+/)[0]})"
+# end
+# 
+# alias :original_p :p
+# def p(string="")
+#   original_puts "\s(#{caller.first.match(/(\w+\.\w+:\d+)|Rakefile:\d+/)[0]})"
+#   super(string)
+# end
+# 
+# alias :original_print :print
+# def print(string="")
+#   super string + "\s(#{caller.first.match(/(\w+\.\w+:\d+)|Rakefile:\d+/)[0]})"
+# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: erector
 version: !ruby/object:Gem::Version 
-  version: 0.3.105
+  version: 0.3.110
 platform: ruby
 authors: 
 - Pivotal Labs