mack 0.6.0.1 → 0.6.1

data/CHANGELOG

@@ -1,3 +1,48 @@
+===0.6.1
+* [#70] Mack-more: better association rules for data_factory
+* [#60] Fixed Mack executable problem
+* [#59] Fixed gems:* tasks
+* [#57] Moved most files under to lib/mack
+* [#56] mack-more: Added Mack::Utils::RegistryMap
+* [#55] mack-more: mack-facets: Mack::Utils::Registry is now Mack::Utils::RegistryList
+* [#54] Added DataMapper 0.9.3 support
+* [#52] mack-more: mack-[orm] should require mack-[orm].rb using its full path.
+* [#51] Application generator should generate orm support in the right place
+* [#50] Mack will now have 2 environment files: mack_core and mack_app.  Mack.rb will load both files, but it gives other module chance to load just the core files and not the application's files.
+* [#49] Making sure the orm tasks is available when orm_support is removed from the app_config
+* [#49] mack-active_record:  mack-active_record.rb will require mack-active_record_tasks.rb
+* [#49] mack-data_mapper:  mack-data_mapper.rb will require mack-data_mapper_tasks.rb
+* [#49] Updated warning message if orm is defined in app_config (i.e. user only needs to require mack-[orm_name], instead of both that and mack-[orm_name]_tasks).
+* [#48] rake generator:list now displays the correct names for the generator tasks.
+* [#47] rake gems:* tasks now work, and no longer require mack_ruby_core_extensions
+* [#46] Calling .to_param on nil now raises a NoMethodError exception.
+* [#45] rake stats task now works with Test::Unit::TestCase
+* [#44] Mack::Runner has now been extended to allow for greater extension flexibility.
+* [#43] Added a Mack::Utils::Registry class to allow for easy creation of registries.
+* [#42] Sessions can now be turned off globally using the app_config.mack.use_sessions switch.
+* [#41] Deprecate orm_support.rb
+* [#38] There is now a registry of Controllers that are in the system.
+* [#36] Renamed the initialize method in the Mack::Controller module to configure_controller. This gives
+  control of the initialize method back to the class.
+* [#34] Mack::l10n now raises exception with a fully qualified name.
+* [#33] mack-active_record now requires ActiveRecord 2.0.2 explicitly, not >=2.0.2
+* [#31] Added support for ruby-debug.
+* [#26] Log Coloring for console output.
+* [#24] Added mack-notifier support.
+* [#18] Added Page caching. All that's needed for using page caching is to require the mack-caching gem, turn on
+  page caching in your config files with: 
+    use_page_caching: true
+  and, in your controllers, specify which pages you would like cached with the cache_pages directive:
+    cache_pages :only => [:index, :show] # you can also use :except
+* [#14] Data Factory
+* [#7] Added support for Extlib::Hook in a few places.
+* [#6] RJS support
+* Added a rake tmp:clear task.
+* gem: cachetastic 1.7.3
+* gem: application_configuration 1.5.2
+* gem: ruby-debug 0.10.0
+* gem: data_mapper 0.9.3
+
 ===0.6.0.1
 * Updated mack-localization (in mack-more) to be independent from utf8proc gem
 

data/bin/mack

@@ -6,7 +6,7 @@ require 'ostruct'
 require 'pp'
 require 'erb'
 require 'genosaurus'
-require File.join(File.dirname(__FILE__), "..", "lib", "generators", "mack_application_generator", "mack_application_generator")
+require File.join(File.dirname(__FILE__), "..", "lib", "mack", "generators", "mack_application_generator", "mack_application_generator")
 
 app = ARGV[0]
 raise "You must specify a name for this application!" if app.nil?
@@ -14,7 +14,8 @@ raise "You must specify a name for this application!" if app.nil?
 options = OpenStruct.new
 options.orm = "data_mapper"
 options.testing_framework = "rspec"
-options.version = "0.6.0.1"
+options.js_framework = "jquery"
+options.version = "0.6.1"
 
 opts = OptionParser.new do |opts|
   opts.banner = "Usage: mack <application_name> [options]"
@@ -27,8 +28,12 @@ opts = OptionParser.new do |opts|
     options.testing_framework = v
   end
   
+  opts.on("-j [jquery|prototype]") do |v|
+    options.js_framework = v
+  end
+  
 end
 
 opts.parse!(ARGV)
 
-MackApplicationGenerator.run({"version" => options.version, "app" => app, "orm" => options.orm, "testing_framework" => options.testing_framework})
+MackApplicationGenerator.run({"version" => options.version, "app" => app, "orm" => options.orm, "testing_framework" => options.testing_framework, "js_framework" => options.js_framework})

data/lib/mack.rb

@@ -1,57 +1,2 @@
-require 'rubygems'
-require 'rack'
-require 'digest'
-require 'mack-facets'
-require 'application_configuration'
-require 'cachetastic'
-require 'fileutils'
-require 'log4r'
-require 'crypt/rijndael'
-require 'singleton'
-require 'uri'
-require 'drb'
-require 'rinda/ring'
-require 'rinda/tuplespace'
-require 'builder'
-require 'erubis'
-require 'erb'
-require 'genosaurus'
-require 'net/http'
-require 'pp'
-require 'test/unit'
-
-require File.join(File.dirname(__FILE__), "initialization", "configuration.rb")
-
-unless Mack::Configuration.initialized
-  
-  puts "Initializing logging..."
-  require File.join(File.dirname(__FILE__), "initialization", "logging.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!
-  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
-  
-  require File.join(File.dirname(__FILE__), "runner")
-  
-  require File.join(File.dirname(__FILE__), "initialization", "orm_support.rb")
-
-  require File.join(File.dirname(__FILE__), "initialization", "application.rb")
-  
-  require File.join(File.dirname(__FILE__), "initialization", "helpers.rb")
-  
-  Mack::Configuration.initialized = true if Mack::Configuration.initialized.nil?
-
-  Mack.logger.info "Initialization finished."
-end
+require File.join(File.dirname(__FILE__), 'mack_core')
+require File.join(File.dirname(__FILE__), 'mack_app')

data/lib/mack/controller/all_helpers.rb

@@ -0,0 +1,14 @@
+module Mack
+  module ControllerHelpers # :nodoc:
+
+    # Used to easily include all Mack::ControllerHelpers. It will NOT include itself!
+    # This is primarily used to aid in testing controller helpers.
+    def self.included(base)
+      Mack::ControllerHelpers.constants.each do |c|
+        mod = "Mack::ControllerHelpers::#{c}".constantize
+        mod.include_safely_into(base) unless base.is_a?(mod)
+      end
+    end # included
+    
+  end # ViewHelpers
+end # Mack

data/lib/{controller → mack/controller}/controller.rb

@@ -25,7 +25,7 @@ module Mack
     # If an exception was thrown by a request this represents that error.
     attr_accessor :caught_exception
 
-    def initialize(request, response, cookies)
+    def configure_controller(request, response, cookies)
       @request = request
       @response = response
       @render_options = {}
@@ -43,6 +43,7 @@ module Mack
 
     # Gives access to the session. See Mack::Session for more information.
     def session
+      raise Mack::Errors::NoSessionError.new if self.request.session.nil?
       self.request.session
     end
 
@@ -364,8 +365,13 @@ module Mack
     # Make sure that all the class level methods got included into the receiver's class
     #
     def self.included(base)
+      Mack::Controller::Registry.add(base)
       base.extend(ClassMethods)
     end
     
+    # Houses a repository of all the controllers in the system.
+    class Registry < Mack::Utils::RegistryList
+    end
+    
   end # Controller
 end # Mack

data/lib/{distributed → mack/distributed}/routing/urls.rb

@@ -32,4 +32,13 @@ module Mack
       
     end # Routes
   end # Distributed
-end # Mack
+end # Mack
+
+Mack::Routes.after_class_method(:build) do
+  if app_config.mack.use_distributed_routes
+    raise Mack::Distributed::Errors::ApplicationNameUndefined.new if app_config.mack.distributed_app_name.nil?
+    
+    d_urls = Mack::Distributed::Routes::Urls.new(app_config.mack.distributed_site_domain)
+    d_urls.put
+  end
+end

data/lib/{errors → mack/errors}/errors.rb

@@ -1,6 +1,10 @@
 module Mack
   module Errors # :nodoc:
     
+    # Raised when there is no session available and one is trying to be accessed.
+    class NoSessionError < StandardError
+    end
+    
     # Raised when someone calls render twice in one action
     # 
     # Example:

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

@@ -0,0 +1,6 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+gem 'mack', '<%= @options["version"] %>'
+require 'mack_tasks'

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

@@ -0,0 +1,11 @@
+whiny_config_missing: false
+
+mack::session_id: _<%= @options["app"].downcase %>_session_id
+
+mack::testing_framework: <%= @options["testing_framework"] %>
+
+# Mack provides RJS support through mack-javascript gem.
+# In order to have RJS support, you will need to perform the following steps:
+# 1.  Uncomment the code below, and make sure that the framework is the one you want to use
+# 2.  run:  rake generate:javascript
+# mack::js_framework: <%= @options["js_framework"] %>

data/lib/{generators → mack/generators}/mack_application_generator/templates/config/initializers/gems.rb.template

@@ -5,6 +5,9 @@
 # :libs, optional, is an array of files you want to require.
 # :source, options, is the source you want to use to install a particular gem.
 require_gems do |gem|
+<% if @options["orm"] -%>
+  gem.add "mack-<%=@options["orm"]%>", :libs => "mack-<%=@options["orm"]%>"
+<% end -%>
   # examples:
   # gem.add :redgreen, :version => "1.2.2", :libs => :redgreen
   # gem.add :termios

data/lib/{initialization → mack/initialization}/application.rb

@@ -1,13 +1,13 @@
 # set up initializers:
-Mack.logger.info "Initializing custom initializers..."
+Mack.logger.debug "Initializing custom initializers..."
 Dir.glob(File.join(Mack.root, "config", "initializers", "**/*.rb")) do |d|
   require d
 end
-Mack.logger.info "Initializing custom gems..."
+Mack.logger.debug "Initializing custom gems..."
 Mack::Utils::GemManager.instance.do_requires
 
 # require 'plugins':
-Mack.logger.info "Initializing plugins..."
+Mack.logger.debug "Initializing plugins..."
 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.info "Initializing lib classes..."
+Mack.logger.debug "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..."
+Mack.logger.debug "Initializing routes..."
 require File.join(Mack.root, "config", "routes")
 
 # require 'app' files:
-Mack.logger.info "Initializing 'app' classes..."
+Mack.logger.debug "Initializing 'app' classes..."
 Dir.glob(File.join(Mack.root, "app", "**/*.rb")).each do |d|
   # puts "d: #{d}"
   begin

data/lib/{initialization → mack/initialization}/configuration.rb

@@ -16,7 +16,8 @@ module Mack
   module Configuration # :nodoc:
 
     class << self
-      attr_accessor :initialized
+      attr_accessor :initialized_core
+      attr_accessor :initialized_application
     end
 
     # use local memory and store stuff for 24 hours:
@@ -61,8 +62,8 @@ module Mack
         "mack::cache_classes" => true,
         "mack::use_lint" => true,
         "mack::show_exceptions" => true,
+        "mack::use_sessions" => true,
         "mack::session_id" => "_mack_session_id",
-        "mack::rendering_systems" => [:action, :text, :partial, :public, :url, :xml],
         "mack::cookie_values" => {
           "path" => "/"
         },
@@ -83,7 +84,11 @@ module Mack
         "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::error_color" => "red",
+        "log::completed_color" => "green",
         "log_level" => "info"
       }.merge(eval("DEFAULTS_#{Mack.env.upcase}"))
     end

data/lib/{initialization → mack/initialization}/console.rb

@@ -7,7 +7,7 @@
 
 fl = File.join(File.dirname(__FILE__), "..")
 
-require File.join(fl, "mack")
+require File.join(fl, "..", "mack")
 
 require File.join(fl, "testing", "helpers")
 

data/lib/{initialization → mack/initialization}/helpers.rb

@@ -1,5 +1,5 @@
 # Include ApplicationHelper into all controllers:
-Mack.logger.info "Initializing helpers..."
+Mack.logger.debug "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.")

data/lib/{initialization → mack/initialization}/logging.rb

@@ -15,6 +15,31 @@ module Mack
 end
 
 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))
+          when /^(ERROR:|FATAL:)/
+            old_write(Mack::Utils::Ansi::Color.wrap(app_config.log.error_color, data))
+          else
+            old_write(data)
+          end
+        end
+
+      end
+
+    end # IOOutputter
+  end # Log4r
+  
   log_directory = app_config.log_root || File.join(Mack.root, "log")
   FileUtils.mkdir_p(log_directory)
 

data/lib/mack/initialization/orm_support.rb

@@ -0,0 +1,20 @@
+# 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.warn %{
+    Please note that setting up orm in app_config has been deprecated, and will not be supported in future mack releases.
+    Here's how to update your existing application:
+    1.  Remove the line:
+        orm: data_mapper
+        from the app_config/default.yml file
+    2.  In gems.rb, add the following line in the require_gems block:
+        gem.add "mack-data_mapper", :libs => "mack-data_mapper"
+        ** if you use active record, then change it to mack-active_record instead of mack-data_mapper
+    }
+  Mack.logger.debug "Initializing #{orm} orm..."
+  require "mack-#{orm}"
+  require "mack-#{orm}_tasks"
+end