markaby 0.6.9 → 0.6.10

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+= 0.6.10
+
+* Rails fixes for form_for + content_for
+
 = 0.6.9
 
 * Bug fix for url_for.  Previously, you'd need to capture { *_path } instead of

data/Markaby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{markaby}
-  s.version = "0.6.9"
+  s.version = "0.6.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["_why", "Tim Fletcher", "John Barton", "spox", "smtlaissezfaire"]
-  s.date = %q{2010-08-03}
+  s.date = %q{2010-08-13}
   s.description = %q{Tim Fletcher and _why's ruby driven HTML templating system}
   s.email = %q{scott@railsnewbie.com}
   s.extra_rdoc_files = [
@@ -41,11 +41,13 @@ Gem::Specification.new do |s|
      "spec/markaby/markaby_other_static.mab",
      "spec/markaby/markaby_spec.rb",
      "spec/markaby/rails/spec_helper.rb",
+     "spec/markaby/rails/views/layouts/layout.mab",
      "spec/markaby/rails/views/markaby/_a_partial.mab",
      "spec/markaby/rails/views/markaby/_partial_child_with_locals.mab",
      "spec/markaby/rails/views/markaby/access_to_helpers.mab",
      "spec/markaby/rails/views/markaby/broken.mab",
      "spec/markaby/rails/views/markaby/correct_template_values.mab",
+     "spec/markaby/rails/views/markaby/double_output.mab",
      "spec/markaby/rails/views/markaby/form_for.mab",
      "spec/markaby/rails/views/markaby/form_for_with_fields.mab",
      "spec/markaby/rails/views/markaby/form_for_with_multiple_fields.mab",
@@ -58,6 +60,10 @@ Gem::Specification.new do |s|
      "spec/markaby/rails/views/markaby/render_with_ivar.mab",
      "spec/markaby/rails/views/markaby/renders_erb.rhtml",
      "spec/markaby/rails/views/markaby/routes.mab",
+     "spec/markaby/rails/views/markaby/yielding.mab",
+     "spec/markaby/rails/views/markaby/yielding_content_for_with_block_helper.mab",
+     "spec/markaby/rails/views/markaby/yielding_two.mab",
+     "spec/markaby/rails/views/markaby/yielding_with_content_for.mab",
      "spec/markaby/rails_spec.rb",
      "spec/markaby/rails_version_spec.rb",
      "spec/markaby/tilt/erb.erb",

data/VERSION

@@ -1 +1 @@
-0.6.9
+0.6.10

data/lib/markaby/rails/current.rb

@@ -40,6 +40,16 @@ module Markaby
         end
       end
     end
+
+    module CaptureHelper
+      def capture(*args, &block)
+        if output_buffer.kind_of?(Markaby::Builder)
+          output_buffer.capture(&block)
+        else
+          super
+        end
+      end
+    end
   end
 end
 
@@ -54,8 +64,6 @@ end
 #
 # String === options
 #
-# We prefer to override url_for rather than String#===
-#
 ActionView::Helpers::UrlHelper.class_eval do
   alias_method :url_for_aliased_by_markaby, :url_for
 
@@ -71,4 +79,8 @@ ActionView::Helpers::UrlHelper.class_eval do
   end
 end
 
+ActionView::Base.class_eval do
+  include Markaby::Rails::CaptureHelper
+end
+
 ActionView::Template.register_template_handler(:mab, Markaby::Rails::TemplateHandler)

data/lib/markaby/rails/rails_builder.rb

@@ -2,13 +2,36 @@ module Markaby
   module Rails
     class RailsBuilder < Markaby::Builder
       def form_for(*args, &block)
+        @_helper.output_buffer = OutputBuffer.new
+
         @template.form_for(*args) do |__form_for_variable|
-          yield(FormHelperProxy.new(self, __form_for_variable))
+          # flush <form tags> + switch back to markaby
+          text(@_helper.output_buffer)
+          @_helper.output_buffer = self
+
+          yield FormHelperProxy.new(@_helper, __form_for_variable)
+
+          # switch back to output string output buffer and flush
+          # final </form> tag
+          @_helper.output_buffer = OutputBuffer.new
         end
+        text(@_helper.output_buffer)
+
+        # finally, switch back to our regular buffer
+        @_helper.output_buffer = self
       end
 
       alias_method :safe_concat, :concat
 
+      # Rails 2.3.6 calls safe_concat on the output buffer.
+      # Future versions of rails alias safe_concat to concat on the core
+      # class String.
+      #
+      # Obviously, that's a bad idea.  Thanks a ton, Rails.
+      class OutputBuffer < String
+        alias_method :safe_concat, :concat
+      end
+
       # This is used for the block variable given to form_for.  Typically, an erb template looks as so:
       #
       #   <% form_for :foo do |f|
@@ -30,8 +53,8 @@ module Markaby
       #     f.text_field :bar
       #   end
       class FormHelperProxy
-        def initialize(builder, proxied_object)
-          @builder = builder
+        def initialize(view, proxied_object)
+          @view           = view
           @proxied_object = proxied_object
         end
 
@@ -43,8 +66,7 @@ module Markaby
 
         def method_missing(sym, *args, &block)
           result = @proxied_object.__send__(sym, *args, &block)
-          @builder.text(result) if result.is_a?(String)
-          result
+          @view.concat(result)
         end
       end
     end

data/spec/markaby/rails/views/layouts/layout.mab

@@ -0,0 +1,11 @@
+div :id => "main" do
+  yield
+end
+
+str = yield(:foo)
+
+unless str.blank?
+  div :id => "foo" do
+    str
+  end
+end

data/spec/markaby/rails/views/markaby/double_output.mab

@@ -0,0 +1,8 @@
+content_for :foo do
+  form_for :foo do |f|
+    p :class => "foo" do
+      f.text_field :foo
+      f.submit "foo"
+    end
+  end
+end

data/spec/markaby/rails/views/markaby/routes.mab

@@ -1 +1 @@
-link_to "Foo", new_user_path
+link_to("Foo", new_user_path)

data/spec/markaby/rails/views/markaby/yielding.mab

@@ -0,0 +1,3 @@
+p :class => "hey" do
+  "hi there"
+end

data/spec/markaby/rails/views/markaby/yielding_content_for_with_block_helper.mab

@@ -0,0 +1,5 @@
+content_for :foo do
+  form_for :foo do |f|
+    f.text_field :foo
+  end
+end

data/spec/markaby/rails/views/markaby/yielding_two.mab

@@ -0,0 +1,7 @@
+p :class => "hi" do
+  "hi there"
+end
+
+p :class => "hi" do
+  "hi again"
+end

data/spec/markaby/rails/views/markaby/yielding_with_content_for.mab

@@ -0,0 +1,3 @@
+content_for :foo do
+  p "in foo content_for"
+end

data/spec/markaby/rails_spec.rb

@@ -115,6 +115,41 @@ if RUNNING_RAILS
 
     def routes
     end
+
+    def render_with_yielding
+      render :layout   => "layout.mab",
+             :template => "markaby/yielding"
+    end
+
+    def render_with_yielding_where_template_has_two_elements
+      render :layout   => "layout.mab",
+             :template => "markaby/yielding_two"
+    end
+
+    def render_with_yielding_content_for_block
+      render :layout   => "layout.mab",
+             :template => "markaby/yielding_with_content_for"
+    end
+
+    def render_content_for_with_block_helper
+      @obj = Object.new
+      def @obj.foo
+        "bar"
+      end
+
+      render :layout   => "layout.mab",
+             :template => "markaby/yielding_content_for_with_block_helper"
+    end
+
+    def renders_content_for_with_form_for_without_double_render
+      @obj = Object.new
+      def @obj.foo
+        "bar"
+      end
+
+      render :layout   => "layout.mab",
+             :template => "markaby/double_output"
+    end
   end
 
   class MarkabyOnRailsTest < ActionController::TestCase
@@ -212,43 +247,98 @@ if RUNNING_RAILS
              @controller.last_exception.message.to_s
     end
 
-    def test_renders_form_for_properly
-      get :renders_form_for
-
+    def test_routes_work
+      get :routes
       assert_response :success
 
-      assert %r(<form.*></form>) =~ @response.body
+      expected_output = "<a href=\"/users/new\">Foo</a>"
+      assert_equal expected_output, @response.body
     end
 
-    def test_renders_form_for_with_fields_for
-      get :render_form_for_with_fields
+    if Rails::VERSION::MAJOR >= 2
+      def test_renders_form_for_properly
+        get :renders_form_for
 
-      assert_response :success
+        assert_response :success
 
-      assert_equal "<form action=\"/markaby/render_form_for_with_fields\" method=\"post\"><input id=\"foo_foo\" name=\"foo[foo]\" size=\"30\" type=\"text\" /></form>",
-                   @response.body
-    end
+        assert %r(<form.*></form>) =~ @response.body
+      end
 
-    def test_renders_form_for_with_multiple_fields
-      get :render_form_for_with_multiple_fields
+      def test_renders_form_for_with_fields_for
+        get :render_form_for_with_fields
 
-      assert_response :success
+        assert_response :success
 
-      expected_output =  "<form action=\"/markaby/render_form_for_with_multiple_fields\" method=\"post\">"
-      expected_output << "<input id=\"foo_foo\" name=\"foo[foo]\" size=\"30\" type=\"text\" />"
-      expected_output << "<input id=\"foo_baz\" name=\"foo[baz]\" size=\"30\" type=\"text\" />"
-      expected_output << "</form>"
+        assert_equal "<form action=\"/markaby/render_form_for_with_fields\" method=\"post\"><input id=\"foo_foo\" name=\"foo[foo]\" size=\"30\" type=\"text\" /></form>",
+                     @response.body
+      end
 
-      assert_equal expected_output,
-                   @response.body
-    end
+      def test_renders_form_for_with_multiple_fields
+        get :render_form_for_with_multiple_fields
 
-    def test_routes_work
-      get :routes
-      assert_response :success
+        assert_response :success
 
-      expected_output = "<a href=\"/users/new\">Foo</a>"
-      assert_equal expected_output, @response.body
+        expected_output =  "<form action=\"/markaby/render_form_for_with_multiple_fields\" method=\"post\">"
+        expected_output << "<input id=\"foo_foo\" name=\"foo[foo]\" size=\"30\" type=\"text\" />"
+        expected_output << "<input id=\"foo_baz\" name=\"foo[baz]\" size=\"30\" type=\"text\" />"
+        expected_output << "</form>"
+
+        assert_equal expected_output,
+                     @response.body
+      end
+
+      def test_rendering_with_yield_works
+        get :render_with_yielding
+        assert_response :success
+
+        expected_output = '<div id="main"><p class="hey">hi there</p></div>'
+        assert_equal expected_output, @response.body
+      end
+
+      def test_render_with_yielding_where_template_has_two_elements
+        get :render_with_yielding_where_template_has_two_elements
+        assert_response :success
+
+        expected_output = '<div id="main"><p class="hi">hi there</p><p class="hi">hi again</p></div>'
+        assert_equal expected_output, @response.body
+      end
+
+      def test_render_with_yielding_content_for_block
+        get :render_with_yielding_content_for_block
+        assert_response :success
+
+        expected_output = '<div id="main"></div><div id="foo"><p>in foo content_for</p></div>'
+        assert_equal expected_output, @response.body
+      end
+
+      def test_render_content_for_with_block_helper
+        get :render_content_for_with_block_helper
+        assert_response :success
+
+        expected_output = '<div id="main"></div><div id="foo">'
+        expected_output << '<form action="/markaby/render_content_for_with_block_helper" method="post">'
+        expected_output << '<input id="foo_foo" name="foo[foo]" size="30" type="text" />'
+        expected_output << '</form>'
+        expected_output << '</div>'
+
+        assert_equal expected_output, @response.body
+      end
+
+      def test_renders_content_for_with_form_for_without_double_render
+        get :renders_content_for_with_form_for_without_double_render
+        assert_response :success
+
+        expected_output  = '<div id="main"></div><div id="foo">'
+        expected_output << '<form action="/markaby/renders_content_for_with_form_for_without_double_render" method="post">'
+        expected_output << '<p class="foo">'
+        expected_output << '<input id="foo_foo" name="foo[foo]" size="30" type="text" />'
+        expected_output << '<input id="foo_submit" name="commit" type="submit" value="foo" />'
+        expected_output << '</p>'
+        expected_output << '</form>'
+        expected_output << '</div>'
+
+        assert_equal expected_output, @response.body
+      end
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: markaby
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 6
-  - 9
-  version: 0.6.9
+  - 10
+  version: 0.6.10
 platform: ruby
 authors: 
 - _why
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-03 00:00:00 -04:00
+date: 2010-08-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,11 +72,13 @@ files:
 - spec/markaby/markaby_other_static.mab
 - spec/markaby/markaby_spec.rb
 - spec/markaby/rails/spec_helper.rb
+- spec/markaby/rails/views/layouts/layout.mab
 - spec/markaby/rails/views/markaby/_a_partial.mab
 - spec/markaby/rails/views/markaby/_partial_child_with_locals.mab
 - spec/markaby/rails/views/markaby/access_to_helpers.mab
 - spec/markaby/rails/views/markaby/broken.mab
 - spec/markaby/rails/views/markaby/correct_template_values.mab
+- spec/markaby/rails/views/markaby/double_output.mab
 - spec/markaby/rails/views/markaby/form_for.mab
 - spec/markaby/rails/views/markaby/form_for_with_fields.mab
 - spec/markaby/rails/views/markaby/form_for_with_multiple_fields.mab
@@ -89,6 +91,10 @@ files:
 - spec/markaby/rails/views/markaby/render_with_ivar.mab
 - spec/markaby/rails/views/markaby/renders_erb.rhtml
 - spec/markaby/rails/views/markaby/routes.mab
+- spec/markaby/rails/views/markaby/yielding.mab
+- spec/markaby/rails/views/markaby/yielding_content_for_with_block_helper.mab
+- spec/markaby/rails/views/markaby/yielding_two.mab
+- spec/markaby/rails/views/markaby/yielding_with_content_for.mab
 - spec/markaby/rails_spec.rb
 - spec/markaby/rails_version_spec.rb
 - spec/markaby/tilt/erb.erb