mack 0.8.0.101 → 0.8.1

data/lib/mack_tasks.rb

@@ -6,31 +6,26 @@ require 'rubygems'
 require 'mack-facets'
 require 'configatron'
 
-fl = File.join(File.dirname(__FILE__), 'mack')
+fl = File.join_from_here('mack')
 
 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')
-
-  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
-
+  require File.join_from_here('..', 'bin', 'gem_load_path.rb')
+  require File.join(fl, 'tasks', 'rake_helpers.rb')
+  
+  require File.join(fl, 'boot', 'version.rb')
+  require File.join(fl, 'boot', 'extensions.rb')
+  require File.join(fl, 'boot', 'paths.rb')
+  require File.join(fl, 'boot', 'portlets.rb')
+  require File.join(fl, 'boot', 'configuration.rb')
+  require File.join(fl, 'boot', 'environment.rb')
+  require File.join(fl, 'boot', 'gem_tasks.rb')
+  
   # Requires all rake tasks that ship with the Mack framework.
-  [fl, Mack::Paths.lib, Mack::Paths.plugins].each do |dir|
+  [fl, Mack.search_path(:lib), Mack.search_path(:plugins)].flatten.each do |dir|
     begin
       require File.join(dir, "tasks", "rake_helpers.rb")
     rescue Exception => e
@@ -42,6 +37,38 @@ else
         load f
       end
     end
-  end
+  end  
+  
+  
+  # # puts "running mack_tasks from: #{fl}"
+  # require File.join(File.dirname(__FILE__), '..', 'bin', 'gem_load_path')
+  # 
+  # 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.8.0.101
+  version: 0.8.1
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-11 00:00:00 -04:00
+date: 2008-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.0.101
+        version: 0.8.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: configatron
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.1.4
+        version: 2.1.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: logging
@@ -136,8 +136,31 @@ extra_rdoc_files:
 - CHANGELOG
 files: 
 - README
+- lib/mack/application.rb
 - lib/mack/assets/asset_helpers.rb
 - lib/mack/assets/assets_mgr.rb
+- lib/mack/boot/app.rb
+- lib/mack/boot/assets.rb
+- lib/mack/boot/configuration.rb
+- lib/mack/boot/console.rb
+- lib/mack/boot/core.rb
+- lib/mack/boot/environment.rb
+- lib/mack/boot/extensions.rb
+- lib/mack/boot/gem_tasks.rb
+- lib/mack/boot/gems.rb
+- lib/mack/boot/hello.rb
+- lib/mack/boot/helpers.rb
+- lib/mack/boot/initializers.rb
+- lib/mack/boot/lib.rb
+- lib/mack/boot/logging/basic_layout.rb
+- lib/mack/boot/logging/color_layout.rb
+- lib/mack/boot/logging/filter.rb
+- lib/mack/boot/logging.rb
+- lib/mack/boot/paths.rb
+- lib/mack/boot/plugins.rb
+- lib/mack/boot/portlets.rb
+- lib/mack/boot/routes.rb
+- lib/mack/boot/version.rb
 - lib/mack/controller/all_helpers.rb
 - lib/mack/controller/controller.rb
 - lib/mack/controller/cookie_jar.rb
@@ -147,6 +170,7 @@ files:
 - lib/mack/controller/tell.rb
 - lib/mack/controller/uploaded_file.rb
 - lib/mack/core_extensions/kernel.rb
+- lib/mack/core_extensions/object.rb
 - lib/mack/core_extensions/symbol.rb
 - lib/mack/errors/errors.rb
 - lib/mack/generators/controller_generator/controller_generator.rb
@@ -174,6 +198,7 @@ files:
 - lib/mack/generators/mack_application_generator/templates/config/initializers/gems.rb.template
 - lib/mack/generators/mack_application_generator/templates/config/initializers/inflections.rb.template
 - lib/mack/generators/mack_application_generator/templates/config/initializers/mime_types.rb.template
+- lib/mack/generators/mack_application_generator/templates/config/initializers/portlets.rb.template
 - lib/mack/generators/mack_application_generator/templates/config/routes.rb.template
 - lib/mack/generators/mack_application_generator/templates/public/404.html.template
 - lib/mack/generators/mack_application_generator/templates/public/500.html.template
@@ -197,23 +222,17 @@ files:
 - 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
 - lib/mack/generators/plugin_generator/templates/vendor/plugins/%=@plugin_name%/lib/tasks/%=@plugin_name%_tasks.rake.template
+- lib/mack/generators/portlet_generator/portlet_generator.rb
+- lib/mack/generators/portlet_generator/templates/portlet_config/portlet.spec.template
+- lib/mack/generators/portlet_generator/templates/README.template
 - lib/mack/generators/view_helper_generator/manifest.yml
 - lib/mack/generators/view_helper_generator/templates/app/helpers/views/helper.rb.template
 - lib/mack/generators/view_helper_generator/templates/test/helpers/views/rspec.rb.template
 - 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/basic_layout.rb
-- lib/mack/initialization/logging/color_layout.rb
-- lib/mack/initialization/logging/filter.rb
-- lib/mack/initialization/logging.rb
-- lib/mack/initialization/plugins.rb
-- lib/mack/initialization/server/simple_server.rb
+- lib/mack/portlets/manager.rb
+- lib/mack/portlets/portlet.rb
+- lib/mack/portlets/unpacker.rb
 - lib/mack/rendering/engine/base.rb
 - lib/mack/rendering/engine/builder.rb
 - lib/mack/rendering/engine/erubis.rb
@@ -248,9 +267,9 @@ files:
 - lib/mack/tasks/generator_tasks.rake
 - lib/mack/tasks/log_tasks.rake
 - lib/mack/tasks/mack_dump_tasks.rake
-- lib/mack/tasks/mack_server_tasks.rake
 - lib/mack/tasks/mack_tasks.rake
 - lib/mack/tasks/mack_update_tasks.rake
+- lib/mack/tasks/portlet_tasks.rake
 - lib/mack/tasks/rake_helpers.rb
 - lib/mack/tasks/rake_rules.rake
 - lib/mack/tasks/test_tasks.rake
@@ -269,9 +288,9 @@ files:
 - lib/mack/utils/http_status_codes.yml
 - lib/mack/utils/mime_types.rb
 - lib/mack/utils/mime_types.yml
-- lib/mack/utils/paths.rb
 - lib/mack/utils/reloader.rb
 - lib/mack/utils/server.rb
+- lib/mack/utils/static.rb
 - lib/mack/version.rb
 - lib/mack/view_helpers/all_helpers.rb
 - lib/mack/view_helpers/date_time_helpers.rb

data/lib/mack/initialization/application.rb

@@ -1,53 +0,0 @@
-boot_load(:initializers) do
-  Mack.logger.debug "Initializing custom initializers..." unless configatron.mack.log.disable_initialization_logging
-  Dir.glob(Mack::Paths.initializers("**/*.rb")) do |d|
-    require d
-  end  
-end
-
-boot_load(:lib, :plugins, :gems) do
-  # require 'lib' files:
-  Mack.logger.debug "Initializing lib classes..." unless configatron.mack.log.disable_initialization_logging
-  Dir.glob(Mack::Paths.lib("**/*.rb")).each do |d|
-    require d
-  end
-end
-
-boot_load(:default_controller, :lib) do
-  # make sure that default_controller is available to other controllers
-  path = Mack::Paths.controllers("default_controller.rb")
-  require path if File.exists?(path)
-end
-
-boot_load(:routes) do
-  # set up routes:
-  Mack.logger.debug "Initializing routes..." unless configatron.mack.log.disable_initialization_logging
-  require Mack::Paths.config("routes")
-end
-
-boot_load(:app_files, :default_controller) do
-  # require 'app' files:
-  Mack.logger.debug "Initializing 'app' classes..." unless configatron.mack.log.disable_initialization_logging
-  Dir.glob(Mack::Paths.app("**/*.rb")).each do |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
-  
-  # Add default assets
-  assets_mgr.defaults do |a| 
-    a.add_css "scaffold" if File.exists?Mack::Paths.stylesheets("scaffold.css")
-  end
-end

data/lib/mack/initialization/boot_loader.rb

@@ -1,72 +0,0 @@
-module Kernel
-  
-  def boot_load(name, *dependencies, &block)
-    Mack::BootLoader.instance.add(name, *dependencies, &block)
-  end
-  
-end
-
-
-module Mack
-  class BootLoader
-    include Singleton
-    
-    attr_accessor :sequences
-    
-    def initialize
-      self.sequences = {}
-    end
-    
-    def add(name, *dependencies, &block)
-      self.sequences[name.to_sym] = Mack::BootLoader::Loader.new(name.to_sym, *dependencies, &block)
-    end
-    
-    def self.run(*args)
-      args.each do |a|
-        begin
-          Mack::BootLoader.instance.sequences[a.to_sym].run
-        rescue Exception => e
-          raise e
-        end
-      end
-    end
-    
-    def self.run!(*args)
-      args.each do |a|
-        Mack::BootLoader.instance.sequences[a.to_sym].run!
-      end
-    end
-    
-    private
-    class Loader
-      
-      attr_accessor :name
-      attr_accessor :dependencies
-      attr_accessor :sequence
-      
-      def initialize(name, *dependencies, &block)
-        self.name = name.to_sym
-        self.dependencies = dependencies
-        self.sequence = block
-        @run = false
-      end
-      
-      def run
-        return if @run
-        self.dependencies.each do |dep|
-          Mack::BootLoader.run(dep)
-        end
-        self.sequence.call
-        @run = true
-      end
-      
-      def run!
-        self.dependencies.each do |dep|
-          Mack::BootLoader.run!(dep)
-        end
-        self.sequence.call
-      end
-      
-    end
-  end
-end

data/lib/mack/initialization/configuration.rb

@@ -1,101 +0,0 @@
-require 'mack-facets'
-require 'configatron'
-require File.join(File.dirname(__FILE__), 'boot_loader')
-require File.join(File.dirname(__FILE__), '..', 'core_extensions', 'kernel')
-require File.join(File.dirname(__FILE__), '..', 'utils', 'paths')
-boot_load(:configuration) do
-  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
-    
-    # Returns true/false based on whether the specified environment
-    # is the current environment
-    def self.env?(env)
-      self.env == env.to_s
-    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:
-      unless const_defined?("LOADED")
-        configatron.mack.render_url_timeout = 5
-        configatron.mack.cache_classes = true
-        configatron.mack.reload_classes = 1
-        configatron.mack.deep_class_reload = false
-        configatron.mack.use_lint = true
-        configatron.mack.show_exceptions = true
-        configatron.mack.use_sessions = true
-        configatron.mack.session_id = '_mack_session_id'
-        configatron.mack.cookie_values = {:path => '/'}
-        configatron.mack.site_domain = 'http://localhost:3000'
-        configatron.mack.testing_framework = :rspec
-        configatron.mack.rspec_file_pattern = 'test/**/*_spec.rb'
-        configatron.mack.test_case_file_pattern = 'test/**/*_test.rb'
-        configatron.mack.session_store = :cookie
-        configatron.mack.disable_forgery_detector = false
-        configatron.mack.assets.max_distribution = 4
-        configatron.mack.assets.hosts = ''
-        configatron.mack.assets.stamp = Time.now.to_i
-        configatron.mack.cookie_session_store.expiry_time = 4.hours
-        
-        configatron.mack.log.level = :info
-        configatron.mack.log.detailed_requests = true
-        configatron.mack.log.disable_initialization_logging = false
-        configatron.mack.log.root = Mack::Paths.log
-        configatron.mack.log.colors.db = :cyan
-        configatron.mack.log.colors.error = :red
-        configatron.mack.log.colors.fatal = :red
-        configatron.mack.log.colors.warn = :yellow
-        configatron.mack.log.colors.completed = :purple
-        configatron.mack.log.use_colors = true
-        configatron.mack.log.time_format = '%Y-%m-%d %H:%M:%S'
-      
-        if Mack.env?(:production)
-          configatron.mack.use_lint = false
-          configatron.mack.show_exceptions = false
-          configatron.mack.log.level = :info
-          configatron.mack.log.detailed_requests = true
-          configatron.mack.log.use_colors = false
-        end
-      
-        if Mack.env?(:development)
-          configatron.mack.cache_classes = false
-          configatron.mack.log.level = :debug
-        end
-
-        if Mack.env?(:test)
-          configatron.mack.cookie_values = {}
-          configatron.mack.session_store = :test
-          configatron.mack.disable_forgery_detector = true
-          configatron.mack.run_remote_tests = true
-          configatron.mack.log.level = :error
-        end
-
-        if File.exists?(Mack::Paths.configatron('default.rb'))
-          require Mack::Paths.configatron('default.rb')
-        end
-      
-        if File.exists?(Mack::Paths.configatron("#{Mack.env}.rb"))
-          require Mack::Paths.configatron("#{Mack.env}.rb")
-        end
-    
-        def self.dump
-          configatron.inspect
-        end
-        
-        LOADED = true
-        
-      end
-    
-    end
-  end
-end

data/lib/mack/initialization/console.rb

@@ -1,29 +0,0 @@
-# This file gets loaded when you run:
-#   rake console
-# It loads the following classes to make using the application via the console easier:
-# 
-# * Mack::TestHelpers
-# * Mack::Routes::Urls
-
-fl = File.join(File.dirname(__FILE__), "..")
-
-require File.join(fl, "..", "..", "bin", "gem_load_path")
-
-require File.join(fl, "..", "mack")
-
-require File.join(fl, "testing", "helpers")
-
-# self.send(:include, Mack::TestHelpers)
-self.send(:include, Mack::Routes::Urls)
-
-# When using the Mack console if you edit any files
-# you can reload them in the console using this method
-# without having to exit the console and start again.
-def reload!
-  ivar_cache("_rack_reloader") do
-    Mack::Reloader.new(nil)
-  end.reload!
-end
-
-# Prevent AutoRunner from getting executed when user exits out of console
-Test::Unit.run = true