mack 0.7.0.1 → 0.7.1

data/lib/mack_core.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'rack'
 require 'digest'
 require 'mack-facets'
+require 'mack-encryption'
 require 'application_configuration'
 require 'cachetastic'
 require 'fileutils'
@@ -18,31 +19,51 @@ require 'genosaurus'
 require 'net/http'
 require 'pp'
 require 'test/unit'
+begin
+  # just in case people don't have it installed.
+  require 'ruby-debug'
+rescue Exception => e
+end
 
 fl = File.join(File.dirname(__FILE__), "mack")
-require File.join(fl, "version")
+require File.join(fl, "initialization", "boot_loader.rb")
+require File.join(fl, "initialization", "environment.rb")
 require File.join(fl, "initialization", "configuration.rb")
+require File.join(fl, "initialization", "logging.rb")
 
-unless Mack::Configuration.initialized_core
-  
-  # puts "Initializing logging..."
-  require File.join(fl, "initialization", "logging.rb")
-  
+boot_load(:version) do
+  require File.join(File.dirname(__FILE__), "mack", "version")
+end
 
+boot_load(:paths) do
+  require File.join(File.dirname(__FILE__), "mack", "utils", "paths")
+end
+
+boot_load(:gems) do
+  Mack.logger.debug "Initializing custom gems..." unless app_config.log.disable_initialization_logging
+  load Mack::Paths.initializers("gems.rb")
+  Mack::Utils::GemManager.instance.do_requires
+end
+
+boot_load(:core_classes) do
   Mack.logger.debug "Initializing core classes..." unless app_config.log.disable_initialization_logging
   # Require all the necessary files to make Mack actually work!
-  lib_dirs = ["errors", "core_extensions", "utils", "runner_helpers", "routing", "view_helpers", "rendering", "controller", "tasks", "initialization/server", "generators", "distributed"]
+  lib_dirs = ["errors", "core_extensions", "utils", "sessions", "runner_helpers", "routing", "view_helpers", "rendering", "controller", "tasks", "initialization/server", "generators", "distributed"]
   lib_dirs << "testing"# if Mack.env == "test"
   lib_dirs.each do |dir|
-    dir_globs = Dir.glob(File.join(fl, dir, "**/*.rb"))
+    dir_globs = Dir.glob(File.join(File.dirname(__FILE__), "mack", dir, "**/*.rb"))
     dir_globs.each do |d|
-      require d
+      require d unless d.match(/console/)
     end
   end
-  
-  require File.join(fl, "runner")
-  
-  Mack::Configuration.initialized_core = true if Mack::Configuration.initialized_core.nil?
+end
 
+boot_load(:runner) do
+  require File.join(File.dirname(__FILE__), "mack", "runner")
+end
+
+boot_load(:load_mack_core, :version, :paths, :configuration, :logging, :core_classes, :gems) do
   Mack.logger.debug "Initialization of Mack Core finished." unless app_config.log.disable_initialization_logging
-end
+end
+
+Mack::BootLoader.run(:load_mack_core)

data/lib/mack_tasks.rb

@@ -1,32 +1,47 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
+require 'fileutils'
 require 'rubygems'
 require 'mack-facets'
 require 'application_configuration'
 
-require File.join(File.dirname(__FILE__), "mack", "initialization", "configuration.rb")
+fl = File.join(File.dirname(__FILE__), 'mack')
 
-require File.join(File.dirname(__FILE__), 'mack_core')
-gems_rb = File.join(Mack.root, "config", "initializers", "gems.rb")
-if File.exists?(gems_rb)
-  begin
-    require File.join(Mack.root, "config", "initializers", "gems.rb")
-    Mack::Utils::GemManager.instance.do_requires
-  rescue Gem::LoadError
-  end
-end
+f_tasks = File.join(FileUtils.pwd, 'vendor', 'framework', 'mack', 'lib', 'mack_tasks.rb')
+if File.exists?(f_tasks) && f_tasks != __FILE__
+  # puts "Run from the local copy"
+  require f_tasks
+else
+  # puts "running mack_tasks from: #{fl}"
+  require File.join(File.dirname(__FILE__), '..', 'bin', 'gem_load_path')
 
-# 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|
-  begin
-    require File.join(dir, "tasks", "rake_helpers.rb")
-  rescue Exception => e
-  end
-  files = Dir.glob(File.join(dir, "**/*.rake"))
-  files.each do |f|
-    unless f == __FILE__
-      load f
+  require File.join(fl, 'tasks', 'rake_helpers')
+  require File.join(fl, 'core_extensions', 'kernel')
+  require File.join(fl, 'utils', 'paths')
+
+  require File.join(fl, 'initialization', 'boot_loader')
+  require File.join(fl, 'initialization', 'configuration')
+
+  Mack::BootLoader.run(:configuration)
+  require File.join(fl, 'utils', 'gem_manager')
+
+  require Mack::Paths.initializers("gems.rb")
+  Mack::Utils::GemManager.instance.do_task_requires
+
+  # Requires all rake tasks that ship with the Mack framework.
+  [fl, Mack::Paths.lib, Mack::Paths.plugins].each do |dir|
+    begin
+      require File.join(dir, "tasks", "rake_helpers.rb")
+    rescue Exception => e
+      # raise e
+    end
+    files = Dir.glob(File.join(dir, "**/*.rake"))
+    files.each do |f|
+      unless f == __FILE__
+        load f
+      end
     end
   end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack
 version: !ruby/object:Gem::Version 
-  version: 0.7.0.1
+  version: 0.7.1
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-29 00:00:00 -04:00
+date: 2008-09-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 0.4.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: mack-more
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.7.0.1
+        version: 0.7.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: application_configuration
@@ -42,16 +42,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.5.3
     version: 
-- !ruby/object:Gem::Dependency 
-  name: cachetastic
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.7.4
-    version: 
 - !ruby/object:Gem::Dependency 
   name: log4r
   type: :runtime
@@ -110,7 +100,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.2.2
+        version: 1.2.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: rcov
@@ -132,20 +122,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.4
     version: 
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.10.0
-    version: 
 description: Mack is a powerful, yet simple, web application framework.  It takes some cues from the likes of Rails and Merb, so it's not entirely unfamiliar. Mack hopes to provide developers a great framework for building, and deploying, portal and distributed applications.
 email: mark@mackframework.com
 executables: 
 - mack
+- mackery
+- mackery-console
+- mackery-server
 extensions: []
 
 extra_rdoc_files: 
@@ -159,7 +142,6 @@ files:
 - lib/mack/controller/filter.rb
 - lib/mack/controller/request.rb
 - lib/mack/controller/response.rb
-- lib/mack/controller/session.rb
 - lib/mack/controller/tell.rb
 - lib/mack/controller/uploaded_file.rb
 - lib/mack/core_extensions/kernel.rb
@@ -204,6 +186,9 @@ files:
 - lib/mack/generators/mack_application_generator/templates/test/spec_helper.rb.template
 - lib/mack/generators/mack_application_generator/templates/test/test_helper.rb.template
 - lib/mack/generators/mack_application_generator/templates/vendor/plugins.template
+- lib/mack/generators/passenger_generator/passenger_generator.rb
+- lib/mack/generators/passenger_generator/templates/config.ru.template
+- lib/mack/generators/passenger_generator/templates/tmp/README.template
 - lib/mack/generators/plugin_generator/plugin_generator.rb
 - lib/mack/generators/plugin_generator/templates/vendor/plugins/%=@plugin_name%/init.rb.template
 - lib/mack/generators/plugin_generator/templates/vendor/plugins/%=@plugin_name%/lib/%=@plugin_name%.rb.template
@@ -214,8 +199,10 @@ files:
 - lib/mack/generators/view_helper_generator/templates/test/helpers/views/test_case.rb.template
 - lib/mack/generators/view_helper_generator/view_helper_generator.rb
 - lib/mack/initialization/application.rb
+- lib/mack/initialization/boot_loader.rb
 - lib/mack/initialization/configuration.rb
 - lib/mack/initialization/console.rb
+- lib/mack/initialization/environment.rb
 - lib/mack/initialization/helpers.rb
 - lib/mack/initialization/logging.rb
 - lib/mack/initialization/plugins.rb
@@ -243,7 +230,10 @@ files:
 - lib/mack/runner_helpers/registry.rb
 - lib/mack/runner_helpers/request_logger.rb
 - lib/mack/runner_helpers/session.rb
-- lib/mack/tasks/cachetastic_tasks.rake
+- lib/mack/sessions/cookie_session_store.rb
+- lib/mack/sessions/session.rb
+- lib/mack/sessions/session_store_base.rb
+- lib/mack/sessions/test_session_store.rb
 - lib/mack/tasks/gem_tasks.rake
 - lib/mack/tasks/generator_tasks.rake
 - lib/mack/tasks/log_tasks.rake
@@ -262,12 +252,16 @@ files:
 - lib/mack/testing/test_assertions.rb
 - lib/mack/testing/test_case.rb
 - lib/mack/utils/ansi/ansi_color.rb
+- lib/mack/utils/content_length_handler.rb
+- lib/mack/utils/forgery_detector.rb
 - lib/mack/utils/gem_manager.rb
 - lib/mack/utils/mime_types.rb
 - lib/mack/utils/mime_types.yml
+- lib/mack/utils/paths.rb
 - lib/mack/utils/server.rb
 - lib/mack/version.rb
 - lib/mack/view_helpers/all_helpers.rb
+- lib/mack/view_helpers/asset_helpers.rb
 - lib/mack/view_helpers/date_time_helpers.rb
 - lib/mack/view_helpers/form_helpers.rb
 - lib/mack/view_helpers/html_helpers.rb
@@ -278,6 +272,8 @@ files:
 - lib/mack_app.rb
 - lib/mack_core.rb
 - lib/mack_tasks.rb
+- bin/env_handler.rb
+- bin/gem_load_path.rb
 - CHANGELOG
 has_rdoc: true
 homepage: http://www.mackframework.com

data/lib/mack/tasks/cachetastic_tasks.rake

@@ -1,58 +0,0 @@
-require 'find'
-namespace :cachetastic do
-  
-  task :manipulate_caches => :environment do
-    cache_name = ENV['cache_name']
-    cache_name = cache_name.camelcase
-    action = ENV['cache_action']
-    running_time("#{cache_name}.#{action}") do
-      case cache_name
-      when "All"
-        puts "About to work on ALL caches!"
-        # force all caches to register themselves:
-        ["#{Mack.root}/lib/caches"].each do |dir|
-          Find.find(dir) do |f|
-            # puts f
-            if FileTest.directory?(f) and !f.match(/.svn/)
-            else
-              if FileTest.file?(f)
-                m = f.match(/\/[a-zA-Z\-_]*.rb$/)
-                if m
-                  model = m.to_s
-                  unless model.match("test_")
-                    x = model.gsub('/', '').gsub('.rb', '')
-                    # puts "x: #{x}"
-                    require x
-                  end
-                end
-              end
-            end
-          end
-        end
-        caches = Cachetastic::Caches::Base.all_registered_caches.dup
-        caches.sort!
-        caches.reverse!
-        caches.each do |cache|
-          do_work(cache, action)
-        end
-      else
-        do_work(cache_name, action)
-      end
-    end
-  end
-  
-  def do_work(cache, action)
-    begin
-      puts "Calling: #{cache}.#{action}"
-      cache.constantize.send(action)
-    rescue MethodNotImplemented => e
-      msg = "Cachetastic.rake Warning: cache #{cache} does not implement #{action}. This is probably an error."
-      puts msg
-      Mack.logger.warning(msg)
-    rescue NoMethodError => e
-    rescue Exception => e
-      raise e
-    end
-  end
-  
-end