moved path creation for disambiguated assets to rack in the app

removed spurious dependencies

3 files changed, 9 insertions, 25 deletions

diff --git a/chef-server-slice/lib/chef-server-slice.rb b/chef-server-slice/lib/chef-server-slice.rb
index 3bf2dfb6cf..61612cb2cc 100644
--- a/chef-server-slice/lib/chef-server-slice.rb
+++ b/chef-server-slice/lib/chef-server-slice.rb
@@ -102,7 +102,6 @@ if defined?(Merb::Plugins)
       scope.match('/openid/consumer/complete').to(:controller => 'openid_consumer', :action => 'complete').name(:openid_consumer_complete)
       scope.match('/openid/consumer/logout').to(:controller => 'openid_consumer', :action => 'logout').name(:openid_consumer_logout)
 
-      # the slice is mounted at /chefserverslice - note that it comes before default_routes
       scope.match('/').to(:controller => 'nodes', :action =>'index').name(:top)      
       # enable slice-level default routes by default
       # scope.default_routes
@@ -123,12 +122,5 @@ if defined?(Merb::Plugins)
   #
   # Or just call setup_default_structure! to setup a basic Merb MVC structure.
   ChefServerSlice.setup_default_structure!
-  
-  # freaky path fix for javascript and stylesheets
-  unless ChefServerSlice.standalone?
-    ChefServerSlice.public_components.each do |component|
-      ChefServerSlice.push_app_path(component, Merb.dir_for(:public) / "#{component}s", nil)    
-    end
-  end
 end
 
diff --git a/chef-server/config/dependencies.rb b/chef-server/config/dependencies.rb
index c9d083122e..3901639f58 100644
--- a/chef-server/config/dependencies.rb
+++ b/chef-server/config/dependencies.rb
@@ -13,23 +13,7 @@ dependency("merb-cache", merb_gems_version) do
   end
 end
 dependency "merb-helpers", merb_gems_version 
-dependency "merb-mailer", merb_gems_version  
 dependency "merb-slices", merb_gems_version  
-dependency "merb-auth-core", merb_gems_version
-dependency "merb-auth-more", merb_gems_version
-# dependency "merb-auth-slice-password", merb_gems_version
-dependency "merb-param-protection", merb_gems_version
 dependency "merb-exceptions", merb_gems_version
 
-dependency "data_objects", do_gems_version
-dependency "do_sqlite3", do_gems_version # If using another database, replace this
-dependency "dm-core", dm_gems_version         
-dependency "dm-aggregates", dm_gems_version   
-dependency "dm-migrations", dm_gems_version   
-dependency "dm-timestamps", dm_gems_version   
-dependency "dm-types", dm_gems_version        
-dependency "dm-validations", dm_gems_version  
-dependency "dm-serializer", dm_gems_version   
-
-dependency "merb_datamapper", merb_gems_version
 dependency "chef-server-slice"
diff --git a/chef-server/config/rack.rb b/chef-server/config/rack.rb
index 494c687342..e6bde4d226 100644
--- a/chef-server/config/rack.rb
+++ b/chef-server/config/rack.rb
@@ -7,5 +7,13 @@ end
 # that serves static files
 use Merb::Rack::Static, Merb.dir_for(:public)
 
+Merb::Slices.config.each do |slice_module, config|
+  slice_module = Object.full_const_get(slice_module.to_s.camel_case) if slice_module.class.in?(String, Symbol)
+  slice_module.send("public_components").each do |component|
+    slice_static_dir = slice_module.send("dir_for", :public)
+    use Merb::Rack::Static, slice_static_dir
+  end
+end
+
 # this is our main merb application
-run Merb::Rack::Application.new
\ No newline at end of file
+run Merb::Rack::Application.new