oasis 0.5.2 → 0.5.3

data/lib/oasis.rb

@@ -1,6 +1,6 @@
 require 'active_support/core_ext/module'
 require "oasis/version"
-require "oasis/debug"
+require "oasis/logger"
 require "oasis/app/list"
 require "oasis/app/loader"
 require "oasis/dependencies"

data/lib/oasis/app/loader.rb

@@ -7,7 +7,7 @@ module Oasis
       def register_plugin_as_loaded_with_oasis(plugin)
         register_plugin_as_loaded_without_oasis(plugin)
         Oasis.apps << plugin if plugin.engine?
-        Oasis::Debug.log "Loading Rails App: #{plugin.name}"
+        Oasis::Logger.trace "Loading Rails App: #{plugin.name}"
       end
       
       def self.included(base)

data/lib/oasis/dependencies.rb

@@ -17,20 +17,20 @@ module Oasis
       # if they are suffixed with helper or controller.
       if file_name =~ /_(helper|controller)?$/
         type = file_name.split("_").last
-        Oasis::Debug.log "searching for #{type} named '#{file_name}'"
+        Oasis::Logger.trace "searching for #{type} named '#{file_name}'"
         Oasis.apps.each do |app|
           plugin_file_name = File.expand_path(File.join(app.directory, "app", "#{type}s", base_name))
-          Oasis::Debug.log "checking engine '#{app.name}' for '#{file_name}' (#{plugin_file_name})"
+          Oasis::Logger.trace "checking engine '#{app.name}' for '#{file_name}' (#{plugin_file_name})"
           break if File.file? "#{plugin_file_name}.rb"
         end
         
       else
         
         # if we didn't find it in helpers or controllers, lets try looking in models.
-        Oasis::Debug.log "searching for models named '#{file_name}'"
+        Oasis::Logger.trace "searching for models named '#{file_name}'"
         Oasis.apps.each do |app|
           plugin_file_name = File.expand_path(File.join(app.directory, "app", "models", base_name))
-          Oasis::Debug.log "checking engine '#{app.name}' for '#{file_name}' (#{plugin_file_name})"
+          Oasis::Logger.trace "checking engine '#{app.name}' for '#{file_name}' (#{plugin_file_name})"
           break if File.file? "#{plugin_file_name}.rb"
         end
         
@@ -38,16 +38,16 @@ module Oasis
       
       # success! we've found code in the engine, lets load it.
       if File.file?("#{plugin_file_name}.rb")
-        Oasis::Debug.log "loading '#{file_name}' from an engine."
+        Oasis::Logger.debug "loading '#{file_name}' from an engine."
         file_loaded = true if super(plugin_file_name, const_path)
       end
       
       app_file_name = File.join(RAILS_ROOT, "app", "#{type||"model"}s", base_name)
       if File.file? "#{app_file_name}.rb"
-        Oasis::Debug.log "loading from application: #{file_name}" 
+        Oasis::Logger.trace "loading from application: #{file_name}" 
         file_loaded = true if super(app_file_name, const_path)
       else
-        Oasis::Debug.log "file '#{file_name}' not found in application"
+        Oasis::Logger.trace "file '#{file_name}' not found in application"
       end
       
       # if we managed to load a file, return true. If not, default to the original method.

data/lib/oasis/logger.rb

@@ -0,0 +1,40 @@
+module Oasis
+  class Logger
+    LOG_LEVELS = {
+      :trace => 1,
+      :debug => 2,
+      :warn => 3
+    }.freeze
+    RAILS_LOG_METHOD = {
+      :trace => :debug,
+      :debug => :debug,
+      :warn => :warn
+    }.freeze
+    class << self
+      def level
+        @level || :warn
+      end
+      def level=(v)
+        unless LOG_LEVELS.has_key?(v)
+          errmsg = "#{v.inspect} is not a log level. Please use one of #{LOG_LEVELS.keys.map(&:inspect).join(", ")}"
+          raise ArgumentError, errmsg
+        end
+        @level = v
+      end
+      def trace(msg); log(msg, :trace); end
+      def debug(msg); log(msg, :debug); end
+      def warn(msg);  log(msg, :warn);  end
+      def log(msg, level)
+        return unless LOG_LEVELS[level] >= LOG_LEVELS[self.level]
+        msg = "** [OASIS] : #{msg}"
+        if defined?(Rails)
+          Rails.logger.send(RAILS_LOG_METHOD[level], msg)
+        elsif defined?(RAILS_DEFAULT_LOGGER)
+          RAILS_DEFAULT_LOGGER.send(RAILS_LOG_METHOD[level], msg)
+        else
+          $stderr.puts msg
+        end
+      end
+    end
+  end
+end

data/lib/oasis/routes.rb

@@ -6,7 +6,7 @@ module Oasis
     cattr_accessor :apps
     def self.routing_for(name, &blk)
       self.apps[name] = blk
-      Debug.log "loaded routes for app: #{name}"
+      Oasis::Logger.debug "loaded routes for app: #{name}"
     end
     
     def self.reset!

data/lib/oasis/version.rb

@@ -1,3 +1,3 @@
 module Oasis
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/test/helper.rb

@@ -24,7 +24,7 @@ require 'oasis'
 
 # silence the logger, or define a new path for logging.
 module Oasis
-  class Debug
+  class Logger
     def self.log(*args)
       nil
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oasis
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Derek Perez
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-27 00:00:00 -08:00
+date: 2010-02-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,11 +42,11 @@ files:
 - lib/oasis/app/list.rb
 - lib/oasis/app/loader.rb
 - lib/oasis/configure.rb
-- lib/oasis/debug.rb
 - lib/oasis/dependencies.rb
 - lib/oasis/development.rb
 - lib/oasis/layout.rb
 - lib/oasis/loader.rb
+- lib/oasis/logger.rb
 - lib/oasis/routes.rb
 - lib/oasis/version.rb
 - oasis.gemspec

data/lib/oasis/debug.rb

@@ -1,9 +0,0 @@
-module Oasis
-  class Debug
-    def self.log(msg)
-      if defined? RAILS_DEFAULT_LOGGER && RAILS_ENV == "development"
-        RAILS_DEFAULT_LOGGER.debug "** [OASIS] : #{msg}"
-      end
-    end
-  end
-end