RubyGems - merb-core - Versions diffs - 0.9.7 → 0.9.8 - Mend

merb-core 0.9.7 → 0.9.8

Files changed (274) hide show

data/lib/merb-core/dispatch/default_exception/views/index.html.erb CHANGED Viewed

@@ -1,6 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-  <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
   <title><%= humanize_exception(@exceptions.first) %></title>
   <%= partial :css %>
 </head>
@@ -14,7 +17,7 @@
         <% @exceptions.each_with_index do |exception,i| %>
           <li>
             <a href="#exception_<%= i %>"><%= humanize_exception(exception) %></a>
-            <%= html_escape(exception.message.split("\n",2).first) %>
+            <%= escape_html(exception.message.split("\n",2).first) %>
           </li>
         <% end %>
       </ul>
@@ -51,7 +54,7 @@
       </h1>
       <%= error_codes(exception) %>
       <p class="options">
-        <label class="all">All<input type="checkbox" autocomplete="off"></label>
+        <label class="all">All<input type="checkbox" autocomplete="off" /></label>
         <span class="all">
           <label class="app">App<input type="checkbox" checked="checked" autocomplete="off"/></label>
           <label class="framework">Framework<input type="checkbox" autocomplete="off"/></label>
@@ -84,6 +87,7 @@
       <% end %>
     </table>
   <% end %>
+  </div>
   <div class="footer">
     lots of love, from <a href="http://www.merbivore.com">merb</a>
   </div>

data/lib/merb-core/dispatch/dispatcher.rb CHANGED Viewed

@@ -53,9 +53,9 @@ module Merb
           "you may need to check your Rackup file, see the Problems " \
           "section at: http://wiki.merbivore.com/pages/rack-middleware"
       end
-      if klass == Application
-        raise NotFound, "The 'Application' controller has no public actions"
+      if klass.abstract?
+        raise NotFound, "The '#{klass}' controller has no public actions"
       end
       controller = dispatch_action(klass, params[:action])

data/lib/merb-core/dispatch/request.rb CHANGED Viewed

@@ -41,7 +41,7 @@ module Merb
           "Route matched, but route did not specify a controller.\n" +
           "Did you forgot to add :controller => \"people\" or :controller " +
           "segment to route definition?\nHere is what's specified:\n" +
-          request.route_params.inspect
+          route.inspect
       end
       path = [params[:namespace], params[:controller]].compact.join("/")
       controller = path.snake_case.to_const_string
@@ -95,7 +95,49 @@ module Merb
     # into request params hash.
     def find_route!
       @route, @route_params = Merb::Router.route_for(self)
-      @params.merge! @route_params
+      params.merge! @route_params
+    end
+    # Processes the return value of a deferred router block
+    # and returns the current route params for the current
+    # request evaluation
+    # ---
+    # @private
+    def _process_block_return(retval)
+      # If the return value is an array, then it is a redirect
+      # so we must set the request as a redirect and extract
+      # the redirect params and return it as a hash so that the
+      # dispatcher can handle it
+      if retval.is_a?(Array)
+        redirects!
+        return { :url => retval[0], :status => retval[1] }
+      end
+      retval
+    end
+    # Sets the request as a redirect. This method is only really
+    # used in the router to tell the request object how to handle
+    # the route params. This will also set the request as matched.
+    # ---
+    # @private
+    def redirects!
+      @matched   = true
+      @redirects = true
+    end
+    # Sets the request as matched. This will abort evaluating any
+    # further deferred procs.
+    # ---
+    # @private
+    def matched!
+      @matched = true
+    end
+    # Checks whether or not the request has been matched to a route.
+    # ---
+    # @private
+    def matched?
+      @matched
     end
     # Redirect status of route matched this request.
@@ -104,7 +146,7 @@ module Merb
     # Integer::
     #   The URL to redirect to if the route redirects
     def redirect_status
-      route.redirect_status
+      @route_params[:status] if redirects?
     end
     # Returns redirect url of route matched this request.
@@ -112,7 +154,7 @@ module Merb
     # ==== Returns
     # <String>:: redirect url of route matched this request
     def redirect_url
-      route.redirect_url
+      @route_params[:url] if redirects?
     end
     # Returns true if matched route does immediate redirection.
@@ -120,7 +162,7 @@ module Merb
     # ==== Returns
     # <Boolean>:: if matched route does immediate redirection.
     def redirects?
-      route.redirects?
+      @redirects
     end
     private
@@ -271,10 +313,10 @@ module Merb
     # ==== Returns
     # String::
-    #   The protocol, i.e. either "https://" or "http://" depending on the
+    #   The protocol, i.e. either "https" or "http" depending on the
     #   HTTPS header.
     def protocol
-      ssl? ? 'https://' : 'http://'
+      ssl? ? 'https' : 'http'
     end
     # ==== Returns
@@ -292,7 +334,7 @@ module Merb
     # ==== Returns
     # String:: The full URI, including protocol and host
     def full_uri
-      protocol + host + uri
+      protocol + "://" + host + uri
     end
     # ==== Returns
@@ -535,7 +577,12 @@ module Merb
         query = preserve_order ? Dictionary.new : {}
         for pair in (query_string || '').split(/[#{delimiter}] */n)
           key, value = unescape(pair).split('=',2)
-          normalize_params(query, key, value)
+          next if key.nil?
+          if key.include?('[')
+            normalize_params(query, key, value)
+          else
+            query[key] = value
+          end
         end
         preserve_order ? query : query.to_mash
       end

data/lib/merb-core/dispatch/router.rb CHANGED Viewed

@@ -1,7 +1,8 @@
 require 'merb-core/dispatch/router/cached_proc'
 require 'merb-core/dispatch/router/behavior'
+require 'merb-core/dispatch/router/resources'
 require 'merb-core/dispatch/router/route'
-require 'merb-core/controller/mixins/responder'
 module Merb
   # Router stores route definitions and finds the first
   # route that matches the incoming request URL.
@@ -20,19 +21,69 @@ module Merb
   #
   # Compilation is synchronized by mutex.
   class Router
-    SEGMENT_REGEXP = /(:([a-z_][a-z0-9_]*|:))/
-    SEGMENT_REGEXP_WITH_BRACKETS = /(:[a-z_]+)(\[(\d+)\])?/
-    JUST_BRACKETS = /\[(\d+)\]/
-    PARENTHETICAL_SEGMENT_STRING = "([^\/.,;?]+)".freeze
+    @routes          = []
+    @named_routes    = {}
+    @resource_routes = {}
+    @compiler_mutex  = Mutex.new
+    @root_behavior   = Behavior.new.defaults(:action => "index")
-    @@named_routes = {}
-    @@routes = []
-    @@compiler_mutex = Mutex.new
-    cattr_accessor :routes, :named_routes
+    # Raised when route lookup fails.
+    class RouteNotFound < StandardError; end;
+    # Raised when parameters given to generation
+    # method do not match route parameters.
+    class GenerationError < StandardError; end;
+    class NotCompiledError < StandardError; end;
     class << self
-      # Finds route matching URI of the request and
-      # returns a tuple of [route index, route params].
+      # @private
+      attr_accessor :routes, :named_routes, :resource_routes, :root_behavior
+      # Creates a route building context and evaluates the block in it. A
+      # copy of +root_behavior+ (and instance of Behavior) is copied as
+      # the context.
+      #
+      # ==== Parameters
+      # first<Array>::
+      #   An array containing routes that should be prepended to the routes
+      #   defined in the block.
+      #
+      # last<Array>::
+      #   An array containing routes that should be appended to the routes
+      #   defined in the block.
+      #
+      # ==== Returns
+      # Merb::Router::
+      #   Returns self to allow chaining of methods.
+      def prepare(first = [], last = [], &block)
+        @routes = []
+        root_behavior._with_proxy(&block)
+        @routes = first + @routes + last
+        compile
+        self
+      end
+      # Appends route in the block to routing table.
+      def append(&block)
+        prepare(routes, [], &block)
+      end
+      # Prepends routes in the block to routing table.
+      def prepend(&block)
+        prepare([], routes, &block)
+      end
+      # Clears the routing table. Route generation and request matching
+      # won't work anymore until a new routing table is built.
+      def reset!
+        class << self
+          alias_method :match, :match_before_compilation
+        end
+        self.routes, self.named_routes = [], {}
+      end
+      # Finds route matching URI of the request and returns a tuple of
+      # [route index, route params]. This method is called by the
+      # dispatcher and isn't as useful in applications.
       #
       # ==== Parameters
       # request<Merb::Request>:: request to match.
@@ -42,7 +93,10 @@ module Merb
       #   Two-tuple: route index and route parameters. Route
       #   parameters are :controller, :action and all the named
       #   segments of the route.
-      def route_for(request)
+      #
+      # ---
+      # @private
+      def route_for(request) #:nodoc:
         index, params = match(request)
         route = routes[index] if index
         if !route
@@ -51,152 +105,124 @@ module Merb
         end
         [route, params]
       end
-      # Clear all routes.
-      def reset!
-        self.routes, self.named_routes = [], {}
-      end
-      # Appends the generated routes to the current routes.
-      #
-      # ==== Parameters
-      # &block::
-      #   A block that generates new routes when yielded a new Behavior.
-      def append(&block)
-        prepare(@@routes, [], &block)
+      # Just a placeholder for the compiled match method
+      def match_before_compilation(request) #:nodoc:
+        raise NotCompiledError, "The routes have not been compiled yet"
       end
-      # Prepends the generated routes to the current routes.
+      alias_method :match, :match_before_compilation
+      # Generates a URL from the params
       #
       # ==== Parameters
-      # &block::
-      #   A block that generates new routes when yielded a new Behavior.
-      def prepend(&block)
-        prepare([], @@routes, &block)
-      end
-      # Prepares new routes and adds them to existing routes.
+      # name<Symbol>::
+      #   The name of the route to generate
       #
-      # ==== Parameters
-      # first<Array>:: An array of routes to add before the generated routes.
-      # last<Array>:: An array of routes to add after the generated routes.
-      # &block:: A block that generates new routes.
+      # anonymous_params<Object>::
+      #   An array of anonymous parameters to generate the route
+      #   with. These parameters are assigned to the route parameters
+      #   in the order that they are passed.
       #
-      # ==== Block parameters (&block)
-      # new_behavior<Behavior>:: Behavior for child routes.
-      def prepare(first = [], last = [], &block)
-        @@routes = []
-        yield Behavior.new({}, { :action => 'index' }) # defaults
-        @@routes = first + @@routes + last
-        compile
-      end
-      # Capture any new routes that have been added within the block.
-      #
-      # This utility method lets you track routes that have been added;
-      # it doesn't affect how/which routes are added.
+      # params<Hash>::
+      #   Named parameters to generate the route with.
       #
-      # &block:: A context in which routes are generated.
-      def capture(&block)
-        routes_before, named_route_keys_before = self.routes.dup, self.named_routes.keys
-        yield
-        [self.routes - routes_before, self.named_routes.except(*named_route_keys_before)]
-      end
+      # defaults<Hash>::
+      #   A hash of default parameters to generate the route with.
+      #   This is usually the request parameters. If there are any
+      #   required params that are missing to generate the route,
+      #   they are pulled from this hash.
       # ==== Returns
-      # String:: A routing lambda statement generated from the routes.
-      def compiled_statement
-        @@compiler_mutex.synchronize do
-          @@compiled_statement = "def match(request)\n"
-          @@compiled_statement << "  params = request.params\n"
-          @@compiled_statement << "  cached_path = request.path\n  cached_method = request.method.to_s\n  "
-          @@routes.each_with_index { |route, i| @@compiled_statement << route.compile(i == 0) }
-          @@compiled_statement << "  else\n    [nil, {}]\n"
-          @@compiled_statement << "  end\n"
-          @@compiled_statement << "end"
+      # String:: The generated URL
+      # ---
+      # @private
+      def url(name, *args)
+        unless name.is_a?(Symbol)
+          args.unshift(name)
+          name = :default
         end
-      end
-      # Defines the match function for this class based on the
-      # compiled_statement.
-      def compile
-        puts "compiled route: #{compiled_statement}" if $DEBUG
-        eval(compiled_statement, binding, "Generated Code for Router#match(#{__FILE__}:#{__LINE__})", 1)
+        unless route = Merb::Router.named_routes[name]
+          raise Merb::Router::GenerationError, "Named route not found: #{name}"
+        end
+        defaults = args.pop
+        route.generate(args, defaults)
       end
-      # Generates a URL based on passed options.
+      # Generates a URL from the resource(s)
       #
       # ==== Parameters
-      # name<~to_sym, Hash>:: The name of the route to generate.
-      # params<Hash, Fixnum, Object>:: The params to use in the route generation.
-      # fallback<Hash>:: Parameters for generating a fallback URL.
+      # resources<Symbol,Object>::
+      #   The identifiers for the resource route to generate. These
+      #   can either be symbols or objects. Symbols denote resource
+      #   collection routes and objects denote the members.
       #
+      # params<Hash>::
+      #   Any extra parameters needed to generate the route.
       # ==== Returns
-      # String:: The generated URL.
-      #
-      # ==== Alternatives
-      # If name is a hash, it will be merged with params and passed on to
-      # generate_for_default_route along with fallback.
-      def generate(name, params = {}, fallback = {})
-        params.reject! { |k,v| v.nil? } if params.is_a? Hash
-        if name.is_a? Hash
-          name.reject! { |k,v| v.nil? }
-          return generate_for_default_route(name.merge(params), fallback)
+      # String:: The generated URL
+      # ---
+      # @private
+      def resource(*args)
+        defaults = args.pop
+        options  = extract_options_from_args!(args) || {}
+        key      = []
+        params   = []
+        args.each do |arg|
+          if arg.is_a?(Symbol) || arg.is_a?(String)
+            key << arg.to_s
+          else
+            key << arg.class.to_s
+            params << arg
+          end
         end
-        name = name.to_sym
-        unless @@named_routes.key? name
-          raise "Named route not found: #{name}"
-        else
-          @@named_routes[name].generate(params, fallback)
+        params << options
+        unless route = Merb::Router.resource_routes[key]
+          raise Merb::Router::GenerationError, "Resource route not found: #{args.inspect}"
         end
+        route.generate(params, defaults)
       end
-      # Generates a URL based on the default route scheme of
-      # "/:controller/:action/:id.:format".
-      #
-      # ==== Parameters
-      # params<Hash>::
-      #   The primary parameters to create the route from (see below).
-      # fallback<Hash>:: Fallback parameters. Same options as params.
-      #
-      # ==== Options (params)
-      # :controller<~to_s>:: The controller name. Required.
-      # :action<~to_s>:: The action name. Required.
-      # :id<~to_s>:: The ID for use in the action.
-      # :format<~to_s>:: The format of the preferred response.
-      #
-      # ==== Returns
-      # String:: The generated URL.
-      def generate_for_default_route(params, fallback)
-        query_params = params.reject do |k,v|
-          [:controller, :action, :id, :format, :fragment].include?(k.to_sym)
+    private
+      # Defines method with a switch statement that does routes recognition.
+      def compile
+        if routes.any?
+          eval(compiled_statement, binding, "Generated Code for Router", 1)
+        else
+          reset!
         end
+      end
-        controller = params[:controller] || fallback[:controller]
-        raise "Controller Not Specified" unless controller
-        url = "/#{controller}"
+      # Generates method that does route recognition with a switch statement.
+      def compiled_statement
+        @compiler_mutex.synchronize do
+          condition_keys, if_statements = Set.new, ""
-        if params[:action] || params[:id] || params[:format] || !query_params.empty?
-          action = params[:action] || fallback[:action]
-          raise "Action Not Specified" unless action
-          url += "/#{action}"
-        end
-        if params[:id]
-          url += "/#{params[:id]}"
-        end
-        if format = params[:format]
-          format = fallback[:format] if format == :current
-          url += ".#{format}"
-        end
-        unless query_params.empty?
-          url += "?" + Merb::Request.params_to_query_string(query_params)
-        end
-        if params[:fragment]
-          url += "##{params[:fragment]}"
+          routes.each_with_index do |route, i|
+            route.freeze
+            route.conditions.keys.each { |key| condition_keys << key }
+            if_statements << route.compiled_statement(i == 0)
+          end
+          statement =  "def match(request)\n"
+          statement << condition_keys.inject("") do |cached, key|
+            cached << "  cached_#{key} = request.#{key}.to_s\n"
+          end
+          statement <<    if_statements
+          statement << "  else\n"
+          statement << "    [nil, {}]\n"
+          statement << "  end\n"
+          statement << "end"
         end
-        url
       end
-    end # self
+    end # class << self
   end
 end