Removed the duplication for defining the logger accessors everywhere …

…and instead created a logging helper which is included into Object.

lib/halcyon.rb

@@ -42,3 +42,6 @@ def root
   end
 
 end
+
+#logger and klass.logger methods for use everywhere.
+Object.send(:include, Halcyon::Logging::Helpers)

lib/halcyon/application.rb

@@ -6,7 +6,7 @@ module Halcyon
   # 
   # Manages shutting down and starting up hooks, routing, dispatching, etc.
   # Also restricts the requests to acceptable clients, defaulting to all.
-  class Application
+  class Application 
     include Exceptions
 
     autoload :Router, 'halcyon/application/router'
@@ -167,10 +167,6 @@ def acceptable_request!(env)
       end
     end
 
-    def logger
-      Halcyon.logger
-    end
-
     def hooks
       self.class.hooks
     end
@@ -183,10 +179,6 @@ def hooks
         @hooks ||= {}
       end
 
-      def logger
-        Halcyon.logger
-      end
-
       # Defines routes for the application.
       # 
       # Refer to Halcyon::Application::Router for documentation and resources.

lib/halcyon/application/router.rb

@@ -41,10 +41,6 @@ class Router < Merb::Router
 
       class << self
 
-        def logger
-          Halcyon.logger
-        end
-
         # Retrieves the last value from the +route+ call in Halcyon::Controller
         # and, if it's a Hash, sets it to +@@default_route+ to designate the
         # failover route. If +route+ is not a Hash, though, the internal default

lib/halcyon/controller.rb

@@ -19,18 +19,6 @@ def initialize(env)
 
     class << self
 
-      # The current application logger instance, usable in the class context.
-      # This means you can call <tt>self.logger</tt> from inside of class
-      # methods, filters, etc.
-      # 
-      # Examples
-      #   self.logger.debug "Test message"
-      # 
-      # Returns Logger:logger
-      def logger
-        Halcyon.logger
-      end
-
       # Not implemented.
       def before method, &proc
         raise NotImplemented.new
@@ -43,14 +31,6 @@ def after method, &proc
 
     end
 
-    # The current application logger instance.
-    # 
-    # Examples
-    #   self.logger.debug "Deleting user's cached data"
-    def logger
-      Halcyon.logger
-    end
-
     # Returns the request params and the route params.
     # 
     # Returns Hash:{route_params, get_params, post_params}.to_mash

lib/halcyon/logging.rb

@@ -1,6 +1,8 @@
 module Halcyon
   module Logging
 
+    autoload :Helpers, 'halcyon/logging/helpers'
+
     autoload :Logger, 'halcyon/logging/logger'
     autoload :Logging, 'halcyon/logging/logging'
     autoload :Analogger, 'halcyon/logging/analogger'

lib/halcyon/logging/helpers.rb

@@ -0,0 +1,37 @@
+module Halcyon
+  module Logging
+    module Helpers
+
+      def self.included(target)
+        target.extend(ClassMethods)
+      end
+
+      # The current application logger instance.
+      # 
+      # Examples
+      #   self.logger.debug "Deleting user's cached data"
+      # 
+      # Returns Logger:logger
+      def logger
+        Halcyon.logger
+      end
+
+      module ClassMethods
+
+        # The current application logger instance, usable in the class context.
+        # This means you can call <tt>self.logger</tt> from inside of class
+        # methods, filters, etc.
+        # 
+        # Examples
+        #   self.logger.debug "Test message"
+        # 
+        # Returns Logger:logger
+        def logger
+          Halcyon.logger
+        end
+
+      end
+
+    end
+  end
+end

lib/halcyon/runner.rb

@@ -86,16 +86,8 @@ def call(env)
       @app.call(env)
     end
 
-    def logger
-      Halcyon.logger
-    end
-
     class << self
 
-      def logger
-        Halcyon.logger
-      end
-
       # Loads the configuration file specified into <tt>Halcyon.config</tt>.
       #   +file+ the configuration file to load
       #