RubyGems - wycats-merb-core - Versions diffs - 0.9.8 → 0.9.9 - Mend

wycats-merb-core 0.9.8 → 0.9.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (58) hide show

data/CHANGELOG +136 -2
data/CONTRIBUTORS +6 -0
data/PUBLIC_CHANGELOG +15 -0
data/Rakefile +12 -14
data/lib/merb-core.rb +82 -43
data/lib/merb-core/bootloader.rb +268 -60
data/lib/merb-core/config.rb +119 -34
data/lib/merb-core/controller/abstract_controller.rb +58 -18
data/lib/merb-core/controller/exceptions.rb +2 -15
data/lib/merb-core/controller/merb_controller.rb +28 -1
data/lib/merb-core/controller/mime.rb +4 -0
data/lib/merb-core/controller/mixins/controller.rb +14 -17
data/lib/merb-core/controller/mixins/render.rb +23 -28
data/lib/merb-core/controller/mixins/responder.rb +0 -1
data/lib/merb-core/controller/template.rb +44 -20
data/lib/merb-core/core_ext/kernel.rb +8 -3
data/lib/merb-core/dispatch/default_exception/default_exception.rb +1 -1
data/lib/merb-core/dispatch/default_exception/views/_css.html.erb +3 -1
data/lib/merb-core/dispatch/default_exception/views/_javascript.html.erb +71 -67
data/lib/merb-core/dispatch/default_exception/views/index.html.erb +6 -2
data/lib/merb-core/dispatch/dispatcher.rb +5 -9
data/lib/merb-core/dispatch/request.rb +46 -57
data/lib/merb-core/dispatch/router.rb +83 -6
data/lib/merb-core/dispatch/router/behavior.rb +87 -27
data/lib/merb-core/dispatch/router/resources.rb +281 -167
data/lib/merb-core/dispatch/router/route.rb +141 -27
data/lib/merb-core/logger.rb +213 -202
data/lib/merb-core/rack.rb +3 -1
data/lib/merb-core/rack/adapter.rb +7 -4
data/lib/merb-core/rack/adapter/ebb.rb +12 -13
data/lib/merb-core/rack/adapter/evented_mongrel.rb +2 -15
data/lib/merb-core/rack/adapter/irb.rb +3 -2
data/lib/merb-core/rack/adapter/mongrel.rb +22 -15
data/lib/merb-core/rack/adapter/swiftiplied_mongrel.rb +4 -16
data/lib/merb-core/rack/adapter/thin.rb +21 -22
data/lib/merb-core/rack/adapter/thin_turbo.rb +4 -11
data/lib/merb-core/rack/adapter/webrick.rb +54 -18
data/lib/merb-core/rack/handler/mongrel.rb +12 -13
data/lib/merb-core/rack/middleware/csrf.rb +1 -1
data/lib/merb-core/server.rb +135 -98
data/lib/merb-core/tasks/gem_management.rb +50 -12
data/lib/merb-core/tasks/merb.rb +1 -0
data/lib/merb-core/tasks/merb_rake_helper.rb +9 -38
data/lib/merb-core/tasks/stats.rake +2 -2
data/lib/merb-core/test.rb +9 -3
data/lib/merb-core/test/helpers.rb +1 -0
data/lib/merb-core/test/helpers/multipart_request_helper.rb +3 -2
data/lib/merb-core/test/helpers/request_helper.rb +40 -372
data/lib/merb-core/test/helpers/route_helper.rb +15 -7
data/lib/merb-core/test/matchers.rb +1 -0
data/lib/merb-core/test/matchers/controller_matchers.rb +4 -247
data/lib/merb-core/test/matchers/view_matchers.rb +22 -4
data/lib/merb-core/test/run_specs.rb +117 -25
data/lib/merb-core/version.rb +1 -1
metadata +1 -1
data/lib/merb-core/vendor/facets.rb +0 -2
data/lib/merb-core/vendor/facets/dictionary.rb +0 -433
data/lib/merb-core/vendor/facets/inflect.rb +0 -342

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>
@@ -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

@@ -83,18 +83,14 @@ module Merb
     # ==== Returns
     # Merb::Controller::
     #   Merb::Controller set with redirect headers and a 301/302 status
-    def redirect(url = nil, opts = {})
-      controller = Merb::Controller.new(self)
-      unless url
-        status, url = redirect_status, redirect_url
-      end
+    def redirect
+      status, url = redirect_status, redirect_url
+      controller = Merb::Controller.new(self, status)
       Merb.logger.info("Dispatcher redirecting to: #{url} (#{status})")
       Merb.logger.flush
-      controller.redirect(url, opts)
-      controller.status = status if status
+      controller.headers['Location'] = url
       controller.body = "<html><body>You are being <a href=\"#{url}\">redirected</a>.</body></html>"
       controller
     end

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

@@ -97,6 +97,48 @@ module Merb
       @route, @route_params = Merb::Router.route_for(self)
       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
@@ -269,59 +311,6 @@ module Merb
       return @env[Merb::Const::REMOTE_ADDR]
     end
-    # ==== Parameters
-    # name<~to_sym, Hash>:: The name of the URL to generate.
-    # rparams<Hash>:: Parameters for the route generation.
-    #
-    # ==== Returns
-    # String:: The generated URL.
-    #
-    # ==== Alternatives
-    # If a hash is used as the first argument, a default route will be
-    # generated based on it and rparams.
-    # ====
-    # TODO: Update this documentation
-    def generate_url(name, *args)
-      unless Symbol === name
-        args.unshift(name)
-        name = :default
-      end
-      unless route = Merb::Router.named_routes[name]
-        raise Merb::Router::GenerationError, "Named route not found: #{name}"
-      end
-      route.generate(args, params)
-    end
-    # ==== Parameters
-    # name<~to_sym, Hash>:: The name of the URL to generate.
-    # rparams<Hash>:: Parameters for the route generation.
-    #
-    # ==== Returns
-    # String:: The generated url with protocol + hostname + URL.
-    #
-    # ==== Options
-    #
-    # :protocol and :host options are special: use them to explicitly
-    # specify protocol and host of resulting url. If you omit them,
-    # protocol and host of request are used.
-    #
-    # ==== Alternatives
-    # If a hash is used as the first argument, a default route will be
-    # generated based on it and rparams.
-    def generate_absolute_url(name, rparams={})
-      if rparams.is_a?(Hash)
-        tprotocol = rparams.delete(:protocol)
-        thost = rparams.delete(:host)
-      end
-      (tprotocol || protocol) + "://" +
-        (thost || host) +
-        generate_url(name, rparams)
-    end
     # ==== Returns
     # String::
     #   The protocol, i.e. either "https" or "http" depending on the
@@ -345,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

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

@@ -21,10 +21,11 @@ module Merb
   #
   # Compilation is synchronized by mutex.
   class Router
-    @routes         = []
-    @named_routes   = {}
-    @compiler_mutex = Mutex.new
-    @root_behavior  = Behavior.new.defaults(:action => "index")
+    @routes          = []
+    @named_routes    = {}
+    @resource_routes = {}
+    @compiler_mutex  = Mutex.new
+    @root_behavior   = Behavior.new.defaults(:action => "index")
     # Raised when route lookup fails.
     class RouteNotFound < StandardError; end;
@@ -35,7 +36,7 @@ module Merb
     class << self
       # @private
-      attr_accessor :routes, :named_routes, :root_behavior
+      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
@@ -55,7 +56,7 @@ module Merb
       #   Returns self to allow chaining of methods.
       def prepare(first = [], last = [], &block)
         @routes = []
-        root_behavior.with_proxy(&block)
+        root_behavior._with_proxy(&block)
         @routes = first + @routes + last
         compile
         self
@@ -111,6 +112,82 @@ module Merb
       end
       alias_method :match, :match_before_compilation
+      # Generates a URL from the params
+      #
+      # ==== Parameters
+      # name<Symbol>::
+      #   The name of the route to generate
+      #
+      # 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.
+      #
+      # params<Hash>::
+      #   Named parameters to generate the route with.
+      #
+      # 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:: The generated URL
+      # ---
+      # @private
+      def url(name, *args)
+        unless name.is_a?(Symbol)
+          args.unshift(name)
+          name = :default
+        end
+        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 from the resource(s)
+      #
+      # ==== Parameters
+      # 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
+      # ---
+      # @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
+        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
     private

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

@@ -28,12 +28,19 @@ module Merb
           @behaviors.pop
         end
+        def respond_to?(*args)
+          super || @behaviors.last.respond_to?(*args)
+        end
         # Rake does some stuff with methods in the global namespace, so if I don't
         # explicitly define the Behavior methods to proxy here (specifically namespace)
         # Rake's methods take precedence.
+        # ---
+        # Removing the following:
+        # name full_name fixatable redirect
         %w(
           match to with register default defaults options option namespace identify
-          default_routes defer_to name full_name fixatable redirect capture
+          default_routes defer defer_to capture resources resource
         ).each do |method|
           class_eval %{
             def #{method}(*args, &block)
@@ -42,8 +49,21 @@ module Merb
           }
         end
-        def respond_to?(*args)
-          super || @behaviors.last.respond_to?(*args)
+        # --- These methods are to be used in defer_to blocks
+        # Generates a URL from the passed arguments. This method is for use
+        # inside of defer_to
+        def url(name, *args)
+          args << {}
+          Merb::Router.url(name, *args)
+        end
+        def redirect(url, opts = {})
+          [url, opts[:permanent] ? 301 : 302]
+        end
+        def route(params)
+          params
         end
       private
@@ -78,18 +98,21 @@ module Merb
       #   The initial route default parameters. See #defaults.
       # options<Hash>::
       #   The initial route options. See #options.
+      # blocks<Array>::
+      #   The stack of deferred routing blocks for the route
       #
       # ==== Returns
       # Behavior:: The initialized Behavior object
       #---
       # @private
-      def initialize(proxy = nil, conditions = {}, params = {}, defaults = {}, identifiers = {}, options = {}) #:nodoc:
+      def initialize(proxy = nil, conditions = {}, params = {}, defaults = {}, identifiers = {}, options = {}, blocks = []) #:nodoc:
         @proxy       = proxy
         @conditions  = conditions
         @params      = params
         @defaults    = defaults
         @identifiers = identifiers
         @options     = options
+        @blocks      = blocks
         stringify_condition_values
       end
@@ -174,12 +197,15 @@ module Merb
       #---
       # @public
       def match(path = {}, conditions = {}, &block)
-        path, conditions = path[:path], path if Hash === path
-        conditions[:path] = merge_paths(path)
+        path, conditions = path[:path], path if path.is_a?(Hash)
         raise Error, "The route has already been committed. Further conditions cannot be specified" if @route
+        conditions.delete_if { |k, v| v.nil? }
+        conditions[:path] = merge_paths(path)
-        behavior = Behavior.new(@proxy, @conditions.merge(conditions), @params, @defaults, @identifiers, @options)
+        behavior = Behavior.new(@proxy, @conditions.merge(conditions), @params, @defaults, @identifiers, @options, @blocks)
         with_behavior_context(behavior, &block)
       end
@@ -211,7 +237,7 @@ module Merb
       def to(params = {}, &block)
         raise Error, "The route has already been committed. Further params cannot be specified" if @route
-        behavior = Behavior.new(@proxy, @conditions, @params.merge(params), @defaults, @identifiers, @options)
+        behavior = Behavior.new(@proxy, @conditions, @params.merge(params), @defaults, @identifiers, @options, @blocks)
         if block_given?
           with_behavior_context(behavior, &block)
@@ -256,7 +282,7 @@ module Merb
       # ---
       # @public
       def default(defaults = {}, &block)
-        behavior = Behavior.new(@proxy, @conditions, @params, @defaults.merge(defaults), @identifiers, @options)
+        behavior = Behavior.new(@proxy, @conditions, @params, @defaults.merge(defaults), @identifiers, @options, @blocks)
         with_behavior_context(behavior, &block)
       end
@@ -291,7 +317,7 @@ module Merb
           options[key] = (options[key] || []) + [value.freeze] if value
         end
-        behavior = Behavior.new(@proxy, @conditions, @params, @defaults, @identifiers, options)
+        behavior = Behavior.new(@proxy, @conditions, @params, @defaults, @identifiers, options, @blocks)
         with_behavior_context(behavior, &block)
       end
@@ -335,6 +361,7 @@ module Merb
         # option keys could be nil
         opts[:controller_prefix] = name unless opts.has_key?(:controller_prefix)
         opts[:name_prefix]       = name unless opts.has_key?(:name_prefix)
+        opts[:resource_prefix]   = opts[:name_prefix] unless opts.has_key?(:resource_prefix)
         behavior = self
         behavior = behavior.match("/#{path}") unless path.nil? || path.empty?
@@ -368,7 +395,7 @@ module Merb
           { Object => identifiers }
         end
-        behavior = Behavior.new(@proxy, @conditions, @params, @defaults, identifiers.freeze, @options)
+        behavior = Behavior.new(@proxy, @conditions, @params, @defaults, identifiers.freeze, @options, @blocks)
         with_behavior_context(behavior, &block)
       end
@@ -418,14 +445,23 @@ module Merb
       # Route :: The default route.
       #
       # ==== Examples
-      #   r.defer_to do |request, params|
+      #   defer_to do |request, params|
       #     params.merge :controller => 'here',
       #       :action => 'there' if request.xhr?
       #   end
       #---
       # @public
-      def defer_to(params = {}, &conditional_block)
-        to_route(params, &conditional_block)
+      def defer_to(params = {}, &block)
+        defer(block).to(params)
+      end
+      # Takes a Proc as a parameter and applies it as a deferred proc for all the
+      # routes defined in the block. This is mostly interesting for plugin
+      # developers.
+      def defer(deferred_block, &block)
+        blocks = @blocks + [CachedProc.new(deferred_block)]
+        behavior = Behavior.new(@proxy, @conditions, @params, @defaults, @identifiers, @options, blocks)
+        with_behavior_context(behavior, &block)
       end
       # Names this route in Router. Name must be a Symbol.
@@ -467,11 +503,22 @@ module Merb
         self
       end
-      def redirect(url, permanent = true)
+      # Sets the current route as a redirect.
+      #
+      # ==== Parameters
+      # path<String::
+      #   The path to redirect to
+      #
+      # options<Hash>::
+      #   Options for the redirect
+      #   The supported options are:
+      #   * :permanent: Whether or not the redirect should be permanent.
+      #                 The default value is false.
+      def redirect(url, opts = {})
         raise Error, "The route has already been committed." if @route
-        status = permanent ? 301 : 302
-        @route = Route.new(@conditions, {:url => url.freeze, :status => status.freeze}, :redirects => true)
+        status = opts[:permanent] ? 301 : 302
+        @route = Route.new(@conditions, {:url => url.freeze, :status => status.freeze}, @blocks, :redirects => true)
         @route.register
         self
       end
@@ -487,7 +534,7 @@ module Merb
         name_prefix     = [@options[:name_prefix]].flatten.compact.map { |p| "#{p}_"}
         current_names   = Merb::Router.named_routes.keys
-        behavior = Behavior.new(@proxy, @conditions, @params, @defaults, @identifiers, @options)
+        behavior = Behavior.new(@proxy, @conditions, @params, @defaults, @identifiers, @options, @blocks)
         with_behavior_context(behavior, &block)
         Merb::Router.named_routes.reject { |k,v| current_names.include?(k) }.each do |name, route|
@@ -501,21 +548,23 @@ module Merb
       # So that Router can have a default route
       # ---
       # @private
-      def with_proxy(&block) #:nodoc:
+      def _with_proxy(&block) #:nodoc:
         proxy = Proxy.new
-        proxy.push Behavior.new(proxy, @conditions, @params, @defaults, @identifiers, @options)
+        proxy.push Behavior.new(proxy, @conditions, @params, @defaults, @identifiers, @options, @blocks)
         proxy.instance_eval(&block)
         proxy
       end
     protected
+      def _route
+        @route
+      end
-      def to_route(params = {}, &conditional_block) # :nodoc:
+      def to_route # :nodoc:
         raise Error, "The route has already been committed." if @route
-        params     = @params.merge(params)
-        controller = params[:controller]
+        controller = @params[:controller]
         if prefixes = @options[:controller_prefix]
           controller ||= ":controller"
@@ -526,17 +575,28 @@ module Merb
           end
         end
-        params.merge!(:controller => controller.to_s.gsub(%r{^/}, '')) if controller
+        @params.merge!(:controller => controller.to_s.gsub(%r{^/}, '')) if controller
         # Sorts the identifiers so that modules that are at the bottom of the
         # inheritance chain come first (more specific modules first). Object
         # should always be last.
         identifiers = @identifiers.sort { |(first,_),(sec,_)| first <=> sec || 1 }
-        @route = Route.new(@conditions.dup, params, :defaults => @defaults.dup, :identifiers => identifiers, &conditional_block)
-        @route.register
+        @route = Route.new(@conditions.dup,@params, @blocks, :defaults => @defaults.dup, :identifiers => identifiers)
+        if before = @options[:before] && @options[:before].last
+          @route.register_at(Router.routes.index(before))
+        else
+          @route.register
+        end
         self
       end
+      # Allows to insert the route at a certain spot in the list of routes
+      # instead of appending to the list.
+      def before(route, &block) #:nodoc:
+        options(:before => route, &block)
+      end
     private