@@ -20,10 +20,11 @@ module ScrewUnit end end - attr_reader :path_containing_screwrc, :asset_manager + attr_reader :path_containing_screwrc, :asset_manager, :resource_locators def initialize @asset_manager = AssetManager.new + @resource_locators = [] asset_manager.add_js_location("/screw_unit_core", "#{SCREW_UNIT_ROOT}/client/lib") asset_manager.add_js_location("/screw_unit_vendor", "#{SCREW_UNIT_ROOT}/client/vendor") asset_manager.add_js_location("/screw_unit_stylesheets", "#{SCREW_UNIT_ROOT}/client/stylesheets") @@ -47,6 +48,10 @@ module ScrewUnit asset_manager.add_location(virtual_path, absolutize_path(relative_path)) end + def add_resource_locator(locator) + resource_locators.unshift(locator) + end + def absolutize_path(relative_path) File.expand_path(File.join(path_containing_screwrc, relative_path)) end lib/screw_unit/configuration.rb @@ -1,8 +1,9 @@ module ScrewUnit class Dispatcher - attr_reader :root + attr_reader :root, :resource_locators def initialize(configuration) + @resource_locators = configuration.resource_locators @root = Resources::Root.new(configuration) end @@ -23,6 +24,11 @@ module ScrewUnit end def locate_resource(path) + resource_locators.each do |locator| + resource = locator.locate_resource(path) + return resource if resource + end + path_parts(path).inject(root) do |resource, child_resource_name| resource.locate(child_resource_name) end lib/screw_unit/dispatcher.rb @@ -22,7 +22,7 @@ module ScrewUnit def require_declarations declarations = [] File.open(physical_path, 'r') do |f| - f.lines.each do |line| + f.readlines.each do |line| if match = RELATIVE_REQUIRE_REGEX.match(line) require_path = match[0] declarations.push(RelativeRequireDeclaration.new(containing_dir, match[1], asset_manager)) lib/screw_unit/js_file.rb @@ -11,9 +11,29 @@ module ScrewUnit end def get - file = Rack::File.new(nil) - file.path = asset_manager.physicalize_path(virtual_path) - file.serving + [200, headers, ::File.read(physical_path)] + end + + MIME_TYPES = { + ".css" => "text/css", + ".gif" => "image/gif", + ".js" => "application/javascript", + ".jpg" => "image/jpeg", + ".jpeg" => "image/jpeg", + ".png" => "image/png", + } + + def headers + { + "Content-Type" => mime_type(physical_path), + "Last-Modified" => ::File.mtime(physical_path).httpdate + } + end + + protected + + def mime_type(physical_path) + MIME_TYPES[::File.extname(physical_path)] end end end lib/screw_unit/resources/file.rb @@ -5,7 +5,7 @@ module ScrewUnit attr_reader :manager, :dir before do - @dir = File.dirname(__FILE__) + @dir = File.expand_path(File.dirname(__FILE__)) @manager = AssetManager.new manager.add_js_location("/specs/1", "#{dir}/file_system_fixtures_for_asset_manager_specs/dir_1") manager.add_js_location("/specs/2", "#{dir}/file_system_fixtures_for_asset_manager_specs/dir_2") spec/screw_unit/asset_manager_spec.rb @@ -2,5 +2,59 @@ require "#{File.dirname(__FILE__)}/../screw_unit_spec_helper" module ScrewUnit describe Dispatcher do + attr_reader :dispatcher, :locator_1, :locator_2 + before do + @locator_1 = Object.new + @locator_2 = Object.new + @dispatcher = Dispatcher.new(configuration) + end + + describe "#locate_resource(path)" do + context "when there are #resource_locators" do + def configuration + return @configuration if @configuration + @configuration = Configuration.new + @configuration.add_resource_locator(locator_1) + @configuration.add_resource_locator(locator_2) + @configuration + end + + context "when one of the custom locators returns a resource" do + attr_reader :resource + before do + @resource = Object.new + mock(locator_2).locate_resource("/foo").ordered { nil } + mock(locator_1).locate_resource("/foo").ordered { resource } + end + + it "returns that resource" do + dispatcher.locate_resource("/foo").should == resource + end + end + + context "when no custom locators return a resource" do + before do + mock(locator_2).locate_resource("/foo").ordered { nil } + mock(locator_1).locate_resource("/foo").ordered { nil } + end + + it "performs the normal dispatch starting at Resources::Root" do + mock.instance_of(Resources::Root).locate("foo") + dispatcher.locate_resource("/foo") + end + end + end + + context "when there are no #resource_locators" do + def configuration + @configuration ||= Configuration.new + end + + it "performs the normal dispatch starting at Resources::Root" do + mock.instance_of(Resources::Root).locate("foo") + dispatcher.locate_resource("/foo") + end + end + end end end spec/screw_unit/dispatcher_spec.rb @@ -5,7 +5,7 @@ module ScrewUnit attr_reader :js_file, :dir before do - @dir = File.dirname(__FILE__) + @dir = File.expand_path(File.dirname(__FILE__)) asset_manager = Configuration.new.asset_manager asset_manager.add_js_location("/implementations", "#{dir}/file_system_fixtures_for_asset_manager_specs/dir_3") @js_file = JsFile.new("#{dir}/file_system_fixtures_for_asset_manager_specs/dir_1/1.js", asset_manager) spec/screw_unit/js_file_spec.rb @@ -6,13 +6,13 @@ module ScrewUnit attr_reader :dir, :asset_manager before do - spec_file_dir = ::File.dirname(__FILE__) + spec_file_dir = ::File.expand_path(::File.dirname(__FILE__)) @asset_manager = Configuration.new.asset_manager end describe "#locate" do before do - asset_manager.add_location("/x", "#{::File.dirname(__FILE__)}/file_system_fixtures") + asset_manager.add_location("/x", "#{::File.expand_path(::File.dirname(__FILE__))}/file_system_fixtures") @dir = Dir.new("/x", asset_manager) end @@ -50,8 +50,9 @@ module ScrewUnit describe "#glob" do before do @dir = Dir.new("/foo", asset_manager) - asset_manager.add_location("/foo/bar", "#{::File.dirname(__FILE__)}/file_system_fixtures/code_under_test") - asset_manager.add_location("/foo/baz", "#{::File.dirname(__FILE__)}/file_system_fixtures/specs") + absolute_dir = ::File.expand_path(::File.dirname(__FILE__)) + asset_manager.add_location("/foo/bar", "#{absolute_dir}/file_system_fixtures/code_under_test") + asset_manager.add_location("/foo/baz", "#{absolute_dir}/file_system_fixtures/specs") end it "returns File resources with the correct relative paths for all files matching the pattern" do spec/screw_unit/resources/dir_spec.rb @@ -6,7 +6,7 @@ module ScrewUnit attr_reader :dir, :file, :asset_manager before do - @dir = ::File.dirname(__FILE__) + @dir = ::File.expand_path(::File.dirname(__FILE__)) @asset_manager = Configuration.new.asset_manager asset_manager.add_js_location("/", "#{dir}/file_system_fixtures") @file = File.new(virtual_path, asset_manager) spec/screw_unit/resources/file_spec.rb @@ -6,7 +6,7 @@ module ScrewUnit attr_reader :spec_dir, :asset_manager before do - dir = ::File.dirname(__FILE__) + dir = ::File.expand_path(::File.dirname(__FILE__)) @asset_manager = Configuration.new.asset_manager asset_manager.add_js_location("/specs", "#{dir}/file_system_fixtures/specs") @spec_dir = SpecDir.new("/specs", asset_manager) spec/screw_unit/resources/spec_dir_spec.rb @@ -6,7 +6,7 @@ module ScrewUnit attr_reader :dir, :spec_file_resources, :spec_suite, :asset_manager before do - @dir = ::File.dirname(__FILE__) + @dir = ::File.expand_path(::File.dirname(__FILE__)) @asset_manager = Configuration.new.asset_manager asset_manager.add_location("/specs", "#{dir}/file_system_fixtures/specs") @spec_file_resources = Dir.new("/specs", asset_manager).glob("**/*.js") spec/screw_unit/resources/spec_suite_spec.rb 0a996bfb70fbd3bb9dd6ab2a729fc62da6d5b080 cfcef85e2f7a84299b3b40e692e239385bb3ba8b Grockit grockit@grok-a.local http://github.com/nathansobo/screw-unit/commit/9fc63d0dda5a4e4793ed23e076392bcdc604e6ca 9fc63d0dda5a4e4793ed23e076392bcdc604e6ca 2009-10-09T13:04:39-07:00 2009-10-09T13:04:39-07:00 Merge branch 'mmol' 4314ba80a3bfa1ab5215fdccd8236ade5cb96fe1 Grockit grockit@grok-a.local