mack 0.4.7 → 0.5.0

data/lib/initialization/initializers/plugins.rb

@@ -1,5 +1,5 @@
 plugins = [] # a list of all plugins
-Dir.glob(File.join(MACK_PLUGINS, "*")).each do |d|
+Dir.glob(File.join(Mack::Configuration.plugins, "*")).each do |d|
   plugins << d
   $: << File.join(d, "lib") # add the lib for this plugin to the global load path
 end

data/lib/initialization/server/simple_server.rb

@@ -2,8 +2,6 @@ module Mack
   # Even though it's called, SimpleServer, this might be the only server you need to run
   # a Mack application.
   # 
-  #   $ ruby script/server
-  # 
   # This SimpleServer does not use Thin. But does work with anything that Rack has a handler for.
   class SimpleServer
     

data/lib/mack.rb

@@ -113,8 +113,8 @@ module Mack
       if File.extname(env["PATH_INFO"]).blank?
         env["PATH_INFO"] << ".html"
       end
-      if File.exists?(File.join(MACK_PUBLIC, env["PATH_INFO"]))
-        return Rack::File.new(File.join(MACK_PUBLIC)).call(env)
+      if File.exists?(File.join(Mack::Configuration.public_directory, env["PATH_INFO"]))
+        return Rack::File.new(File.join(Mack::Configuration.public_directory)).call(env)
       else
         raise exception
       end

data/lib/mack_tasks.rb

@@ -1,6 +1,12 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
+require 'rubygems'
+require 'application_configuration'
+
+require File.join(File.dirname(__FILE__), "initialization", "configuration.rb")
+require File.join(File.dirname(__FILE__), "initialization", "initializers", "orm_support.rb")
+
 # Requires all rake tasks that ship with the Mack framework.
 [File.join(File.dirname(__FILE__)), File.join(FileUtils.pwd, "lib"), File.join(FileUtils.pwd, "vendor", "plugins")].each do |dir|
   begin

data/lib/rendering/base.rb

@@ -41,7 +41,7 @@ module Mack
       private
       # Used to render a file from disk.
       def render_file(f, options = {})
-        options = {:is_partial => false, :ext => ".#{self.params(:format)}.erb", :dir => MACK_VIEWS}.merge(options)
+        options = {:is_partial => false, :ext => ".#{self.params(:format)}.erb", :dir => Mack::Configuration.views_directory}.merge(options)
         partial = f.to_s
         parts = partial.split("/")
         if parts.size == 1

data/lib/rendering/classes/action.rb

@@ -10,7 +10,7 @@ module Mack
         rescue Errno::ENOENT => e
           begin
             # If the action doesn't exist on disk, try to render it from the public directory:
-            t = render_file(options[:action], {:dir => MACK_PUBLIC, :ext => ".#{params(:format)}", :layout => false}.merge(options))
+            t = render_file(options[:action], {:dir => Mack::Configuration.public_directory, :ext => ".#{params(:format)}", :layout => false}.merge(options))
             # Because it's being served from public don't wrap a layout around it!
             # self.controller.instance_variable_get("@render_options").merge!({:layout => false})
             return t

data/lib/rendering/classes/public.rb

@@ -5,7 +5,7 @@ module Mack
     class Public < Base
       
       def render
-        render_file(options[:public], {:dir => MACK_PUBLIC, :ext => ".html", :layout => false}.merge(options))
+        render_file(options[:public], {:dir => Mack::Configuration.public_directory, :ext => ".html", :layout => false}.merge(options))
       end
       
     end

data/lib/rendering/classes/url.rb

@@ -1,4 +1,5 @@
 require 'net/http'
+require File.join(File.dirname(__FILE__), "..", 'base')
 module Mack
   module Rendering
     # Used when someone calls render(:url => "http://www.mackframework.com")

data/lib/rendering/classes/xml.rb

@@ -10,7 +10,7 @@ module Mack
         rescue Errno::ENOENT => e
           begin
             # If the action doesn't exist on disk, try to render it from the public directory:
-            t = render_file(options[:xml], {:dir => MACK_PUBLIC, :ext => ".xml.erb", :layout => false}.merge(options.merge(:format => :xml)))
+            t = render_file(options[:xml], {:dir => Mack::Configuration.public_directory, :ext => ".xml.erb", :layout => false}.merge(options.merge(:format => :xml)))
             return t
           rescue Errno::ENOENT => ex
           end

data/lib/sea_level/controller_base.rb

@@ -77,6 +77,8 @@ module Mack
       # An implicit render will happen if one is not specified in the action.
       # 
       # Only :action and :text will get layouts wrapped around them.
+      #
+      # You can also specify the response status code as part of the options hash.
       # 
       # Examples:
       #   class MyAwesomeController < Mack::Controller::Base
@@ -85,7 +87,7 @@ module Mack
       #       render(:text => "Hello World!")
       #     end
       # 
-      #     # This will render MACK_ROOT/views/my_awesome_controller/foo.html.erb
+      #     # This will render Mack::Configuration.root/views/my_awesome_controller/foo.html.erb
       #     def show
       #       render(:action => :foo)
       #     end
@@ -96,12 +98,12 @@ module Mack
       #       render(:action => :foo)
       #     end
       # 
-      #     # This will render MACK_ROOT/views/my_awesome_controller/delete.html.erb
+      #     # This will render Mack::Configuration.root/views/my_awesome_controller/delete.html.erb
       #     def delete
       #     end
       # 
       #     # This will render the text 'Hello World!' to the screen. Assuming that
-      #     # there is no file: MACK_ROOT/views/my_awesome_controller/update.html.erb
+      #     # there is no file: Mack::Configuration.root/views/my_awesome_controller/update.html.erb
       #     # The reason for this is if the view for the action doesn't exist, and the
       #     # last thing returned from the action is a String, that string will be returned.
       #     def update
@@ -109,13 +111,13 @@ module Mack
       #     end
       # 
       #     # This will raise a Mack::Errors::InvalidRenderType error. Assuming that
-      #     # there is no file: MACK_ROOT/views/my_awesome_controller/create.html.erb
+      #     # there is no file: Mack::Configuration.root/views/my_awesome_controller/create.html.erb
       #     def create
       #       @user = User.find(1)
       #     end
       # 
       #     # This will raise a Errno::ENOENT error. Assuming that
-      #     # there is no file: MACK_ROOT/views/my_awesome_controller/bar.html.erb
+      #     # there is no file: Mack::Configuration.root/views/my_awesome_controller/bar.html.erb
       #     def bar
       #       render(:action => "bar")
       #     end
@@ -137,14 +139,14 @@ module Mack
       #     end
       # 
       #     # This will render a partial. In this case it will look for:
-      #     # MACK_ROOT/views/my_awesome_controller/_latest_news.html.erb
+      #     # Mack::Configuration.root/views/my_awesome_controller/_latest_news.html.erb
       #     # Partials do NOT get wrapped in layouts.
       #     def latest_news
       #       render(:partial => :latest_news)
       #     end
       # 
       #     # This will render a partial. In this case it will look for:
-      #     # MACK_ROOT/views/some_other/_old_news.html.erb
+      #     # Mack::Configuration.root/views/some_other/_old_news.html.erb
       #     # Partials do NOT get wrapped in layouts.
       #     def latest_news
       #       render(:partial => "some_other/old_news")
@@ -175,9 +177,16 @@ module Mack
       #     def get_index
       #       render(:url => "/")
       #     end
+      #
+      #     # This will render 'application/404' and set the response status code to 404
+      #     def to_the_unknown
+      #       return render(:action => '/application/404', :status => 404)
+      #     end
+      #        
       #   end
       def render(options = {:action => self.action_name})
         raise Mack::Errors::DoubleRender.new if render_performed?
+        response.status = options[:status] unless options[:status].nil?
         unless options[:action] || options[:text]
           options = {:layout => false}.merge(options)
         end
@@ -345,11 +354,11 @@ module Mack
         # 
         # Example:
         #   class MyAwesomeController < Mack::Controller::Base
-        #     # Sets all actions to use: "#{MACK_ROOT}/app/views/layouts/dark.html.erb" as they're layout.
+        #     # Sets all actions to use: "#{Mack::Configuration.root}/app/views/layouts/dark.html.erb" as they're layout.
         #     layout :dark
         # 
         #     def index
-        #       # Sets this action to use: "#{MACK_ROOT}/app/views/layouts/bright.html.erb" as it's layout.
+        #       # Sets this action to use: "#{Mack::Configuration.root}/app/views/layouts/bright.html.erb" as it's layout.
         #       render(:text => "Welcome...", :layout => :bright)
         #     end
         # 
@@ -359,7 +368,7 @@ module Mack
         #     end
         #   end
         # 
-        # The default layout is "#{MACK_ROOT}/app/views/layouts/application.html.erb".
+        # The default layout is "#{Mack::Configuration.root}/app/views/layouts/application.html.erb".
         # 
         # If a layout is specified, and it doesn't exist a Mack::Errors::UnknownLayout error will be raised.
         def layout(lay)

data/lib/sea_level/helpers/view_helpers/html_helpers.rb

@@ -2,7 +2,7 @@ module Mack
   module ViewHelpers
     module HtmlHelpers
       
-      # This is just an alias to Mack::Utils::Html.
+      # This is just an alias to 
       # 
       # Examples:
       #   <%= link_to("http://www.mackframework.com") %> # => <a href="http://www.mackframework.com">http://www.mackframework.com</a>
@@ -17,31 +17,116 @@ module Mack
       # nothing will happen. This is extremely useful for 'delete' type of links.
       #   <%= link_to("Mack", "http://www.mackframework.com", :method => :delete, :confirm => "Are you sure?") %>
       def link_to(link_text, url = link_text, html_options = {})
-        Mack::Utils::Html.href(link_text, url, html_options)
+        options = {:href => url}.merge(html_options)
+        a(link_text, options)
       end
       
-      # A wrapper method for views that calls out to Mack::Utils::Html.
+      # Used in views to create href links. It takes link_text, url, and a Hash that gets added
+      # to the href as options.
       # 
       # Examples:
-      #   <%= html.b("hello") %> # => <b>hello</b>
-      def html
-        Mack::Utils::Html
+      #    a("http://www.mackframework.com") # => <a href="http://www.mackframework.com">http://www.mackframework.com</a>
+      #    a("Mack", :href => "http://www.mackframework.com") # => <a href="http://www.mackframework.com">Mack</a>
+      #    a("Mack", :href => "http://www.mackframework.com", :target => "_blank") # => <a href="http://www.mackframework.com" target="_blank">Mack</a>
+      #    a("Mack", :href => "http://www.mackframework.com", :target => "_blank", :rel => :nofollow) # => <a href="http://www.mackframework.com" target="_blank" rel="nofollow">Mack</a>
+      # If you pass in :method as an option it will be a JavaScript form that will post to the specified link with the 
+      # methd specified.
+      #    a("Mack", :href => "http://www.mackframework.com", :method => :delete)
+      # If you use the :method option you can also pass in a :confirm option. The :confirm option will generate a 
+      # javascript confirmation window. If 'OK' is selected the the form will submit. If 'cancel' is selected, then
+      # nothing will happen. This is extremely useful for 'delete' type of links.
+      #    a("Mack", :href => "http://www.mackframework.com", :method => :delete, :confirm => "Are you sure?")
+      def a(link_text, options = {})
+        options = {:href => link_text}.merge(options)
+        if options[:method]
+          meth = nil
+          confirm = nil
+        
+          meth = %{var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;var s = document.createElement('input'); s.setAttribute('type', 'hidden'); s.setAttribute('name', '_method'); s.setAttribute('value', '#{options[:method]}'); f.appendChild(s);f.submit()}
+          options.delete(:method)
+        
+          if options[:confirm]
+            confirm = %{if (confirm('#{options[:confirm]}'))}
+            options.delete(:confirm)
+          end
+        
+          options[:onclick] = (confirm ? (confirm + " { ") : "") << meth << (confirm ? (" } ") : "") << ";return false;"
+        end
+        content_tag(:a, options, link_text)
       end
       
-      # A wrapper method for image link.
+      # Builds an HTML tag.
+      # 
+      # Examples:
+      #   content_tag(:b) {"hello"} # => <b>hello</b>
+      #   content_tag("div", :class => :foo) {"hello world!"} # => <div class="foo">hello world!</div>
+      def content_tag(tag, options = {}, content = nil, &block)
+        if block_given?
+          concat("<#{tag}#{build_options(options)}>\n", block.binding)
+          yield
+          concat("</#{tag}>", block.binding)
+        else
+           "<#{tag}#{build_options(options)}>#{content}</#{tag}>"
+        end
+      end
+      
+      # Builds an HTML tag with no content.
+      # 
+      # Examples:
+      #   non_content_tag(:br) # => <br />
+      #   non_content_tag(:hr, :width => "100%") # => <hr width="100%" />
+      def non_content_tag(tag, options = {})
+        "<#{tag}#{build_options(options)} />"
+      end
+      
+      # Builds a HTML image tag.
+      def img(image_src, options = {})
+        non_content_tag(:img, {:src => image_src}.merge(options))
+      end
+      
+      
+      # Wraps an image tag with a link tag.
       # 
       # Examples:
       #   <%= link_image_to("/images/foo.jpg", "#" %> # => <a href="#"><img src="/images/foo.jpg"></a>
       def link_image_to(image_url, url, image_options = {}, html_options = {})
-        link_to(Mack::Utils::Html.image_tag(image_url, image_options), url, html_options)
+        link_to(img(image_url, image_options), url, html_options)
       end
       
-      # A wrapper to Mack::Utils::Html rss method.
-      # 
       # Example:
       #   <%= rss_tag(posts_index_url(:format => :xml)) %>
       def rss_tag(url)
-        Mack::Utils::Html.rss(url)
+        "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"#{url}\">"
+      end
+      
+      def form(action, options = {}, &block)
+        options = {:method => :post, :action => action}.merge(options)
+        if options[:id]
+          options = {:class => options[:id]}.merge(options)
+        end
+        if options[:multipart]
+          options = {:enctype => "multipart/form-data"}.merge(options)
+          options.delete(:multipart)
+        end
+        meth = nil
+        unless options[:method] == :get || options[:method] == :post
+          meth = "<input name=\"_method\" type=\"hidden\" value=\"#{options[:method]}\" />\n"
+          options[:method] = :post
+        end
+        concat("<form#{build_options(options)}>\n", block.binding)
+        concat(meth, block.binding) unless meth.blank?
+        yield
+        concat("</form>", block.binding)
+        # content_tag(:form, options, &block)
+      end
+      
+      private
+      def build_options(options)
+        opts = ""
+        unless options.empty?
+          opts = " " << options.join("%s=\"%s\"", " ")
+        end
+        opts
       end
       
     end # HtmlHelpers

data/lib/sea_level/helpers/view_helpers/string_helpers.rb

@@ -0,0 +1,22 @@
+module Mack
+  module ViewHelpers
+    module StringHelpers
+      
+      # Takes a count integer and a word and returns a phrase containing the count
+      # and the correct inflection of the word.
+      # 
+      # Examples:
+      #   pluralize_word(0, "error") # => "0 errors"
+      #   pluralize_word(1, "error") # => "1 error"
+      #   pluralize_word(2, "error") # => "2 errors"
+      def pluralize_word(count, word)
+        if count.to_i == 1
+          "#{count} #{word.singular}"
+        else
+          "#{count} #{word.plural}"
+        end
+      end
+      
+    end # StringHelpers
+  end # ViewHelpers
+end # Mack

data/lib/sea_level/uploaded_file.rb

@@ -1,3 +1,4 @@
+require File.join(File.dirname(__FILE__), 'request')
 module Mack
   # Wraps the Hash that Rack creates when you post a file.
   class Request::UploadedFile

data/lib/sea_level/view_binder.rb

@@ -13,11 +13,6 @@ class Mack::ViewBinder
     @xml = Builder::XmlMarkup.new(:target => @xml_output, :indent => 1)
   end
   
-  # Returns the binding for this class.
-  def view_binding
-    binding
-  end
-  
   # If a method can not be found then the :locals key of
   # the options is used to find the variable.
   def method_missing(sym, *args)
@@ -57,6 +52,19 @@ class Mack::ViewBinder
     raise Mack::Errors::UnknownRenderOption.new(options)
   end
   
+  def run(io)
+    # TODO: find a nicer way of doing this:
+    if ((controller.params(:format).to_sym == :xml) || options[:format] == :xml) && (options[:action] || options[:xml])
+      return eval(io, binding)
+    else
+      return Erubis::Eruby.new(io).result(binding)
+    end
+  end
+  
+  def concat(txt, b)
+    eval( "_buf", b) << txt
+  end
+  
   private
   
   # Transfer instance variables from the controller to the view.
@@ -72,12 +80,7 @@ class Mack::ViewBinder
     # and returns a String. The io can be either an IO object or a String.
     def render(io, controller, options = {})
       vb = Mack::ViewBinder.new(controller, options)
-      # TODO: find a nicer way of doing this:
-      if ((controller.params(:format).to_sym == :xml) || options[:format] == :xml) && (options[:action] || options[:xml])
-        return eval(io, vb.view_binding)
-      else
-        return Erubis::Eruby.new(io).result(vb.view_binding)
-      end
+      vb.run(io)
     end
     
   end

data/lib/tasks/cachetastic_tasks.rake

@@ -10,7 +10,7 @@ namespace :cachetastic do
       when "All"
         puts "About to work on ALL caches!"
         # force all caches to register themselves:
-        ["#{MACK_ROOT}/lib/caches"].each do |dir|
+        ["#{Mack::Configuration.root}/lib/caches"].each do |dir|
           Find.find(dir) do |f|
             # puts f
             if FileTest.directory?(f) and !f.match(/.svn/)
@@ -55,15 +55,15 @@ namespace :cachetastic do
     end
   end
   
-  namespace :page_cache do
-    
-    desc "Expires the page cache."
-    task :expire_all => :environment do
-      running_time do("Cachetastic::Caches::PageCache.expire_all")
-        Cachetastic::Caches::PageCache.expire_all
-      end
-    end
-    
-  end
+  # namespace :page_cache do
+  #   
+  #   desc "Expires the page cache."
+  #   task :expire_all => :environment do
+  #     running_time do("Cachetastic::Caches::PageCache.expire_all")
+  #       Cachetastic::Caches::PageCache.expire_all
+  #     end
+  #   end
+  #   
+  # end
   
 end

data/lib/tasks/mack_server_tasks.rake

@@ -22,15 +22,15 @@ namespace :mack do
         d_handler = "thin"
       rescue Exception => e
       end
-
-      MACK_ROOT = FileUtils.pwd unless Object.const_defined?("MACK_ROOT")
+      
+      Mack::Configuration.set(:root, FileUtils.pwd) if Mack::Configuration.root.nil?
 
       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")
+      # require File.join(Mack::Configuration.root, "config", "boot.rb")
       require 'mack'
 
       if options.handler == "thin"