mack-distributed/lib/mack-distributed/extensions/route_map.rb mack-distributed/lib/mack-distributed/extensions/urls.rb @@ -8,7 +8,6 @@ config = { "mack::drb_timeout" => 0 } app_config.load_hash(config.merge(app_config.final_configuration_settings), "mack-distributed") -# app_config.reload # load *.rb files Dir.glob(File.join(base, "**", "*.rb")).each do |f| mack-distributed/lib/mack-distributed.rb @@ -33,51 +33,6 @@ module Mack end # Routes end # Distributed - module Routes # :nodoc: - module Urls - # 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.share_routes - d_urls = Mack::Distributed::Routes::Urls.get(app_name) - 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) - else - return nil - end - end # droute_url - end # Urls - - class RouteMap - alias_method :normal_connect_with_named_route, :connect_with_named_route - - def connect_with_named_route(n_route, pattern, options = {}) - n_route = n_route.methodize - normal_connect_with_named_route(n_route, pattern, options) - if app_config.mack.share_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 # connect_with_named_route - - end # RouteMap - - end # Routes - end # Mack Mack::Routes.after_class_method(:build) do mack-distributed/lib/mack-distributed/routes/urls.rb c8e93fc4ae67fa03c5a444fb0395ac3ff6d2569e Mark Bates mark@mackframework.com http://github.com/markbates/mack-more/commit/96e33b3960ec4ecbda89345afff128e33e7c05aa 96e33b3960ec4ecbda89345afff128e33e7c05aa 2008-08-06T12:56:49-07:00 2008-08-06T12:56:49-07:00 Finished renaming use_distributed_routes to share_routes [#79 state:resolved] 5486c53d4014adfc5ee4d10dda78e72847be5dd5 Mark Bates mark@mackframework.com