mack 0.6.0.1 → 0.6.1

data/lib/mack/tasks/tmp_tasks.rake

@@ -0,0 +1,8 @@
+namespace :tmp do
+  
+  desc "Clears out your tmp directory"
+  task :clear do
+    FileUtils.rm_rf(File.join(FileUtils.pwd, "tmp"))
+  end
+  
+end

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

@@ -10,7 +10,7 @@ module Mack
         rake = Rake::Application.new
         Rake.application = rake
       
-        [File.join(File.dirname(__FILE__), "..", "mack_tasks.rb"), tasks].flatten.each do |task|
+        [File.join(File.dirname(__FILE__), "..", "..", "mack_tasks.rb"), tasks].flatten.each do |task|
           load(task)
         end
       

data/lib/{testing → mack/testing}/rspec.rb

@@ -1,11 +1,12 @@
 require File.join(File.dirname(__FILE__), "helpers")
 
+require 'spec'
 module Spec # :nodoc:
   module Example # :nodoc:
     module ExampleMethods # :nodoc:
       include Mack::Routes::Urls
       include Mack::Testing::Helpers
-      
+    
       alias_method :mack_spec_execute, :execute
 
       def execute(options, instance_variables)
@@ -14,7 +15,7 @@ module Spec # :nodoc:
         end
         @__res
       end
-      
+    
     end
   end
 end

data/lib/mack/utils/ansi/ansi_color.rb

@@ -0,0 +1,22 @@
+module Mack
+  module Utils # :nodoc:
+    module Ansi # :nodoc:
+      
+      module Color
+        
+        def self.wrap(color, string)
+          "\e[#{Mack::Utils::Ansi::ColorRegistry.registered_items[color.to_sym] || 0}m#{string}\e[0m"
+        end
+        
+      end # Color
+      
+      class ColorRegistry < Mack::Utils::RegistryMap
+        def initial_state
+          { :blue => 34, :black => 30, :red => 31, :green => 32, :yellow => 33, :magenta => 35,
+            :purple => 35, :cyan => 36, :white => 37, :clear => 0 }
+        end
+      end
+      
+    end # Ansi
+  end # Utils
+end # Mack

data/lib/{utils → mack/utils}/gem_manager.rb

@@ -31,12 +31,17 @@ module Mack
       # Requires the gem and any libs that you've specified.
       def do_requires
         @required_gem_list.each do |g|
-          if g.version?
-            gem(g.name, g.version)
-          else
-            gem(g.name)
+          begin
+            if g.version?
+              gem(g.name, g.version)
+            else
+              gem(g.name)
+            end
+            g.libs.each { |l| require l.to_s } if g.libs?
+          rescue Gem::LoadError => er
+            Mack.logger.warn "WARNING: gem #{g.name} [version: #{g.version}] is required, but is not installed"
+            raise er
           end
-          g.libs.each {|l| require l.to_s} if g.libs?
         end
       end
       

data/lib/{utils → mack/utils}/mime_types.yml

@@ -280,7 +280,8 @@
 :wk1: application/x-123
 :ppa: application/vnd.ms-powerpoint
 :xls: application/excel; application/vnd.ms-excel; application/x-excel; application/x-msexcel
-:js: application/x-javascript
+:js_official: application/x-javascript
+:js: text/javascript
 :ani: application/x-navi-animation
 :rmp: audio/x-pn-realaudio; audio/x-pn-realaudio-plugin
 :pre: application/x-freelance

data/lib/{utils → mack/utils}/server.rb

@@ -1,5 +1,10 @@
 module Mack
   module Utils
+    
+    # Houses a registry of Rack runners that should be called before the Mack::Runner.
+    class RunnersRegistry < Mack::Utils::RegistryList
+    end
+    
     module Server
     
       # This method wraps all the necessary components of the Rack system around
@@ -7,6 +12,11 @@ module Mack
       def self.build_app
         # Mack framework:
         app = Mack::Runner.new
+        
+        Mack::Utils::RunnersRegistry.registered_items.each do |runner|
+          app = runner.new(app)
+        end
+        
         # Any urls listed will go straight to the public directly and will not be served up via the app:
         app = Rack::Static.new(app, :urls => ["/css", "/images", "/files", "/images", "/stylesheets", "/javascripts", "/media"], :root => "public")
         app = Rack::Lint.new(app) if app_config.mack.use_lint 
@@ -15,13 +25,9 @@ module Mack
         app = Rack::Recursive.new(app)
         # This will reload any edited classes if the cache_classes config setting is set to true.
         app = Rack::Reloader.new(app, 1) unless app_config.mack.cache_classes
-        # TODO: Not sure about this logger, investigate better ones.
-        # TODO: Depends on Mack.logger already being configured.
-        # This makes it a drag run this 'standalone' in another Ruby program.
-        # app = Rack::CommonLogger.new(app, Mack.logger)
         app
       end
-    
+      
     end # Server
   end # Utils
 end # Mack

data/lib/mack/view_helpers/all_helpers.rb

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

data/lib/{view_helpers → mack/view_helpers}/html_helpers.rb

@@ -1,5 +1,5 @@
 module Mack
-  module ViewHelpers
+  module ViewHelpers # :nodoc:
     module HtmlHelpers
       
       # This is just an alias to 

data/lib/{view_helpers → mack/view_helpers}/string_helpers.rb

@@ -1,5 +1,5 @@
 module Mack
-  module ViewHelpers
+  module ViewHelpers # :nodoc:
     module StringHelpers
       
       # Takes a count integer and a word and returns a phrase containing the count

data/lib/mack_app.rb

@@ -0,0 +1,19 @@
+require 'ruby-debug'
+
+fl = File.join(File.dirname(__FILE__), "mack")
+
+require File.join(fl, "initialization", "configuration.rb")
+
+unless Mack::Configuration.initialized_application
+  
+  Mack.logger.debug "Starting application in #{Mack.env} mode."
+  Mack.logger.debug "Mack root: #{Mack.root}"
+
+  require File.join(fl, "initialization", "application.rb")
+  
+  require File.join(fl, "initialization", "helpers.rb")
+  
+  Mack::Configuration.initialized_application = true if Mack::Configuration.initialized_application.nil?
+
+  Mack.logger.debug "Initialization of Mack Application Environment finished."
+end

data/lib/mack_core.rb

@@ -0,0 +1,52 @@
+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 'redgreen'
+
+fl = File.join(File.dirname(__FILE__), "mack")
+
+require File.join(fl, "initialization", "configuration.rb")
+
+unless Mack::Configuration.initialized_core
+  
+  # puts "Initializing logging..."
+  require File.join(fl, "initialization", "logging.rb")
+  
+
+  Mack.logger.debug "Initializing core classes..."
+  # 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 << "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(fl, "runner")
+  
+  require File.join(fl, "initialization", "orm_support.rb")
+  
+  Mack::Configuration.initialized_core = true if Mack::Configuration.initialized_core.nil?
+
+  Mack.logger.debug "Initialization of Mack Core finished."
+end

data/lib/mack_tasks.rb

@@ -4,9 +4,24 @@ require 'rake/rdoctask'
 require 'rubygems'
 require 'application_configuration'
 
-require File.join(File.dirname(__FILE__), "initialization", "configuration.rb")
+require File.join(File.dirname(__FILE__), "mack", "initialization", "configuration.rb")
+
+require File.join(File.dirname(__FILE__), 'mack_core')
+require File.join(Mack.root, "config", "initializers", "gems.rb")
+Mack::Utils::GemManager.instance.do_requires
+
 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 gem.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
+    }
   require "mack-#{orm}_tasks"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack
 version: !ruby/object:Gem::Version 
-  version: 0.6.0.1
+  version: 0.6.1
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-18 00:00:00 -04:00
+date: 2008-08-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.6.0.1
+        version: 0.6.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: application_configuration
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.5.0
+        version: 1.5.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: cachetastic
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.7.2
+        version: 1.7.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: log4r
@@ -142,6 +142,16 @@ 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: 
@@ -154,101 +164,111 @@ extra_rdoc_files:
 - CHANGELOG
 files: 
 - README
-- lib/controller/controller.rb
-- lib/controller/cookie_jar.rb
-- lib/controller/filter.rb
-- lib/controller/request.rb
-- lib/controller/response.rb
-- lib/controller/session.rb
-- lib/controller/uploaded_file.rb
-- lib/core_extensions/kernel.rb
-- lib/core_extensions/string.rb
-- lib/distributed/errors/errors.rb
-- lib/distributed/routing/urls.rb
-- lib/distributed/utils/rinda.rb
-- lib/errors/errors.rb
-- lib/generators/mack_application_generator/mack_application_generator.rb
-- lib/generators/mack_application_generator/manifest.yml
-- lib/generators/mack_application_generator/templates/app/controllers/default_controller.rb.template
-- lib/generators/mack_application_generator/templates/app/helpers/controllers/default_controller_helper.rb.template
-- lib/generators/mack_application_generator/templates/app/helpers/views/application_helper.rb.template
-- lib/generators/mack_application_generator/templates/app/views/default/index.html.erb.template
-- lib/generators/mack_application_generator/templates/app/views/layouts/application.html.erb.template
-- lib/generators/mack_application_generator/templates/config/app_config/default.yml.template
-- lib/generators/mack_application_generator/templates/config/app_config/development.yml.template
-- lib/generators/mack_application_generator/templates/config/app_config/production.yml.template
-- lib/generators/mack_application_generator/templates/config/app_config/test.yml.template
-- lib/generators/mack_application_generator/templates/config/database.yml.template
-- lib/generators/mack_application_generator/templates/config/initializers/gems.rb.template
-- lib/generators/mack_application_generator/templates/config/initializers/mime_types.rb.template
-- lib/generators/mack_application_generator/templates/config/routes.rb.template
-- lib/generators/mack_application_generator/templates/public/favicon.ico.template
-- lib/generators/mack_application_generator/templates/public/stylesheets/scaffold.css.template
-- lib/generators/mack_application_generator/templates/Rakefile.template
-- lib/generators/mack_application_generator/templates/test/functional/default_controller_spec.rb.template
-- lib/generators/mack_application_generator/templates/test/functional/default_controller_test.rb.template
-- lib/generators/mack_application_generator/templates/test/spec.opts.template
-- lib/generators/mack_application_generator/templates/test/spec_helper.rb.template
-- lib/generators/mack_application_generator/templates/test/test_helper.rb.template
-- lib/generators/mack_application_generator/templates/vendor/plugins.template
-- lib/generators/plugin_generator/plugin_generator.rb
-- lib/generators/plugin_generator/templates/vendor/plugins/%=@plugin_name%/init.rb.template
-- lib/generators/plugin_generator/templates/vendor/plugins/%=@plugin_name%/lib/%=@plugin_name%.rb.template
-- lib/generators/plugin_generator/templates/vendor/plugins/%=@plugin_name%/lib/tasks/%=@plugin_name%_tasks.rake.template
-- lib/initialization/application.rb
-- lib/initialization/configuration.rb
-- lib/initialization/console.rb
-- lib/initialization/helpers.rb
-- lib/initialization/logging.rb
-- lib/initialization/orm_support.rb
-- lib/initialization/plugins.rb
-- lib/initialization/server/simple_server.rb
+- lib/mack/controller/all_helpers.rb
+- lib/mack/controller/controller.rb
+- lib/mack/controller/cookie_jar.rb
+- lib/mack/controller/filter.rb
+- lib/mack/controller/request.rb
+- lib/mack/controller/response.rb
+- lib/mack/controller/session.rb
+- lib/mack/controller/uploaded_file.rb
+- lib/mack/core_extensions/kernel.rb
+- lib/mack/core_extensions/string.rb
+- lib/mack/distributed/errors/errors.rb
+- lib/mack/distributed/routing/urls.rb
+- lib/mack/distributed/utils/rinda.rb
+- lib/mack/errors/errors.rb
+- lib/mack/generators/mack_application_generator/mack_application_generator.rb
+- lib/mack/generators/mack_application_generator/manifest.yml
+- lib/mack/generators/mack_application_generator/templates/app/controllers/default_controller.rb.template
+- lib/mack/generators/mack_application_generator/templates/app/helpers/controllers/default_controller_helper.rb.template
+- lib/mack/generators/mack_application_generator/templates/app/helpers/views/application_helper.rb.template
+- lib/mack/generators/mack_application_generator/templates/app/views/default/index.html.erb.template
+- lib/mack/generators/mack_application_generator/templates/app/views/layouts/application.html.erb.template
+- lib/mack/generators/mack_application_generator/templates/config/app_config/default.yml.template
+- lib/mack/generators/mack_application_generator/templates/config/app_config/development.yml.template
+- lib/mack/generators/mack_application_generator/templates/config/app_config/production.yml.template
+- lib/mack/generators/mack_application_generator/templates/config/app_config/test.yml.template
+- lib/mack/generators/mack_application_generator/templates/config/database.yml.template
+- lib/mack/generators/mack_application_generator/templates/config/initializers/gems.rb.template
+- lib/mack/generators/mack_application_generator/templates/config/initializers/mime_types.rb.template
+- lib/mack/generators/mack_application_generator/templates/config/routes.rb.template
+- lib/mack/generators/mack_application_generator/templates/public/favicon.ico.template
+- lib/mack/generators/mack_application_generator/templates/public/stylesheets/scaffold.css.template
+- lib/mack/generators/mack_application_generator/templates/Rakefile.template
+- lib/mack/generators/mack_application_generator/templates/test/functional/default_controller_spec.rb.template
+- lib/mack/generators/mack_application_generator/templates/test/functional/default_controller_test.rb.template
+- lib/mack/generators/mack_application_generator/templates/test/spec.opts.template
+- 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/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
+- lib/mack/generators/plugin_generator/templates/vendor/plugins/%=@plugin_name%/lib/tasks/%=@plugin_name%_tasks.rake.template
+- lib/mack/initialization/application.rb
+- lib/mack/initialization/configuration.rb
+- lib/mack/initialization/console.rb
+- lib/mack/initialization/helpers.rb
+- lib/mack/initialization/logging.rb
+- lib/mack/initialization/orm_support.rb
+- lib/mack/initialization/plugins.rb
+- lib/mack/initialization/server/simple_server.rb
+- lib/mack/rendering/engine/base.rb
+- lib/mack/rendering/engine/builder.rb
+- lib/mack/rendering/engine/erubis.rb
+- lib/mack/rendering/engine/registry.rb
+- lib/mack/rendering/type/action.rb
+- lib/mack/rendering/type/base.rb
+- lib/mack/rendering/type/file_base.rb
+- lib/mack/rendering/type/inline.rb
+- lib/mack/rendering/type/layout.rb
+- lib/mack/rendering/type/partial.rb
+- lib/mack/rendering/type/public.rb
+- lib/mack/rendering/type/template.rb
+- lib/mack/rendering/type/text.rb
+- lib/mack/rendering/type/url.rb
+- lib/mack/rendering/type/xml.rb
+- lib/mack/rendering/view_template.rb
+- lib/mack/routing/route_map.rb
+- lib/mack/routing/urls.rb
+- lib/mack/runner.rb
+- lib/mack/runner_helpers/base.rb
+- 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/tasks/gem_tasks.rake
+- lib/mack/tasks/generator_tasks.rake
+- lib/mack/tasks/log_tasks.rake
+- lib/mack/tasks/mack_dump_tasks.rake
+- lib/mack/tasks/mack_ring_server_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/rake_helpers.rb
+- lib/mack/tasks/rake_rules.rake
+- lib/mack/tasks/test_tasks.rake
+- lib/mack/tasks/tmp_tasks.rake
+- lib/mack/testing/helpers.rb
+- lib/mack/testing/response.rb
+- lib/mack/testing/rspec.rb
+- lib/mack/testing/test_assertions.rb
+- lib/mack/testing/test_case.rb
+- lib/mack/utils/ansi/ansi_color.rb
+- lib/mack/utils/crypt/default_worker.rb
+- lib/mack/utils/crypt/keeper.rb
+- lib/mack/utils/gem_manager.rb
+- lib/mack/utils/mime_types.rb
+- lib/mack/utils/mime_types.yml
+- lib/mack/utils/server.rb
+- lib/mack/view_helpers/all_helpers.rb
+- lib/mack/view_helpers/html_helpers.rb
+- lib/mack/view_helpers/string_helpers.rb
 - lib/mack.rb
+- lib/mack_app.rb
+- lib/mack_core.rb
 - lib/mack_tasks.rb
-- lib/rendering/engine/base.rb
-- lib/rendering/engine/builder.rb
-- lib/rendering/engine/erubis.rb
-- lib/rendering/engine/registry.rb
-- lib/rendering/type/action.rb
-- lib/rendering/type/base.rb
-- lib/rendering/type/file_base.rb
-- lib/rendering/type/inline.rb
-- lib/rendering/type/layout.rb
-- lib/rendering/type/partial.rb
-- lib/rendering/type/public.rb
-- lib/rendering/type/template.rb
-- lib/rendering/type/text.rb
-- lib/rendering/type/url.rb
-- lib/rendering/type/xml.rb
-- lib/rendering/view_template.rb
-- lib/routing/route_map.rb
-- lib/routing/urls.rb
-- lib/runner.rb
-- lib/tasks/cachetastic_tasks.rake
-- lib/tasks/gem_tasks.rake
-- lib/tasks/generator_tasks.rake
-- lib/tasks/log_tasks.rake
-- lib/tasks/mack_dump_tasks.rake
-- lib/tasks/mack_ring_server_tasks.rake
-- lib/tasks/mack_server_tasks.rake
-- lib/tasks/mack_tasks.rake
-- lib/tasks/mack_update_tasks.rake
-- lib/tasks/rake_helpers.rb
-- lib/tasks/rake_rules.rake
-- lib/tasks/test_tasks.rake
-- lib/testing/helpers.rb
-- lib/testing/response.rb
-- lib/testing/rspec.rb
-- lib/testing/test_assertions.rb
-- lib/testing/test_case.rb
-- lib/utils/crypt/default_worker.rb
-- lib/utils/crypt/keeper.rb
-- lib/utils/gem_manager.rb
-- lib/utils/mime_types.rb
-- lib/utils/mime_types.yml
-- lib/utils/server.rb
-- lib/view_helpers/html_helpers.rb
-- lib/view_helpers/string_helpers.rb
 - CHANGELOG
 has_rdoc: true
 homepage: http://www.mackframework.com