From 70e666f9e12b586dc133071e59622b3fab73cef7 Mon Sep 17 00:00:00 2001
From: Andrew Hunter <andrew.hunter@livingsocial.com>
Date: Mon, 4 Nov 2013 12:13:20 -0700
Subject: [PATCH] Regenerate gemspec for version 2.6.1

---
 CHANGELOG.rdoc     |  3 +++
 VERSION            |  2 +-
 blocks.gemspec     |  2 +-
 lib/blocks/base.rb | 16 ++++++++--------
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index f4f8f04..1f70c1e 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,3 +1,6 @@
+2.6.1 (November 4, 2013)
+* Made content_tag_with_block a public method in Blocks::Base so that it can be used in table-for gem.
+
 2.6.0 (November 4, 2013)
 * Internally changed how configuration works (externally, it should feel the same, with the exception of the fact that templates_folder was changed to partials_folder... this will likely change again in the coming days)
 * Started cleaning up and rewriting some of the tests
diff --git a/VERSION b/VERSION
index 914ec96..b8d12d7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6.0
\ No newline at end of file
+2.6.1
\ No newline at end of file
diff --git a/blocks.gemspec b/blocks.gemspec
index c707824..9cb7e77 100644
--- a/blocks.gemspec
+++ b/blocks.gemspec
@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "blocks"
-  s.version = "2.6.0"
+  s.version = "2.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Hunter"]
diff --git a/lib/blocks/base.rb b/lib/blocks/base.rb
index 100a00d..ae55d6a 100644
--- a/lib/blocks/base.rb
+++ b/lib/blocks/base.rb
@@ -404,6 +404,14 @@ def around(name, options={}, &block)
       nil
     end
 
+    def content_tag_with_block(tag, tag_html, *args, &block)
+      if tag
+        view.content_tag(tag, view.capture(&block), call_each_hash_value_with_params(tag_html, *args))
+      else
+        view.capture(&block)
+      end
+    end
+
     protected
 
     def initialize(view, options={})
@@ -552,13 +560,5 @@ def define_block_container(*args, &block)
       blocks[block_container.name] = block_container if blocks[block_container.name].nil? && block_given?
       block_container
     end
-
-    def content_tag_with_block(tag, tag_html, *args, &block)
-      if tag
-        view.content_tag(tag, view.capture(&block), call_each_hash_value_with_params(tag_html, *args))
-      else
-        view.capture(&block)
-      end
-    end
   end
 end