mack 0.7.1.1 → 0.8.0

data/lib/mack/initialization/application.rb

@@ -1,5 +1,5 @@
 boot_load(:initializers) do
-  Mack.logger.debug "Initializing custom initializers..." unless app_config.log.disable_initialization_logging
+  Mack.logger.debug "Initializing custom initializers..." unless configatron.mack.log.disable_initialization_logging
   Dir.glob(Mack::Paths.initializers("**/*.rb")) do |d|
     require d
   end  
@@ -7,7 +7,7 @@ end
 
 boot_load(:lib, :plugins, :gems) do
   # require 'lib' files:
-  Mack.logger.debug "Initializing lib classes..." unless app_config.log.disable_initialization_logging
+  Mack.logger.debug "Initializing lib classes..." unless configatron.mack.log.disable_initialization_logging
   Dir.glob(Mack::Paths.lib("**/*.rb")).each do |d|
     require d
   end
@@ -21,15 +21,14 @@ end
 
 boot_load(:routes) do
   # set up routes:
-  Mack.logger.debug "Initializing routes..." unless app_config.log.disable_initialization_logging
+  Mack.logger.debug "Initializing routes..." unless configatron.mack.log.disable_initialization_logging
   require Mack::Paths.config("routes")
 end
 
 boot_load(:app_files, :default_controller) do
   # require 'app' files:
-  Mack.logger.debug "Initializing 'app' classes..." unless app_config.log.disable_initialization_logging
+  Mack.logger.debug "Initializing 'app' classes..." unless configatron.mack.log.disable_initialization_logging
   Dir.glob(Mack::Paths.app("**/*.rb")).each do |d|
-    # puts "d: #{d}"
     begin
       require d
     rescue NameError => e
@@ -46,4 +45,9 @@ boot_load(:app_files, :default_controller) do
       end
     end
   end
+  
+  # Add default assets
+  assets_mgr.defaults do |a| 
+    a.add_css "scaffold" if File.exists?Mack::Paths.stylesheets("scaffold.css")
+  end
 end

data/lib/mack/initialization/boot_loader.rb

@@ -26,8 +26,7 @@ module Mack
         begin
           Mack::BootLoader.instance.sequences[a.to_sym].run
         rescue Exception => e
-          puts "[#{a}]: #{e.message}"
-          puts e.backtrace
+          raise e
         end
       end
     end
@@ -70,105 +69,4 @@ module Mack
       
     end
   end
-end
-
-# module Mack
-#   class BootLoader
-#     include Singleton
-#     include Extlib::Hook
-#     
-#     attr_accessor :steps
-#     attr_accessor :additional_procs
-#     
-#     def initialize
-#       self.steps = [:initializers, :gems, :plugins, :libs, :default_controller, :routes, :app, :additional]
-#       self.additional_procs = []
-#     end
-#     
-#     def start
-#       Mack.logger.debug "Starting boot loader sequence...."
-#     end
-#     
-#     def initializers
-#       # set up initializers:
-#       Mack.logger.debug "Initializing custom initializers..." unless app_config.log.disable_initialization_logging
-#       Dir.glob(Mack::Paths.initializers("**/*.rb")) do |d|
-#         require d
-#       end
-#     end
-#     
-#     def gems
-#       Mack.logger.debug "Initializing custom gems..." unless app_config.log.disable_initialization_logging
-#       Mack::Utils::GemManager.instance.do_requires
-#     end
-#     
-#     def plugins
-#       # require 'plugins':
-#       Mack.logger.debug "Initializing plugins..." unless app_config.log.disable_initialization_logging
-#       require File.join(File.dirname(__FILE__), "plugins.rb")
-#     end
-#     
-#     def libs
-#       # require 'lib' files:
-#       Mack.logger.debug "Initializing lib classes..." unless app_config.log.disable_initialization_logging
-#       Dir.glob(Mack::Paths.lib("**/*.rb")).each do |d|
-#         require d
-#       end
-#     end
-#     
-#     def default_controller
-#       # make sure that default_controller is available to other controllers
-#       path = Mack::Paths.controllers("default_controller.rb")
-#       require path if File.exists?(path)
-#     end
-#     
-#     def routes
-#       # set up routes:
-#       Mack.logger.debug "Initializing routes..." unless app_config.log.disable_initialization_logging
-#       require Mack::Paths.config("routes")
-#     end
-#     
-#     def app
-#       # require 'app' files:
-#       Mack.logger.debug "Initializing 'app' classes..." unless app_config.log.disable_initialization_logging
-#       Dir.glob(Mack::Paths.app("**/*.rb")).each do |d|
-#         # puts "d: #{d}"
-#         begin
-#           require d
-#         rescue NameError => e
-#           if e.message.match("uninitialized constant")
-#             mod = e.message.gsub("uninitialized constant ", "")
-#             x =%{
-#               module ::#{mod}
-#               end
-#             }
-#             eval(x)
-#             require d
-#           else
-#             raise e
-#           end
-#         end
-#       end
-#     end
-#     
-#     def additional
-#       self.additional_procs.each do |p|
-#         puts "p: #{p.inspect}"
-#         p.call
-#       end
-#     end
-#     
-#     def finish
-#       Mack.logger.debug "...Finished boot loader sequence."
-#     end
-#     
-#     def self.run
-#       Mack::BootLoader.instance.start
-#       Mack::BootLoader.instance.steps.each do |step|
-#         Mack::BootLoader.instance.send(step)
-#       end
-#       Mack::BootLoader.instance.finish
-#     end
-#     
-#   end
-# end
+end

data/lib/mack/initialization/configuration.rb

@@ -1,6 +1,7 @@
 require 'mack-facets'
-require 'application_configuration'
+require 'configatron'
 require File.join(File.dirname(__FILE__), 'boot_loader')
+require File.join(File.dirname(__FILE__), '..', 'core_extensions', 'kernel')
 require File.join(File.dirname(__FILE__), '..', 'utils', 'paths')
 boot_load(:configuration) do
   module Mack
@@ -14,83 +15,85 @@ boot_load(:configuration) do
     def self.env
       ENV["MACK_ENV"] ||= "development"
     end
+    
+    # Returns true/false based on whether the specified environment
+    # is the current environment
+    def self.env?(env)
+      self.env == env.to_s
+    end
   
     # All configuration for the Mack subsystem happens here. Each of the default environments,
     # production, development, and test have their own default configuration options. These
     # get merged with overall default options.
     module Configuration # :nodoc:
+      unless const_defined?("LOADED")
+        configatron.mack.render_url_timeout = 5
+        configatron.mack.cache_classes = true
+        configatron.mack.reload_classes = 1
+        configatron.mack.deep_class_reload = false
+        configatron.mack.use_lint = true
+        configatron.mack.show_exceptions = true
+        configatron.mack.use_sessions = true
+        configatron.mack.session_id = '_mack_session_id'
+        configatron.mack.cookie_values = {:path => '/'}
+        configatron.mack.site_domain = 'http://localhost:3000'
+        configatron.mack.testing_framework = :rspec
+        configatron.mack.rspec_file_pattern = 'test/**/*_spec.rb'
+        configatron.mack.test_case_file_pattern = 'test/**/*_test.rb'
+        configatron.mack.session_store = :cookie
+        configatron.mack.disable_forgery_detector = false
+        configatron.mack.assets.max_distribution = 4
+        configatron.mack.assets.hosts = ''
+        configatron.mack.assets.stamp = Time.now.to_i
+        configatron.mack.cookie_session_store.expiry_time = 4.hours
+        
+        configatron.mack.log.level = :info
+        configatron.mack.log.detailed_requests = true
+        configatron.mack.log.disable_initialization_logging = false
+        configatron.mack.log.root = Mack::Paths.log
+        configatron.mack.log.colors.db = :cyan
+        configatron.mack.log.colors.error = :red
+        configatron.mack.log.colors.fatal = :red
+        configatron.mack.log.colors.warn = :yellow
+        configatron.mack.log.colors.completed = :purple
+        configatron.mack.log.use_colors = true
+        configatron.mack.log.time_format = '%Y-%m-%d %H:%M:%S'
+      
+        if Mack.env?(:production)
+          configatron.mack.use_lint = false
+          configatron.mack.show_exceptions = false
+          configatron.mack.log.level = :info
+          configatron.mack.log.detailed_requests = true
+          configatron.mack.log.use_colors = false
+        end
+      
+        if Mack.env?(:development)
+          configatron.mack.cache_classes = false
+          configatron.mack.log.level = :debug
+        end
 
-      class << self
-        attr_accessor :initialized_core
-        attr_accessor :initialized_application
-      end
+        if Mack.env?(:test)
+          configatron.mack.cookie_values = {}
+          configatron.mack.session_store = :test
+          configatron.mack.disable_forgery_detector = true
+          configatron.mack.run_remote_tests = true
+          configatron.mack.log.level = :error
+        end
 
-      # use local memory and store stuff for 24 hours:
-      # use file for sessions and store them for 4 hours: 
-      DEFAULTS_PRODUCTION = {
-        "mack::use_lint" => false,
-        "mack::show_exceptions" => false,
-        "log_level" => "info",
-        "log::detailed_requests" => false
-      } unless self.const_defined?("DEFAULTS_PRODUCTION")
-    
-      # use local memory and store stuff for 5 minutes:
-      DEFAULTS_DEVELOPMENT = {
-        "mack::cache_classes" => false,
-        "log_level" => "debug"
-      } unless self.const_defined?("DEFAULTS_DEVELOPMENT")
-    
-      # use local memory and store stuff for 1 hour:
-      DEFAULTS_TEST = {
-        "log_level" => "error",
-        "run_remote_tests" => true,
-        "mack::cookie_values" => {},
-        "mack::session_store" => "test",
-        "mack::disable_forgery_detector" => true
-      } unless self.const_defined?("DEFAULTS_TEST")
-    
-      unless self.const_defined?("DEFAULTS")
-        DEFAULTS = {
-          "mack::render_url_timeout" => 5,
-          "mack::cache_classes" => true,
-          "mack::use_lint" => true,
-          "mack::show_exceptions" => true,
-          "mack::use_sessions" => true,
-          "mack::session_id" => "_mack_session_id",
-          "mack::cookie_values" => {
-            "path" => "/"
-          },
-          "mack::site_domain" => "http://localhost:3000",
-          "mack::testing_framework" => "rspec",
-          "mack::rspec_file_pattern" => "test/**/*_spec.rb",
-          "mack::test_case_file_pattern" => "test/**/*_test.rb",
-          "log::detailed_requests" => true,
-          "log::db_color" => "cyan",
-          "log::error_color" => "red",
-          "log::fatal_color" => "red",
-          "log::warn_color" => "yellow",
-          "log::completed_color" => "purple",
-          "log_level" => "info",
-          "mack::session_store" => "cookie",
-          "cookie_session_store::expiry_time" => 4.hours
-        }#.merge(eval("DEFAULTS_#{Mack.env.upcase}"))
-      end
-    
-      app_config.load_hash(DEFAULTS, "mack_defaults")
-      app_config.load_hash(eval("DEFAULTS_#{Mack.env.upcase}"), "mack_defaults_#{Mack.env}")
-      app_config.load_file(Mack::Paths.app_config("default.yml"))
-      app_config.load_file(Mack::Paths.app_config("#{Mack.env}.yml"))
-      # app_config.reload
+        if File.exists?(Mack::Paths.configatron('default.rb'))
+          require Mack::Paths.configatron('default.rb')
+        end
+      
+        if File.exists?(Mack::Paths.configatron("#{Mack.env}.rb"))
+          require Mack::Paths.configatron("#{Mack.env}.rb")
+        end
     
-      def self.dump
-        fcs = app_config.instance.instance_variable_get("@final_configuration_settings")
-        conf = {}
-        fcs.each_pair do |k, v|
-          unless v.is_a?(Application::Configuration::Namespace)
-            conf[k.to_s] = v unless k.to_s.match("__")
-          end
+        def self.dump
+          configatron.inspect
         end
-        conf
+        
+        LOADED = true
+        
       end
     
     end

data/lib/mack/initialization/console.rb

@@ -21,7 +21,7 @@ self.send(:include, Mack::Routes::Urls)
 # without having to exit the console and start again.
 def reload!
   ivar_cache("_rack_reloader") do
-    Rack::Reloader.new(nil, 1)
+    Mack::Reloader.new(nil)
   end.reload!
 end
 

data/lib/mack/initialization/helpers.rb

@@ -1,11 +1,6 @@
 boot_load(:helpers, :logging) do
   # Include ApplicationHelper into all controllers:
-  Mack.logger.debug "Initializing helpers..." unless app_config.log.disable_initialization_logging
-  # adding application_helper module into all defined controllers
-  if Object.const_defined?("ApplicationHelper")
-    deprecate_method("ApplicationHelper", "Mack::ViewHelpers::ApplicationHelper", "0.7.0")
-    ApplicationHelper.include_safely_into(Mack::Rendering::ViewTemplate)
-  end
+  Mack.logger.debug "Initializing helpers..." unless configatron.mack.log.disable_initialization_logging
 
   module Mack
     module ControllerHelpers # :nodoc:

data/lib/mack/initialization/logging/basic_layout.rb

@@ -0,0 +1,14 @@
+module Mack
+  module Logging # :nodoc:
+    
+    class BasicLayout < ::Logging::Layout # :nodoc:
+
+      def format(event)
+        obj = format_obj(event.data)
+        sprintf("%*s:\t[%s]\t%s\n", ::Logging::MAX_LEVEL_LENGTH, ::Logging::LNAMES[event.level], Time.now.strftime(configatron.mack.log.time_format), obj)
+      end
+
+    end # BasicLayout
+
+  end # Logging
+end # Mack

data/lib/mack/initialization/logging/color_layout.rb

@@ -0,0 +1,23 @@
+module Mack
+  module Logging # :nodoc:
+
+    class ColorLayout < Mack::Logging::BasicLayout # :nodoc:
+
+      def format(event)
+        message = super(event)
+        if message.match(/^(SELECT|INSERT|UPDATE|DELETE|CREATE|DROP)/)
+          return Mack::Utils::Ansi::Color.wrap(configatron.mack.log.colors.db, message)
+        else
+          color = configatron.mack.log.colors.retrieve(event.level_name.downcase.to_sym, nil)
+          if color
+            return Mack::Utils::Ansi::Color.wrap(color, message)
+          else
+            return message
+          end
+        end
+      end
+
+    end # ColorLayout
+
+  end # Logging
+end # Mack

data/lib/mack/initialization/logging/filter.rb

@@ -0,0 +1,45 @@
+module Mack
+  module Logging # :nodoc:
+    
+    # Used to house a list of filters for parameter logging. The initial list
+    # includes password and password_confirmation
+    class Filter
+      include Singleton
+    
+      # The list of parameters you want filtered for logging.
+      attr_reader :list
+    
+      def initialize
+        @list = [:password, :password_confirmation]
+      end
+    
+      # Adds 'n' number of parameter names to the list
+      def add(*args)
+        @list << args
+        @list.flatten!
+      end
+    
+      # Removes 'n' number of parameter names from the list
+      def remove(*args)
+        @list.delete_values(*args)
+      end
+    
+      class << self
+      
+        def remove(*args)
+          Mack::Logging::Filter.instance.remove(*args)
+        end
+      
+        def add(*args)
+          Mack::Logging::Filter.instance.add(*args)
+        end
+      
+        def list
+          Mack::Logging::Filter.instance.list
+        end
+      
+      end
+    
+    end # Filter
+  end # Logging
+end # Mack

data/lib/mack/initialization/logging.rb

@@ -1,6 +1,30 @@
 boot_load(:logging, :configuration) do
-  require 'log4r'
+  
+  require 'logging'
   require File.join(File.dirname(__FILE__), "..", "utils", "ansi", "ansi_color")
+  require File.join(File.dirname(__FILE__), 'logging', 'filter')
+  require File.join(File.dirname(__FILE__), 'logging', 'basic_layout')
+  require File.join(File.dirname(__FILE__), 'logging', 'color_layout')
+  
+  module Logging # :nodoc:
+    
+    def self.level_name_from_num(num)
+      h = ivar_cache do
+        Logging::LEVELS.invert
+      end
+      h[num]
+    end
+    
+    class LogEvent # :nodoc:
+      
+      def level_name
+        ::Logging.level_name_from_num(self.level)
+      end
+      
+    end
+    
+  end # Logging
+  
   module Mack
   
     def self.logger
@@ -12,102 +36,22 @@ boot_load(:logging, :configuration) do
     end
   
     def self.reset_logger!
-      log_directory = app_config.log_root || Mack::Paths.log
+      log_directory = configatron.mack.log.retrieve(:root, Mack::Paths.log)
       begin
         FileUtils.mkdir_p(log_directory)
       rescue Exception => e
       end
-
-      Mack.logger = Log4r::Logger.new('')
-      Mack.logger.level =  Module.instance_eval("Log4r::#{(app_config.log_level || :info).to_s.upcase}")
-
-      format = Log4r::PatternFormatter.new(:pattern => "%l:\t[%d]\t%M")
-
-      if Mack.env == "development"
-        # console:
-        Mack.logger.add(Log4r::StdoutOutputter.new('console', :formatter => format))
-      end
-
-      # file:
-      Mack.logger.add(Log4r::FileOutputter.new('fileOutputter', :filename => File.join(log_directory, "#{Mack.env}.log"), :trunc => false, :formatter => format))    
+      
+      Mack.logger = ::Logging::RootLogger.new
+      Mack.logger.add_appenders(::Logging::Appenders::File.new(Mack.env, :filename => File.join(log_directory, "#{Mack.env}.log"), :layout => Mack::Logging::BasicLayout.new))
+      Mack.logger.add_appenders(::Logging::Appenders::Stdout.new(:layout => Mack::Logging::ColorLayout.new)) if Mack.env?(:development)
+      Mack.logger.level = configatron.mack.log.retrieve(:level, :info)
     end
   
-  end
+  end # Mack
 
   unless Mack.logger
-    module Log4r # :nodoc:
-      class IOOutputter # :nodoc:
-
-        # let's not do this more than once. :)
-        unless Log4r::IOOutputter.private_instance_methods.include?("old_write")
-
-          alias_method :old_write, :write
-
-          def write(data)
-            case data
-            when /^(DEBUG:|INFO:|WARN:|ERROR:|FATAL:)\s\[.*\]\s(SELECT|INSERT|UPDATE|DELETE|CREATE|DROP)/
-              old_write(Mack::Utils::Ansi::Color.wrap(app_config.log.db_color, data))
-            else
-              level = data.match(/^\w+/).to_s
-              color = app_config.log.send("#{level.downcase}_color")
-              if color
-                old_write(Mack::Utils::Ansi::Color.wrap(color, data))
-              else
-                old_write(data)
-              end
-            end
-          end
-
-        end
-
-      end # IOOutputter
-    end # Log4r
-  
     Mack.reset_logger!
   end
 
-  module Mack
-    module Logging # :nodoc:
-      # Used to house a list of filters for parameter logging. The initial list
-      # includes password and password_confirmation
-      class Filter
-        include Singleton
-      
-        # The list of parameters you want filtered for logging.
-        attr_reader :list
-      
-        def initialize
-          @list = [:password, :password_confirmation]
-        end
-      
-        # Adds 'n' number of parameter names to the list
-        def add(*args)
-          @list << args
-          @list.flatten!
-        end
-      
-        # Removes 'n' number of parameter names from the list
-        def remove(*args)
-          @list.delete_values(*args)
-        end
-      
-        class << self
-        
-          def remove(*args)
-            Mack::Logging::Filter.instance.remove(*args)
-          end
-        
-          def add(*args)
-            Mack::Logging::Filter.instance.add(*args)
-          end
-        
-          def list
-            Mack::Logging::Filter.instance.list
-          end
-        
-        end
-      
-      end
-    end
-  end
-end
+end # boot_load

data/lib/mack/initialization/plugins.rb

@@ -1,5 +1,5 @@
 boot_load(:plugins, :initializers) do
-  Mack.logger.debug "Initializing plugins..." unless app_config.log.disable_initialization_logging
+  Mack.logger.debug "Initializing plugins..." unless configatron.mack.log.disable_initialization_logging
   plugins = [] # a list of all plugins
   Dir.glob(Mack::Paths.plugins("*")).each do |d|
     plugins << d

data/lib/mack/rendering/engine/builder.rb

@@ -7,6 +7,9 @@ module Mack
       class Builder < Mack::Rendering::Engine::Base
         
         def render(io, binding)
+          if io.is_a?(File)
+            io = io.read
+          end
           @_xml = ::Builder::XmlMarkup.new(:target => @_xml_output, :indent => 1)
           view_template.instance_variable_set("@_xml", @_xml)
           eval(io, binding)

data/lib/mack/rendering/engine/erubis.rb

@@ -6,12 +6,35 @@ module Mack
       class Erubis < Mack::Rendering::Engine::Base
         
         def render(io, binding)
-          src = Mack::Rendering::Engine::Erubis::TemplateCache.instance.cache[io]
-          if src.nil?
-            src = ::Erubis::Eruby.new(io).src
-            Mack::Rendering::Engine::Erubis::TemplateCache.instance.cache[io] = src
+          io_src = io
+          file_name = nil
+          if io.is_a?(File)
+            io_src = io.read
+            file_name = io.path
+          end
+          
+          eruby = nil
+
+          eruby = ::Erubis::Eruby.new(io_src)
+
+          eruby.filename = file_name
+          begin
+            eruby.result(binding)
+          rescue NoMethodError => e
+            if file_name
+              m = NoMethodError.new("undefined method `#{e.name}' for #{e.backtrace[0].match(/(^.+:\d)/).captures.first}")
+              m.set_backtrace(e.backtrace)
+              raise m
+            end
+            raise e
+          rescue NameError => e
+            if file_name
+              m = NameError.new("undefined local variable or method `#{e.name}' for #{e.backtrace[0].match(/(^.+:\d)/).captures.first}")
+              m.set_backtrace(e.backtrace)
+              raise m
+            end
+            raise e
           end
-          eval(src, binding)
         end
         
         def extension
@@ -51,17 +74,6 @@ module Mack
           eval( "_buf", the_binding, __FILE__, __LINE__)
         end
         
-        class TemplateCache # :nodoc:
-          include Singleton
-          
-          attr_reader :cache
-          
-          def initialize
-            @cache = {}
-          end
-          
-        end
-        
       end # Erubis
     end # Engines
   end # Rendering

data/lib/mack/rendering/type/file_base.rb

@@ -13,7 +13,7 @@ module Mack
           Mack::Rendering::Engine::Registry.engines[type].each do |e|
             @engine = find_engine(e).new(self.view_template)
             find_file(file + ".#{@engine.extension}") do |f|
-              return @engine.render(File.open(f).read, self.binder)
+              return @engine.render(File.new(f), self.binder)
             end
           end
           raise Mack::Errors::ResourceNotFound.new(file + ".*")