Changeset 973

Show
Ignore:
Timestamp:
11/12/07 14:58:17 (10 months ago)
Author:
wyca..@gmail.com
Message:

Benchmark app

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/merb/core_ext/get_args.rb

    r922 r973  
    4040    def get_args 
    4141      klass, meth = self.to_s.split(/ /).to_a[1][0..-2].split("#") 
     42      # Remove stupidity for #<Method: Class(Object)#foo> 
     43      klass = $` if klass =~ /\(/ 
    4244      ParseTreeArray.translate(Object.const_get(klass), meth).get_args 
    4345    end 

  • trunk/lib/merb/server.rb

    r965 r973  
    347347              loaded_classes = Merb::Controller._subclasses - old_subclasses 
    348348              load_action_arguments(loaded_classes) 
     349              load_controller_globs 
    349350            rescue Exception => e 
    350351              puts "Error reloading file #{file}: #{e}" 

  • trunk/spec/fixtures/controllers/dispatch_spec_controllers.rb

    r904 r973  
    3535end 
    3636 
     37class Baz < Merb::Controller 
     38   
     39  def index 
     40  end 
     41   
     42end 
     43 
     44class Bat < Merb::Controller 
     45end 
    3746 
    3847class AdminAccessRequired < Merb::ControllerExceptions::Unauthorized; end 
    …… 
    215224end 
    216225 
     226# If this throws an error, it's because parameterized args are somehow borked 
    217227Merb::Server.load_application