Freeze at subclasses level too

hanami · Aug 1, 2013 · d108767 · d108767
1 parent 04a3093
commit d108767
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 2 deletions.
diff --git a/lib/lotus/view/dsl.rb b/lib/lotus/view/dsl.rb
@@ -30,8 +30,12 @@ def template(value = nil)
       protected
       def load!
         super
-        root.freeze
-        format.freeze
+
+        views.each do |v|
+          v.root.freeze
+          v.format.freeze
+          v.template.freeze
+        end
       end
     end
   end

diff --git a/lib/lotus/view/inheritable.rb b/lib/lotus/view/inheritable.rb
@@ -12,6 +12,11 @@ def subclasses
       protected
       def load!
         subclasses.freeze
+        views.freeze
+      end
+
+      def views
+        @@views ||= [ self ] + subclasses.to_a
       end
     end
   end

diff --git a/test/load_test.rb b/test/load_test.rb
@@ -22,12 +22,40 @@
       JsonRenderView.format.frozen?.must_equal true
     end
 
+    it 'freezes .format for subclasses' do
+      Articles::RssIndex.format.frozen?.must_equal true
+    end
+
+    it 'freezes .template' do
+      Articles::Show.template.frozen?.must_equal true
+    end
+
+    it 'freezes .template for subclasses' do
+      Articles::JsonShow.template.frozen?.must_equal true
+    end
+
     it 'freezes .subclasses' do
       Articles::Index.subclasses.frozen?.must_equal true
     end
 
+    it 'freezes .subclasses for subclasses' do
+      Articles::AtomIndex.subclasses.frozen?.must_equal true
+    end
+
+    it 'freezes view .views' do
+      Articles::Index.send(:views).frozen?.must_equal true
+    end
+
+    it 'freezes .views for subclasses' do
+      Articles::RssIndex.send(:views).frozen?.must_equal true
+    end
+
     it 'freezes .registry' do
       Articles::Index.send(:registry).frozen?.must_equal true
     end
+
+    it 'freezes .registry for subclasses' do
+      Articles::AtomIndex.send(:registry).frozen?.must_equal true
+    end
   end
 end