Skip to content

Commit

Permalink
Regenerate gemspec for version 2.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Hunter committed Nov 4, 2013
1 parent 0153f94 commit 70e666f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 10 deletions.
3 changes: 3 additions & 0 deletions 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
Expand Down
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
2.6.0
2.6.1
2 changes: 1 addition & 1 deletion blocks.gemspec
Expand Up @@ -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"]
Expand Down
16 changes: 8 additions & 8 deletions lib/blocks/base.rb
Expand Up @@ -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={})
Expand Down Expand Up @@ -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

0 comments on commit 70e666f

Please sign in to comment.