@@ -134,6 +134,7 @@ module Mack # If A HollyCrapError is thrown it will be caught and rendered using the OopsController and the 500 action. # You can catch all exceptions using Exception. class RouteMap + include Extlib::Hook include Singleton def initialize # :nodoc: @@ -246,15 +247,6 @@ module Mack } Mack::Routes::Urls.class_eval(url) - - if app_config.mack.use_distributed_routes - - Mack::Routes::Urls.class_eval %{ - def #{n_route}_distributed_url(options = {}) - (@dsd || app_config.mack.distributed_site_domain) + #{n_route}_url(options) - end - } - end end def regex_from_pattern(pattern) lib/mack/routing/route_map.rb @@ -58,46 +58,6 @@ module Mack } end - # Retrieves a distributed route from a DRb server. - # - # Example: - # droute_url(:app_1, :home_page_url) - # droute_url(:registration_app, :signup_url, {:from => :google}) - def droute_url(app_name, route_name, options = {}) - if app_config.mack.use_distributed_routes - d_urls = Mack::Distributed::Routes::Urls.get(app_name) - # return d_urls.send(route_name, options) - # ivar_cache("droute_url_hash") do - # {} - # end - # d_urls = @droute_url_hash[app_name.to_sym] - # if d_urls.nil? - # d_urls = Mack::Distributed::Routes::UrlCache.get(app_name.to_sym) - # @droute_url_hash[app_name.to_sym] = d_urls - # if d_urls.nil? - # raise Mack::Distributed::Errors::UnknownApplication.new(app_name) - # end - # end - route_name = route_name.to_s - if route_name.match(/_url$/) - unless route_name.match(/_distributed_url$/) - route_name.gsub!("_url", "_distributed_url") - end - else - route_name << "_distributed_url" - end - raise Mack::Distributed::Errors::UnknownRouteName.new(app_name, route_name) unless d_urls.respond_to?(route_name) - return d_urls.run(route_name, options) - # if d_urls.run.respond_to?(route_name) - # return d_urls.run.send(route_name, options) - # else - # raise Mack::Distributed::Errors::UnknownRouteName.new(app_name, route_name) - # end - else - return nil - end - end # droute_url - end # Urls end # Routes end # Mack \ No newline at end of file lib/mack/routing/urls.rb b019c553d4a6275449e2bdb31c639fa81a65ecf4 Mark Bates mark@mackframework.com http://github.com/markbates/mack/commit/1ebc213b46acb34085bab506b13b623eed08443a 1ebc213b46acb34085bab506b13b623eed08443a 2008-08-06T12:31:24-07:00 2008-08-06T12:31:24-07:00 Removed the last, I hope, of the distributed code from Mack. [#8] d14a9a574c97381453d1e205e9b035423ac47be8 Mark Bates mark@mackframework.com