lib/screw_unit/array_extension.rb lib/screw_unit/string_extension.rb spec/screw_unit/array_extension_spec.rb spec/screw_unit/asset_location_spec.rb spec/screw_unit/file_system_fixtures_for_asset_manager_specs/dir/6.js @@ -1,4 +1,4 @@ - ScrewUnit.configure do +ScrewUnit.configure do port 8181 add_js_location "/under_test", "client/lib" add_js_location "/specs", "client/spec" .screwrc @@ -6,6 +6,8 @@ require "#{dir}/screw_unit/server" require "#{dir}/screw_unit/resources" require "#{dir}/screw_unit/configuration" require "#{dir}/screw_unit/asset_manager" +require "#{dir}/screw_unit/string_extension" +require "#{dir}/screw_unit/array_extension" require "#{dir}/screw_unit/asset_location" require "#{dir}/screw_unit/js_file" lib/screw_unit.rb @@ -3,6 +3,9 @@ module ScrewUnit attr_reader :virtual_prefix, :physical_prefix def initialize(virtual_prefix, physical_prefix) + + raise "No directory exists at #{physical_prefix}" unless File.exist?(physical_prefix) && File.directory?(physical_prefix) + @virtual_prefix, @physical_prefix = virtual_prefix, physical_prefix end @@ -21,11 +24,11 @@ module ScrewUnit end def matches_physical_path?(physical_path) - physical_path.starts_with?(physical_prefix) + physical_path.path_starts_with?(physical_prefix) end def matches_virtual_path?(virtual_path) - virtual_path.starts_with?(virtual_prefix) + virtual_path.path_starts_with?(virtual_prefix) end def matches_virtual_glob_pattern?(virtual_glob_pattern) @@ -34,11 +37,11 @@ module ScrewUnit def is_subsumed_by_virtual_glob_pattern?(pattern) glob_pattern_without_wildcards = pattern.gsub(/\/\*.*/, "") - virtual_prefix.starts_with?(glob_pattern_without_wildcards) + virtual_prefix.path_starts_with?(glob_pattern_without_wildcards) end def subsumes_virtual_glob_pattern?(pattern) - pattern.starts_with?(virtual_prefix) + pattern.path_starts_with?(virtual_prefix) end def virtual_glob(virtual_glob_pattern) lib/screw_unit/asset_location.rb @@ -1,9 +1,3 @@ -class String - def starts_with?(prefix) - index(prefix) == 0 - end -end - module ScrewUnit class AssetManager attr_reader :locations, :js_locations lib/screw_unit/asset_manager.rb @@ -6,6 +6,8 @@ module ScrewUnit attr_reader :physical_path, :containing_dir, :asset_manager def initialize(physical_path, asset_manager) + raise "JsFile created with nil physical_path" if physical_path.nil? + @physical_path, @asset_manager = physical_path, asset_manager @containing_dir = File.dirname(physical_path) end @@ -49,7 +51,9 @@ module ScrewUnit class GlobalRequireDeclaration attr_reader :js_file def initialize(global_path, asset_manager) - @js_file = JsFile.new(asset_manager.physicalize_path_from_js_load_path(global_path + ".js"), asset_manager) + physical_path = asset_manager.physicalize_path_from_js_load_path(global_path + ".js") + raise "No file '#{global_path}.js' found on load path" unless physical_path + @js_file = JsFile.new(physical_path, asset_manager) end end end lib/screw_unit/js_file.rb @@ -25,6 +25,11 @@ module ScrewUnit manager.add_location('/', "#{dir}/file_system_fixtures_for_asset_manager_specs/dir_4") manager.virtualize_path("#{dir}/file_system_fixtures_for_asset_manager_specs/dir_4/1.css").should == "/1.css" end + + it "is not confused by multiple physical paths with the same partial prefix" do + manager.add_location("/specs/b", "#{dir}/file_system_fixtures_for_asset_manager_specs/dir") + manager.virtualize_path("#{dir}/file_system_fixtures_for_asset_manager_specs/dir_1/1.js").should == "/specs/1/1.js" + end end describe "#physicalize_path" do @@ -38,6 +43,12 @@ module ScrewUnit manager.add_location('/', "#{dir}/file_system_fixtures_for_asset_manager_specs/dir_4") manager.physicalize_path('/1.css').should == "#{dir}/file_system_fixtures_for_asset_manager_specs/dir_4/1.css" end + + it "is not confused by multiple virtual paths with the same partial prefix" do + manager.add_location("/foo_prime", "#{dir}/file_system_fixtures_for_asset_manager_specs/dir_1") + manager.add_location("/foo", "#{dir}/file_system_fixtures_for_asset_manager_specs/dir_2") + manager.physicalize_path("/foo_prime/1.js").should == "#{dir}/file_system_fixtures_for_asset_manager_specs/dir_1/1.js" + end end describe "#glob_virtual_paths" do spec/screw_unit/asset_manager_spec.rb efbf242a6ad31d1f59f5ec52883778157048cc7c Grockit grockit@grok-a.local http://github.com/nathansobo/screw-unit/commit/784d7162106caaaa0b10481bf31cac705ccc0a81 784d7162106caaaa0b10481bf31cac705ccc0a81 2009-09-08T12:02:37-07:00 2009-09-08T12:02:37-07:00 Fixed AssetLocation to only consider / separated tokens when determining prefix matches. This avoids locations like 'foo_a' from matching virtual paths ending in 'foo' efb861ee0eedf704e5079da474609bb1afa395de Grockit grockit@grok-a.local