mack 0.7.0.1 → 0.7.1

data/lib/mack/utils/gem_manager.rb

@@ -45,17 +45,34 @@ module Mack
         end
       end
       
+      # Requires the gem and any libs that you've specified.
+      def do_task_requires
+        @required_gem_list.each do |g|
+          begin
+            if g.version?
+              gem(g.name, g.version)
+            else
+              gem(g.name)
+            end
+            g.tasks.each { |l| require l.to_s } if g.tasks?
+          rescue Exception => e
+          end
+        end
+      end
+      
       private
       class GemObject # :nodoc:
         attr_accessor :name
         attr_accessor :version
         attr_accessor :libs
+        attr_accessor :tasks
         attr_accessor :source
         
         def initialize(name, options = {})
           self.name = name
           self.version = options[:version]
           self.libs = [options[:libs]].flatten.compact
+          self.tasks = [options[:tasks], "#{name}_tasks"].flatten.compact
           self.source = options[:source]
         end
         
@@ -66,7 +83,7 @@ module Mack
         end
         
         def libs?
-          !self.libs.empty?
+          self.libs.any?
         end
         
         def version?
@@ -77,6 +94,10 @@ module Mack
           !self.source.blank?
         end
         
+        def tasks?
+          self.tasks.any?
+        end
+        
       end
       
     end # GemManager

data/lib/mack/utils/paths.rb

@@ -0,0 +1,154 @@
+module Mack
+  module Paths
+    
+    # <MACK_PROJECT_ROOT>
+    def self.root(*files)
+      File.join(Mack.root, files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/public
+    def self.public(*files)
+      Mack::Paths.root("public", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/public/images
+    def self.images(*files)
+      Mack::Paths.public("images", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/public/javascripts
+    def self.javascripts(*files)
+      Mack::Paths.public("javascripts", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/public/stylesheets
+    def self.stylesheets(*files)
+      Mack::Paths.public("stylesheets", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/app
+    def self.app(*files)
+      Mack::Paths.root("app", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/log
+    def self.log(*files)
+      Mack::Paths.root("log", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/test
+    def self.test(*files)
+      Mack::Paths.root("test", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/tmp
+    def self.tmp(*files)
+      Mack::Paths.root("tmp", files)
+    end
+        
+    # <MACK_PROJECT_ROOT>/test/models
+    def self.model_tests(*files)
+      Mack::Paths.test("models", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/test/controllers
+    def self.controller_tests(*files)
+      Mack::Paths.test("controllers", files)
+    end
+    
+    def self.test_helpers(*files)
+      Mack::Paths.test("helpers", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/test/helpers/controllers
+    def self.controller_helper_tests(*files)
+      Mack::Paths.test_helpers("controllers", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/test/helpers/views
+    def self.view_helper_tests(*files)
+      Mack::Paths.test_helpers("views", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/app/views
+    def self.views(*files)
+      Mack::Paths.app("views", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/app/views/layouts
+    def self.layouts(*files)
+      Mack::Paths.views("layouts", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/app/controllers
+    def self.controllers(*files)
+      Mack::Paths.app("controllers", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/app/models
+    def self.models(*files)
+      Mack::Paths.app("models", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/app/helpers
+    def self.helpers(*files)
+      Mack::Paths.app("helpers", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/app/helpers/controllers
+    def self.controller_helpers(*files)
+      Mack::Paths.helpers("controllers", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/app/helpers/views
+    def self.view_helpers(*files)
+      Mack::Paths.helpers("views", files)
+    end
+
+    # <MACK_PROJECT_ROOT>/lib
+    def self.lib(*files)
+      Mack::Paths.root("lib", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/lib/tasks
+    def self.tasks(*files)
+      Mack::Paths.lib("tasks", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/db
+    def self.db(*files)
+      Mack::Paths.root("db", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/db/migrations
+    def self.migrations(*files)
+      Mack::Paths.db("migrations", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/config
+    def self.config(*files)
+      Mack::Paths.root("config", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/config/app_config
+    def self.app_config(*files)
+      Mack::Paths.config("app_config", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/config/initializers
+    def self.initializers(*files)
+      Mack::Paths.config("initializers", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/vendor
+    def self.vendor(*files)
+      Mack::Paths.root("vendor", files)
+    end
+    
+    # <MACK_PROJECT_ROOT>/vendor/plugins
+    def self.plugins(*files)
+      Mack::Paths.vendor("plugins", files)
+    end
+    
+  end # Paths
+end # Mack

data/lib/mack/utils/server.rb

@@ -1,33 +1,35 @@
 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
       # Mack::Runner. This can be used build your own server around the Mack framework.
       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", "/favicon.ico"], :root => "public")
+        app = Mack::Utils::ContentLengthHandler.new(app)
         app = Rack::Lint.new(app) if app_config.mack.use_lint 
         app = Rack::ShowStatus.new(app) 
         app = Rack::ShowExceptions.new(app) if app_config.mack.show_exceptions
         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
         app
       end
-      
+
     end # Server
   end # Utils
 end # Mack

data/lib/mack/version.rb

@@ -1,3 +1,3 @@
 module Mack
-  VERSION = '0.7.0.1' unless const_defined?("VERSION")
+  VERSION = '0.7.1' unless const_defined?("VERSION")
 end

data/lib/mack/view_helpers/asset_helpers.rb

@@ -0,0 +1,50 @@
+module Mack
+  class AssetHelpers # :nodoc:
+    include Singleton
+    
+    # 
+    # Set the asset hosts for this app.  It supports the following format:
+    # - plain string: the string literal will be considered as the asset hosts (e.g. 'http://assets.foo.com')
+    # - formatted string: to support asset host distribution (e.g. 'http://asset%d.foo.com')
+    # - a proc object: to support custom asset hosts generation (e.g. Proc.new { |source| 'assets.foo.com' }
+    #
+    # The max number of distribution can be set from app_config's asset_hosts_max_distribution.
+    # The default value is 4
+    #
+    def asset_hosts=(host)
+      @hosts = host
+    end
+    
+    # 
+    # Return the max number of asset hosts distribution
+    #
+    def max_distribution
+      return app_config.asset_hosts_max_distribution.to_i || 4
+    end
+    
+    #
+    # Return the asset hosts for this application.
+    #
+    def asset_hosts(source = '')
+      ret_val = ''
+      
+      # if no explicit asset_host setting, then use the one defined in app_config (if exists)
+      host = @hosts || app_config.asset_hosts
+      host = '' if host.nil?
+      
+      if host.kind_of?(Proc)
+        ret_val = host.call(source)
+      else
+        ret_val = sprintf(host, rand(max_distribution))
+      end
+      return ret_val
+    end
+    
+    #
+    # Clear previously set configuration for asset hosts
+    #
+    def reset!
+      @hosts = nil
+    end
+  end
+end

data/lib/mack/view_helpers/form_helpers.rb

@@ -3,6 +3,19 @@ module Mack
     # A useful collection of helpers for forms.
     module FormHelpers
       
+      #
+      # Get the secret token to be added in an HTML form.
+      # This is to ensure that your form is valid.
+      # 
+      # Only call this method if you generate the form manually.
+      # If you use the form() method to generate your form, then
+      # the authenticity token is already included in your form.
+      #
+      def form_authenticity_field
+        str = %{<input type="hidden" name="__authenticity_token" value="#{Mack::Utils::AuthenticityTokenDispenser.instance.dispense_token(request.session.id)}" />}
+      end
+        
+      
       # Examples:
       #   <% form(users_create_url) do -%>
       #     # form stuff here...
@@ -31,6 +44,7 @@ module Mack
         end
         concat("<form#{build_options(options)}>\n", block.binding)
         concat(meth, block.binding) unless meth.blank?
+        concat(form_authenticity_field, block.binding) if !app_config.mack.disable_forgery_detector
         yield
         concat("\n</form>", block.binding)
         # content_tag(:form, options, &block)
@@ -38,22 +52,54 @@ module Mack
       
       # Generates a button with a form around it and will set the request method to delete.
       def delete_button(url, value = "Delete", form_options = {}, button_options = {})
-        if button_options[:confirm]
-          button_options[:onclick] = "if (confirm('#{button_options[:confirm]}')) {submit();}; return false;"
-          button_options.delete(:confirm)
-        end
         t = "\n" << hidden_field(:_method, :value => :delete)
         t << "\n" << submit_button(value, button_options)
         t << "\n"
         content_tag(:form, {:action => url, :method => :post}.merge(form_options), t)
       end
       
-      alias_deprecated_method :submit_tag, :submit_button, '0.7.0'
-      
       # Examples:
       #   <%= submit_button %> # => <input type="submit" value="Submit" />
       #   <%= submit_button "Login" %> # => <input type="submit" value="Login" />
+      #   You can disable the button after clicking it. In essence, this will work as follows:
+      #   <%= submit_button "Login", :disable_with => "Please wait..." %> 
+      #    # => <input type="submit" value="Login" onclick="this.disabled=true;this.value='Please wait...';this.form.submit();" />
+      #  Even though :disable_with will work on the onclick parameter, you can add your own onclick behaviour to the mix, as follows:
+      #  <%= submit_button "Login", :disable_with => "Please wait...", :onclick => "alert('test')" %> 
+      #    # => <input type="submit" value="Login" onclick="this.disabled=true;this.value='Please wait...';alert('test');this.form.submit();" />
+      #
+      # Please note that if the form.submit() returns false the button's value will be restored to 
+      # its initial value. This behaviour is acheived through the injection of a couple bits of JS 
+      # into the onlick existing parameter. These bits are injected after the disabled value, and 
+      # all existing onclick behaviour that you define in the :onlick option. The included JS bits 
+      # are as follows:
+      #   "result = (this.form.onsubmit ? (this.form.onsubmit() ? this.form.submit() : false) : this.form.submit())",
+      #   "if (result == false) { this.value = this.getAttribute('originalValue'); this.disabled = false }",
+      #   "return result;"
       def submit_button(value = "Submit", options = {}, *original_args)
+        if options[:confirm]
+          onclick = "if (confirm('#{options.delete(:confirm)}')) {submit();}; return false;"
+          onclick << ";#{options.delete(:onclick)}" if options.has_key?(:onclick)
+          options[:onclick] = onclick
+        end
+        # processing the disable with option, which will be embebed in the onclick parameter.
+        if disable_with = options.delete(:disable_with)
+          disable_with = "this.innerHTML='#{disable_with}'"
+          
+          # Making sure that we keep the content of the onclick option, should it exist.
+          disable_with << ";#{options.delete(:onclick)}" if options.has_key?(:onclick)
+          
+          # Setting the onlick option.
+          options[:onclick] = [
+            "this.setAttribute('originalValue', this.innerHTML)",
+            "this.disabled=true",
+            disable_with,
+            "result = (this.form.onsubmit ? (this.form.onsubmit() ? this.form.submit() : false) : this.form.submit())",
+            "if (result == false) { this.innerHTML = this.getAttribute('originalValue'); this.disabled = false }",
+            "return result;",
+          ].join(";")
+        end
+        
         # non_content_tag(:input, {:type => :submit, :value => value}.merge(options))
         content_tag(:button, {:type => :submit}.merge(options), value)
       end

data/lib/mack/view_helpers/link_helpers.rb

@@ -129,7 +129,8 @@ module Mack
         link = ""
         files.each do |name|
           file_name = !name.to_s.end_with?(".js") ? "#{name}.js" : "#{name}"
-          link += "<javascript src=\"#{get_resource_root}/javascripts/#{file_name}?#{Time.now.to_i}\" type=\"#{options[:type]}\" />\n"
+          resource = "/javascripts/#{file_name}"
+          link += "<javascript src=\"#{get_resource_root(resource)}#{resource}?#{Time.now.to_i}\" type=\"#{options[:type]}\" />\n"
         end
         return link
       end
@@ -153,16 +154,18 @@ module Mack
         link = ""
         files.each do |name|
           file_name = !name.to_s.end_with?(".css") ? "#{name}.css" : "#{name}"
-          link += "<link href=\"#{get_resource_root}/stylesheets/#{file_name}\" media=\"#{options[:media]}\" rel=\"#{options[:rel]}\" type=\"#{options[:type]}\" />\n"
+          resource = "/stylesheets/#{file_name}"
+          link += "<link href=\"#{get_resource_root(resource)}#{resource}\" media=\"#{options[:media]}\" rel=\"#{options[:rel]}\" type=\"#{options[:type]}\" />\n"
         end
         
         return link
       end
       
       private
-      def get_resource_root
+      def get_resource_root(resource)
         path = ""
         path = "#{app_config.mack.distributed_site_domain}" if app_config.mack.distributed_site_domain
+        path = Mack::AssetHelpers.instance.asset_hosts(resource) if path.empty?
         return path
       end
       

data/lib/mack_app.rb

@@ -1,20 +1,18 @@
-require 'ruby-debug'
-
 fl = File.join(File.dirname(__FILE__), "mack")
+require File.join(fl, "initialization", "application.rb")
+require File.join(fl, "initialization", "helpers.rb")
+require File.join(fl, "initialization", "plugins.rb")
 
-require File.join(fl, "initialization", "configuration.rb")
+boot_load(:start_mack_application, :configuration, :print_hello_banner, :lib, :routes, :app_files, :helpers, :runner) do
+  Mack::Environment.load
+  Mack.logger.debug "Initialization of Mack Application Environment finished."
+end
 
-unless Mack::Configuration.initialized_application
-  
-  Mack.logger.debug "Starting application in #{Mack.env} mode."
+boot_load(:print_hello_banner, :configuration) do
+  Mack.reset_logger!
   Mack.logger.debug "Mack root: #{Mack.root}"
   Mack.logger.debug "Mack version: #{Mack::VERSION}"
+  Mack.logger.debug "Starting application in #{Mack.env} mode."
+end
 
-  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
+Mack::BootLoader.run(:start_mack_application)