fixed again some issues with nils ini initialization. That should fix…

… it finally.
nirnanaaa · Jan 16, 2014 · a5dd03f · a5dd03f
1 parent 04ca4c6
commit a5dd03f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/gollum_rails/setup.rb b/lib/gollum_rails/setup.rb
@@ -18,7 +18,7 @@ class << self
 
       attr_accessor :wiki_path
 
-      attr_accessor :wiki_options
+      attr_writer :wiki_options
 
       attr_accessor :repository
 
@@ -28,6 +28,10 @@ class << self
       attr_accessor :options
 
 
+      def wiki_options
+        return {} unless @wiki_options.kind_of? Hash
+        @wiki_options ||= {} 
+      end
       # Wiki startup options
       def options=(options)
         @options = options

diff --git a/lib/gollum_rails/store.rb b/lib/gollum_rails/store.rb
@@ -21,7 +21,7 @@ module ClassMethods
       # Gets the wiki instance
       def wiki
         raise InitializationError, "Wiki path was not initialized!" if Setup.wiki_path.nil?
-        @wiki ||= Gollum::Wiki.new(Setup.wiki_path, {} )
+        @wiki ||= Gollum::Wiki.new(Setup.wiki_path, Setup.wiki_options )
       end
     end
     # Gets the pages format