@@ -1,16 +1,12 @@ base = File.join(File.dirname(__FILE__), "mack-distributed") -config = { - "mack::share_routes" => false, - "mack::share_objects" => false, - "mack::distributed_app_name" => nil, - "mack::distributed_site_domain" => "http://localhost:3000", - "mack::drb_timeout" => 0 -} - +config = {} +config["mack::share_routes"] = false if app_config.mack.share_routes.nil? +config["mack::share_objects"] = false if app_config.mack.share_objects.nil? +config["mack::distributed_app_name"] = String.randomize(10) if app_config.mack.distributed_app_name.nil? +config["mack::distributed_site_domain"] = "http://localhost:3000" if app_config.mack.distributed_site_domain.nil? +config["mack::drb_timeout"] = 0 if app_config.mack.drb_timeout.nil? app_config.load_hash(config, "mack-distributed") -app_config.load_hash(app_config.final_configuration_settings, "original settings") -# app_config.reload # load *.rb files Dir.glob(File.join(base, "**", "*.rb")).each do |f| mack-distributed/lib/mack-distributed.rb @@ -32,6 +32,51 @@ 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) + # 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 Mack::Routes.after_class_method(:build) do mack-distributed/lib/mack-distributed/routes/urls.rb d1f8d3cc46fe4d472431b6d44ff0779149985cc2 Mark Bates mark@mackframework.com http://github.com/markbates/mack-more/commit/fa64e5f6e217a9b8a4a33cfb09a5a41f846c32b4 fa64e5f6e217a9b8a4a33cfb09a5a41f846c32b4 2008-08-06T11:56:11-07:00 2008-08-06T11:56:11-07:00 Just a few more tests to go with renaming use_distributed_routes to share_routes. [#79] 65266ae3ef137064408a5b85d2377de691751ed8 Mark Bates mark@mackframework.com