mack 0.5.5.4 → 0.6.0

data/lib/controller/filter.rb

@@ -2,10 +2,11 @@ module Mack
   module Controller
     # A wrapper class to hold calls to filter methods for Controllers.
     # This class should never be called by itself. Instead there are helper
-    # methods in Mack::Controller::Base to do this for.
+    # methods in Mack::Controller to do this for.
     # 
     # Examples:
-    #   class MyAwesomeController < Mack::Controller::Base
+    #   class MyAwesomeController
+    #     include Mack::Controller
     #     # all actions in this controller will have this filter run:
     #     before_filter: authenticate
     #     # only the show and index actions in this controller will have this filter run:

data/lib/controller/request.rb

@@ -1,19 +1,34 @@
 module Mack
+  
   class Request < Rack::Request
     
+    class Parameters < Hash # :nodoc:
+      alias_method :old_hash, :[]
+      def [](key)
+        data = old_hash(key.to_sym) || old_hash(key.to_s)
+        data = data.to_s if data.is_a?(Symbol)
+        return data
+      end
+      
+      def to_s
+        s = self.inspect
+        Mack::Logging::Filter.list.each do |p|
+          s.gsub!(/:#{p}=>\"[^\"]+\"/, ":#{p}=>\"<FILTERED>\"")
+        end
+        s
+      end
+      
+    end
+    
+    
     def initialize(env) # :nodoc:
       super(env)
-      @mack_params = {}
+      @mack_params = Mack::Request::Parameters.new
       parse_params(rack_params)
     end
     
     alias_method :rack_params, :params # :nodoc:
-    
-    # Returns all parameters associated with this request.
-    def all_params
-      @mack_params
-    end
-    
+        
     # Merges another Hash with the parameters for this request.
     def merge_params(opts = {})
       parse_params(opts)
@@ -52,29 +67,16 @@ module Mack
     #   uri: '/users/1?foo=bar'
     #   route: '/users/:id' => {:controller => 'users', :action => 'show'}
     #   parameters: {:controller => 'users', :action => 'show', :id => 1, :foo => "bar"}
-    def params(key)
-      ivar_cache("params_#{key}") do
-        p = (@mack_params[key.to_sym] || @mack_params[key.to_s])
-        unless p.nil?
-          p = p.to_s if p.is_a?(Symbol)
-          if p.is_a?(String)
-            p = p.to_s.uri_unescape
-          elsif p.is_a?(Hash)
-            p.each_pair do |k,v|
-              if v.is_a?(String)
-                p[k] = v.to_s.uri_unescape
-              end
-            end
-          end
-        end
-        p
-      end
+    def params
+      @mack_params
     end
     
+    alias_method :all_params, :params
+    
     # Returns a Mack::Request::UploadedFile object.
     def file(key)
       ivar_cache("file_#{key}") do
-        Mack::Request::UploadedFile.new(params(key))
+        Mack::Request::UploadedFile.new(params[key] ||= {})
       end
     end
     
@@ -85,9 +87,11 @@ module Mack
           nv = k.to_s.match(/.+\[(.+)\]/).captures.first
           nk = k.to_s.match(/(.+)\[.+\]/).captures.first
           @mack_params[nk.to_sym] = {} if @mack_params[nk.to_sym].nil?
+          v = v.uri_unescape if v.is_a?(String)
           @mack_params[nk.to_sym].merge!(nv.to_sym => v)
         else
-          @mack_params[k.to_sym] = v
+          v = v.uri_unescape if v.is_a?(String)
+          @mack_params[k.to_sym] = v#.to_s.uri_unescape
         end
       end
     end

data/lib/controller/session.rb

@@ -25,6 +25,11 @@ module Mack
       sess_hash[key.to_sym] = value
     end
     
+    # Clears out the session.
+    def reset!
+      @sess_hash = {}
+    end
+    
     private
     attr_reader :sess_hash # :nodoc:
     

data/lib/distributed/utils/rinda.rb

@@ -9,7 +9,7 @@ module Mack
           begin
             ring_server.take([options[:space], options[:klass_def], nil, nil], options[:timeout])
           rescue Exception => e
-            # MACK_DEFAULT_LOGGER.error(e)
+            # Mack.logger.error(e)
           end
           register(options)
         end

data/lib/errors/errors.rb

@@ -4,7 +4,8 @@ module Mack
     # Raised when someone calls render twice in one action
     # 
     # Example:
-    #   class FooController < Mack::Controller::Base
+    #   class FooController
+    #     include Mack::Controller
     #     def index
     #       render(:text,  "Hello World")
     #       render(:action, "edit")
@@ -16,7 +17,8 @@ module Mack
     # Raised when an action returns something other then a string.
     # 
     # Example:
-    #   class FooController < Mack::Controller::Base
+    #   class FooController
+    #     include Mack::Controller
     #     def index
     #       [1,2,3,4]
     #     end
@@ -58,7 +60,7 @@ module Mack
     class UnknownLayout < StandardError
       # Takes a layout name.
       def initialize(layout)
-        super("Could not find layout in: #{File.join(Mack::Configuration.root, "app", "views", layout.to_s + ".html.erb")}")
+        super("Could not find layout in: #{File.join(Mack.root, "app", "views", layout.to_s + ".html.erb")}")
       end
     end
     

data/lib/generators/mack_application_generator/mack_application_generator.rb

@@ -4,4 +4,8 @@ class MackApplicationGenerator < Genosaurus
     @options["app"].underscore.downcase
   end
   
+  def testing_framework
+    @options["testing_framework"]
+  end
+  
 end

data/lib/generators/mack_application_generator/manifest.yml

@@ -5,8 +5,12 @@ default_controller:
   output_path: <%= File.join(app_name, "app", "controllers", "default_controller.rb") %>
 application_helper:
   type: file
-  template_path: <%= File.join(templates_directory_path, "app", "helpers", "application_helper.rb.template") %>
-  output_path: <%= File.join(app_name, "app", "helpers", "application_helper.rb") %>
+  template_path: <%= File.join(templates_directory_path, "app", "helpers", "views", "application_helper.rb.template") %>
+  output_path: <%= File.join(app_name, "app", "helpers", "views", "application_helper.rb") %>
+default_controller_helper:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "app", "helpers", "controllers", "default_controller_helper.rb.template") %>
+  output_path: <%= File.join(app_name, "app", "helpers", "controllers", "default_controller_helper.rb") %>
 index_view:
   type: file
   template_path: <%= File.join(templates_directory_path, "app", "views", "default", "index.html.erb.template") %>
@@ -25,7 +29,7 @@ database_yml:
   type: file
   template_path: <%= File.join(templates_directory_path, "config", "database.yml.template") %>
   output_path: <%= File.join(app_name, "config", "database.yml") %>
-<% ["routes.rb", "thin.ru", "thin.yml"].each do |f| -%>
+<% ["routes.rb"].each do |f| -%>
 <%= f %>_config_file:
   type: file
   template_path: <%= File.join(templates_directory_path, "config", "#{f}.template") %>
@@ -47,10 +51,6 @@ rakefile:
   type: file
   template_path: <%= File.join(templates_directory_path, "Rakefile.template") %>
   output_path: <%= File.join(app_name, "Rakefile") %>
-test_helper:
-  type: file
-  template_path: <%= File.join(templates_directory_path, "test", "test_helper.rb.template") %>
-  output_path: <%= File.join(app_name, "test", "test_helper.rb") %>
 
 # Directories:
 models:
@@ -59,17 +59,50 @@ models:
 lib_tasks:
   type: directory
   output_path: <%= File.join(app_name, "lib", "tasks") %>
+db_migrations:
+  type: directory
+  output_path: <%= File.join(app_name, "db", "migrations") %>
 <% ["images", "javascripts"].each do |f| -%>
 public_<%= f %>:
   type: directory
   output_path: <%= File.join(app_name, "public", f) %>
 <% end -%>
+
+# Test
+<% if testing_framework == "test_case" %>
+test_helper:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "test", "test_helper.rb.template") %>
+  output_path: <%= File.join(app_name, "test", "test_helper.rb") %>
 test_functional:
   type: directory
   output_path: <%= File.join(app_name, "test", "functional") %>
+test_example:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "test", "functional", "default_controller_test.rb.template") %>
+  output_path: <%= File.join(app_name, "test", "functional", "default_controller_test.rb") %>
 test_unit:
   type: directory
   output_path: <%= File.join(app_name, "test", "unit") %>
+<% elsif testing_framework == "rspec" %>
+test_spec_helper:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "test", "spec_helper.rb.template") %>
+  output_path: <%= File.join(app_name, "test", "spec_helper.rb") %>
+test_spec_opts:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "test", "spec.opts.template") %>
+  output_path: <%= File.join(app_name, "test", "spec.opts") %>
+test_spec_example:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "test", "functional", "default_controller_spec.rb.template") %>
+  output_path: <%= File.join(app_name, "test", "functional", "default_controller_spec.rb") %>
+test_spec_unit:
+  type: directory
+  output_path: <%= File.join(app_name, "test", "unit") %>
+<% end %>
+
+# Plugins
 vendor_plugins:
   type: directory
   output_path: <%= File.join(app_name, "vendor", "plugins") %>

data/lib/generators/mack_application_generator/templates/Rakefile.template

@@ -3,4 +3,8 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 
 gem 'mack', '<%= @options["version"] %>'
-require 'mack_tasks'
+require 'mack_tasks'
+
+<% if @options["testing_framework"] != "rspec" -%>
+  alias_task :default, "test:<%= @options["testing_framework"] %>"
+<% end -%>

data/lib/generators/mack_application_generator/templates/app/controllers/default_controller.rb.template

@@ -1,4 +1,5 @@
-class DefaultController < Mack::Controller::Base
+class DefaultController
+  include Mack::Controller
   
   # /
   def index

data/lib/generators/mack_application_generator/templates/app/helpers/controllers/default_controller_helper.rb.template

@@ -0,0 +1,7 @@
+module Mack
+  module ControllerHelpers
+    module DefaultController
+      # Anything in this module will be included into the DefaultController
+    end
+  end
+end

data/lib/generators/mack_application_generator/templates/app/helpers/views/application_helper.rb.template

@@ -0,0 +1,7 @@
+module Mack
+  module ViewHelpers
+    module ApplicationHelper
+      # Anything in this module will be included into all views
+    end
+  end
+end

data/lib/generators/mack_application_generator/templates/config/app_config/default.yml.template

@@ -2,4 +2,5 @@ whiny_config_missing: false
 
 mack::session_id: _<%= @options["app"].downcase %>_session_id
 
-orm: <%= @options["orm"] %>
+orm: <%= @options["orm"] %>
+mack::testing_framework: <%= @options["testing_framework"] %>

data/lib/generators/mack_application_generator/templates/config/database.yml.template

@@ -29,17 +29,18 @@ when "data_mapper"
 development:
   default:
     adapter: sqlite3
-    database: db/<%= @options["app"].downcase %>_development.db 
-
+    database: <%%= File.join(Mack.root, "db", "<%= @options["app"].downcase %>_development.db") %>
+ 
 test:
   default:
     adapter: sqlite3
-    database: db/<%= @options["app"].downcase %>_test.db 
-
+    database: <%%= File.join(Mack.root, "db", "<%= @options["app"].downcase %>_test.db") %>
+ 
 production:
   default:
     adapter: sqlite3
-    database: db/<%= @options["app"].downcase %>_production.db 
+    database: <%%= File.join(Mack.root, "db", "<%= @options["app"].downcase %>_production.db") %>
+
 <% else -%>
 # development:
 #   adapter: mysql
@@ -64,13 +65,13 @@ production:
 
 development:
   adapter: sqlite3
-  database: db/<%= @options["app"].downcase %>_development.db 
-
+  database: <%%= File.join(Mack.root, "db", "<%= @options["app"].downcase %>_development.db") %>
+ 
 test:
   adapter: sqlite3
-  database: db/<%= @options["app"].downcase %>_test.db 
-
+  database: <%%= File.join(Mack.root, "db", "<%= @options["app"].downcase %>_test.db") %>
+ 
 production:
   adapter: sqlite3
-  database: db/<%= @options["app"].downcase %>_production.db
+  database: <%%= File.join(Mack.root, "db", "<%= @options["app"].downcase %>_production.db") %>
 <% end -%>

data/lib/generators/mack_application_generator/templates/test/functional/default_controller_spec.rb.template

@@ -0,0 +1,9 @@
+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/generators/mack_application_generator/templates/test/functional/default_controller_test.rb.template

@@ -0,0 +1,10 @@
+# This is a sample TestCase file.  You can safely delete this file
+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/generators/mack_application_generator/templates/test/spec.opts.template

@@ -0,0 +1,2 @@
+--format specdoc
+--colour

data/lib/generators/mack_application_generator/templates/test/spec_helper.rb.template

@@ -0,0 +1,8 @@
+require 'rubygems'
+require 'pathname'
+require 'spec'
+
+ENV["MACK_ENV"] = "test"
+ENV["MACK_ROOT"] = File.join(File.dirname(__FILE__), "..")
+load(File.join(File.dirname(__FILE__), "..", "Rakefile"))
+require 'mack'

data/lib/generators/mack_application_generator/templates/test/test_helper.rb.template

@@ -2,7 +2,8 @@ require 'rubygems'
 require "test/unit"
 require 'fileutils'
 
-ENV["_mack_env"] = "test"
+ENV["MACK_ENV"] = "test"
+ENV["MACK_ROOT"] = File.join(File.dirname(__FILE__), "..")
 
 # load the mack framework:
 load(File.join(File.dirname(__FILE__), "..", "Rakefile"))

data/lib/initialization/application.rb

@@ -0,0 +1,46 @@
+# set up initializers:
+Mack.logger.info "Initializing custom initializers..."
+Dir.glob(File.join(Mack.root, "config", "initializers", "**/*.rb")) do |d|
+  require d
+end
+Mack.logger.info "Initializing custom gems..."
+Mack::Utils::GemManager.instance.do_requires
+
+# require 'plugins':
+Mack.logger.info "Initializing plugins..."
+require File.join(File.dirname(__FILE__), "plugins.rb")
+
+# make sure that default_controller is available to other controllers
+path = File.join(Mack.root, "app", "controllers", "default_controller.rb")
+require path if File.exists?(path) 
+
+# require 'lib' files:
+Mack.logger.info "Initializing lib classes..."
+Dir.glob(File.join(Mack.root, "lib", "**/*.rb")).each do |d|
+  require d
+end
+
+# set up routes:
+Mack.logger.info "Initializing routes..."
+require File.join(Mack.root, "config", "routes")
+
+# require 'app' files:
+Mack.logger.info "Initializing 'app' classes..."
+Dir.glob(File.join(Mack.root, "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

data/lib/initialization/configuration.rb

@@ -1,52 +1,41 @@
 module Mack
   
+  # Returns the root of the current Mack application
+  def self.root
+    ENV["MACK_ROOT"] ||= FileUtils.pwd
+  end
+  
+  # Returns the environment of the current Mack application
+  def self.env
+    ENV["MACK_ENV"] ||= "development"
+  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:
-    
-    def self.env
-      ENV["_mack_env"] ||= ENV["MACK_ENV"]
-    end
 
-    def self.method_missing(sym, *args)
-      ev = "_mack_#{sym}".downcase
-      return ENV[ev]
+    class << self
+      attr_accessor :initialized
     end
-    
-    def self.set(name, value)
-      ENV["_mack_#{name.to_s.downcase}"] = value
-    end
-    
-    self.set(:env, "development") if self.env.nil?
-    self.set(:root, FileUtils.pwd) if self.root.nil?
-    self.set(:public_directory, File.join(self.root, "public")) if self.public_directory.nil?
-    self.set(:app_directory, File.join(self.root, "app")) if self.app_directory.nil?
-    self.set(:lib_directory, File.join(self.root, "lib")) if self.lib_directory.nil?
-    self.set(:config_directory, File.join(self.root, "config")) if self.config_directory.nil?
-    self.set(:views_directory, File.join(self.app_directory, "views")) if self.views_directory.nil?
-    self.set(:layouts_directory, File.join(self.views_directory, "layouts")) if self.layouts_directory.nil?
-    self.set(:plugins, File.join(self.root, "vendor", "plugins")) if self.plugins.nil?
-
-    
 
     # 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_level" => "info",
       "log::detailed_requests" => false,
       "cachetastic_caches_mack_session_cache_options" => {
         "debug" => false,
         "adapter" => "file",
         "store_options" => 
-          {"dir" => File.join(Mack::Configuration.root, "tmp")},
+          {"dir" => File.join(Mack.root, "tmp")},
         "expiry_time" => 14400,
         "logging" => {
           "logger_1" => {
             "type" => "file",
-            "file" => File.join(Mack::Configuration.root, "log", "cachetastic_caches_mack_session_cache.log")
+            "file" => File.join(Mack.root, "log", "cachetastic_caches_mack_session_cache.log")
           }
         }
       }
@@ -55,13 +44,12 @@ module Mack
     # use local memory and store stuff for 5 minutes:
     DEFAULTS_DEVELOPMENT = {
       "mack::cache_classes" => false,
-      "log::level" => "debug",
-      "log::console" => true,
+      "log_level" => "debug"
     } unless self.const_defined?("DEFAULTS_DEVELOPMENT")
     
     # use local memory and store stuff for 1 hour:
     DEFAULTS_TEST = {
-      "log::level" => "error",
+      "log_level" => "error",
       "run_remote_tests" => true,
       "mack::drb_timeout" => 0,
       "mack::cookie_values" => {}
@@ -85,7 +73,7 @@ module Mack
           "logging" => {
             "logger_1" => {
               "type" => "file",
-              "file" => File.join(Mack::Configuration.root, "log", "cachetastic.log")
+              "file" => File.join(Mack.root, "log", "cachetastic.log")
             }
           }
         },
@@ -94,18 +82,15 @@ module Mack
         "mack::distributed_app_name" => nil,
         "mack::distributed_site_domain" => "http://localhost:3000",
         "mack::drb_timeout" => 1,
+        "mack::default_respository_name" => "default",
         "log::detailed_requests" => true,
-        "log::level" => "info",
-        "log::console" => false,
-        "log::file" => true,
-        "log::console_format" => "%l:\t[%d]\t%M",
-        "log::file_format" => "%l:\t[%d]\t%M"
-      }.merge(eval("DEFAULTS_#{Mack::Configuration.env.upcase}"))
+        "log_level" => "info"
+      }.merge(eval("DEFAULTS_#{Mack.env.upcase}"))
     end
     
     app_config.load_hash(DEFAULTS, "mack_defaults")
-    app_config.load_file(File.join(Mack::Configuration.config_directory, "app_config", "default.yml"))
-    app_config.load_file(File.join(Mack::Configuration.config_directory, "app_config", "#{Mack::Configuration.env}.yml"))
+    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
     
   end