glue 0.40.0 → 0.41.0

data/lib/glue/attribute.rb

@@ -20,26 +20,25 @@ class Module
    
       def #{m} *args
         # gmosx: this is a hack, rethink!
+        # Jo: still hackish, alot faster
         
-        unless klass = args.last.is_a?(Hash) ? args.last[:class] : nil
-          for a in args
-            if a.is_a? Class
-              klass = a
-              break
-            end
-          end
+        if args.last.is_a?(Hash)
+          klass = args.last[:class] ? args.last[:class] : args[-2]
+          klass = nil unless klass.is_a? Class
+        else
+          klass = args.last if args.last.is_a? Class
         end
-                
+        
         # If the class defines the included_as_property callback
         # call to modify the base with custom code.
 
-        if klass.respond_to? :included_as_property 
+        if klass.respond_to? :included_as_property
           klass.included_as_property(self, args)
         else
           #{m}_previous *args
         end
 
-        unless serializable_attributes.empty? 
+        if klass && !serializable_attributes.empty?
           include Og::EntityMixin unless ancestors.include?(Og::EntityMixin)
           include Glue::Validation unless ancestors.include?(Glue::Validation)
           include Aspects unless ancestors.include?(Aspects)

data/lib/glue/configuration.rb

@@ -117,13 +117,45 @@ class Configuration
     #    use the parameters for the live (production)
     #    server. Optimized for speed.
     #
-    # Tries to set the default value from the CONFIGURATION_MODE 
+    # Tries to set the default value from the NITRO_MODE
     # environment variable.
     
     attr_accessor :mode
 
     def mode
-      @mode || ENV.fetch('CONFIGURATION_MODE', :debug).to_sym
+      mode = nil
+      if mode = ENV['CONFIGURATION_MODE']
+        $stderr.puts "CONFIGURATION_MODE is deprecated, use NITRO_MODE"
+      end
+      @mode || mode || ENV.fetch('NITRO_MODE', :debug).to_sym
+    end
+    
+    # The log output destination.
+    #
+    # ['STDOUT' 'STDERR']
+    #     Sets the log to stdout or stderr.
+    #
+    # [str]
+    #     Any other string is regarded as path
+    
+    attr_accessor :log
+    
+    def log
+      return @log if @log
+      
+      log = ENV.fetch('NITRO_LOG', Logger.new('log/app.log'))
+      
+      if log.kind_of?(String)
+        if log =~ /(STD(?:OUT|ERR))/i
+          log = Object.const_get($1.upcase)
+        elsif File.directory?(File.dirname(log))
+          log = Logger.new(log)
+        else
+          log = 'log/app.log'
+        end
+      end
+      
+      @log = log
     end
     
     alias kernel_load load

data/lib/glue/logger.rb

@@ -118,18 +118,16 @@ class Logger
   # Set the global Logger.
   
   def self.set(logger)
-    if logger.is_a?(String)
+    if logger.is_a?(String) || logger.is_a?(IO)
       @@global_logger = Logger.new(logger)
-      @@global_logger.setup_format do |severity, timestamp, progname, msg|  
-        SIMPLE_FORMAT % [severity, msg]
-      end
     elsif logger.is_a?(Logger)
       @@global_logger = logger
-      @@global_logger.setup_format do |severity, timestamp, progname, msg|  
-        SIMPLE_FORMAT % [severity, msg]
-      end
     else
-      raise ArgumentError.new
+      raise ArgumentError
+    end
+    
+    @@global_logger.setup_format do |severity, timestamp, progname, msg|  
+      SIMPLE_FORMAT % [severity, msg]
     end
   end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: glue
 version: !ruby/object:Gem::Version 
-  version: 0.40.0
-date: 2006-11-13 10:56:17 +02:00
+  version: 0.41.0
+date: 2006-12-12 12:36:45 +02:00
 summary: Utility methods and classes for Nitro + Og
 require_paths: 
 - lib