mack 0.5.0 → 0.5.5

data/CHANGELOG

@@ -1,3 +1,22 @@
+===0.5.5
+* INCOMPATIBILITY NOTICE: Ripped apart the ENTIRE rendering engine and rewrote it from the ground up. This means that wherever you are using 'render' calls in your views and controllers need to be changed. The new format is render(type, value, options). Examples: render(:action, :show), render(:url, "http://www.mackframework.com"), etc...
+* INCOMPATIBILITY NOTICE: Files named *.xml.erb need to be changed to *.xml.builder to use the Builder::XmlMarkup library. If you leave the .erb extension on there the file will be run through Erubis.
+* INCOMPATIBILITY NOTICE: <%= @content_for_layout %> is now <%= yield_to :view %>
+* Added Markaby support.
+* Added Haml support.
+* Added content_for and yield_to methods in views.
+* Erubis compiled templates are now cached for increased performance.
+* Added render(:inline) and render(:template) support.
+* Refactored, and reorganized some files to clean up the gem.
+* Fixed bug with cookies not merging with configured app_config parameters.
+* Added mime-types. The 'Content-Type' header is now being set based on the format that is requested. Default is text/html.
+* Fixed r.defaults in routes so they are always the last routes to be checked, no matter where they are placed in the routes definitions.
+* render(:url) now recognizes 'local' urls and tries to run them through the app, mimicking most headers from the original request.
+* Added 'options' banners to the mack and mack_ring_server binaries.
+* gem: genosaurus 1.1.8
+* gem: mack_ruby_core_extensions 0.1.28
+* gem: markaby 0.5.0
+
 ===0.5.0
 * Added rake db:create and db:create:all rake tasks.
 * Refactored out constants, such as MACK_ROOT and MACK_ENV and made them into Mack::Configuration.env, Mack::Configuration.root, etc...

data/bin/mack

@@ -13,11 +13,12 @@ raise "You must specify a name for this application!" if app.nil?
 
 options = OpenStruct.new
 options.orm = "data_mapper"
-options.version = "0.5.0"
+options.version = "0.5.5"
 
 opts = OptionParser.new do |opts|
+  opts.banner = "Usage: mack <application_name> [options]"
   
-  opts.on("-o [ORM]") do |v|
+  opts.on("-o [data_mapper|active_record]") do |v|
     options.orm = v
   end
   

data/bin/mack_ring_server

@@ -3,7 +3,25 @@ require 'rubygems'
 require 'daemons'
 require 'rinda/ring'
 require 'rinda/tuplespace'
-require 'fileutils'
+require 'fileutils' 
+require 'optparse'
+require 'optparse/time'
+require 'ostruct'
+
+options = OpenStruct.new
+opts = OptionParser.new do |opts|
+  opts.banner = <<-BANNER
+Usage: mack_ring_server <command>
+Available commands are:
+
+- start
+- stop
+- restart
+
+BANNER
+end
+
+opts.parse!(ARGV)
 
 FileUtils.mkdir_p(File.join("tmp", "pids"))
 

data/lib/{sea_level/controller_base.rb → controller/base.rb}

@@ -7,7 +7,7 @@ module Mack
     # Example:
     #   class MyAwesomeController < Mack::Controller::Base
     #     def index
-    #       render(:text => "Hello World!")
+    #       render(:text, "Hello World!")
     #     end
     #   end
     class Base
@@ -52,18 +52,72 @@ module Mack
         # only run public methods!
         if self.public_methods.include?(self.action_name)
           # call the action and capture the results to a variable.
-          @result_of_action_called = self.send(self.action_name)
+          self.send(self.action_name)
         else
           # there is no action on this controller, so call the render method
           # which will check the view directory and run action.html.erb if it exists.
-          render(:action => self.action_name)
+          render(:action, self.action_name)
         end
         run_filters(:after)
         # do the work of rendering.
-        @final_rendered_action = complete_layout_render(complete_action_render)
+        @final_rendered_action = do_render
         run_filters(:after_render)
         @final_rendered_action
       end
+
+      # This will redirect the request to the specified url. A default status of
+      # 302, Moved Temporarily, is set if no status is specified. A simple HTML
+      # page is rendered in case the redirect does not occur. A server side
+      # redirect is also possible by using the option :server_side => true.
+      # When a server side redirect occurs the url must be a 'local' url, not an
+      # external url. The 'original' url of the request will NOT change.
+      def redirect_to(url, options = {})
+        options = {:status => 302}.merge(options)
+        raise Rack::ForwardRequest.new(url) if options[:server_side]
+        response.status = options[:status]
+        response[:location] = url
+        render(:text, redirect_html(request.path_info, url, options[:status]))
+      end
+      
+      # In an action wants will run blocks of code based on the content type that has
+      # been requested.
+      # 
+      # Examples:
+      #   class MyAwesomeController < Mack::Controller::Base
+      #     def hello
+      #       wants(:html) do
+      #         render(:text, "<html>Hello World</html>")
+      #       end
+      #       wants(:xml) do
+      #         render(:text, "<xml><greeting>Hello World</greeting></xml>")
+      #       end
+      #     end
+      #   end
+      # 
+      # If you were to go to: /my_awesome/hello you would get:
+      #   "<html>Hello World</html>"
+      # 
+      # If you were to go to: /my_awesome/hello.html you would get:
+      #   "<html>Hello World</html>"
+      # 
+      # If you were to go to: /my_awesome/hello.xml you would get:
+      #   "<xml><greeting>Hello World</greeting></xml>"
+      def wants(header_type, &block)
+        header_type = header_type.to_sym
+        if header_type == params(:format).to_sym
+          yield
+        end
+      end
+
+      # Returns true/false depending on whether the render action has been called yet.
+      def render_performed?
+        @render_performed
+      end
+      
+      # Gives access to the MACK_DEFAULT_LOGGER.
+      def logger
+        MACK_DEFAULT_LOGGER
+      end
       
       # This method can be called from within an action. This 'registers' the render that you
       # would like to happen once the action is completed.
@@ -84,18 +138,18 @@ module Mack
       #   class MyAwesomeController < Mack::Controller::Base
       #     # This will render the text 'Hello World!' to the screen.
       #     def index
-      #       render(:text => "Hello World!")
+      #       render(:text, "Hello World!")
       #     end
       # 
       #     # This will render Mack::Configuration.root/views/my_awesome_controller/foo.html.erb
       #     def show
-      #       render(:action => :foo)
+      #       render(:action, :foo)
       #     end
       # 
       #     # This will raise a Mack::Errors::DoubleRender error.
       #     def edit
-      #       render(:text => "Hello World!")
-      #       render(:action => :foo)
+      #       render(:text, "Hello World!")
+      #       render(:action, :foo)
       #     end
       # 
       #     # This will render Mack::Configuration.root/views/my_awesome_controller/delete.html.erb
@@ -119,7 +173,7 @@ module Mack
       #     # This will raise a Errno::ENOENT error. Assuming that
       #     # there is no file: Mack::Configuration.root/views/my_awesome_controller/bar.html.erb
       #     def bar
-      #       render(:action => "bar")
+      #       render(:action, "bar")
       #     end
       #     
       #     # This will render a file from the public directory. Files served from the
@@ -127,7 +181,7 @@ module Mack
       #     # served from the public directory is .html. This can be overridden with the
       #     # :ext => ".<ext>" option.
       #     def show_public_file
-      #       render(:public => "my/files/foo")
+      #       render(:public, "my/files/foo")
       #     end
       # 
       #     # This will render a file from the public directory. Files served from the
@@ -135,39 +189,39 @@ module Mack
       #     # served from the public directory is .html. This can be overridden with the
       #     # :ext => ".<ext>" option. 
       #     def show_public_xml_file
-      #       render(:public => "my/files/foo", :ext => ".xml")
+      #       render(:public, "my/files/foo", :ext => ".xml")
       #     end
       # 
       #     # This will render a partial. In this case it will look for:
       #     # 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)
+      #       render(:partial, :latest_news)
       #     end
       # 
       #     # This will render a partial. In this case it will look for:
       #     # 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")
+      #       render(:partial, "some_other/old_news")
       #     end
       # 
       #     # This will render a url. If the url does not return a status code of '200',
       #     # an empty string will be returned by default. The default method for rendering
       #     # urls is a get.
       #     def yahoo
-      #       render(:url => "http://www.yahoo.com")
+      #       render(:url, "http://www.yahoo.com")
       #     end
       # 
       #     # This will render a url. If the url does not return a status code of '200',
       #     # a Mack::Errors::UnsuccessfulRenderUrl exception will be raised.
       #     def idontexist
-      #       render(:url => "http://www.idontexist.com", :raise_exception => true)
+      #       render(:url, "http://www.idontexist.com", :raise_exception => true)
       #     end
       # 
       #     # This will render a url with a post.
       #     def post_to_somewhere
-      #       render(:url => "http://www.mackframework.com/post_to_me", :method => :post, 
+      #       render(:url, "http://www.mackframework.com/post_to_me", :method => :post, 
       #              :parameters => {:id => 1, :user => "markbates"})
       #     end
       # 
@@ -175,81 +229,36 @@ module Mack
       #     # 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 => "/")
+      #       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)
+      #       return render(:action, '/application/404', :status => 404)
       #     end
       #        
       #   end
-      def render(options = {:action => self.action_name})
+      def render(render_type = :action, render_value = self.action_name, options = {})
         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
-        @render_options = options
+        options = {:content_type => Mack::Utils::MimeTypes[params(:format)], :layout => layout}.merge(options)
+        response["Content-Type"] = options[:content_type]
+        options.delete(:content_type)
+        @view_template = Mack::Rendering::ViewTemplate.new(render_type, render_value, 
+                                                           {:format => params(:format).to_sym, :controller => self}.merge(options))
         @render_performed = true
       end
       
-      # This will redirect the request to the specified url. A default status of
-      # 302, Moved Temporarily, is set if no status is specified. A simple HTML
-      # page is rendered in case the redirect does not occur. A server side
-      # redirect is also possible by using the option :server_side => true.
-      # When a server side redirect occurs the url must be a 'local' url, not an
-      # external url. The 'original' url of the request will NOT change.
-      def redirect_to(url, options = {})
-        options = {:status => 302}.merge(options)
-        raise Rack::ForwardRequest.new(url) if options[:server_side]
-        response.status = options[:status]
-        response[:location] = url
-        render(:text => redirect_html(request.path_info, url, options[:status]))
-      end
-      
-      # In an action wants will run blocks of code based on the content type that has
-      # been requested.
-      # 
-      # Examples:
-      #   class MyAwesomeController < Mack::Controller::Base
-      #     def hello
-      #       wants(:html) do
-      #         render(:text => "<html>Hello World</html>")
-      #       end
-      #       wants(:xml) do
-      #         render(:text => "<xml><greeting>Hello World</greeting></xml>")
-      #       end
-      #     end
-      #   end
-      # 
-      # If you were to go to: /my_awesome/hello you would get:
-      #   "<html>Hello World</html>"
-      # 
-      # If you were to go to: /my_awesome/hello.html you would get:
-      #   "<html>Hello World</html>"
-      # 
-      # If you were to go to: /my_awesome/hello.xml you would get:
-      #   "<xml><greeting>Hello World</greeting></xml>"
-      def wants(header_type, &block)
-        header_type = header_type.to_sym
-        if header_type == params(:format).to_sym
-          yield
-        end
-      end
-      
-      # Returns true/false depending on whether the render action has been called yet.
-      def render_performed?
-        @render_performed
+      private
+      def do_render
+        render unless @view_template
+        @rendered_action = @view_template.compile_and_render
       end
-      
-      # Gives access to the MACK_DEFAULT_LOGGER.
-      def logger
-        MACK_DEFAULT_LOGGER
+
+      def layout
+        :application
       end
       
-      private
-      
       def run_filters(type)
         filters = self.class.controller_filters[type]
         return true if filters.empty?
@@ -261,56 +270,6 @@ module Mack
         end
       end
       
-      def complete_layout_render(action_content)
-        @content_for_layout = action_content
-        # if @render_options[:action] || @render_options[:text]
-          # only action and text should get a layout.
-          # if a layout is specified, use that:
-          # i use has_key? here because we want people
-          # to be able to override layout with nil/false.
-          if @render_options.has_key?(:layout)
-            if @render_options[:layout]
-              return Mack::ViewBinder.new(self).render(@render_options.merge({:action => "layouts/#{@render_options[:layout]}"}))
-            else
-              # someone has specified NO layout via nil/false
-              return @content_for_layout
-            end
-          else layout
-            # use the layout specified by the layout method
-            begin
-              return Mack::ViewBinder.new(self).render(@render_options.merge({:action => "layouts/#{layout}"}))
-            rescue Errno::ENOENT => e
-              # if the layout doesn't exist, we don't care.
-            rescue Exception => e
-              raise e
-            end
-          end
-        # end
-        @content_for_layout
-      end
-
-      def complete_action_render
-        if render_performed?
-          return Mack::ViewBinder.new(self, @render_options).render(@render_options)
-        else
-          begin
-            # try action.html.erb
-            return Mack::ViewBinder.new(self).render({:action => self.action_name})
-          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)
-            else
-              raise e
-            end
-          end
-        end
-      end # complete_action_render
-      
-      def layout
-        :application
-      end
-      
       public
       class << self
         
@@ -359,12 +318,12 @@ module Mack
         # 
         #     def index
         #       # Sets this action to use: "#{Mack::Configuration.root}/app/views/layouts/bright.html.erb" as it's layout.
-        #       render(:text => "Welcome...", :layout => :bright)
+        #       render(:text, "Welcome...", :layout => :bright)
         #     end
         # 
         #     def index
         #       # This will no use a layout.
-        #       render(:text => "Welcome...", :layout => false)
+        #       render(:text, "Welcome...", :layout => false)
         #     end
         #   end
         # 

data/lib/{sea_level → controller}/cookie_jar.rb

@@ -4,11 +4,11 @@ module Mack
   #   class MyAwesomeController < Mack::Controller::Base
   #     def index
   #       cookies[:id] = 1
-  #       render(:text => "Hello!")
+  #       render(:text,  "Hello!")
   #     end
   # 
   #     def show
-  #       render(:text => "The id in the cookie is: #{cookies[:id]}")
+  #       render(:text,  "The id in the cookie is: #{cookies[:id]}")
   #     end
   #   end
   class CookieJar
@@ -42,7 +42,7 @@ module Mack
       unless value.is_a?(Hash)
         value = {:value => value}
       end
-      value = app_config.mack.cookie_values.merge(value)
+      value = app_config.mack.cookie_values.symbolize_keys.merge(value)
       self.all_cookies[key] = value
       self.response.set_cookie(key, value)
     end

data/lib/distributed/routing/urls.rb

@@ -13,7 +13,7 @@ module Mack
         def put
           Mack::Distributed::Utils::Rinda.register_or_renew(:space => app_config.mack.distributed_app_name.to_sym, 
                                                             :klass_def => :distributed_routes, 
-                                                            :object => self)
+                                                            :object => self, :timeout => 0)
         end
         
         def run(meth, options)