summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2011-12-28 12:30:00 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2011-12-28 12:30:00 +0100
commit12e2914308f8abdb6511063770ff71b8725c4f46 (patch)
treeee4693c76f8d3bac9714b43b61dc706535687325
parentc956dbb0e57f15cb79728be74aad83defeada17a (diff)
downloadzorglub-12e2914308f8abdb6511063770ff71b8725c4f46.zip
zorglub-12e2914308f8abdb6511063770ff71b8725c4f46.tar.gz
rename Config.default_engine into Config.engine
-rw-r--r--lib/zorglub/config.rb2
-rw-r--r--lib/zorglub/node.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/zorglub/config.rb b/lib/zorglub/config.rb
index 3916ac7..12dc508 100644
--- a/lib/zorglub/config.rb
+++ b/lib/zorglub/config.rb
@@ -6,9 +6,9 @@ module Zorglub
@options = {
:root => '.',
:engine => nil,
+ :layout => 'default',
:view_dir => 'view',
:layout_dir => 'layout',
- :default_layout => 'default',
:session_on => false
}
@engines = { }
diff --git a/lib/zorglub/node.rb b/lib/zorglub/node.rb
index e80c051..040e323 100644
--- a/lib/zorglub/node.rb
+++ b/lib/zorglub/node.rb
@@ -20,7 +20,7 @@ module Zorglub
#
def layout name=nil
@layout = name unless name.nil?
- @layout ||= Config.default_layout
+ @layout ||= Config.layout
end
#
attr_writer :app