Fixed Ruby warnings

hanami · Mar 22, 2016 · 1f60c53 · 1f60c53
1 parent 0b91a5f
commit 1f60c53
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/lib/hanami/view/dsl.rb b/lib/hanami/view/dsl.rb
@@ -76,7 +76,7 @@ def root(value = nil)
       #   Articles::JsonShow.format # => :json
       def format(value = nil)
         if value.nil?
-          @format
+          @format ||= nil
         else
           @format = value
         end
@@ -314,6 +314,7 @@ def template(value = nil)
       #   Articles::Show.layout # => Hanami::View::Rendering::NullLayout
       def layout(value = nil)
         if value.nil?
+          @layout  ||= nil
           @_layout ||= Rendering::LayoutFinder.find(@layout || configuration.layout, configuration.namespace)
         elsif !value
           @layout = Hanami::View::Rendering::NullLayout

diff --git a/lib/hanami/view/rendering/layout_scope.rb b/lib/hanami/view/rendering/layout_scope.rb
@@ -18,7 +18,10 @@ class LayoutScope < BasicObject
         # @api private
         # @since 0.1.0
         def initialize(layout, scope)
-          @layout, @scope = layout, scope
+          @layout = layout
+          @scope  = scope
+          @view   = nil
+          @locals = nil
         end
 
         # Returns the classname as string

diff --git a/lib/hanami/view/rendering/scope.rb b/lib/hanami/view/rendering/scope.rb
@@ -21,7 +21,9 @@ class Scope < LayoutScope
         # @api private
         # @since 0.1.0
         def initialize(view, locals = {})
-          @view, @locals, @layout = view, locals, layout
+          @view   = view
+          @locals = locals
+          @layout = layout
         end
 
         # Returns an inspect String

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -43,14 +43,6 @@ def unload!
   def include?(object)
     @paths.include?(object)
   end
-
-  def ==(other)
-    other.kind_of?(Hanami::Utils::LoadPaths) &&
-      other.paths == self.paths
-  end
-
-  protected
-  attr_reader :paths
 end
 
 Hanami::View::Configuration.class_eval do