From fa9bab923ec279980371c19794bfd997df4fd033 Mon Sep 17 00:00:00 2001
From: elliottcable <git@elliottcable.name>
Date: Thu, 5 Mar 2009 21:56:00 -0900
Subject: [PATCH] Cleaned up the initialization routines.

---
 examples/initialization.rb |  2 +-
 lib/nfoiled.rb             | 28 ++++++++++++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/examples/initialization.rb b/examples/initialization.rb
index 02f4565..42f3597 100644
--- a/examples/initialization.rb
+++ b/examples/initialization.rb
@@ -9,7 +9,7 @@ require 'nfoiled'
 # First, we need to ensure that Ncurses will exit cleanly (that is, we don't
 # want an interrupt or fatal error to screw up the terminal output after the
 # program exists).
-at_exit { ::Ncurses.endwin }
+Nfoiled::initialize
 
 # Second, the actual initialization of Ncurses. This allocates the necessary
 # memory and initializes all variables.
diff --git a/lib/nfoiled.rb b/lib/nfoiled.rb
index 537afbe..b096ebb 100644
--- a/lib/nfoiled.rb
+++ b/lib/nfoiled.rb
@@ -5,24 +5,44 @@ require 'ncurses'
 module Nfoiled
   VERSION = 0
   
+  class <<self
+    @initialized = false
+    attr_accessor :initialized
+    alias_method :initialized?, :initialized
+  end
+  
   ##
   # This module method is responsible for setting up the entirety of Nfoiled's
   # overall environment. It will be called before any other Nfoiled
   # functionality is allowed. In most cases, this will be called for you.
+  # 
+  # This method also schedules `Nfoiled::finalize` to be automatically run
+  # `at_exit`.
   def self.initialize!
-    @@initialized = true
+    self.initialized = true
+    at_exit { Nfoiled.finalize }
   end
   
   ##
   # This module method ensures that Nfoiled is initialized. It simply calls
   # `Nfoiled::initialize!` if Nfoiled hasn't already been initialized.
   def self.initialize
-    initialize! unless @@initialized
+    initialize! unless initialized?
   end
   
   ##
-  # This method is
+  # This method is responsible for tearing down any environment set up by the
+  # `Ncurses::initialize!` method.
   def self.finalize!
-    @@initialized = false
+    self.initialized = false
+    ::Ncurses.endwin
+  end
+  
+  ##
+  # This module method ensures that Nfoiled is finalize. It simply calls
+  # `Nfoiled::finalize!` if Nfoiled hasn't already been finalized.
+  def self.finalize
+    # TODO: Ensure finalization on fatal errors or interrupts
+    finalize! if initialized?
   end
 end
-- 
2.11.4.GIT