Merge pull request #63 from hanami/fix-ruby-warnings

Fix Ruby warnings
hanami · Mar 22, 2016 · 530c737 · 530c737
2 parents 0c7619b + 51cab1b
commit 530c737
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/hanami-helpers.gemspec b/hanami-helpers.gemspec
@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hanami-utils', '~> 0.8'
 
   spec.add_development_dependency 'bundler',  '~> 1.6'
-  spec.add_development_dependency 'rake',     '~> 10.0'
+  spec.add_development_dependency 'rake',     '~> 11'
   spec.add_development_dependency 'minitest', '~> 5.5'
 end
diff --git a/lib/hanami/helpers/form_helper/form_builder.rb b/lib/hanami/helpers/form_helper/form_builder.rb
@@ -107,8 +107,10 @@ class FormBuilder < ::Hanami::Helpers::HtmlHelper::HtmlBuilder
         def initialize(form, attributes, context = nil, &blk)
           super()
 
-          @context = context
-          @blk     = blk
+          @context    = context
+          @blk        = blk
+          @verb       = nil
+          @csrf_token = nil
 
           # Nested form
           if @context.nil? && attributes.is_a?(Values)

diff --git a/lib/hanami/helpers/html_helper/empty_html_node.rb b/lib/hanami/helpers/html_helper/empty_html_node.rb
@@ -60,7 +60,7 @@ def to_s
         # @since 0.1.0
         # @api private
         def attributes
-          return if @attributes.nil?
+          return unless defined?(@attributes) && !@attributes.nil?
           result = ''
 
           @attributes.each do |attribute_name, value|