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

lib/semantic_rails_view_helpers/attributes_builder_base.rb

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

lib/semantic_rails_view_helpers/engine.rb

@@ -5,7 +5,7 @@ module SemanticRailsViewHelpers
     initializer 'semantic_rails_view_helpers.initialize', :before => :load_config_initializers do |app|
       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

semantic_rails_view_helpers.gemspec

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