mack 0.5.5.4 → 0.6.0

data/lib/initialization/console.rb

@@ -9,7 +9,10 @@ fl = File.join(File.dirname(__FILE__), "..")
 
 require File.join(fl, "mack")
 
-require File.join(fl, "test_extensions", "test_helpers")
+require File.join(fl, "testing", "helpers")
 
 # self.send(:include, Mack::TestHelpers)
-self.send(:include, Mack::Routes::Urls)
+self.send(:include, Mack::Routes::Urls)
+
+# Prevent AutoRunner from getting executed when user exits out of console
+Test::Unit.run = true

data/lib/initialization/helpers.rb

@@ -0,0 +1,31 @@
+# Include ApplicationHelper into all controllers:
+Mack.logger.info "Initializing helpers..."
+# adding application_helper module into all defined controllers
+if Object.const_defined?("ApplicationHelper")
+  Mack.logger.warn("ApplicationHelper has been deprecated! Please use move it to Mack::ViewHelpers::ApplicationHelper instead.")
+  ApplicationHelper.include_safely_into(Mack::Rendering::ViewTemplate)
+end
+
+module Mack
+  module ControllerHelpers # :nodoc:
+  end
+  
+  module ViewHelpers # :nodoc:
+  end
+end
+
+# Find controller level Helpers and include them into their respective controllers
+Mack::ControllerHelpers.constants.each do |cont|
+  h = "Mack::ControllerHelpers::#{cont}"
+  if Object.const_defined?(cont)
+    h.constantize.include_safely_into(cont.constantize)
+  else
+    Mack.logger.warn("Could not find: #{cont} controller for helper: #{h}")
+  end
+end
+
+# Find view level Helpers and include them into the Mack::Rendering::ViewTemplate
+Mack::ViewHelpers.constants.each do |cont|
+  h = "Mack::ViewHelpers::#{cont}".constantize
+  h.include_safely_into(Mack::Rendering::ViewTemplate)
+end

data/lib/initialization/logging.rb

@@ -1,24 +1,78 @@
 #--
 # Configure logging
 #++
-include Log4r
 
-log_dir_loc = File.join(Mack::Configuration.root, "log")
-FileUtils.mkdir_p(log_dir_loc)
+module Mack
+  
+  def self.logger
+    $mack_default_logger
+  end
+  
+  def self.logger=(log)
+    $mack_default_logger = log
+  end
+  
+end
+
+unless Mack.logger
+  log_directory = app_config.log_root || File.join(Mack.root, "log")
+  FileUtils.mkdir_p(log_directory)
 
-unless Object.const_defined?("MACK_DEFAULT_LOGGER")
-  log = Log4r::Logger.new('')
-  log.level =  Module.instance_eval("Log4r::#{app_config.log.level.to_s.upcase}")
-  # console:
-  if app_config.log.console
-    console_format = PatternFormatter.new(:pattern => app_config.log.console_format)
-    log.add(Log4r::StdoutOutputter.new('console', :formatter => console_format))
+  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:
-  if app_config.log.file
-    file_format = PatternFormatter.new(:pattern => app_config.log.file_format)
-    log.add(FileOutputter.new('fileOutputter', :filename => File.join(log_dir_loc, "#{Mack::Configuration.env}.log"), :trunc => false, :formatter => file_format))
+  Mack.logger.add(Log4r::FileOutputter.new('fileOutputter', :filename => File.join(log_directory, "#{Mack.env}.log"), :trunc => false, :formatter => format))
+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
-  
-  Object::MACK_DEFAULT_LOGGER = log
 end

data/lib/initialization/orm_support.rb

@@ -1,4 +1,10 @@
-orm = app_config.orm || 'data_mapper'
- 
-require "mack-#{orm}"
-require "mack-#{orm}_tasks"
+# If the application explicitly says it doesn't want to use any orm,
+# then we're not going to initialize any default orm.
+# Note: this is initialization process only. By the default, application
+# generated by mack still have data_mapper as default.
+orm = app_config.orm
+unless orm.nil? 
+  Mack.logger.info "Initializing #{orm} orm..."
+  require "mack-#{orm}"
+  require "mack-#{orm}_tasks"
+end

data/lib/initialization/plugins.rb

@@ -1,5 +1,5 @@
 plugins = [] # a list of all plugins
-Dir.glob(File.join(Mack::Configuration.plugins, "*")).each do |d|
+Dir.glob(File.join(Mack.root, "vendor", "plugins", "*")).each do |d|
   plugins << d
   $: << File.join(d, "lib") # add the lib for this plugin to the global load path
 end

data/lib/mack.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'rack'
 require 'digest'
-require 'mack_ruby_core_extensions'
+require 'mack-facets'
 require 'application_configuration'
 require 'cachetastic'
 require 'fileutils'
@@ -15,101 +15,43 @@ require 'rinda/tuplespace'
 require 'builder'
 require 'erubis'
 require 'erb'
-require 'markaby'
-require 'haml'
 require 'genosaurus'
 require 'net/http'
+require 'pp'
+require 'test/unit'
 
 require File.join(File.dirname(__FILE__), "initialization", "configuration.rb")
 
 unless Mack::Configuration.initialized
   
-  puts "Starting application in #{Mack::Configuration.env} mode."
-  puts "Mack root: #{Mack::Configuration.root}"
-  
+  puts "Initializing logging..."
   require File.join(File.dirname(__FILE__), "initialization", "logging.rb")
   
-  require File.join(File.dirname(__FILE__), "initialization", "orm_support.rb")
-
   fl = File.join(File.dirname(__FILE__))
 
+  Mack.logger.info "Starting application in #{Mack.env} mode."
+  Mack.logger.info "Mack root: #{Mack.root}"
+
+  Mack.logger.info "Initializing core classes..."
   # Require all the necessary files to make Mack actually work!
-  ["distributed", "errors", "core_extensions", "utils", "test_extensions", "routing", "view_helpers", "rendering", "controller", "tasks", "initialization/server", "generators"].each do |dir|
+  lib_dirs = ["distributed", "errors", "core_extensions", "utils", "routing", "view_helpers", "rendering", "controller", "tasks", "initialization/server", "generators"]
+  lib_dirs << "testing" if Mack.env == "test"
+  lib_dirs.each do |dir|
     dir_globs = Dir.glob(File.join(fl, dir, "**/*.rb"))
     dir_globs.each do |d|
       require d
     end
   end
   
-
-
-  # ------------------------------------------------------------------------
-
-  # set up application stuff:
-
-  # set up routes:
-  require File.join(Mack::Configuration.config_directory, "routes")
-  
-  # set up initializers:
-  Dir.glob(File.join(Mack::Configuration.config_directory, "initializers", "**/*.rb")) do |d|
-    require d
-  end
-  Mack::Utils::GemManager.instance.do_requires
-
-  # require 'plugins':
-  require File.join(File.dirname(__FILE__), "initialization", "plugins.rb")
-  
-  # make sure that default_controller is available to other controllers
-  path = File.join(Mack::Configuration.app_directory, "controllers", "default_controller.rb")
-  require path if File.exists?(path) 
-  
-  # require 'app' files:
-  Dir.glob(File.join(Mack::Configuration.app_directory, "**/*.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
-  
-  # require 'lib' files:
-  Dir.glob(File.join(Mack::Configuration.lib_directory, "**/*.rb")).each do |d|
-    require d
-  end
+  require File.join(File.dirname(__FILE__), "runner")
   
+  require File.join(File.dirname(__FILE__), "initialization", "orm_support.rb")
 
-  # ------------------------------------------------------------------------ 
-  
-  # Include ApplicationHelper into all controllers:
-  if Object.const_defined?("ApplicationHelper")
-    ApplicationHelper.include_safely_into(Mack::Controller::Base, Mack::Rendering::ViewTemplate)
-  end
-  # Find other Helpers and include them into their respective controllers.
-  Object.constants.collect {|c| c if c.match(/Controller$/)}.compact.each do |cont|
-    if Object.const_defined?("#{cont}Helper")
-      h = "#{cont}Helper".constantize
-      h.include_safely_into(cont, Mack::Rendering::ViewTemplate)
-    end
-  end
+  require File.join(File.dirname(__FILE__), "initialization", "application.rb")
   
-  # Find view level Helpers and include them into the Mack::Rendering::ViewTemplate
-  Mack::ViewHelpers.constants.each do |cont|
-      h = "Mack::ViewHelpers::#{cont}".constantize
-      h.include_safely_into(Mack::Rendering::ViewTemplate)
-  end
+  require File.join(File.dirname(__FILE__), "initialization", "helpers.rb")
   
-  Mack::Configuration.set(:initialized, "true") if Mack::Configuration.initialized.nil?
-end
+  Mack::Configuration.initialized = true if Mack::Configuration.initialized.nil?
 
-require File.join(File.dirname(__FILE__), "runner")
+  Mack.logger.info "Initialization finished."
+end

data/lib/mack_tasks.rb

@@ -5,7 +5,10 @@ require 'rubygems'
 require 'application_configuration'
 
 require File.join(File.dirname(__FILE__), "initialization", "configuration.rb")
-require File.join(File.dirname(__FILE__), "initialization", "orm_support.rb")
+orm = app_config.orm
+unless orm.nil?
+  require "mack-#{orm}_tasks"
+end
 
 # Requires all rake tasks that ship with the Mack framework.
 [File.join(File.dirname(__FILE__)), File.join(FileUtils.pwd, "lib"), File.join(FileUtils.pwd, "vendor", "plugins")].each do |dir|

data/lib/rendering/engine/erubis.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'base')
+require File.join(File.dirname(__FILE__), "base")
 module Mack
   module Rendering # :nodoc:
     module Engine # :nodoc:

data/lib/rendering/engine/registry.rb

@@ -14,11 +14,11 @@ module Mack
       
         def initialize
           @engines = {
-            :action => [:erubis, :builder, :markaby, :haml],
-            :template => [:erubis, :builder, :markaby, :haml],
-            :partial => [:erubis, :builder, :markaby, :haml],
-            :layout => [:erubis, :markaby, :haml],
-            :xml => [:builder, :erubis, :markaby, :haml]
+            :action => [:erubis, :builder],
+            :template => [:erubis, :builder],
+            :partial => [:erubis, :builder],
+            :layout => [:erubis],
+            :xml => [:builder, :erubis]
           }
         end
         

data/lib/rendering/type/action.rb

@@ -5,10 +5,11 @@ module Mack
       # Used to render a template that's relative to a controller.
       # 
       # Example:
-      #   class UsersController < Mack::Controller::Base
+      #   class UsersController
+      #     include Mack::Controller
       #     # /users/:id
       #     def show
-      #       @user = User.first(params(:id))
+      #       @user = User.first(params[:id])
       #     end
       #     # /users
       #     def index

data/lib/rendering/type/base.rb

@@ -49,7 +49,7 @@ module Mack
         # Returns the directory path for the current controller.
         def controller_view_path
           ivar_cache do
-            File.join(Mack::Configuration.views_directory, self.controller.controller_name)
+            File.join(Mack.root, "app", "views", self.controller.controller_name)
           end
         end
         

data/lib/rendering/type/layout.rb

@@ -12,11 +12,11 @@ module Mack
         # Example:
         #   app/views/layouts/application.html.erb 
         def render
-          l_file = File.join(Mack::Configuration.views_directory, 'layouts', "#{self.options[:layout]}.#{self.options[:format]}")
+          l_file = File.join(Mack.root, "app", "views", 'layouts', "#{self.options[:layout]}.#{self.options[:format]}")
           begin
             render_file(l_file, :layout)
           rescue Mack::Errors::ResourceNotFound => e
-            MACK_DEFAULT_LOGGER.warn(e)
+            Mack.logger.warn(e)
             self.view_template.yield_to :view
           end
         end

data/lib/rendering/type/partial.rb

@@ -24,7 +24,7 @@ module Mack
           else
             # it's elsewhere
             parts[parts.size - 1] = "_" << parts.last
-            partial = File.join(Mack::Configuration.views_directory, parts)
+            partial = File.join(Mack.root, "app", "views", parts)
           end
           partial = "#{partial}.#{self.options[:format]}"
           render_file(partial, :partial)

data/lib/rendering/type/public.rb

@@ -13,7 +13,7 @@ module Mack
           if File.extname(p_file).blank?
             p_file = "#{p_file}.#{self.options[:format]}"
           end
-          find_file(Mack::Configuration.public_directory, p_file) do |f|
+          find_file(Mack.root, "public", p_file) do |f|
             return File.open(f).read
           end
           raise Mack::Errors::ResourceNotFound.new(p_file)

data/lib/rendering/type/template.rb

@@ -13,7 +13,7 @@ module Mack
         # Example:
         #   <%= render(:template, "users/show") %> # => app/views/users/show.html.erb
         def render
-          t_file = File.join(Mack::Configuration.views_directory, "#{self.render_value}.#{self.options[:format]}")
+          t_file = File.join(Mack.root, "app", "views", "#{self.render_value}.#{self.options[:format]}")
           render_file(t_file, :template)
         end
         

data/lib/rendering/type/url.rb

@@ -81,18 +81,18 @@ module Mack
         def do_render_local_url(url, options)
           Timeout::timeout(app_config.mack.render_url_timeout || 5) do
             cooks = {}
-            self.cookies.all.each do |c,v|
+            self.view_template.cookies.all.each do |c,v|
               cooks[c] = v[:value]
             end
             request = self.view_template.request
-            # MACK_DEFAULT_LOGGER.debug "ORIGINAL REQUEST: #{request.env.inspect}"
+            # Mack.logger.debug "ORIGINAL REQUEST: #{request.env.inspect}"
             env = request.env.dup
             env - ["rack.input", "rack.errors", "PATH_INFO", "REQUEST_PATH", "REQUEST_URI", "REQUEST_METHOD"]
             env["rack.request.query_hash"] = options[:parameters] || {}
             env["HTTP_COOKIE"] = "#{app_config.mack.session_id}=#{request.session.id};" if env["HTTP_COOKIE"].nil?
             options = env.merge(options)
-            # MACK_DEFAULT_LOGGER.debug "NEW OPTIONS: #{options.inspect}"
-            # MACK_DEFAULT_LOGGER.debug "url: #{url}"
+            # Mack.logger.debug "NEW OPTIONS: #{options.inspect}"
+            # Mack.logger.debug "url: #{url}"
             response = yield url, options
             if response.successful?
               return response.body

data/lib/rendering/type/xml.rb

@@ -5,10 +5,11 @@ module Mack
       # Used to render an XML template that's relative to a controller.
       # 
       # Example:
-      #   class UsersController < Mack::Controller::Base
+      #   class UsersController
+      #     include Mack::Controller
       #     # /users/:id
       #     def show
-      #       @user = User.first(params(:id))
+      #       @user = User.first(params[:id])
       #     end
       #     # /users
       #     def index

data/lib/rendering/view_template.rb

@@ -1,7 +1,7 @@
 module Mack
   module Rendering # :nodoc:
     # This class is used to do all the view level bindings.
-    # It allows for seperation between the Mack::Controller::Base and the view levels.
+    # It allows for seperation between the Mack::Controller and the view levels.
     class ViewTemplate
       
       # Allows access to any options passed into the template.
@@ -16,12 +16,12 @@ module Mack
         @_yield_to_cache = {}
       end
       
-      # Allows access to the current Mack::Controller::Base object.
+      # Allows access to the current Mack::Controller object.
       def controller
         self.options[:controller]
       end
       
-      # Returns the Mack::Request associated with the current Mack::Controller::Base object.
+      # Returns the Mack::Request associated with the current Mack::Controller object.
       def request
         self.controller.request
       end
@@ -31,7 +31,7 @@ module Mack
         self.request.session
       end
       
-      # Returns the Mack::CookieJar associated with the current Mack::Controller::Base object.
+      # Returns the Mack::CookieJar associated with the current Mack::Controller object.
       def cookies
         self.controller.cookies
       end
@@ -44,12 +44,12 @@ module Mack
       end
       
       # Maps to the controller's param method. See also Mack::Controller::Base params.
-      def params(key)
-        self.controller.params(key)
+      def params
+        self.controller.params
       end
       
       # Handles rendering calls both in the controller and in the view.
-      # For full details of render examples see Mack::Controller::Base render.
+      # For full details of render examples see Mack::Controller render.
       # Although the examples there are all in controllers, they idea is still
       # the same for views.
       #