Merge branch 'master' of github.com:johnbintz/semantic_rails_view_helpers

This commit is contained in:
John Bintz 2013-01-12 13:39:18 -05:00
commit ff2202a8f4
3 changed files with 4 additions and 4 deletions

View File

@ -42,7 +42,7 @@ module SemanticRailsViewHelpers
value = @context.render(:partial => "attributes/#{options[:as]}", :locals => { :object => @object, :field => field, :raw_value => raw_value, :value => value }) value = @context.render(:partial => "attributes/#{options[:as]}", :locals => { :object => @object, :field => field, :raw_value => raw_value, :value => value })
end end
(value or '').html_safe (value or '').to_s.html_safe
end end
def field!(field, options = {}, &block) def field!(field, options = {}, &block)

View File

@ -5,7 +5,7 @@ module SemanticRailsViewHelpers
initializer 'semantic_rails_view_helpers.initialize', :before => :load_config_initializers do |app| initializer 'semantic_rails_view_helpers.initialize', :before => :load_config_initializers do |app|
ActionView::Base.send :include, SemanticRailsViewHelpers::ViewHelpers ActionView::Base.send :include, SemanticRailsViewHelpers::ViewHelpers
app.config.add_semantic_data = false if app.config.add_semantic_data.blank? app.config.add_semantic_data = false if !app.config.respond_to?(:add_semantic_data)
end end
end end
end end

View File

@ -15,6 +15,6 @@ Gem::Specification.new do |gem|
gem.require_paths = ["lib"] gem.require_paths = ["lib"]
gem.version = SemanticRailsViewHelpers::VERSION gem.version = SemanticRailsViewHelpers::VERSION
gem.add_dependency 'capybara' #gem.add_dependency 'capybara'
gem.add_dependency 'rspec' #gem.add_dependency 'rspec'
end end