@@ -18,5 +18,5 @@ module ActsAsRouting end end -require 'acts_as_routing_rails' if defined?(ActionController::Routing) -require 'acts_as_routing_merb' if defined?(Merb::Router) \ No newline at end of file +require File.join(File.dirname(__FILE__), 'acts_as_routing_rails') if defined?(ActionController::Routing) +require File.join(File.dirname(__FILE__), 'acts_as_routing_merb') if defined?(Merb::Router) lib/acts_as_routing.rb @@ -4,14 +4,16 @@ Merb::Router::Resources.class_eval do def resource_options_with_acts_as_routing resource_options_without_acts_as_routing + [ :acts_as ] end - alias_method_chain :resource_options, :acts_as_routing + alias :resource_options_without_acts_as_routing :resource_options + alias :resource_options :resource_options_with_acts_as_routing # always have a block, so resource_block gets called def resources_with_empty_block(*args, &block) block ||= Proc.new {} resources_without_empty_block(*args, &block) end - alias_method_chain :resources, :empty_block + alias :resources_without_empty_block :resources + alias :resources :resources_with_empty_block def resource_block(builders, &block) all_acts_as = [@options.delete(:acts_as)].flatten.compact lib/acts_as_routing_merb.rb 18cfdfb7991b4f3f19c3f0199fd1627a4adbf626 Warren Konkel wkonkel@gmail.com http://github.com/hungrymachine/acts_as_routing/commit/d2138312a21ae105ec09edc78dd81a417c0c179a d2138312a21ae105ec09edc78dd81a417c0c179a 2008-11-26T10:07:24-08:00 2008-11-26T10:07:24-08:00 merb fixes 7b8f4ab904217d2aaf7a399f738a25b27fef454e Warren Konkel wkonkel@gmail.com