diff --git a/lib/lotus/view/rendering/layout_registry.rb b/lib/lotus/view/rendering/layout_registry.rb index 2c57652d..1efbbefc 100644 --- a/lib/lotus/view/rendering/layout_registry.rb +++ b/lib/lotus/view/rendering/layout_registry.rb @@ -21,7 +21,7 @@ def initialize(template) # @since 0.1.0 # # @see Lotus::Layout::ClassMethods#registry - class LayoutRegistry < ::Hash + class LayoutRegistry # Initialize the registry # # @param view [Class] the view @@ -29,8 +29,7 @@ class LayoutRegistry < ::Hash # @api private # @since 0.1.0 def initialize(view) - super() - + @registry = {} @view = view prepare! end @@ -50,15 +49,15 @@ def initialize(view) # @api private # @since 0.1.0 def resolve(context) - fetch(format(context)) { NullTemplate.new } + @registry.fetch(format(context)) { NullTemplate.new } end protected def prepare! templates.each do |template| - merge! template.format => template + @registry.merge! template.format => template end - self.any? or raise MissingTemplateLayoutError.new(@view) + @registry.any? or raise MissingTemplateLayoutError.new(@view) end def templates diff --git a/lib/lotus/view/rendering/registry.rb b/lib/lotus/view/rendering/registry.rb index c23e7b3d..38acf322 100644 --- a/lib/lotus/view/rendering/registry.rb +++ b/lib/lotus/view/rendering/registry.rb @@ -89,7 +89,7 @@ class Registry < LayoutRegistry # # @see Lotus::View::Rendering#render def resolve(context) - view, template = fetch(format(context)) { self[DEFAULT_FORMAT] } + view, template = @registry.fetch(format(context)) { @registry[DEFAULT_FORMAT] } view.new(template, context) end @@ -101,13 +101,13 @@ def prepare! def prepare_views! views.each do |view| - merge! view.format || DEFAULT_FORMAT => [ view, template_for(view) ] + @registry.merge! view.format || DEFAULT_FORMAT => [ view, template_for(view) ] end end def prepare_templates! templates.each do |template| - merge! template.format => [ view_for(template), template ] + @registry.merge! template.format => [ view_for(template), template ] end end