mack 0.6.1.2 → 0.7.0

data/lib/mack/generators/mack_application_generator/templates/test/{functional → controllers}/default_controller_spec.rb.template

@@ -1,9 +1,11 @@
 require File.join(File.dirname(__FILE__), "..", "spec_helper.rb")
 
 describe DefaultController do
+  
   it "should be able to successfully connect to home page" do
     get home_page_url
     response.should be_successful
     response.body.should match(/Welcome to your Mack application!/)
   end
+  
 end

data/lib/mack/generators/mack_application_generator/templates/test/{functional → controllers}/default_controller_test.rb.template

@@ -2,9 +2,11 @@
 require File.join(File.dirname(__FILE__), "..", "test_helper.rb")
 
 class DefaultControllerTest < Test::Unit::TestCase
+  
   def test_home_page
     get home_page_url
     assert_response :success
     assert_match("Welcome to your Mack application!", response.body)
   end
+  
 end

data/lib/mack/generators/mack_application_generator/templates/test/helpers/controllers/default_controller_helper_spec.rb.template

@@ -0,0 +1,6 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+
+describe Mack::ControllerHelpers::DefaultController do
+  include Mack::ControllerHelpers::DefaultController
+  
+end

data/lib/mack/generators/mack_application_generator/templates/test/helpers/controllers/default_controller_helper_test.rb.template

@@ -0,0 +1,10 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+
+class DefaultControllerHelperTest < Test::Unit::TestCase
+  include Mack::ControllerHelpers::DefaultController
+  
+  def test_truth
+    assert true
+  end
+  
+end

data/lib/mack/generators/mack_application_generator/templates/test/helpers/views/application_helper_spec.rb.template

@@ -0,0 +1,6 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+
+describe Mack::ViewHelpers::ApplicationHelper do
+  include Mack::ViewHelpers
+  
+end

data/lib/mack/generators/mack_application_generator/templates/test/helpers/views/application_helper_test.rb.template

@@ -0,0 +1,10 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+
+class ApplicationHelperTest < Test::Unit::TestCase
+  include Mack::ViewHelpers
+  
+  def test_truth
+    assert true
+  end
+  
+end

data/lib/mack/generators/view_helper_generator/manifest.yml

@@ -0,0 +1,15 @@
+helper_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "app", "helpers", "views", "helper.rb.template") %>
+  output_path: <%= File.join("app", "helpers", "views", "#{@name_singular}_helper.rb") %>
+<% if app_config.mack.testing_framework == "test_case" -%>
+helper_test_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "test", "helpers", "views", "test_case.rb.template") %>
+  output_path: <%= File.join("test", "helpers", "views", "#{@name_singular}_helper_test.rb") %>
+<% elsif app_config.mack.testing_framework == "rspec" -%>
+helper_test_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "test", "helpers", "views", "rspec.rb.template") %>
+  output_path: <%= File.join("test", "helpers", "views", "#{@name_singular}_helper_spec.rb") %>
+<% end -%>

data/lib/mack/generators/view_helper_generator/templates/app/helpers/views/helper.rb.template

@@ -0,0 +1,7 @@
+module Mack
+  module ViewHelpers
+    module <%= @name_singular_camel %>Helper
+
+    end
+  end
+end

data/lib/mack/generators/view_helper_generator/templates/test/helpers/views/rspec.rb.template

@@ -0,0 +1,6 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+
+describe Mack::ViewHelpers::<%= @name_singular_camel %>Helper do
+  include Mack::ViewHelpers
+  
+end

data/lib/mack/generators/view_helper_generator/templates/test/helpers/views/test_case.rb.template

@@ -0,0 +1,10 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+
+class <%= @name_singular_camel %>HelperTest < Test::Unit::TestCase
+  include Mack::ViewHelpers
+  
+  def test_truth
+    assert true
+  end
+  
+end

data/lib/mack/generators/view_helper_generator/view_helper_generator.rb

@@ -0,0 +1,16 @@
+# Generates view helpers for Mack applications.
+# 
+# Example:
+#   rake generate:view_helper name=post
+class ViewHelperGenerator < Genosaurus
+  
+  require_param :name
+  
+  def setup # :nodoc:
+    @name_singular = param(:name).singular.underscore
+    @name_plural = param(:name).plural.underscore
+    @name_singular_camel = @name_singular.camelcase
+    @name_plural_camel = @name_plural.camelcase
+  end
+  
+end

data/lib/mack/initialization/application.rb

@@ -1,13 +1,13 @@
 # set up initializers:
-Mack.logger.debug "Initializing custom initializers..."
+Mack.logger.debug "Initializing custom initializers..." unless app_config.log.disable_initialization_logging
 Dir.glob(File.join(Mack.root, "config", "initializers", "**/*.rb")) do |d|
   require d
 end
-Mack.logger.debug "Initializing custom gems..."
+Mack.logger.debug "Initializing custom gems..." unless app_config.log.disable_initialization_logging
 Mack::Utils::GemManager.instance.do_requires
 
 # require 'plugins':
-Mack.logger.debug "Initializing plugins..."
+Mack.logger.debug "Initializing plugins..." unless app_config.log.disable_initialization_logging
 require File.join(File.dirname(__FILE__), "plugins.rb")
 
 # make sure that default_controller is available to other controllers
@@ -15,17 +15,17 @@ path = File.join(Mack.root, "app", "controllers", "default_controller.rb")
 require path if File.exists?(path) 
 
 # require 'lib' files:
-Mack.logger.debug "Initializing lib classes..."
+Mack.logger.debug "Initializing lib classes..." unless app_config.log.disable_initialization_logging
 Dir.glob(File.join(Mack.root, "lib", "**/*.rb")).each do |d|
   require d
 end
 
 # set up routes:
-Mack.logger.debug "Initializing routes..."
+Mack.logger.debug "Initializing routes..." unless app_config.log.disable_initialization_logging
 require File.join(Mack.root, "config", "routes")
 
 # require 'app' files:
-Mack.logger.debug "Initializing 'app' classes..."
+Mack.logger.debug "Initializing 'app' classes..." unless app_config.log.disable_initialization_logging
 Dir.glob(File.join(Mack.root, "app", "**/*.rb")).each do |d|
   # puts "d: #{d}"
   begin

data/lib/mack/initialization/configuration.rb

@@ -52,7 +52,6 @@ module Mack
     DEFAULTS_TEST = {
       "log_level" => "error",
       "run_remote_tests" => true,
-      "mack::drb_timeout" => 0,
       "mack::cookie_values" => {}
     } unless self.const_defined?("DEFAULTS_TEST")
     
@@ -79,24 +78,33 @@ module Mack
           }
         },
         "mack::site_domain" => "http://localhost:3000",
-        "mack::use_distributed_routes" => false,
-        "mack::distributed_app_name" => nil,
-        "mack::distributed_site_domain" => "http://localhost:3000",
-        "mack::drb_timeout" => 1,
-        "mack::default_respository_name" => "default",
         "mack::testing_framework" => "rspec",
         "log::detailed_requests" => true,
-        "log::db_color" => "yellow",
+        "log::db_color" => "cyan",
         "log::error_color" => "red",
-        "log::completed_color" => "green",
+        "log::fatal_color" => "red",
+        "log::warn_color" => "yellow",
+        "log::completed_color" => "purple",
         "log_level" => "info"
-      }.merge(eval("DEFAULTS_#{Mack.env.upcase}"))
+      }#.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(File.join(Mack.root, "config", "app_config", "default.yml"))
     app_config.load_file(File.join(Mack.root, "config", "app_config", "#{Mack.env}.yml"))
     # app_config.reload
     
+    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
+      end
+      conf
+    end
+    
   end
 end

data/lib/mack/initialization/helpers.rb

@@ -1,8 +1,8 @@
 # Include ApplicationHelper into all controllers:
-Mack.logger.debug "Initializing helpers..."
+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")
-  Mack.logger.warn("ApplicationHelper has been deprecated! Please use move it to Mack::ViewHelpers::ApplicationHelper instead.")
+  deprecate_method("ApplicationHelper", "Mack::ViewHelpers::ApplicationHelper", "0.7.0")
   ApplicationHelper.include_safely_into(Mack::Rendering::ViewTemplate)
 end
 
@@ -27,5 +27,5 @@ 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)
+  Mack::Rendering::ViewTemplate.send(:include, h)
 end

data/lib/mack/initialization/logging.rb

@@ -1,7 +1,7 @@
 #--
 # Configure logging
 #++
-
+require File.join(File.dirname(__FILE__), "..", "utils", "ansi", "ansi_color")
 module Mack
   
   def self.logger
@@ -12,10 +12,30 @@ module Mack
     $mack_default_logger = log
   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
+    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))    
+  end
+  
 end
 
 unless Mack.logger
-
   module Log4r # :nodoc:
     class IOOutputter # :nodoc:
 
@@ -28,10 +48,14 @@ unless Mack.logger
           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))
-          when /^(ERROR:|FATAL:)/
-            old_write(Mack::Utils::Ansi::Color.wrap(app_config.log.error_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
 
@@ -40,21 +64,7 @@ unless Mack.logger
     end # IOOutputter
   end # Log4r
   
-  log_directory = app_config.log_root || File.join(Mack.root, "log")
-  FileUtils.mkdir_p(log_directory)
-
-  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.reset_logger!
 end
 
 module Mack

data/lib/mack/rendering/view_template.rb

@@ -14,6 +14,7 @@ module Mack
         self.render_value = render_value
         self.options = options
         @_yield_to_cache = {}
+        Thread.current[:view_template] = self
       end
       
       # Allows access to the current Mack::Controller object.

data/lib/mack/routing/route_map.rb

@@ -10,8 +10,7 @@ module Mack
       yield Mack::Routes::RouteMap.instance
       Mack::Routes::Urls.include_safely_into(Mack::Controller, 
                                              Mack::Rendering::ViewTemplate, 
-                                             Test::Unit::TestCase, 
-                                             Mack::Distributed::Routes::Urls)
+                                             Test::Unit::TestCase)
     end
     
     # Routes are the back bone of the Mack framework. They are used to map incoming urls to controllers.
@@ -135,6 +134,7 @@ module Mack
     # If A HollyCrapError is thrown it will be caught and rendered using the OopsController and the 500 action.
     # You can catch all exceptions using Exception.
     class RouteMap
+      include Extlib::Hook
       include Singleton
       
       def initialize # :nodoc:
@@ -187,6 +187,7 @@ module Mack
       # also added to the 'params' object in the request.
       # If the route can not be found a Mack::Errors::UndefinedRoute exception is raised.
       def get_route_from_request(req)
+        orig_pattern = req.path_info.dup
         pattern = req.path_info.downcase
         unless pattern == "/"
           pattern.chop! if pattern.match(/\/$/)
@@ -199,7 +200,7 @@ module Mack
           rt.each do |route|
             if pattern.match(route.regex_pattern) && route.method == meth
               r = route
-              opts = r.options_with_embedded_parameters(pattern)
+              opts = r.options_with_embedded_parameters(orig_pattern)
               req.merge_params(opts)
               return opts
             end
@@ -247,15 +248,6 @@ module Mack
         }
         
         Mack::Routes::Urls.class_eval(url)
-        
-        if app_config.mack.use_distributed_routes
-          
-          Mack::Routes::Urls.class_eval %{
-            def #{n_route}_distributed_url(options = {})
-              (@dsd || app_config.mack.distributed_site_domain) + #{n_route}_url(options)
-            end
-          }
-        end
       end
       
       def regex_from_pattern(pattern)
@@ -316,6 +308,12 @@ module Mack
               opts[val] = split_uri[ind]
             end
           end
+          [:controller, :action].each do |key|
+            if opts[key]
+              opts[key] = opts[key].to_s.downcase.to_sym
+            end
+          end
+          
           opts
         end
         

data/lib/mack/routing/urls.rb

@@ -58,46 +58,6 @@ module Mack
         }
       end
       
-      # Retrieves a distributed route from a DRb server.
-      # 
-      # Example:
-      #   droute_url(:app_1, :home_page_url)
-      #   droute_url(:registration_app, :signup_url, {:from => :google})
-      def droute_url(app_name, route_name, options = {})
-        if app_config.mack.use_distributed_routes
-          d_urls = Mack::Distributed::Routes::Urls.get(app_name)
-          # return d_urls.send(route_name, options)
-          # ivar_cache("droute_url_hash") do
-          #   {}
-          # end
-          # d_urls = @droute_url_hash[app_name.to_sym]
-          # if d_urls.nil?
-          #   d_urls = Mack::Distributed::Routes::UrlCache.get(app_name.to_sym)
-          #   @droute_url_hash[app_name.to_sym] = d_urls
-          #   if d_urls.nil?
-          #     raise Mack::Distributed::Errors::UnknownApplication.new(app_name)
-          #   end
-          # end
-          route_name = route_name.to_s
-          if route_name.match(/_url$/)
-            unless route_name.match(/_distributed_url$/)
-              route_name.gsub!("_url", "_distributed_url")
-            end
-          else
-            route_name << "_distributed_url"
-          end
-          raise Mack::Distributed::Errors::UnknownRouteName.new(app_name, route_name) unless d_urls.respond_to?(route_name)
-          return d_urls.run(route_name, options)
-          # if d_urls.run.respond_to?(route_name)
-          #   return d_urls.run.send(route_name, options)
-          # else
-          #   raise Mack::Distributed::Errors::UnknownRouteName.new(app_name, route_name)
-          # end
-        else
-          return nil
-        end
-      end # droute_url
-    
     end # Urls
   end # Routes
 end # Mack 

data/lib/mack/runner.rb

@@ -10,6 +10,8 @@ module Mack
     attr_reader :request # :nodoc:
     attr_reader :cookies # :nodoc:
     attr_reader :runner_helpers # :nodoc:
+    attr_reader :original_controller
+    attr_reader :original_action
     
     # This method needs to be defined as part of the Rack framework. As is noted for the Mack::Runner
     # class, this is where the center of the Mack framework lies.
@@ -22,14 +24,17 @@ module Mack
             # because the route is specified to be a redirect, let's do that:
             redirect_to(route)
           else
-            self.request.all_params[:original_controller] = route[:controller]
-            self.request.all_params[:original_action] = route[:action]
+            # set these in case we need them for handling errors:
+            @original_controller = route[:controller]
+            @original_action = route[:action]
             run_controller(route)
           end
         # rescue Mack::Errors::ResourceNotFound, Mack::Errors::UndefinedRoute => e
         #   return try_to_find_resource(env, e)
         rescue Exception => e
           route = Mack::Routes::RouteMap.instance.get_route_from_error(e.class)
+          self.request.all_params[:original_controller] = @original_controller
+          self.request.all_params[:original_action] = @original_action
           unless route.nil?
             run_controller(route, e)
           else