mack 0.3.0 → 0.4.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+===0.4.0
+* Added Distributed Routes!
+* gem: mack_ruby_core_extensions 0.1.3
+* removed gem: ruby_extensions
+
 ===0.3.0
 * Ticket: #8 Xml Builder Support
 * Ticket: #7 Ability to drive certain content based on 'format'
@@ -37,4 +42,4 @@
 
 ===0.0.4
 * gem: rack 0.3.0
-* gem: ruby_extensions 1.0.11 
+* gem: ruby_extensions 1.0.11 

data/lib/core_extensions/string.rb

@@ -1,40 +1,5 @@
 class String
   
-  # Camel cases the string.
-  # 
-  # Examples: 
-  #   "user".camelcase # => User
-  #   "my_blog".camelcase # => MyBlog
-  #   "my/blog".camelcase # => My::Blog
-  def camelcase
-    self.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
-  end
-  
-  # Returns a constant of the string.
-  # 
-  # Examples:
-  #   "User".constantize # => User
-  #   "HomeController".constantize # => HomeController
-  #   "Mack::Configuration" # => Mack::Configuration
-  def constantize
-    Module.instance_eval("::#{self}")
-  end
-  
-  # If the string is empty, this will return true.
-  def blank?
-    self == ""
-  end
-  
-  # Maps to Mack::Utils::Inflector.instance.pluralize
-  def plural
-    Mack::Utils::Inflector.instance.pluralize(self)
-  end
-  
-  # Maps to Mack::Utils::Inflector.instance.singularize
-  def singular
-    Mack::Utils::Inflector.instance.singularize(self)
-  end
-  
   # Maps to Kernel _encrypt
   # 
   # Examples:

data/lib/distributed/errors/errors.rb

@@ -0,0 +1,27 @@
+module Mack
+  module Distributed # :nodoc:
+    module Errors # :nodoc:
+      
+      # Raised when an unknown distributed application is referenced.
+      class UnknownApplication < StandardError
+        # Takes the application name.
+        def initialize(app_name)
+          super("APPLICATION: #{app_name} is not a known/registered distributed application.")
+        end
+      end
+    
+      # Raised when an unknown distributed route name for a distributed application is referenced.
+      class UnknownRouteName < StandardError
+        # Takes the application name and the route name.
+        def initialize(app_name, route_name)
+          super("ROUTE_NAME: #{route_name}, is not a known/registered distributed route name for application: #{app_name}.")
+        end
+      end
+      
+      # Raised when an application doesn't declare it's application name for use in a distributed system.
+      class ApplicationNameUndefined < StandardError
+      end
+      
+    end # Errors
+  end # Distributed
+end # Mack

data/lib/distributed/routing/url_cache.rb

@@ -0,0 +1,10 @@
+module Mack
+  module Distributed
+    module Routes # :nodoc:
+      # Used to house the Mack::Distributed::Routes::Urls object for each distributed application.
+      class UrlCache < Cachetastic::Caches::Base
+        
+      end # UrlCache
+    end # Routes
+  end # Distributed
+end # Mack

data/lib/distributed/routing/urls.rb

@@ -0,0 +1,48 @@
+module Mack
+  module Distributed
+    module Routes
+      # A class used to house the Mack::Routes::Url module for distributed applications.
+      # Functionally this class does nothing, but since you can't cache a module, a class is needed.
+      class Urls
+        
+        def initialize(dsd) # :nodoc:
+          @dsd = dsd
+          @url_method_list = {}
+        end
+        
+        # def add_url_method(key, meth)
+        #   @url_method_list[key.to_sym] = meth
+        # end
+        
+        def []=(key, method)
+          @url_method_list[key.to_sym] = method
+          @runner = nil
+        end
+        
+        def run
+          if @runner.nil?
+            klass_name = String.randomize(40).downcase.camelcase
+            meths = ""
+            @url_method_list.each_pair {|k,v| meths += v + "\n\n"}
+            eval %{
+              class Mack::Distributed::Routes::Temp::M#{klass_name}
+                include Mack::Routes::Urls
+                def initialize(dsd)
+                  @dsd = dsd
+                end
+                #{meths}
+              end
+            }
+            @runner = "Mack::Distributed::Routes::Temp::M#{klass_name}".constantize.new(@dsd)
+          end
+          @runner
+        end
+        
+      end # Urls
+      
+      module Temp # :nodoc:
+      end # Temp
+      
+    end # Routes
+  end # Distributed
+end # Mack

data/lib/generators/generator_base.rb

@@ -49,9 +49,7 @@ module Mack
       end
       
       # Needs to be implemented by the subclass.
-      def generate
-        raise MethodNotImplemented.new("generate")
-      end
+      needs_method :generate
       
       # Takes an input_file runs it through ERB and 
       # saves it to the specified output_file. If the output_file exists it will

data/lib/initialization/configuration.rb

@@ -11,17 +11,6 @@ module Mack
       "mack::show_exceptions" => false,
       "log::level" => "info",
       "log::detailed_requests" => false,
-      "cachetastic_default_options" => {
-        "debug" => false,
-        "adapter" => "local_memory",
-        "expiry_time" => 86400,
-        "logging" => {
-          "logger_1" => {
-            "type" => "file",
-            "file" => File.join(MACK_ROOT, "log", "cachetastic.log")
-          }
-        }
-      },
       "cachetastic_caches_mack_session_cache_options" => {
         "debug" => false,
         "adapter" => "file",
@@ -31,7 +20,7 @@ module Mack
         "logging" => {
           "logger_1" => {
             "type" => "file",
-            "file" => File.join(MACK_ROOT, "log", "cachetastic.log")
+            "file" => File.join(MACK_ROOT, "log", "cachetastic_caches_mack_session_cache.log")
           }
         }
       }
@@ -40,39 +29,14 @@ module Mack
     # use local memory and store stuff for 5 minutes:
     DEFAULTS_DEVELOPMENT = {
       "mack::cache_classes" => false,
-      "mack::default_domain" => "http://localhost:3000",
       "log::level" => "debug",
       "log::console" => true,
-      "cachetastic_default_options" => {
-        "debug" => false,
-        "adapter" => "local_memory",
-        "expiry_time" => 300,
-        "logging" => {
-          "logger_1" => {
-            "type" => "file",
-            "file" => File.join(MACK_ROOT, "log", "cachetastic.log")
-          }
-        }
-      }
     } unless self.const_defined?("DEFAULTS_DEVELOPMENT")
     
     # use local memory and store stuff for 1 hour:
     DEFAULTS_TEST = {
-      "mack::default_domain" => "http://localhost",
-      "mack::default_domain_port" => 6666,
       "log::level" => "error",
       "run_remote_tests" => true,
-      "cachetastic_default_options" => {
-        "debug" => false,
-        "adapter" => "local_memory",
-        "expiry_time" => 3600,
-        "logging" => {
-          "logger_1" => {
-            "type" => "file",
-            "file" => File.join(MACK_ROOT, "log", "cachetastic.log")
-          }
-        }
-      }
     } unless self.const_defined?("DEFAULTS_TEST")
     
     unless self.const_defined?("DEFAULTS")
@@ -86,7 +50,34 @@ module Mack
         "mack::cookie_values" => {
           "path" => "/"
         },
-        # "mack::orm" => "activerecord",
+        "cachetastic_default_options" => {
+          "debug" => false,
+          "adapter" => "local_memory",
+          "expiry_time" => 300,
+          "logging" => {
+            "logger_1" => {
+              "type" => "file",
+              "file" => File.join(MACK_ROOT, "log", "cachetastic.log")
+            }
+          }
+        },
+        "mack_distributed_routes_url_cache_options" => {
+          "debug" => false,
+          "adapter" => "drb",
+          "store_options" => {
+            "host" => "druby://127.0.0.1:61676"
+          },
+          "logging" => {
+            "logger_1" => {
+              "type" => "file",
+              "file" => File.join(MACK_ROOT, "log", "mack_distributed_routes_url_cache.log")
+            }
+          }
+        },
+        "mack::site_domain" => "http://localhost:3000",
+        "mack::use_distributed_routes" => false,
+        "mack::distributed_app_name" => nil,
+        "mack::distributed_site_domain" => "http://localhost:3000",
         "log::detailed_requests" => true,
         "log::level" => "info",
         "log::console" => false,

data/lib/initialization/console.rb

@@ -9,5 +9,5 @@ fl = File.join(File.dirname(__FILE__), "..")
 
 require File.join(fl, "test_extensions", "test_helpers")
 
-self.send(:include, Mack::TestHelpers)
+# self.send(:include, Mack::TestHelpers)
 self.send(:include, Mack::Routes::Urls)

data/lib/initialization/initializer.rb

@@ -1,13 +1,14 @@
 require 'rubygems'
 require 'rack'
 require 'digest'
-require 'ruby_extensions'
+require 'mack_ruby_core_extensions'
 require 'application_configuration'
 require 'cachetastic'
 require 'fileutils'
 require 'log4r'
 require 'crypt/rijndael'
 require 'singleton'
+require 'uri'
 
 # Set up Mack constants, if they haven't already been set up.
 unless Object.const_defined?("MACK_ENV")
@@ -42,7 +43,7 @@ unless Object.const_defined?("MACK_INITIALIZED")
   fl = File.join(File.dirname(__FILE__), "..")
 
   # Require all the necessary files to make Mack actually work!
-  ["errors", "core_extensions", "utils", "test_extensions", "routing", "rendering", "sea_level", "tasks", "initialization/server", "generators"].each do |dir|
+  ["distributed", "errors", "core_extensions", "utils", "test_extensions", "routing", "rendering", "sea_level", "tasks", "initialization/server", "generators"].each do |dir|
     dir_globs = Dir.glob(File.join(fl, dir, "**/*.rb"))
     dir_globs.each do |d|
       require d

data/lib/rendering/base.rb

@@ -26,14 +26,12 @@ module Mack
       
       def initialize(view_binder, options)
         self.view_binder = view_binder
-        self.options = options
+        self.options = {:parameters => {}}.merge(options)
       end
       
       # This is the only method that needs to be implemented by a rendering system.
       # It should return a String.
-      def render
-        raise MethodNotImplemented.new("render")
-      end
+      needs_method :render
       
       # Maps to the view_binder's param method. See also Mack::ViewBinder params.
       def params(key)

data/lib/rendering/classes/url.rb

@@ -5,7 +5,7 @@ module Mack
     class Url < Base
       
       def render
-        options = {:method => :get, :domain => app_config.mack.default_domain, :raise_exception => false}.merge(self.options)
+        options = {:method => :get, :domain => app_config.mack.site_domain, :raise_exception => false}.merge(self.options)
         case options[:method]
         when :get
           do_render_url(options) do |uri, options|

data/lib/routing/route_map.rb

@@ -7,8 +7,13 @@ module Mack
     # 
     # See Mack::Routes::RouteMap for more information.
     def self.build
+      $distributed_urls = Mack::Distributed::Routes::Urls.new(app_config.mack.distributed_site_domain) if $distributed_urls.nil?
       yield Mack::Routes::RouteMap.instance
       Mack::Routes::Urls.include_safely_into(Mack::Controller::Base, Mack::ViewBinder, Test::Unit::TestCase)
+      if app_config.mack.use_distributed_routes
+        raise Mack::Distributed::Errors::ApplicationNameUndefined.new if app_config.mack.distributed_app_name.nil?
+        Mack::Distributed::Routes::UrlCache.set(app_config.mack.distributed_app_name.to_sym, $distributed_urls)
+      end
       # puts "Finished compiling routes: #{Mack::Routes::RouteMap.instance.routes_list.inspect}"
     end
     
@@ -193,21 +198,34 @@ module Mack
         raise Mack::Errors::UndefinedRoute.new(req)
       end # get
       
-      private
       attr_reader :routes_list # :nodoc:
       
+      private
       def connect_with_named_route(n_route, pattern, options = {})
         route = connect(pattern, options)
-        Mack::Routes::Urls.class_eval %{
-            def #{n_route}_url(options = {})
-              url_for_pattern("#{route.original_pattern}", options)
-            end
-            
-            def #{n_route}_full_url(options = {})
-              u = #{n_route}_url(options)
-              "\#{@request.full_host}\#{u}"
+        
+        url = %{
+          def #{n_route}_url(options = {})
+            url_for_pattern("#{route.original_pattern}", options)
+          end
+          
+          def #{n_route}_full_url(options = {})
+            u = #{n_route}_url(options)
+            "\#{@request.full_host}\#{u}"
+          end
+        }
+        
+        Mack::Routes::Urls.class_eval(url)
+        
+        if app_config.mack.use_distributed_routes
+          $distributed_urls["#{n_route}_url"] = url
+          
+          $distributed_urls["#{n_route}_distributed_url"] = %{
+            def #{n_route}_distributed_url(options = {})
+              (@dsd || app_config.mack.distributed_site_domain) + #{n_route}_url(options)
             end
           }
+        end
       end
       
       def regex_from_pattern(pattern)

data/lib/routing/urls.rb

@@ -56,7 +56,43 @@ module Mack
           </html>
         }
       end
+      
+      # Retrieves a distributed route from a DRb server.
+      # 
+      # Example:
+      #   droute_url(:app_1, :home_page_url)
+      #   droute_url(:registration_app, :signup_url, {:from => :google})
+      def droute_url(app_name, route_name, options = {})
+        if app_config.mack.use_distributed_routes
+          ivar_cache("droute_url_hash") do
+            {}
+          end
+          d_urls = @droute_url_hash[app_name.to_sym]
+          if d_urls.nil?
+            d_urls = Mack::Distributed::Routes::UrlCache.get(app_name.to_sym)
+            @droute_url_hash[app_name.to_sym] = d_urls
+            if d_urls.nil?
+              raise Mack::Distributed::Errors::UnknownApplication.new(app_name)
+            end
+          end
+          route_name = route_name.to_s
+          if route_name.match(/_url$/)
+            unless route_name.match(/_distributed_url$/)
+              route_name.gsub!("_url", "_distributed_url")
+            end
+          else
+            route_name << "_distributed_url"
+          end
+          if d_urls.run.respond_to?(route_name)
+            return d_urls.run.send(route_name, options)
+          else
+            raise Mack::Distributed::Errors::UnknownRouteName.new(app_name, route_name)
+          end
+        else
+          return nil
+        end
+      end # droute_url
     
     end # Urls
   end # Routes
-end # Mack
+end # Mack 

data/lib/sea_level/controller_base.rb

@@ -170,7 +170,7 @@ module Mack
       #     end
       # 
       #     # This will render a 'local' url. If a domain is not present render url will
-      #     # reach out for the config parameter "mack::default_domain" and prepend that
+      #     # reach out for the config parameter "mack::site_domain" and prepend that
       #     # to the url. This can be overridden locally with the :domain option.
       #     def get_index
       #       render(:url => "/")
@@ -287,12 +287,12 @@ module Mack
           begin
             # try action.html.erb
             return Mack::ViewBinder.new(self).render({:action => self.action_name})
-          rescue Exception => e
+          rescue Errno::ENOENT => e
             if @result_of_action_called.is_a?(String)
               @render_options[:text] = @result_of_action_called
               return Mack::ViewBinder.new(self).render(@render_options)
             end
-            raise e
+            
           end
         end
       end # complete_action_render

data/lib/sea_level/request.rb

@@ -57,9 +57,9 @@ module Mack
       unless p.nil?
         p = p.to_s if p.is_a?(Symbol)
         if p.is_a?(String)
-          p = Rack::Utils.unescape(p)
+          p = p.to_s.uri_unescape
         elsif p.is_a?(Hash)
-          p.each_pair {|k,v| p[k] = Rack::Utils.unescape(v)}
+          p.each_pair {|k,v| p[k] = v.to_s.uri_unescape}
         end
       end
       p

data/lib/tasks/mack_dump_tasks.rake

@@ -0,0 +1,50 @@
+namespace :mack do
+  
+  namespace :dump do
+
+    desc "Dumps out the configuration for the specified environment."
+    task :config => :environment do
+      fcs = app_config.instance.instance_variable_get("@final_configuration_settings")
+      conf = {}
+      fcs.each_pair do |k, v|
+        unless v.is_a?(Application::Configuration::Namespace)
+          conf[k.to_s] = v unless k.to_s.match("__")
+        end
+      end
+      pp conf
+    end # config
+    
+    desc "Show all the routes available"
+    task :routes => :environment do
+      include Mack::Routes::Urls
+      puts ""
+      puts "Routes:"
+      
+      routes = Mack::Routes::RouteMap.instance.routes_list
+      routes.each do |r|
+        # pp r.inspect
+        pat = r.original_pattern.blank? ? '/' : r.original_pattern
+        pat << "(.:format)"
+        opts = r.options.dup
+        meth = opts[:method]
+        opts.delete(:method)
+        puts "#{pat.rjust(50)}\t#{meth.to_s.upcase}\t#{opts.inspect.ljust(0)}"
+      end
+      puts ""
+      puts "-" * 125
+      puts "Route helper methods:"
+      
+      url_methods = Mack::Routes::Urls.protected_instance_methods.collect {|x| x if x.match(/_url$/)}.compact
+      url_methods.sort.each do |meth|
+        unless meth.match(/(full|droute)_url$/)
+          puts "#{meth.rjust(50)}\t#{self.send(meth)}"
+        end
+      end
+      puts ""
+    end # routes
+
+  end # dump
+
+end # mack
+
+alias_task :routes, "mack:dump:routes"  

data/lib/tasks/mack_server_tasks.rake

@@ -0,0 +1,48 @@
+namespace :mack do
+  
+  namespace :server do
+
+    desc "Starts the webserver."
+    task :start do |t|
+
+      require 'rubygems'
+      require 'optparse'
+      require 'optparse/time'
+      require 'ostruct'
+      require 'fileutils'
+
+      d_handler = "WEBrick"
+      begin
+        require 'mongrel'
+        d_handler = "mongrel"
+      rescue Exception => e
+      end
+      begin
+        require 'thin'
+        d_handler = "thin"
+      rescue Exception => e
+      end
+
+      MACK_ROOT = FileUtils.pwd unless Object.const_defined?("MACK_ROOT")
+
+      options = OpenStruct.new
+      options.port = (ENV["PORT"] ||= "3000") # Does NOT work with Thin!! You must edit the thin.yml file!
+      options.handler = (ENV["HANDLER"] ||= d_handler)
+
+
+      require File.join(MACK_ROOT, "config", "boot.rb")
+
+      if options.handler == "thin"
+        # thin_opts = ["start", "-r", "config/thin.ru"]
+        thin_opts = ["start", "-C", "config/thin.yml"]
+        Thin::Runner.new(thin_opts.flatten).run!
+      else
+        Mack::SimpleServer.run(options)
+      end
+    end # start
+
+  end # server
+  
+end # mack
+
+alias_task :server, "log:clear", "mack:server:start"

data/lib/tasks/mack_tasks.rake

@@ -1,31 +1,22 @@
-desc "Loads the Mack environment. Default is development."
-task :environment do
-  MACK_ENV = ENV["MACK_ENV"] ||= "development" unless Object.const_defined?("MACK_ENV")
-  MACK_ROOT = FileUtils.pwd unless Object.const_defined?("MACK_ROOT")
-  require File.join(MACK_ROOT, "config", "boot.rb")
-end
-
-desc "Loads an irb console allow you full access to the application w/o a browser."
-task :console do
-  libs = []
-  libs << "-r irb/completion"
-  libs << "-r #{File.join(File.dirname(__FILE__), '..', 'mack')}"
-  libs << "-r #{File.join(File.dirname(__FILE__), '..', 'initialization', 'console')}"
-  exec "irb #{libs.join(" ")} --simple-prompt"
-end
-
-namespace :dump do
+namespace :mack do
   
-  desc "Dumps out the configuration for the specified environment."
-  task :config => :environment do
-    fcs = app_config.instance.instance_variable_get("@final_configuration_settings")
-    conf = {}
-    fcs.each_pair do |k, v|
-      unless v.is_a?(Application::Configuration::Namespace)
-        conf[k.to_s] = v unless k.to_s.match("__")
-      end
-    end
-    pp conf
-  end
+  desc "Loads the Mack environment. Default is development."
+  task :environment do
+    MACK_ENV = ENV["MACK_ENV"] ||= "development" unless Object.const_defined?("MACK_ENV")
+    MACK_ROOT = FileUtils.pwd unless Object.const_defined?("MACK_ROOT")
+    require File.join(MACK_ROOT, "config", "boot.rb")
+  end # environment
+
+  desc "Loads an irb console allow you full access to the application w/o a browser."
+  task :console do
+    libs = []
+    libs << "-r irb/completion"
+    libs << "-r #{File.join(File.dirname(__FILE__), '..', 'mack')}"
+    libs << "-r #{File.join(File.dirname(__FILE__), '..', 'initialization', 'console')}"
+    exec "irb #{libs.join(" ")} --simple-prompt"
+  end # console
   
-end
+end # mack
+
+alias_task :console, "mack:console"
+alias_task :environment, "mack:environment"

data/lib/test_extensions/test_helpers.rb

@@ -4,6 +4,12 @@ module Mack
   
   module TestHelpers
     
+    def temp_app_config(options = {})
+      app_config.load_hash(options, String.randomize)
+      yield
+      app_config.revert
+    end
+    
     def remote_test
       if (app_config.run_remote_tests)
         yield

data/lib/utils/crypt/keeper.rb

@@ -31,7 +31,7 @@ module Mack
           if worker.nil?
             worker_klass = key.to_s.camelcase + "Worker"
             if Mack::Utils::Crypt.const_defined?(worker_klass)
-              worker = "Mack::Utils::Crypt::#{worker_klass}".constantize.new
+              worker = "Mack::Utils::Crypt::#{worker_klass}".to_instance
             else
               worker = Mack::Utils::Crypt::DefaultWorker.new
             end

data/lib/utils/html.rb

@@ -60,7 +60,7 @@ module Mack
         #   Mack::Utils::Html.b("hello") # => <b>hello</b>
         #   Mack::Utils::Html.div("hello world!", :class => :foo)) # => <div class="foo">hello world!</div>
         def method_missing(sym, *args)
-          ags = args.from_args
+          ags = args.parse_splat_args
           
           tag = sym
           content = nil

data/tasks/gem_helper.rb

@@ -0,0 +1,48 @@
+class GemHelper # :nodoc:
+  include Singleton
+  
+  attr_accessor :project
+  attr_accessor :package
+  attr_accessor :gem_name
+  attr_accessor :version
+  
+  def initialize
+    self.project = "magrathea"
+    self.package = "mack"
+    self.gem_name = "mack"
+    self.version = "0.4.0"
+  end
+  
+  def gem_name_with_version
+    "#{self.gem_name}-#{self.version}"
+  end
+  
+  def full_gem_name
+    "#{self.gem_name_with_version}.gem"
+  end
+  
+  def release
+    begin
+      rf = RubyForge.new
+      rf.login
+      begin
+        rf.add_release(self.project, self.package, self.version, File.join("pkg", full_gem_name))
+      rescue Exception => e
+        if e.message.match("Invalid package_id") || e.message.match("no <package_id> configured for")
+          puts "You need to create the package!"
+          rf.create_package(self.project, self.package)
+          rf.add_release(self.project, self.package, self.version, File.join("pkg", full_gem_name))
+        else
+          raise e
+        end
+      end
+    rescue Exception => e
+      puts e
+    end
+  end
+  
+  def install
+    puts `sudo gem install #{File.join("pkg", full_gem_name)}`
+  end
+  
+end

data/tasks/gem_tasks.rake

@@ -0,0 +1,93 @@
+require 'rake'
+require 'rake/gempackagetask'
+require 'rake/clean'
+require 'rake/testtask'
+require 'find'
+require 'fileutils'
+
+require 'rubyforge'
+require 'rubygems'
+require 'rubygems/gem_runner'
+require 'singleton'
+
+require 'tasks/gem_helper'
+
+namespace :gem do
+  
+  namespace :package  do
+  
+    desc "Package up the mack gem."
+    task :mack do |t|
+      pwd = FileUtils.pwd
+      gh = GemHelper.instance
+      FileUtils.rm_rf("#{pwd}/pkg", :verbose => true)
+      gem_spec = Gem::Specification.new do |s|
+        s.name = gh.gem_name
+        s.version = gh.version
+        s.summary = "Mack is a powerful, yet simple, web application framework."
+        s.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.
+        }
+        s.author = "markbates"
+        s.email = "mark@mackframework.com"
+        s.homepage = "http://www.mackframework.com"
+        s.has_rdoc = true
+        s.extra_rdoc_files = ["README", "CHANGELOG"]
+        s.files = FileList["README", "**/*.*"].exclude("pkg/").exclude("test/").exclude("tasks/private").exclude("doc")
+        s.require_paths << '.'
+        s.require_paths << 'bin'
+        s.require_paths << 'lib'
+        
+        s.bindir = "bin"
+        s.executables << "mack"
+        
+        s.rdoc_options << '--title' << 'Mack' << '--main' << 'README' << '--line-numbers' << "--inline-source"
+        
+        s.add_dependency("rack", "0.3.0")
+        s.add_dependency("mack_ruby_core_extensions", "0.1.3")
+        s.add_dependency("application_configuration", "1.2.1")
+        s.add_dependency("cachetastic", "1.4.1")
+        s.add_dependency("log4r", "1.0.5")
+        s.add_dependency("thin", "0.7.0")
+        s.add_dependency("builder", "2.1.2")
+        s.add_dependency("crypt", "1.1.4")
+        
+      
+        s.rubyforge_project = gh.project
+      end
+      Rake::GemPackageTask.new(gem_spec) do |pkg|
+        pkg.package_dir = "#{pwd}/pkg"
+        pkg.need_zip = false
+        pkg.need_tar = false
+      end
+      Rake::Task["package"].invoke
+    end
+  
+  end
+  
+  namespace :install do
+    
+    desc "Package up and install the mack gem."
+    task :mack => "gem:package:mack" do |t|
+      GemHelper.instance.install
+    end
+    
+  end
+  
+  namespace :release do
+    
+    desc "Package up, install, and release the mack gem."
+    task :mack => ["gem:install:mack"] do |t|
+      GemHelper.instance.release
+    end
+    
+  end
+  
+end
+
+alias_task :pack, "gem:package:mack"
+alias_task :install, "gem:install:mack"
+alias_task :release, "gem:release:mack"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-19 00:00:00 -04:00
+date: 2008-03-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,13 +22,13 @@ dependencies:
         version: 0.3.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: ruby_extensions
+  name: mack_ruby_core_extensions
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.11
+        version: 0.1.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: application_configuration
@@ -84,7 +84,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.4
     version: 
-description: "mack was developed by: markbates"
+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
@@ -111,12 +111,11 @@ files:
 - bin/templates/public/favicon.ico
 - bin/templates/public/stylesheets/scaffold.css.template
 - bin/templates/Rakefile.template
-- lib/core_extensions/hash.rb
 - lib/core_extensions/kernel.rb
-- lib/core_extensions/module.rb
-- lib/core_extensions/nil.rb
-- lib/core_extensions/object.rb
 - lib/core_extensions/string.rb
+- lib/distributed/errors/errors.rb
+- lib/distributed/routing/url_cache.rb
+- lib/distributed/routing/urls.rb
 - lib/errors/errors.rb
 - lib/generators/generator_base.rb
 - lib/generators/plugin_generator/plugin_generator.rb
@@ -161,19 +160,20 @@ files:
 - lib/sea_level/view_binder.rb
 - lib/tasks/cachetastic_tasks.rake
 - lib/tasks/log_tasks.rake
+- lib/tasks/mack_dump_tasks.rake
+- lib/tasks/mack_server_tasks.rake
 - lib/tasks/mack_tasks.rake
 - lib/tasks/rake_helpers.rb
 - lib/tasks/rake_rules.rake
-- lib/tasks/script_tasks.rake
 - lib/tasks/test_tasks.rake
 - lib/test_extensions/test_assertions.rb
 - lib/test_extensions/test_helpers.rb
 - lib/utils/crypt/default_worker.rb
 - lib/utils/crypt/keeper.rb
 - lib/utils/html.rb
-- lib/utils/inflections.rb
-- lib/utils/inflector.rb
 - lib/utils/server.rb
+- tasks/gem_helper.rb
+- tasks/gem_tasks.rake
 - CHANGELOG
 has_rdoc: true
 homepage: http://www.mackframework.com
@@ -208,6 +208,6 @@ rubyforge_project: magrathea
 rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
-summary: mack
+summary: Mack is a powerful, yet simple, web application framework.
 test_files: []
 

data/lib/core_extensions/hash.rb

@@ -1,39 +0,0 @@
-class Hash
-  
-  # Deletes the key(s) passed in from the hash.
-  def -(ars)
-    [ars].flatten.each {|a| self.delete(a)}
-    self
-  end
-  
-  # Converts a hash to query string parameters. 
-  # An optional boolean escapes the values if true, which is the default.
-  def to_params(escape = true)
-    params = ''
-    stack = []
-    
-    each do |k, v|
-      if v.is_a?(Hash)
-        stack << [k,v]
-      else
-        v = Rack::Utils.escape(v) if escape
-        params << "#{k}=#{v}&"
-      end
-    end
-    
-    stack.each do |parent, hash|
-      hash.each do |k, v|
-        if v.is_a?(Hash)
-          stack << ["#{parent}[#{k}]", v]
-        else
-          v = Rack::Utils.escape(v) if escape
-          params << "#{parent}[#{k}]=#{v}&"
-        end
-      end
-    end
-    
-    params.chop! # trailing &
-    params
-  end
-  
-end

data/lib/core_extensions/module.rb

@@ -1,29 +0,0 @@
-class Module
-  
-  # Bulk converts the security level of methods in this Module from one level to another.
-  def convert_security_of_methods(old_level = :public, new_level = :protected)
-    eval("#{old_level}_instance_methods").each{ |meth| self.send(new_level, meth) }
-    self
-  end
-  
-  # Includes this module into an Object, and changes all public methods to protected.
-  # 
-  # Examples:
-  #   module MyCoolUtils
-  #     def some_meth
-  #       "hi"
-  #     end
-  #     self.include_safely_into(FooController)
-  #   end
-  # or:
-  #   MyCoolUtils.include_safely_into(FooController, SomeOtherClass)
-  def include_safely_into(*args)
-    [args].flatten.each do |a|
-      if a.is_a?(String) || a.is_a?(Symbol)
-        a = a.to_s.constantize
-      end
-      a.send(:include, self.convert_security_of_methods)
-    end
-  end
-  
-end

data/lib/core_extensions/nil.rb

@@ -1,8 +0,0 @@
-class NilClass
-  
-  # Will always allow true since nil's are well, nils.
-  def blank?
-    true
-  end
-  
-end

data/lib/core_extensions/object.rb

@@ -1,9 +0,0 @@
-class Object
-  
-  # This method gets called when a parameter is passed into a named route.
-  # This can be overridden in an Object to provlde custom handling of parameters.
-  def to_param
-    self.to_s
-  end
-  
-end

data/lib/tasks/script_tasks.rake

@@ -1,44 +0,0 @@
-namespace :server do
-  
-  desc "Starts the webserver."
-  task :start do |t|
-    
-    require 'rubygems'
-    require 'optparse'
-    require 'optparse/time'
-    require 'ostruct'
-    require 'fileutils'
-
-    d_handler = "WEBrick"
-    begin
-      require 'mongrel'
-      d_handler = "mongrel"
-    rescue Exception => e
-    end
-    begin
-      require 'thin'
-      d_handler = "thin"
-    rescue Exception => e
-    end
-
-    MACK_ROOT = FileUtils.pwd unless Object.const_defined?("MACK_ROOT")
-
-    options = OpenStruct.new
-    options.port = (ENV["PORT"] ||= "3000") # Does NOT work with Thin!! You must edit the thin.yml file!
-    options.handler = (ENV["HANDLER"] ||= d_handler)
-
-
-    require File.join(MACK_ROOT, "config", "boot.rb")
-
-    if options.handler == "thin"
-      # thin_opts = ["start", "-r", "config/thin.ru"]
-      thin_opts = ["start", "-C", "config/thin.yml"]
-      Thin::Runner.new(thin_opts.flatten).run!
-    else
-      Mack::SimpleServer.run(options)
-    end
-  end
-  
-end
-
-alias_task :server, "log:clear", "server:start"

data/lib/utils/inflections.rb

@@ -1,62 +0,0 @@
-require File.join(File.dirname(__FILE__), "inflector")
-# Default inflections. This is taken from Jeremy McAnally's great Rails plugin, acts_as_good_speeler. Thanks Jeremy! http://www.jeremymcanally.com/
-Mack::Utils::Inflector.inflections do |inflect|
-  inflect.plural(/$/, 's')
-  inflect.plural(/s$/i, 's')
-  inflect.plural(/(bu)s$/i, '\1ses')
-  inflect.plural(/(stimul|hippopotam|octop|vir|syllab|foc|alumn|fung|radi)us$/i, '\1i')
-  inflect.plural(/(ax|test)is$/i, '\1es')
-  inflect.plural(/(alias|status)$/i, '\1es')
-  inflect.plural(/(buffal|tomat|torped)o$/i, '\1oes')
-  inflect.plural(/([dti])um$/i, '\1a')
-  inflect.plural(/sis$/i, 'ses')
-  inflect.plural(/(?:([^f])fe|([lr])f)$/i, '\1\2ves')
-  inflect.plural(/(hive)$/i, '\1s')
-  inflect.plural(/([^aeiouy]|qu)y$/i, '\1ies')
-  inflect.plural(/(x|ch|ss|sh)$/i, '\1es')
-  inflect.plural(/(matr|append|vert|ind)ix|ex$/i, '\1ices')
-  inflect.plural(/([m|l])ouse$/i, '\1ice')
-  inflect.plural(/^(ox)$/i, '\1en')
-  inflect.plural(/(quiz)$/i, '\1zes')
-  inflect.plural(/(phenomen|criteri)on$/i, '\1a')
-  inflect.plural(/^(?!(.*hu|.*ger|.*sha))(.*)(wom|m)an$/i, '\2\3en')
-  inflect.plural(/(curricul|bacteri|medi)um$/i, '\1a')
-  inflect.plural(/(nebul|formul|vit|vertebr|alg|alumn)a$/i, '\1ae')
-
-  inflect.singular(/s$/i, '')
-  inflect.singular(/(n)ews$/i, '\1ews')
-  inflect.singular(/([dti])a$/i, '\1um')
-  inflect.singular(/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i, '\1\2sis')
-  inflect.singular(/(^analy|cri|empha)ses$/i, '\1sis')
-  inflect.singular(/([^f])ves$/i, '\1fe')
-  inflect.singular(/(hive)s$/i, '\1')
-  inflect.singular(/(tive)s$/i, '\1')
-  inflect.singular(/(bus)es$/i, '\1')
-  inflect.singular(/(o)es$/i, '\1')
-  inflect.singular(/(shoe)s$/i, '\1')
-  inflect.singular(/(test|ax)es$/i, '\1is')
-  inflect.singular(/(stimul|hippopotam|octop|vir|syllab|foc|alumn|fung|radi)i$/i, '\1us')
-  inflect.singular(/(alias|status)es$/i, '\1')
-  inflect.singular(/^(ox)en$/i, '\1')
-  inflect.singular(/(vert|ind)ices$/i, '\1ex')
-  inflect.singular(/(matr|append)ices$/i, '\1ix')
-  inflect.singular(/(quiz)zes$/i, '\1')
-  inflect.singular(/(phenomen|criteri)a$/i, '\1on')
-  inflect.singular(/(.*)(wo|m)en$/i, '\1\2an')
-  inflect.singular(/(medi|curricul|bacteri)a$/i, '\1um')
-  inflect.singular(/(nebula|formula|vita|vertebra|alga|alumna)e$/i, '\1')
-  inflect.singular(/^(.*)ookies$/, '\1ookie')
-  inflect.singular(/(.*)ss$/, '\1ss')
-  inflect.singular(/(.*)ies$/, '\1y')
-  
-  inflect.irregular('person', 'people')
-  inflect.irregular('child', 'children')
-  inflect.irregular('sex', 'sexes')
-  inflect.irregular('move', 'moves')
-  inflect.irregular('tooth', 'teeth')
-  inflect.irregular('die', 'dice')
-  inflect.irregular('talisman', 'talismans')
-  inflect.irregular('penis', 'penises')
-  
-  inflect.uncountable(%w(pokemon pokémon equipment information rice money species series fish sheep deer offspring))
-end

data/lib/utils/inflector.rb

@@ -1,129 +0,0 @@
-require 'singleton'
-module Mack
-  module Utils
-    # This class is used to deal with inflection strings. This means taken a string and make it plural, or singular, etc...
-    # Inflection rules can be added very easy, and are checked from the bottom up. This means that the last rule is the first
-    # rule to be matched. The exception to this, kind of, is 'irregular' and 'uncountable' rules. The 'uncountable' rules are
-    # always checked first, then the 'irregular' rules, and finally either the 'singular' or 'plural' rules, depending on what
-    # you're trying to do. Within each of these sets of rules, the last rule in is the first rule matched.
-    # 
-    # Example:
-    #   Mack::Utils::Inflector.inflections do |inflect|
-    #     inflect.plural(/$/, 's')
-    #     inflect.plural(/^(ox)$/i, '\1en')
-    #     inflect.plural(/(phenomen|criteri)on$/i, '\1a')
-    #   
-    #     inflect.singular(/s$/i, '')
-    #     inflect.singular(/(n)ews$/i, '\1ews')
-    #     inflect.singular(/^(.*)ookies$/, '\1ookie')
-    #   
-    #     inflect.irregular('person', 'people')
-    #     inflect.irregular('child', 'children')
-    #   
-    #     inflect.uncountable(%w(fish sheep deer offspring))
-    #   end
-    class Inflector
-      include Singleton
-      
-      def initialize # :nodoc:
-        @plural_rules = []
-        @singular_rules = []
-        @irregular_rules = []
-        @uncountable_rules = []
-      end
-      
-      # Adds a plural rule to the system.
-      # 
-      # Example:
-      #   Mack::Utils::Inflector.inflections do |inflect|
-      #     inflect.plural(/$/, 's')
-      #     inflect.plural(/^(ox)$/i, '\1en')
-      #     inflect.plural(/(phenomen|criteri)on$/i, '\1a')
-      #   end
-      def plural(rule, replacement)
-        @plural_rules << {:rule => rule, :replacement => replacement}
-      end
-      
-      # Adds a singular rule to the system.
-      # 
-      # Example:
-      #   Mack::Utils::Inflector.inflections do |inflect|
-      #     inflect.singular(/s$/i, '')
-      #     inflect.singular(/(n)ews$/i, '\1ews')
-      #     inflect.singular(/^(.*)ookies$/, '\1ookie')
-      #   end
-      def singular(rule, replacement)
-        @singular_rules << {:rule => rule, :replacement => replacement}
-      end
-      
-      # Adds a irregular rule to the system.
-      # 
-      # Example:
-      #   Mack::Utils::Inflector.inflections do |inflect|
-      #     inflect.irregular('person', 'people')
-      #     inflect.irregular('child', 'children')
-      #   end
-      def irregular(rule, replacement)
-        @irregular_rules << {:rule => rule, :replacement => replacement}
-        # do the reverse so you get:
-        # person => people
-        # people => person
-        @irregular_rules << {:rule => replacement, :replacement => rule}
-      end
-      
-      # Adds a uncountable word, or words, to the system.
-      # 
-      # Example:
-      #   Mack::Utils::Inflector.inflections do |inflect|
-      #     inflect.uncountable(%w(fish sheep deer offspring))
-      #   end
-      def uncountable(*args)
-        [args].flatten.each do |word|
-          @uncountable_rules << word.downcase
-        end
-      end
-      
-      # Returns the singular version of the word, if possible.
-      # 
-      # Examples:
-      #   Mack::Utils::Inflector.instance.singularize("armies") # => "army"
-      #   Mack::Utils::Inflector.instance.singularize("people") # => "person"
-      #   Mack::Utils::Inflector.instance.singularize("boats") # => "boat"
-      def singularize(word)
-        do_work(word, @singular_rules)
-      end
-      
-      # Returns the singular version of the word, if possible.
-      # 
-      # Examples:
-      #   Mack::Utils::Inflector.instance.pluralize("army") # => "armies"
-      #   Mack::Utils::Inflector.instance.pluralize("person") # => "people"
-      #   Mack::Utils::Inflector.instance.pluralize("boat") # => "boats"
-      def pluralize(word)
-        do_work(word, @plural_rules)
-      end
-      
-      private
-      def do_work(word, specific_rules)
-        return word if @uncountable_rules.include?(word.downcase)
-        w = word.dup
-        [specific_rules, @irregular_rules].flatten.reverse.each do |rule_hash|
-          return w if w.gsub!(rule_hash[:rule], rule_hash[:replacement])
-        end
-        # if all else fails, return the word:
-        return word
-      end
-      
-      public
-      class << self
-        
-        # Yields up Mack::Utils::Inflector.instance
-        def inflections
-          yield Mack::Utils::Inflector.instance
-        end
-        
-      end
-      
-    end # Inflection
-  end # Utils
-end # Mack