mack 0.7.0.1 → 0.7.1

data/lib/mack/initialization/logging.rb

@@ -1,113 +1,113 @@
-#--
-# Configure logging
-#++
-require File.join(File.dirname(__FILE__), "..", "utils", "ansi", "ansi_color")
-module Mack
+boot_load(:logging, :configuration) do
+  require 'log4r'
+  require File.join(File.dirname(__FILE__), "..", "utils", "ansi", "ansi_color")
+  module Mack
   
-  def self.logger
-    $mack_default_logger
-  end
-  
-  def self.logger=(log)
-    $mack_default_logger = log
-  end
+    def self.logger
+      $mack_default_logger
+    end
   
-  def self.reset_logger!
-    log_directory = app_config.log_root || File.join(Mack.root, "log")
-    begin
-      FileUtils.mkdir_p(log_directory)
-    rescue Exception => e
+    def self.logger=(log)
+      $mack_default_logger = log
     end
+  
+    def self.reset_logger!
+      log_directory = app_config.log_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}")
+      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")
+      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
+      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))    
-  end
+      # file:
+      Mack.logger.add(Log4r::FileOutputter.new('fileOutputter', :filename => File.join(log_directory, "#{Mack.env}.log"), :trunc => false, :formatter => format))    
+    end
   
-end
+  end
 
-unless Mack.logger
-  module Log4r # :nodoc:
-    class IOOutputter # :nodoc:
+  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")
+        # let's not do this more than once. :)
+        unless Log4r::IOOutputter.private_instance_methods.include?("old_write")
 
-        alias_method :old_write, :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))
+          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
-              old_write(data)
+              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
+        end
 
-    end # IOOutputter
-  end # Log4r
+      end # IOOutputter
+    end # Log4r
   
-  Mack.reset_logger!
-end
+    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
+  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
+        # The list of parameters you want filtered for logging.
+        attr_reader :list
       
-      # Adds 'n' number of parameter names to the list
-      def add(*args)
-        @list << args
-        @list.flatten!
-      end
+        def initialize
+          @list = [:password, :password_confirmation]
+        end
       
-      # Removes 'n' number of parameter names from the list
-      def remove(*args)
-        @list.delete_values(*args)
-      end
+        # Adds 'n' number of parameter names to the list
+        def add(*args)
+          @list << args
+          @list.flatten!
+        end
       
-      class << self
-        
+        # Removes 'n' number of parameter names from the list
         def remove(*args)
-          Mack::Logging::Filter.instance.remove(*args)
+          @list.delete_values(*args)
         end
+      
+        class << self
         
-        def add(*args)
-          Mack::Logging::Filter.instance.add(*args)
-        end
+          def remove(*args)
+            Mack::Logging::Filter.instance.remove(*args)
+          end
         
-        def list
-          Mack::Logging::Filter.instance.list
-        end
+          def add(*args)
+            Mack::Logging::Filter.instance.add(*args)
+          end
         
-      end
+          def list
+            Mack::Logging::Filter.instance.list
+          end
+        
+        end
       
+      end
     end
   end
 end

data/lib/mack/initialization/plugins.rb

@@ -1,13 +1,16 @@
-plugins = [] # a list of all plugins
-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
-plugins.sort.each do |plug|
-  begin
-    require File.join(plug, "init.rb") # load the init.rb for each plugin.
-  rescue Exception => e
-    puts e.message
+boot_load(:plugins, :initializers) do
+  Mack.logger.debug "Initializing plugins..." unless app_config.log.disable_initialization_logging
+  plugins = [] # a list of all plugins
+  Dir.glob(Mack::Paths.plugins("*")).each do |d|
+    plugins << d
+    $: << File.join(d, "lib") # add the lib for this plugin to the global load path
+  end
+  plugins.sort.each do |plug|
+    begin
+      require File.join(plug, "init.rb") # load the init.rb for each plugin.
+    rescue Exception => e
+      puts e.message
+    end
+    $:.delete(File.join(plug, "lib")) # remove the plugins lib directory from the global load path.
   end
-  $:.delete(File.join(plug, "lib")) # remove the plugins lib directory from the global load path.
 end

data/lib/mack/initialization/server/simple_server.rb

@@ -8,9 +8,9 @@ module Mack
     class << self
       
       def run(options)
-        r = "Rack::Handler::#{options.handler.camelcase}"
-        puts "Starting app using: #{r} in #{options.environment} mode on port: #{options.port}"
-        eval(r).run(Mack::Utils::Server.build_app, :Port => options.port)
+        r = "Rack::Handler::#{options[:handler].camelcase}"
+        puts "Starting app using: #{r} in #{options[:environment]} mode on port: #{options[:port]}"
+        eval(r).run(Mack::Utils::Server.build_app, :Port => options[:port])
       end
       
     end

data/lib/mack/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.root, "app", "views", self.controller.controller_name)
+            Mack::Paths.views(self.controller.controller_name)
           end
         end
         

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

@@ -12,7 +12,7 @@ module Mack
         # Example:
         #   app/views/layouts/application.html.erb 
         def render
-          l_file = File.join(Mack.root, "app", "views", 'layouts', "#{self.options[:layout]}.#{self.options[:format]}")
+          l_file = Mack::Paths.layouts("#{self.options[:layout]}.#{self.options[:format]}")
           begin
             render_file(l_file, :layout)
           rescue Mack::Errors::ResourceNotFound => e

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

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

data/lib/mack/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.root, "public", p_file) do |f|
+          find_file(Mack::Paths.public(p_file)) do |f|
             return File.open(f).read
           end
           raise Mack::Errors::ResourceNotFound.new(p_file)

data/lib/mack/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.root, "app", "views", "#{self.render_value}.#{self.options[:format]}")
+          t_file = Mack::Paths.views("#{self.render_value}.#{self.options[:format]}")
           render_file(t_file, :template)
         end
         

data/lib/mack/runner.rb

@@ -100,8 +100,8 @@ module Mack
       if File.extname(env["PATH_INFO"]).blank?
         env["PATH_INFO"] << ".html"
       end
-      if File.exists?(File.join(Mack.root, "public", env["PATH_INFO"]))
-        return Rack::File.new(File.join(Mack.root, "public")).call(env)
+      if File.exists?(Mack::Paths.public(env["PATH_INFO"]))
+        return Rack::File.new(Mack::Paths.public).call(env)
       else
         raise exception
       end

data/lib/mack/runner_helpers/session.rb

@@ -11,7 +11,7 @@ module Mack
           unless self.sess_id
             self.sess_id = create_new_session(request, response, cookies)
           else
-            sess = Cachetastic::Caches::MackSessionCache.get(self.sess_id)
+            sess = Mack::SessionStore.get(self.sess_id, request, response, cookies)
             if sess
               request.session = sess
             else
@@ -26,7 +26,7 @@ module Mack
         unless response.redirection?
           request.session.delete(:tell)
         end
-        Cachetastic::Caches::MackSessionCache.set(request.session.id, request.session) if app_config.mack.use_sessions
+        Mack::SessionStore.set(request.session.id, request, response, cookies) if app_config.mack.use_sessions
       end
       
       private
@@ -39,7 +39,7 @@ module Mack
         cookies[app_config.mack.session_id] = {:value => id, :expires => nil}
         sess = Mack::Session.new(id)
         request.session = sess
-        Cachetastic::Caches::MackSessionCache.set(id, sess)
+        Mack::SessionStore.set(request.session.id, request, response, cookies)
         id
       end
       

data/lib/mack/sessions/cookie_session_store.rb

@@ -0,0 +1,44 @@
+require File.join(File.dirname(__FILE__), "session_store_base")
+module Mack
+  module SessionStore
+    # Stores session information in the user's cookie.
+    # The session information is encrypted using the mack-encryption library.
+    # This is the default session store for Mack applications.
+    # To set the expiry time for this session store use the following app_config setting:
+    #   cookie_session_store::expiry_time: <%= 4.hours %>
+    # It is recommend that you set the app_config setting 'default_secret_key' to
+    # something, otherwise it will generate a random one each time you start your application,
+    # which could make decrypting cookies a bit of a pain. :)
+    class Cookie < Mack::SessionStore::Base
+      
+      class << self
+        
+        # Returns a decrypted session from the cookie or nil.
+        def get(id, request, response, cookies)
+          c = cookies[id]
+          return nil if c.nil?
+          begin
+            sess = YAML.load(c.decrypt)
+            return sess
+          rescue Exception => e
+            # The cookie was bad, delete it and start a new session.
+            c.delete(id)
+            return nil
+          end
+        end
+        
+        # Encrypts the session and places it into the cookie.
+        def set(id, request, response, cookies)
+          cookies[id] = {:value => YAML.dump(request.session).encrypt, :expires => (Time.now + app_config.cookie_session_store.expiry_time)}
+        end
+        
+        # Deletes the cookie.
+        def expire(id, request, response, cookies)
+          cookies.delete(id)
+        end
+      
+      end
+      
+    end
+  end
+end

data/lib/mack/sessions/session_store_base.rb

@@ -0,0 +1,62 @@
+module Mack
+  module SessionStore
+    
+    class << self
+      
+      def store # :nodoc:
+        ivar_cache do
+          "Mack::SessionStore::#{app_config.mack.session_store.camelcase}".constantize
+        end
+      end
+      
+      # Calls the get method on the specified session store.
+      def get(*args)
+        self.store.get(*args)
+      end
+      
+      # Calls the set method on the specified session store.
+      def set(*args)
+        self.store.set(*args)
+      end
+      
+      # Calls the expire method on the specified session store.
+      def expire(*args)
+        self.store.expire(*args)
+      end
+      
+      # Calls the expire_all method on the specified session store.
+      def expire_all(*args)
+        self.store.expire_all(*args)
+      end
+      
+    end
+    
+    class Base
+
+      class << self
+    
+        # Needs to be defined by the subclass. Raises NoMethodError.
+        def get(id, request, response, cookies)
+          raise NoMethodError.new("get")
+        end
+        
+        # Needs to be defined by the subclass. Raises NoMethodError.
+        def set(id, request, response, cookies)
+          raise NoMethodError.new("set")
+        end
+        
+        # Needs to be defined by the subclass. Raises NoMethodError.
+        def expire(id, request, response, cookies)
+          raise NoMethodError.new("expire")
+        end
+        
+        # Needs to be defined by the subclass. Raises NoMethodError.
+        def expire_all(request, response, cookies)
+          raise NoMethodError.new("expire_all")
+        end
+      
+      end
+      
+    end # Base
+  end # SessionStore
+end # Mack

data/lib/mack/sessions/test_session_store.rb

@@ -0,0 +1,38 @@
+require File.join(File.dirname(__FILE__), "session_store_base")
+module Mack
+  module SessionStore
+    # A simple Hash based session store for testing.
+    class Test < Mack::SessionStore::Base
+
+      class << self
+        
+        def get(id, *args) # :nodoc:
+          store[id]
+        end
+        
+        def set(id, request, *args) # :nodoc:
+          store[id] = request.session
+        end
+        
+        def direct_set(id, session) # :nodoc:
+          store[id] = session
+        end
+        
+        def expire(id, *args) # :nodoc:
+          store.delete(id)
+        end
+        
+        def expire_all # :nodoc:
+          @store = {}
+        end
+        
+        private
+        def store
+          @store ||= {}
+        end
+        
+      end
+      
+    end # Test
+  end # SessionStore
+end # Mack