merb-core 1.0.15 → 1.1.0.pre

data/lib/merb-core/core_ext/kernel.rb

@@ -1,227 +1,34 @@
-require 'rubygems/dependency'
-
-module Gem
-  class Dependency
-    # :api: private
-    attr_accessor :require_block, :require_as, :original_caller
-  end
-end
-
 module Kernel
-  
-  # Keep track of all required dependencies. 
-  #
-  # @param name<String> The name of the gem to load.
-  # @param *ver<Gem::Requirement, Gem::Version, Array, #to_str>
-  #   Version requirements to be passed to Gem::Dependency.new.
-  #
-  # @return <Gem::Dependency> Dependency information
-  #
-  # :api: private
-  def track_dependency(name, clr, *ver, &blk)
-    options = ver.last.is_a?(Hash) ? ver.pop : {}
-    new_dep = Gem::Dependency.new(name, ver.empty? ? nil : ver)
-    new_dep.require_block = blk
-    new_dep.require_as = options.key?(:require_as) ? options[:require_as] : name
-    new_dep.original_caller = clr
-    
-    deps = Merb::BootLoader::Dependencies.dependencies
-
-    idx = deps.each_with_index {|d,i| break i if d.name == new_dep.name}
-
-    idx = idx.is_a?(Array) ? deps.size + 1 : idx
-    deps.delete_at(idx)
-    deps.insert(idx - 1, new_dep)
-
-    new_dep
-  end
-
-  # Loads the given string as a gem. Execution is deferred until
-  # after the logger has been instantiated and the framework directory
-  # structure is defined.
-  #
-  # If that has already happened, the gem will be activated
-  # immediately, but it will still be registered.
-  # 
-  # ==== Parameters
-  # name<String> The name of the gem to load.
-  # *ver<Gem::Requirement, Gem::Version, Array, #to_str>
-  #   Version requirements to be passed to Gem::Dependency.new.
-  #   If the last argument is a Hash, extract the :immediate option,
-  #   forcing a dependency to load immediately.
-  #
-  # ==== Options
-  #
-  # :immediate   when true, gem is loaded immediately even if framework is not yet ready.
-  # :require_as  file name to require for this gem.
-  #
-  # See examples below.
-  #
-  # ==== Notes
-  #
-  # If block is given, it is called after require is called. If you use a block to
-  # require multiple files, require first using :require_as option and the rest
-  # in the block.
-  #
-  # ==== Examples
-  #
-  # Usage scenario is typically one of the following:
-  #
-  # 1. Gem name and loaded file names are the same (ex.: amqp gem uses amqp.rb).
-  #    In this case no extra options needed.
-  #
-  # dependency "amqp"
-  #
-  # 2. Gem name is different from the file needs to be required
-  #    (ex.: ParseTree gem uses parse_tree.rb as main file).
-  #
-  # dependency "ParseTree", :require_as => "parse_tree"
-  #
-  # 3. You need to require a number of files from the library explicitly
-  #    (ex.: cherry pick features from xmpp4r). Pass an array to :require_as.
-  #
-  # dependency "xmpp4r", :require_as => %w(xmpp4r/client xmpp4r/sasl xmpp4r/vcard)
-  #
-  # 4. You need to require a specific version of the gem.
-  #
-  # dependency "RedCloth", "3.0.4"
-  #
-  # 5. You want to load dependency as soon as the method is called.
-  #
-  # dependency "syslog", :immediate => true
-  #
-  # 6. You need to execute some arbitraty code after dependency is loaded:
-  #
-  # dependency "ruby-growl" do
-  #   g = Growl.new "localhost", "ruby-growl",
-  #              ["ruby-growl Notification"]
-  #   g.notify "ruby-growl Notification", "Ruby-Growl is set up",
-  #         "Ruby-Growl is set up"
-  # end
-  #
-  # When specifying a gem version to use, you can use the same syntax RubyGems
-  # support, for instance, >= 3.0.2 or >~ 1.2.
-  #
-  # See rubygems.org/read/chapter/16 for a complete reference.
-  #
-  # ==== Returns
-  # Gem::Dependency:: The dependency information.
+  # Loads the given string as a gem.
   #
   # :api: public
+  # @deprecated
   def dependency(name, *opts, &blk)
-    immediate = opts.last.delete(:immediate) if opts.last.is_a?(Hash)
-    if immediate || Merb::BootLoader.finished?(Merb::BootLoader::Dependencies)
-      load_dependency(name, caller, *opts, &blk)
-    else
-      track_dependency(name, caller, *opts, &blk)
-    end
-  end
-
-  # Loads the given string as a gem.
-  #
-  # This new version tries to load the file via ROOT/gems first before moving
-  # off to the system gems (so if you have a lower version of a gem in
-  # ROOT/gems, it'll still get loaded).
-  #
-  # @param name<String,Gem::Dependency> 
-  #   The name or dependency object of the gem to load.
-  # @param *ver<Gem::Requirement, Gem::Version, Array, #to_str>
-  #   Version requirements to be passed to Gem.activate.
-  #
-  # @note
-  #   If the gem cannot be found, the method will attempt to require the string
-  #   as a library.
-  #
-  # @return <Gem::Dependency> The dependency information.
-  #
-  # :api: private
-  def load_dependency(name, clr, *ver, &blk)
-    begin
-      dep = name.is_a?(Gem::Dependency) ? name : track_dependency(name, clr, *ver, &blk)
-      return unless dep.require_as
-      Gem.activate(dep)
-    rescue Gem::LoadError => e
-      e.set_backtrace dep.original_caller
-      Merb.fatal! "The gem #{name}, #{ver.inspect} was not found", e
+    warn "DEPRECATED: Use bundler to setup and load dependency #{name}."
+    options = opts.last.is_a?(Hash) ? opts.pop : {}
+    version = opts.pop unless opts.empty?
+    if version
+      warn "DEPRECATED: You want to load gem #{name} with specific version " \
+           "#{version}. This feature is not supported and the LATEST VERSION " \
+           "OF THE GEM WILL BE LOADED."
     end
-  
-    begin
-      require dep.require_as
-    rescue LoadError => e
-      e.set_backtrace dep.original_caller
-      Merb.fatal! "The file #{dep.require_as} was not found", e
-    end
-
-    if block = dep.require_block
-      # reset the require block so it doesn't get called a second time
-      dep.require_block = nil
-      block.call
-    end
-
-    Merb.logger.verbose!("loading gem '#{dep.name}' ...")
-    return dep # ensure needs explicit return
+    require (options[:require_as] ? options[:require_as] : name)
+    nil
   end
 
   # Loads both gem and library dependencies that are passed in as arguments.
-  # Execution is deferred to the Merb::BootLoader::Dependencies.run during bootup.
-  #
-  # ==== Parameters
-  # *args<String, Hash, Array> The dependencies to load.
-  #
-  # ==== Returns
-  # Array[(Gem::Dependency, Array[Gem::Dependency])]:: Gem::Dependencies for the
-  #   dependencies specified in args.
   #
   # :api: public
+  # @deprecated
   def dependencies(*args)
     args.map do |arg|
       case arg
       when String then dependency(arg)
-      when Hash   then arg.map { |r,v| dependency(r, v) }
-      when Array  then arg.map { |r|   dependency(r)    }
+      when Hash then arg.map { |r,v| dependency(r, v) }
+      when Array then arg.map { |r| dependency(r) }
       end
     end
-  end
-
-  # Loads both gem and library dependencies that are passed in as arguments.
-  #
-  # @param *args<String, Hash, Array> The dependencies to load.
-  #
-  # @note
-  #   Each argument can be:
-  #   String:: Single dependency.
-  #   Hash::
-  #     Multiple dependencies where the keys are names and the values versions.
-  #   Array:: Multiple string dependencies.
-  #
-  # @example dependencies "RedCloth"                 # Loads the the RedCloth gem
-  # @example dependencies "RedCloth", "merb_helpers" # Loads RedCloth and merb_helpers
-  # @example dependencies "RedCloth" => "3.0"        # Loads RedCloth 3.0
-  #
-  # :api: private
-  def load_dependencies(*args)
-    args.map do |arg|
-      case arg
-      when String then load_dependency(arg)
-      when Hash   then arg.map { |r,v| load_dependency(r, v) }
-      when Array  then arg.map { |r|   load_dependency(r)    }
-      end
-    end
-  end
-
-  # Does a basic require, and prints a message if an error occurs.
-  #
-  # @param library<to_s> The library to attempt to include.
-  # @param message<String> The error to add to the log upon failure. Defaults to nil.
-  #
-  # :api: private
-  # @deprecated
-  def rescue_require(library, message = nil)
-    Merb.logger.warn("Deprecation warning: rescue_require is deprecated")
-    sleep 2.0
-    require library
-  rescue LoadError, RuntimeError
-    Merb.logger.error!(message) if message
+    nil
   end
 
   # Used in Merb.root/config/init.rb to tell Merb which ORM (Object Relational
@@ -245,15 +52,8 @@ module Kernel
   #   call takes over other.
   #
   # :api: public
-  def use_orm(orm, &blk)
-    begin
-      Merb.orm = orm
-      orm_plugin = "merb_#{orm}"
-      Kernel.dependency(orm_plugin, &blk)
-    rescue LoadError => e
-      Merb.logger.warn!("The #{orm_plugin} gem was not found.  You may need to install it.")
-      raise e
-    end
+  def use_orm(orm)
+    Merb.orm = orm
     nil
   end
 
@@ -274,10 +74,8 @@ module Kernel
   #   $ merb-gen model ActivityEvent
   #
   # :api: public
-  def use_testing_framework(test_framework, *test_dependencies)
+  def use_testing_framework(test_framework)
     Merb.test_framework = test_framework
-    
-    Kernel.dependencies test_dependencies if Merb.env == "test" || Merb.env.nil?
     nil
   end
 
@@ -302,22 +100,9 @@ module Kernel
   #   $ merb-gen resource_controller Project 
   #
   # :api: public
-  def use_template_engine(template_engine, &blk)
+  def use_template_engine(template_engine)
     Merb.template_engine = template_engine
-
-    if template_engine != :erb
-      if template_engine.in?(:haml, :builder)
-        template_engine_plugin = "merb-#{template_engine}"
-      else
-        template_engine_plugin = "merb_#{template_engine}"
-      end
-      Kernel.dependency(template_engine_plugin, &blk)
-    end
-    
     nil
-  rescue LoadError => e
-    Merb.logger.warn!("The #{template_engine_plugin} gem was not found.  You may need to install it.")
-    raise e
   end
 
 

data/lib/merb-core/core_ext/time.rb

@@ -0,0 +1,7 @@
+# Declared to bypass a rubygems 1.3.2 bug :(
+class Time
+  def self.today
+    t = Time.now
+    t - ((t.to_f + t.gmt_offset) % 86400)
+  end
+end

data/lib/merb-core/core_ext.rb

@@ -7,4 +7,5 @@ end
 
 require File.dirname(__FILE__) / "core_ext" / "kernel"
 require File.dirname(__FILE__) / "core_ext" / "hash"
-require File.dirname(__FILE__) / "core_ext" / "class"
+require File.dirname(__FILE__) / "core_ext" / "class"
+require File.dirname(__FILE__) / "core_ext" / "time"

data/lib/merb-core/dispatch/cookies.rb

@@ -37,6 +37,7 @@ module Merb
     # :expires<Time>:: Cookie expiry date.
     # :domain<String>:: The domain for which this cookie applies.
     # :secure<Boolean>:: Security flag.
+    # :http_only<Boolean>:: HttpOnly cookies
     #
     # ==== Notes
     # By using this method, a cookie key is marked for being
@@ -77,10 +78,12 @@ module Merb
           options["expires"] = expiry.gmtime.strftime(Merb::Const::COOKIE_EXPIRATION_FORMAT)
         end
         secure  = options.delete("secure")
+        http_only = options.delete("http_only")
         kookie  = "#{name}=#{Merb::Parse.escape(value)}; "
         # WebKit in particular doens't like empty cookie options - skip them.
         options.each { |k, v| kookie << "#{k}=#{v}; " unless v.blank? }
-        kookie  << 'secure' if secure
+        kookie  << 'secure; ' if secure
+        kookie  << 'HttpOnly; ' if http_only
         cookies << kookie.rstrip
       end
       cookies.empty? ? {} : { 'Set-Cookie' => cookies }

data/lib/merb-core/dispatch/default_exception/default_exception.rb

@@ -31,7 +31,7 @@ Merb::BootLoader.after_app_loads do
             elsif filename.index(Merb.root) == 0
               type = "app"
               shortname = Pathname.new(filename).relative_path_from(Pathname.new(Merb.root))
-            elsif path = Gem.path.find {|p| filename.index(p) == 0}
+            elsif Module.const_defined?(:Gem) && Gem.respond_to?(:path) && path = Gem.path.find {|p| filename.index(p) == 0}
               type = "gem"
               shortname = Pathname.new(filename).relative_path_from(Pathname.new(path))
             else
@@ -82,7 +82,7 @@ Merb::BootLoader.after_app_loads do
           str   =  "  <td class='code' colspan='2'><div>"
         
           __caller_lines__(filename, line, 5) do |lline, lcode|
-            str << "<a href='txmt://open?url=file://#{filename}&amp;line=#{lline}'>#{lline}</a>"
+            str << textmate_url(filename, lline)
             str << "<em>" if line == lline
             str << Erubis::XmlHelper.escape_xml(lcode)
             str << "</em>" if line == lline
@@ -117,4 +117,4 @@ Merb::BootLoader.after_app_loads do
       end
     end
   end
-end
+end

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

@@ -43,21 +43,23 @@ module Merb
     
     @@mutex = Mutex.new
     
+    attr_reader :start
+    
     # Handles request routing and action dispatch.
     # 
     # ==== Returns
-    # Merb::Controller:: the controller that handled the action dispatch.
+    # Array[Integer, Hash, #each]:: A Rack response
     # 
     # :api: private
     def handle
-      start = Time.now
+      @start = env["merb.request_start"] = Time.now
       Merb.logger.info { "Started request handling: #{start.to_s}" }
       
       find_route!
       return rack_response if handled?
       
       klass = controller
-      Merb.logger.debug { "Routed to: #{params.inspect}" }
+      Merb.logger.debug { "Routed to: #{klass::_filter_params(params).inspect}" }
       
       unless klass < Controller
         raise NotFound, 
@@ -71,13 +73,9 @@ module Merb
         raise NotFound, "The '#{klass}' controller has no public actions"
       end
       
-      controller = dispatch_action(klass, params[:action])
-      controller._benchmarks[:dispatch_time] = Time.now - start
-      Merb.logger.info { controller._benchmarks.inspect }
-      Merb.logger.flush
-      controller.rack_response
+      dispatch_action(klass, params[:action])
     rescue Object => exception
-      dispatch_exception(exception).rack_response
+      dispatch_exception(exception)
     end
     
     private
@@ -89,21 +87,20 @@ module Merb
     # status<Integer>:: The status code to respond with.
     #
     # ==== Returns
-    # Merb::Controller::
-    #   The Merb::Controller that was dispatched to.
+    # Array[Integer, Hash, #each]:: A Rack response
     # 
     # :api: private
-    def dispatch_action(klass, action, status=200)
-      # build controller
-      controller = klass.new(self, status)
+    def dispatch_action(klass, action_name, status=200)
+      @env["merb.status"] = status
+      @env["merb.action_name"] = action_name
+      
       if Dispatcher.use_mutex
-        @@mutex.synchronize { controller._dispatch(action) }
+        @@mutex.synchronize { klass.call(env) }
       else
-        controller._dispatch(action)
+        klass.call(env)
       end
-      controller
     end
-    
+        
     # Re-route the current request to the Exception controller if it is
     # available, and try to render the exception nicely.  
     #
@@ -119,8 +116,7 @@ module Merb
     #   original controller.
     #
     # ==== Returns
-    # Exceptions::
-    #   The Merb::Controller that was dispatched to. 
+    # Array[Integer, Hash, #each]:: A Rack response
     # 
     # :api: private
     def dispatch_exception(exception)
@@ -131,7 +127,7 @@ module Merb
         Merb.logger.error(Merb.exception(exception))
       end
       
-      self.exceptions = [exception]
+      exceptions = env["merb.exceptions"] = [exception]
       
       begin
         e = exceptions.first
@@ -139,11 +135,11 @@ module Merb
         if action_name = e.action_name
           dispatch_action(Exceptions, action_name, e.class.status)
         else
-          Merb::Dispatcher::DefaultException.new(self, e.class.status)._dispatch
+          dispatch_action(Dispatcher::DefaultException, :index, e.class.status)
         end
       rescue Object => dispatch_issue
         if e.same?(dispatch_issue) || exceptions.size > 5
-          Merb::Dispatcher::DefaultException.new(self, e.class.status)._dispatch
+          dispatch_action(Dispatcher::DefaultException, :index, e.class.status)
         else
           Merb.logger.error("Dispatching #{e.class} raised another error.")
           Merb.logger.error(Merb.exception(dispatch_issue))

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

@@ -6,8 +6,6 @@ module Merb
     
     # :api: private
     attr_accessor :env, :route
-    # :api: public
-    attr_accessor :exceptions
     # :api: private
     attr_reader :route_params
 
@@ -35,12 +33,31 @@ module Merb
     #   An object like an HTTP Request.
     #
     # :api: private
-    def initialize(rack_env)
+    def initialize(rack_env)      
       @env  = rack_env
       @body = rack_env[Merb::Const::RACK_INPUT]
       @route_params = {}
     end
-
+    
+    # Memoizes the new request object into env["merb.request"] so we
+    # can memoize things into ivars in the request
+    #
+    # ==== Parameters
+    # env<Hash>:: A rack environment
+    # *args<Array>:: Other arguments passed to the superclass
+    #
+    # ==== Returns
+    # Merb::Request:: The new Merb::Request
+    #
+    # :api: public
+    def self.new(env, *args)
+      if self == Merb::Request
+        env["merb.request"] ||= super
+      else
+        super
+      end
+    end    
+    
     # Returns the controller object for initialization and dispatching the
     # request.
     #
@@ -69,6 +86,10 @@ module Merb
       end
     end
 
+    def exceptions
+      env["merb.exceptions"]
+    end
+
     METHODS = %w{get post put delete head options}
 
     # ==== Returns

data/lib/merb-core/dispatch/request_parsers.rb

@@ -55,12 +55,13 @@ module Merb
       boundary_size = boundary.size + EOL.size
       bufsize       = 16384
       content_length -= boundary_size
+      key_memo = []
       # status is boundary delimiter line
       status = input.read(boundary_size)
       return {} if status == nil || status.empty?
       raise ControllerExceptions::MultiPartParseError, "bad content body:\n'#{status}' should == '#{boundary + EOL}'"  unless status == boundary + EOL
-      # second argument to Regexp.quote is for KCODE
-      rx = /(?:#{EOL})?#{Regexp.quote(boundary,'n')}(#{EOL}|--)/
+
+      rx = /(?:#{EOL})?#{Regexp.quote(boundary)}(#{EOL}|--)/n
       loop {
         head      = nil
         body      = ''
@@ -126,7 +127,10 @@ module Merb
         else
           data = body
         end
-        paramhsh = normalize_params(paramhsh,name,data)
+        unless key_memo.include?(name) && name !~ /\[\]/ 
+          paramhsh = normalize_params(paramhsh,name,data) 
+        end
+        key_memo << name
         break  if buf.empty? || content_length == -1
       }
       paramhsh
@@ -183,15 +187,24 @@ module Merb
 
     # ==== Parameter
     # s<String>:: String to URL unescape.
+    # encoding<String>:: Encoding which we force to return. Only for 
+    #                    Ruby 1.9. If encoding is not passed it defaults
+    #                    to Encoding.default_internal. When this is nil
+    #                    (default) no encoding forcing is done.
     #
     # ==== returns
     # String:: The unescaped string.
     #
     # :api: public
-    def self.unescape(s)
-      s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n){
+    def self.unescape(s, encoding = nil)
+      s = s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n){
         [$1.delete('%')].pack('H*')
       }
+      if RUBY_VERSION >= '1.9'
+        encoding ||= Encoding.default_internal
+        s.force_encoding(encoding) if encoding
+      end
+      s
     end
 
     # ==== Parameters

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

@@ -15,7 +15,7 @@ module Merb
         
         # Undefine as many methods as possible so that everything can be proxied
         # along to the behavior
-        instance_methods.each { |m| undef_method m unless %w[ __id__ __send__ class kind_of? respond_to? assert_kind_of should should_not instance_variable_set instance_variable_get instance_eval].include?(m) }
+        instance_methods.each { |m| undef_method m unless %w[ object_id __id__ __send__ class kind_of? respond_to? assert_kind_of should should_not instance_variable_set instance_variable_get instance_eval].include?(m.to_s) }
         
         # :api: private
         def initialize
@@ -656,7 +656,7 @@ module Merb
         with_behavior_context(behavior, &block)
         
         Merb::Router.named_routes.reject { |k,v| current_names.include?(k) }.each do |name, route|
-          name = route.name.to_s.sub("#{name_prefix}", '').to_sym unless name_prefix.empty?
+          name = route.name.to_s.sub(/^#{name_prefix.join('|')}/, '').to_sym unless name_prefix.empty?
           captured_routes[name] = route
         end
         
@@ -709,6 +709,9 @@ module Merb
         end
         
         @params.merge!(:controller => controller.to_s.gsub(%r{^/}, '')) if controller
+
+        # Normalise action into a string
+        @params[:action] = @params[:action].to_s if @params.has_key?(:action)
         
         # Sorts the identifiers so that modules that are at the bottom of the
         # inheritance chain come first (more specific modules first). Object

data/lib/merb-core/dispatch/router/resources.rb

@@ -122,25 +122,6 @@ module Merb
               name(action, name).register_resource(name, action)
           end
 
-          # => show
-          resource.match("/#{root_keys}(.:format)", match_opts.merge(:method => :get)).to(:action => "show").
-            name(singular).register_resource(klass_name, :identifiers => keys)
-
-          # => user defined member routes
-          member.each_pair do |action, method|
-            action = action.to_s
-            resource.match("/#{root_keys}/#{action}(.:format)", match_opts.merge(:method => method)).
-              to(:action => "#{action}").name(action, singular).register_resource(klass_name, action, :identifiers => keys)
-          end
-
-          # => update
-          resource.match("/#{root_keys}(.:format)", match_opts.merge(:method => :put)).
-            to(:action => "update")
-            
-          # => destroy
-          resource.match("/#{root_keys}(.:format)", match_opts.merge(:method => :delete)).
-            to(:action => "destroy")
-
           if block_given?
             parent_keys = keys.map do |k|
               k == :id ? "#{singular}_id".to_sym : k
@@ -152,11 +133,10 @@ module Merb
             nested_match_opts["#{singular}_id".to_sym] = match_opts[:id] if match_opts[:id]
             
             # Procs for building the extra collection/member resource routes
-            placeholder = Router.resource_routes[ [@options[:resource_prefix], klass_name].flatten.compact ]
             builders    = {}
             
             builders[:collection] = lambda do |action, to, method|
-              resource.before(placeholder).match("/#{action}(.:format)", match_opts.merge(:method => method)).
+              resource.match("/#{action}(.:format)", match_opts.merge(:method => method)).
                 to(:action => to).name(action, name).register_resource(name, action)
             end
             
@@ -168,6 +148,26 @@ module Merb
             resource.options(:name_prefix => singular, :resource_prefix => klass_name, :parent_keys => parent_keys).
               match("/#{nested_keys}", nested_match_opts).resource_block(builders, &block)
           end
+
+          # => show
+          resource.match("/#{root_keys}(.:format)", match_opts.merge(:method => :get)).to(:action => "show").
+            name(singular).register_resource(klass_name, :identifiers => keys)
+
+          # => user defined member routes
+          member.each_pair do |action, method|
+            action = action.to_s
+            resource.match("/#{root_keys}/#{action}(.:format)", match_opts.merge(:method => method)).
+              to(:action => "#{action}").name(action, singular).register_resource(klass_name, action, :identifiers => keys)
+          end
+
+          # => update
+          resource.match("/#{root_keys}(.:format)", match_opts.merge(:method => :put)).
+            to(:action => "update")
+
+          # => destroy
+          resource.match("/#{root_keys}(.:format)", match_opts.merge(:method => :delete)).
+            to(:action => "destroy")
+
         end # namespace
       end # resources
 

data/lib/merb-core/dispatch/router/route.rb

@@ -244,7 +244,7 @@ module Merb
         def compiled
           ruby  = ""
           ruby << "lambda do |params, defaults|\n"
-          ruby << "  fragment     = params.delete(:fragment)\n"
+          ruby << "  fragment     = params.delete(:anchor) || params.delete(:fragment)\n"
           ruby << "  query_params = params.dup\n"
           
           with(@segments) do
@@ -589,9 +589,7 @@ module Merb
             captures = ""
 
             if (max = capturing_parentheses_count(value)) > 0
-              captures << (1..max).to_a.map { |n| "#{key}#{n}" }.join(", ")
-              captures << " = "
-              captures << (1..max).to_a.map { |n| "$#{n}" }.join(", ")
+              captures << (1..max).to_a.map { |n| "#{key}#{n} = $#{n}" }.join("; ")
             end
 
             # Note: =~ is slightly faster than .match