lib/screw_unit/js_file.rb spec/screw_unit/asset_manager_spec/dir_4/1.css spec/screw_unit/js_file_spec.rb @@ -2,4 +2,5 @@ *.ipr *.iws .DS_Store -pkg \ No newline at end of file +pkg +.rakeTasks .gitignore @@ -8,6 +8,7 @@ require "#{dir}/screw_unit/resources" require "#{dir}/screw_unit/configuration" require "#{dir}/screw_unit/asset_manager" require "#{dir}/screw_unit/asset_location" +require "#{dir}/screw_unit/js_file" module ScrewUnit VERSION = "1.9.0" lib/screw_unit.rb @@ -49,5 +49,10 @@ module ScrewUnit raise "Does not match glob pattern" end end + + def relative_find(relative_path) + physical_path = File.join(physical_prefix, relative_path) + return physical_path if File.exist?(physical_path) + end end end lib/screw_unit/asset_location.rb @@ -17,13 +17,22 @@ module ScrewUnit end end - attr_reader :locations + attr_reader :locations, :js_locations def initialize @locations = [] + @js_locations = [] end def add_location(virtual_path, physical_path) - locations.push(AssetLocation.new(virtual_path, physical_path)) + location = AssetLocation.new(virtual_path, physical_path) + locations.unshift(location) + location + end + + def add_js_location(virtual_path, physical_path) + location = add_location(virtual_path, physical_path) + js_locations.unshift(location) + location end def virtualize_path(physical_path) @@ -47,5 +56,23 @@ module ScrewUnit matching_locations = locations.select {|l| l.matches_virtual_glob_pattern?(virtual_glob_pattern)} matching_locations.map {|l| l.virtual_glob(virtual_glob_pattern)}.flatten end + + def virtual_dependency_paths(*relative_paths) + virtual_dependency_paths = [] + relative_paths.each do |relative_path| + js_file = find_on_js_load_path(relative_path) + js_file.add_dependencies_to_required_virtual_paths(virtual_dependency_paths) + end + virtual_dependency_paths + end + + def find_on_js_load_path(relative_path) + js_locations.each do |js_location| + if physical_path = js_location.relative_find(relative_path) + return JsFile.new(physical_path, self) + end + end + nil + end end end lib/screw_unit/asset_manager.rb @@ -7,9 +7,10 @@ module ScrewUnit before do @dir = File.dirname(__FILE__) @manager = AssetManager.new - manager.add_location("/specs/1", "#{dir}/asset_manager_spec/dir_1") - manager.add_location("/specs/2", "#{dir}/asset_manager_spec/dir_2") - manager.add_location("/implementations", "#{dir}/asset_manager_spec/dir_3") + manager.add_js_location("/specs/1", "#{dir}/asset_manager_spec/dir_1") + manager.add_js_location("/specs/2", "#{dir}/asset_manager_spec/dir_2") + manager.add_js_location("/implementations", "#{dir}/asset_manager_spec/dir_3") + manager.add_location("/css", "#{dir}/asset_manager_spec/dir_4") end describe "#virtualize_path" do @@ -31,12 +32,24 @@ module ScrewUnit describe "#glob_virtual_paths" do it "maps the glob pattern to the declared locations, potentially spanning multiple physical locations, and returns the matching relative paths" do - manager.glob_virtual_paths("/specs/**/*.js").should == ["/specs/1/1.js", "/specs/1/subdir_1/4.js", "/specs/2/2.js"] + manager.glob_virtual_paths("/specs/**/*.js").should == ["/specs/2/2.js", "/specs/1/1.js", "/specs/1/subdir_1/4.js"] manager.glob_virtual_paths("/specs/1/*.js").should == ["/specs/1/1.js"] manager.glob_virtual_paths("/specs/x/*.js").should == [] manager.glob_virtual_paths("/implementations/**/*.js").should == ["/implementations/3.js", "/implementations/subdir_3/5.js"] manager.glob_virtual_paths("/implementations/*.js").should == ["/implementations/3.js"] end end + + describe "#virtual_dependency_paths" do + it "computes the virtual paths of the require graph extending out from the files on the load path corresponding to the given paths" do + expected_dependency_paths = [ + "/specs/1/subdir_1/4.js", + "/implementations/subdir_3/5.js", + "/implementations/3.js", + "/specs/1/1.js" + ] + manager.virtual_dependency_paths("1.js", "subdir_3/5.js").should == expected_dependency_paths + end + end end end spec/screw_unit/asset_manager_spec.rb @@ -0,0 +1,3 @@ +//= require "subdir_1/4" +//= require <3> +var x = 1; spec/screw_unit/asset_manager_spec/dir_1/1.js @@ -0,0 +1 @@ +//= require "subdir_3/5" spec/screw_unit/asset_manager_spec/dir_3/3.js 6148c2d0891ff05d76982e3d394560c9c0da92dd Grockit grockit@grok-a.local http://github.com/grockit/screw-unit/commit/c5b2ae27608b0981c21571ac07ffdfd6983397be c5b2ae27608b0981c21571ac07ffdfd6983397be 2009-09-02T17:36:58-07:00 2009-09-02T17:36:58-07:00 AssetManager can compute the require graph of scripts on the load path. 27944d7af7e1ca0214a06ccb917691f4c2d03965 Grockit grockit@grok-a.local