@@ -6,7 +6,7 @@ foo: bar mack::page_cache: true -mack::use_distributed_routes: false +mack::share_routes: false mack::distributed_app_name: fake_app # cachetastic_default_options: mack-data_factory/spec/fake_application/config/app_config/default.yml @@ -1,4 +1,4 @@ mack::session_id: _my_fake_app_session_id -mack::use_distributed_routes: false +mack::share_routes: false mack::distributed_app_name: fake_app \ No newline at end of file mack-data_factory/spec/fake_application/config/app_config/development.yml @@ -1,5 +1,17 @@ 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 +} + +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| load(f) mack-distributed/lib/mack-distributed.rb @@ -35,7 +35,7 @@ module Mack end # Mack Mack::Routes.after_class_method(:build) do - if app_config.mack.use_distributed_routes + if app_config.mack.share_routes raise Mack::Distributed::Errors::ApplicationNameUndefined.new if app_config.mack.distributed_app_name.nil? d_urls = Mack::Distributed::Routes::Urls.new(app_config.mack.distributed_site_domain) mack-distributed/lib/mack-distributed/routes/urls.rb @@ -6,7 +6,7 @@ foo: bar mack::page_cache: true -mack::use_distributed_routes: false +mack::share_routes: false mack::distributed_app_name: fake_app mack::share_objects: true mack::drb_timeout: 0 mack-distributed/spec/fake_application/config/app_config/default.yml @@ -1,4 +1,4 @@ mack::session_id: _my_fake_app_session_id -mack::use_distributed_routes: false +mack::share_routes: false mack::distributed_app_name: fake_app \ No newline at end of file mack-distributed/spec/fake_application/config/app_config/development.yml @@ -10,7 +10,7 @@ describe "droute_url" do # it's fine to ignore this, it's expected that it's already running. # all other exceptions should be thrown end - app_config.load_hash({"mack::use_distributed_routes" => true, "mack::distributed_app_name" => :known_app}, :distributed_route_test) + app_config.load_hash({"mack::share_routes" => true, "mack::distributed_app_name" => :known_app}, :distributed_route_test) Mack::Routes.build do |r| # force the routes to go the DRb server r.known "/my_known_app/my_known_url", :controller => :foo, :action => :bar r.known_w_opts "/my_known_app/my_known_url_w_opts/:id", :controller => :foo, :action => :bar @@ -47,7 +47,7 @@ describe "droute_url" do end it "should raise error when d-route is used when not configured as distributed route" do - temp_app_config("mack::use_distributed_routes" => false) do + temp_app_config("mack::share_routes" => false) do droute_url(:known_app, :known_url).should be_nil end end mack-distributed/spec/lib/distributed/routing/distributed_route_spec.rb @@ -6,7 +6,7 @@ foo: bar mack::page_cache: true -mack::use_distributed_routes: false +mack::share_routes: false mack::distributed_app_name: fake_app # cachetastic_default_options: mack-haml/spec/fake_application/config/app_config/default.yml @@ -1,4 +1,4 @@ mack::session_id: _my_fake_app_session_id -mack::use_distributed_routes: false +mack::share_routes: false mack::distributed_app_name: fake_app \ No newline at end of file mack-haml/spec/fake_application/config/app_config/development.yml @@ -6,7 +6,7 @@ foo: bar mack::page_cache: true -mack::use_distributed_routes: false +mack::share_routes: false mack::distributed_app_name: fake_app mack::js_framework: prototype mack-javascript/spec/fake_application/config/app_config/default.yml @@ -1,4 +1,4 @@ mack::session_id: _my_fake_app_session_id -mack::use_distributed_routes: false +mack::share_routes: false mack::distributed_app_name: fake_app \ No newline at end of file mack-javascript/spec/fake_application/config/app_config/development.yml @@ -6,7 +6,7 @@ foo: bar mack::page_cache: true -mack::use_distributed_routes: false +mack::share_routes: false mack::distributed_app_name: fake_app # cachetastic_default_options: mack-markaby/spec/fake_application/config/app_config/default.yml @@ -1,4 +1,4 @@ mack::session_id: _my_fake_app_session_id -mack::use_distributed_routes: false +mack::share_routes: false mack::distributed_app_name: fake_app \ No newline at end of file mack-markaby/spec/fake_application/config/app_config/development.yml @@ -6,7 +6,7 @@ foo: bar mack::page_cache: true -mack::use_distributed_routes: false +mack::share_routes: false mack::distributed_app_name: fake_app # cachetastic_default_options: mack-pdf_writer/spec/fake_application/config/app_config/default.yml @@ -1,4 +1,4 @@ mack::session_id: _my_fake_app_session_id -mack::use_distributed_routes: false +mack::share_routes: false mack::distributed_app_name: fake_app \ No newline at end of file mack-pdf_writer/spec/fake_application/config/app_config/development.yml d14c5b90bb817a15b89928251b5ce993fe60eb7b Mark Bates mark@mackframework.com http://github.com/markbates/mack-more/commit/d1f8d3cc46fe4d472431b6d44ff0779149985cc2 d1f8d3cc46fe4d472431b6d44ff0779149985cc2 2008-08-06T11:16:30-07:00 2008-08-06T11:16:30-07:00 Working on renaming use_distributed_routes to share_routes [#79] 84cc470f884f9105f645d51ba43f6a7e258b78b0 Mark Bates mark@mackframework.com