markaby 0.7.0 → 0.7.1

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+= 0.7.1 (2010-08-19)
+
+* Rails fixes for form_for called from erb templates
+
 = 0.7.0
 
 * Sinatra 1.0 support

data/Markaby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{markaby}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   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-15}
+  s.date = %q{2010-08-19}
   s.description = %q{Tim Fletcher and _why's ruby driven HTML templating system}
   s.email = %q{scott@railsnewbie.com}
   s.extra_rdoc_files = [
@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
      "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/_form_for_with_body_in_erb.erb",
      "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",
@@ -61,6 +62,7 @@ Gem::Specification.new do |s|
      "spec/markaby/rails/views/markaby/render_mab_without_explicit_render_call.mab",
      "spec/markaby/rails/views/markaby/render_with_ivar.mab",
      "spec/markaby/rails/views/markaby/renders_erb.rhtml",
+     "spec/markaby/rails/views/markaby/renders_form_for_with_erb_body.mab",
      "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",

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/markaby/rails/rails_builder.rb

@@ -64,9 +64,26 @@ module Markaby
 
       private
 
+        if ::Rails::VERSION::STRING == "2.2.0"
+          def __template__
+            @view.instance_variable_get("@_last_render")
+          end
+        else
+          def __template__
+            @view.template
+          end
+        end
+
         def method_missing(sym, *args, &block)
           result = @proxied_object.__send__(sym, *args, &block)
-          @view.concat(result)
+
+          # a markaby template may call render :partial with the form proxy helper.
+          # we only want to manually concat _if_ we are in a markaby template (not, say, erb)
+          if __template__.extension == "mab"
+            @view.concat(result)
+          end
+
+          result
         end
       end
     end

data/spec/markaby/rails/views/markaby/_form_for_with_body_in_erb.erb

@@ -0,0 +1 @@
+<%= f.text_field :foo %>

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

@@ -0,0 +1,3 @@
+form_for :foo do |f|
+  render :partial => "form_for_with_body_in_erb", :locals => { :f => f }
+end

data/spec/markaby/rails_spec.rb

@@ -153,6 +153,14 @@ if RUNNING_RAILS
       render :layout   => "layout.mab",
              :template => "markaby/double_output"
     end
+
+    def renders_form_for_with_erb_body
+      @obj = Object.new
+
+      def @obj.foo
+        "bar"
+      end
+    end
   end
 
   class MarkabyOnRailsTest < ActionController::TestCase
@@ -254,7 +262,7 @@ if RUNNING_RAILS
       get :routes
       assert_response :success
 
-      expected_output = "<a href=\"/users/new\">Foo</a>"
+      expected_output = '<a href="/users/new">Foo</a>'
       assert_equal expected_output, @response.body
     end
 
@@ -280,7 +288,7 @@ if RUNNING_RAILS
 
         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>",
+        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
 
@@ -289,10 +297,10 @@ if RUNNING_RAILS
 
         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>"
+        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
@@ -350,6 +358,17 @@ if RUNNING_RAILS
 
         assert_equal expected_output, @response.body
       end
+
+      def test_renders_form_for_with_erb_render_in_body
+        get :renders_form_for_with_erb_body
+        assert_response :success
+
+        str = '<form action="/markaby/renders_form_for_with_erb_body" method="post">'
+        str << '<input id="foo_foo" name="foo[foo]" size="30" type="text" />'
+        str << '</form>'
+
+        assert_equal str, @response.body
+      end
     end
   end
 

data/spec/markaby/sinatra/sinatra_spec.rb

@@ -1,64 +1,67 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
-require File.expand_path(File.dirname(__FILE__) + "/app")
-require 'rack/test'
+unless RUNNING_RAILS
+  require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+  require 'markaby/sinatra'
+  require 'rack/test'
+  require File.expand_path(File.dirname(__FILE__) + "/app")
 
-describe "sinatra integration" do
-  include Rack::Test::Methods
+  describe "sinatra integration" do
+    include Rack::Test::Methods
 
-  def app
-    @app ||= Sinatra::Application
-  end
+    def app
+      @app ||= Sinatra::Application
+    end
 
-  it "should render an empty" do
-    get '/empty_action'
-    last_response.should be_ok
-  end
+    it "should render an empty" do
+      get '/empty_action'
+      last_response.should be_ok
+    end
 
-  it "should render an empty markaby template" do
-    get '/markaby_template'
-    last_response.should be_ok
-    last_response.body.should == ""
-  end
+    it "should render an empty markaby template" do
+      get '/markaby_template'
+      last_response.should be_ok
+      last_response.body.should == ""
+    end
 
-  it "should render a template with html in it" do
-    get '/simple_html'
-    last_response.should be_ok
-    last_response.body.should == "<ul><li>hi</li><li>there</li></ul>"
-  end
+    it "should render a template with html in it" do
+      get '/simple_html'
+      last_response.should be_ok
+      last_response.body.should == "<ul><li>hi</li><li>there</li></ul>"
+    end
 
-  it "should be able to pass variables" do
-    get '/variables'
-    last_response.should be_ok
-    last_response.body.should == '<p class="name">Scott Taylor</p>'
-  end
+    it "should be able to pass variables" do
+      get '/variables'
+      last_response.should be_ok
+      last_response.body.should == '<p class="name">Scott Taylor</p>'
+    end
 
-  it "should be able to pass variables through locals" do
-    get '/variables_with_locals'
-    last_response.should be_ok
-    last_response.body.should == '<p class="name">Scott Taylor</p>'
-  end
+    it "should be able to pass variables through locals" do
+      get '/variables_with_locals'
+      last_response.should be_ok
+      last_response.body.should == '<p class="name">Scott Taylor</p>'
+    end
 
-  it "should have scope to instance variables" do
-    get '/scope_instance_variables'
-    last_response.should be_ok
-    last_response.body.should == '<p class="name">Scott Taylor</p>'
-  end
+    it "should have scope to instance variables" do
+      get '/scope_instance_variables'
+      last_response.should be_ok
+      last_response.body.should == '<p class="name">Scott Taylor</p>'
+    end
 
-  it "should be able to use named templates" do
-    get "/named_template"
-    last_response.should be_ok
-    last_response.body.should == '<div class="title">Hello World!</div>'
-  end
+    it "should be able to use named templates" do
+      get "/named_template"
+      last_response.should be_ok
+      last_response.body.should == '<div class="title">Hello World!</div>'
+    end
 
-  it "should be able to use a layout with :layout" do
-    get '/layout'
-    last_response.should be_ok
-    last_response.body.should == '<html><div class="title">Hello World!</div></html>'
-  end
+    it "should be able to use a layout with :layout" do
+      get '/layout'
+      last_response.should be_ok
+      last_response.body.should == '<html><div class="title">Hello World!</div></html>'
+    end
 
-  it "should be able to access helpers in a template" do
-    get '/helpers'
-    last_response.should be_ok
-    last_response.body.should == "<li>bacon</li>"
+    it "should be able to access helpers in a template" do
+      get '/helpers'
+      last_response.should be_ok
+      last_response.body.should == "<li>bacon</li>"
+    end
   end
-end
+end

data/spec/spec_helper.rb

@@ -8,8 +8,8 @@ require 'markaby'
 require 'markaby/kernel_method'
 require 'markaby/rails'
 
-require 'markaby/sinatra'
 require 'erb'
+require 'markaby/rails/spec_helper'
 
 module MarkabyTestHelpers
   def link_to(obj)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: markaby
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - _why
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-15 00:00:00 -04:00
+date: 2010-08-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,6 +75,7 @@ files:
 - 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/_form_for_with_body_in_erb.erb
 - 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
@@ -92,6 +93,7 @@ files:
 - spec/markaby/rails/views/markaby/render_mab_without_explicit_render_call.mab
 - spec/markaby/rails/views/markaby/render_with_ivar.mab
 - spec/markaby/rails/views/markaby/renders_erb.rhtml
+- spec/markaby/rails/views/markaby/renders_form_for_with_erb_body.mab
 - 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