example/lib/example.js example/lib/models/cat.js example/lib/models/man.js spec/screw_unit/file_system_fixtures_for_asset_manager_specs/dir_1/1.js spec/screw_unit/file_system_fixtures_for_asset_manager_specs/dir_1/subdir_1/4.js spec/screw_unit/file_system_fixtures_for_asset_manager_specs/dir_2/2.js spec/screw_unit/file_system_fixtures_for_asset_manager_specs/dir_3/3.js spec/screw_unit/file_system_fixtures_for_asset_manager_specs/dir_3/subdir_3/5.js spec/screw_unit/file_system_fixtures_for_asset_manager_specs/dir_4/1.css @@ -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 @@ -1,5 +1,5 @@ ScrewUnit.configure do port 8082 - code_under_test_path "models" - specs_path "spec" - end \ No newline at end of file + add_js_location "/under_test", "lib" + add_js_location "/specs", "spec" + end example/.screwrc @@ -1,4 +1,4 @@ -require("/specs/spec_helper") +//= require "../spec_helper" Screw.Unit(function(c) { with(c) { describe('Cat', function() { @@ -30,4 +30,4 @@ Screw.Unit(function(c) { with(c) { }); }); }); -}}); \ No newline at end of file +}}); example/spec/models/cat_spec.js @@ -1,4 +1,4 @@ -require("/specs/spec_helper"); +//= require "../spec_helper" Screw.Unit(function(c) { with(c) { describe('Man', function() { @@ -23,14 +23,14 @@ Screw.Unit(function(c) { with(c) { describe('@click', function() { before(function() { - $('#test_content').append(man.render()); + Screw.$('#test_content').append(man.render()); }); it("removes the man's hair", function() { - expect($('.man .hair')).to_not(be_empty); - $('.man').click(); - expect($('.man .hair')).to(be_empty); + expect(Screw.$('.man .hair')).to_not(be_empty); + Screw.$('.man').click(); + expect(Screw.$('.man .hair')).to(be_empty); }); }); }); -}}); \ No newline at end of file +}}); example/spec/models/man_spec.js @@ -1,8 +1,7 @@ -require("/cat"); -require("/man"); +//= require <example>; Screw.Unit(function(c) { with(c) { before(function() { - $('dom_test').empty(); + Screw.$('dom_test').empty(); // Screw comes with its own version of jQuery, located Screw.$ to keep out of your version's way if you have one }); -}}); \ No newline at end of file +}}); example/spec/spec_helper.js @@ -11,8 +11,8 @@ <script src="spec_helper.js"></script> <script src="matchers/have.js"></script> - <script src="../models/cat.js"></script> - <script src="../models/man.js"></script> + <script src="../lib/models/cat.js"></script> + <script src="../lib/models/man.js"></script> <script src="models/cat_spec.js"></script> <script src="models/man_spec.js"></script> @@ -22,4 +22,4 @@ <body> <div id="dom_test" style="position: absolute; left: -9999"></div> </body> -</html> \ No newline at end of file +</html> example/spec/suite.html @@ -1,7 +1,6 @@ dir = File.dirname(__FILE__) require "rubygems" require "thin" -require "#{dir}/../vendor/sprockets/lib/sprockets" require "#{dir}/screw_unit/dispatcher" require "#{dir}/screw_unit/server" require "#{dir}/screw_unit/resources" lib/screw_unit.rb @@ -10,9 +10,6 @@ module ScrewUnit def initialize @locations = [] @js_locations = [] - add_js_location("/screw_unit_core", "#{SCREW_UNIT_ROOT}/client/lib") - add_js_location("/screw_unit_vendor", "#{SCREW_UNIT_ROOT}/client/vendor") - add_js_location("/screw_unit_stylesheets", "#{SCREW_UNIT_ROOT}/client/stylesheets") end def add_location(virtual_path, physical_path) lib/screw_unit/asset_manager.rb @@ -1,5 +1,4 @@ module ScrewUnit - def self.configure(&block) Configuration.instance.instance_eval(&block) end @@ -25,6 +24,9 @@ module ScrewUnit def initialize @asset_manager = AssetManager.new + 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") end def load_screwrc(path_containing_screwrc) lib/screw_unit/configuration.rb @@ -5,7 +5,7 @@ module ScrewUnit virtual_child_path = ::File.join(virtual_path, name) physical_child_path = asset_manager.physicalize_path(virtual_child_path) - if ::File.exists?(physical_child_path) + if physical_child_path && ::File.exists?(physical_child_path) if ::File.directory?(physical_child_path) Dir.new(virtual_child_path, asset_manager) else lib/screw_unit/resources/dir.rb @@ -7,36 +7,36 @@ module ScrewUnit before do @dir = File.dirname(__FILE__) @manager = AssetManager.new - 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") + 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") + manager.add_js_location("/implementations", "#{dir}/file_system_fixtures_for_asset_manager_specs/dir_3") + manager.add_location("/css", "#{dir}/file_system_fixtures_for_asset_manager_specs/dir_4") end describe "#virtualize_path" do it "converts a physical path to a virtual path based on the declared locations" do - manager.virtualize_path("#{dir}/asset_manager_spec/dir_1/1.js").should == "/specs/1/1.js" - manager.virtualize_path("#{dir}/asset_manager_spec/dir_2/2.js").should == "/specs/2/2.js" - manager.virtualize_path("#{dir}/asset_manager_spec/dir_3/3.js").should == "/implementations/3.js" + manager.virtualize_path("#{dir}/file_system_fixtures_for_asset_manager_specs/dir_1/1.js").should == "/specs/1/1.js" + manager.virtualize_path("#{dir}/file_system_fixtures_for_asset_manager_specs/dir_2/2.js").should == "/specs/2/2.js" + manager.virtualize_path("#{dir}/file_system_fixtures_for_asset_manager_specs/dir_3/3.js").should == "/implementations/3.js" manager.virtualize_path("/crap").should be_nil end it "corrently handles handles a virtual path of '/'" do - manager.add_location('/', "#{dir}/asset_manager_spec/dir_4") - manager.virtualize_path("#{dir}/asset_manager_spec/dir_4/1.css").should == "/1.css" + 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 end describe "#physicalize_path" do it "converts a virtual path to a physical path based on the declared locations" do - manager.physicalize_path("/specs/1/1.js").should == "#{dir}/asset_manager_spec/dir_1/1.js" - manager.physicalize_path("/specs/2/2.js").should == "#{dir}/asset_manager_spec/dir_2/2.js" - manager.physicalize_path("/implementations/3.js").should == "#{dir}/asset_manager_spec/dir_3/3.js" + manager.physicalize_path("/specs/1/1.js").should == "#{dir}/file_system_fixtures_for_asset_manager_specs/dir_1/1.js" + manager.physicalize_path("/specs/2/2.js").should == "#{dir}/file_system_fixtures_for_asset_manager_specs/dir_2/2.js" + manager.physicalize_path("/implementations/3.js").should == "#{dir}/file_system_fixtures_for_asset_manager_specs/dir_3/3.js" end it "corrently handles handles a virtual path of '/'" do - manager.add_location('/', "#{dir}/asset_manager_spec/dir_4") - manager.physicalize_path('/1.css').should == "#{dir}/asset_manager_spec/dir_4/1.css" + 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 end spec/screw_unit/asset_manager_spec.rb @@ -6,17 +6,17 @@ module ScrewUnit before do @dir = File.dirname(__FILE__) - asset_manager = AssetManager.new - asset_manager.add_js_location("/implementations", "#{dir}/asset_manager_spec/dir_3") - @js_file = JsFile.new("#{dir}/asset_manager_spec/dir_1/1.js", asset_manager) + 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) end describe "#require_declarations" do it "returns a relative or global RequireDeclaration for every Sprockets-style require declaration in the file" do require_declarations = js_file.require_declarations require_declarations.size.should == 2 - require_declarations[0].js_file.physical_path.should == "#{dir}/asset_manager_spec/dir_1/subdir_1/4.js" - require_declarations[1].js_file.physical_path.should == "#{dir}/asset_manager_spec/dir_3/3.js" + require_declarations[0].js_file.physical_path.should == "#{dir}/file_system_fixtures_for_asset_manager_specs/dir_1/subdir_1/4.js" + require_declarations[1].js_file.physical_path.should == "#{dir}/file_system_fixtures_for_asset_manager_specs/dir_3/3.js" end end end spec/screw_unit/js_file_spec.rb @@ -7,20 +7,20 @@ module ScrewUnit before do spec_file_dir = ::File.dirname(__FILE__) - @asset_manager = AssetManager.new + @asset_manager = Configuration.new.asset_manager end describe "#locate" do before do - asset_manager.add_location("/", "#{::File.dirname(__FILE__)}/file_system_fixtures") - @dir = Dir.new("/", asset_manager) + asset_manager.add_location("/x", "#{::File.dirname(__FILE__)}/file_system_fixtures") + @dir = Dir.new("/x", asset_manager) end context "when the string names a file in the directory" do it "returns a File resource with the appropriate virtual path and the same AssetManager" do file = dir.locate("foo.js") file.class.should == Resources::File - file.virtual_path.should == "/foo.js" + file.virtual_path.should == "/x/foo.js" file.asset_manager.should == asset_manager end end @@ -29,7 +29,7 @@ module ScrewUnit it "returns a Dir resource with the appropriate absolute path and the same AssetManeger" do subdir = dir.locate("specs") subdir.class.should == Resources::Dir - subdir.virtual_path.should == "/specs" + subdir.virtual_path.should == "/x/specs" subdir.asset_manager.should == asset_manager end end @@ -38,6 +38,10 @@ module ScrewUnit it "returns a FileNotFound resource with the relative path" do not_found = dir.locate("bogus") not_found.class.should == FileNotFound + not_found.virtual_path.should == "/x/bogus" + + not_found = Dir.new("/", asset_manager).locate("bogus") + not_found.class.should == FileNotFound not_found.virtual_path.should == "/bogus" end end spec/screw_unit/resources/dir_spec.rb @@ -7,7 +7,7 @@ module ScrewUnit before do @dir = ::File.dirname(__FILE__) - @asset_manager = AssetManager.new + @asset_manager = Configuration.new.asset_manager asset_manager.add_js_location("/", "#{dir}/file_system_fixtures") @file = File.new(virtual_path, asset_manager) end spec/screw_unit/resources/file_spec.rb @@ -7,7 +7,7 @@ module ScrewUnit before do dir = ::File.dirname(__FILE__) - @asset_manager = AssetManager.new + @asset_manager = Configuration.new.asset_manager asset_manager.add_js_location("/specs", "#{dir}/file_system_fixtures/specs") @spec_dir = SpecDir.new("/specs", asset_manager) end spec/screw_unit/resources/spec_dir_spec.rb @@ -7,7 +7,7 @@ module ScrewUnit before do @dir = ::File.dirname(__FILE__) - @asset_manager = AssetManager.new + @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_suite = SpecSuite.new(spec_file_resources, asset_manager) spec/screw_unit/resources/spec_suite_spec.rb .braids History.txt Manifest.txt client/lib/screw/jquery_mapper.js example/models/cat.js example/models/man.js javascript/lib/disco.js javascript/lib/screw/jquery_mapper.js spec/screw_unit/asset_manager_spec/dir_1/1.js spec/screw_unit/asset_manager_spec/dir_1/subdir_1/4.js spec/screw_unit/asset_manager_spec/dir_2/2.js spec/screw_unit/asset_manager_spec/dir_3/3.js spec/screw_unit/asset_manager_spec/dir_3/subdir_3/5.js spec/screw_unit/asset_manager_spec/dir_4/1.css vendor/sprockets/.gitignore vendor/sprockets/CHANGELOG vendor/sprockets/LICENSE vendor/sprockets/README.markdown vendor/sprockets/Rakefile vendor/sprockets/bin/sprocketize vendor/sprockets/ext/nph-sprockets.cgi vendor/sprockets/lib/sprockets.rb vendor/sprockets/lib/sprockets/concatenation.rb vendor/sprockets/lib/sprockets/environment.rb vendor/sprockets/lib/sprockets/error.rb vendor/sprockets/lib/sprockets/pathname.rb vendor/sprockets/lib/sprockets/preprocessor.rb vendor/sprockets/lib/sprockets/secretary.rb vendor/sprockets/lib/sprockets/source_file.rb vendor/sprockets/lib/sprockets/source_line.rb vendor/sprockets/lib/sprockets/version.rb vendor/sprockets/sprockets.gemspec vendor/sprockets/test/fixtures/assets/images/script_with_assets/one.png vendor/sprockets/test/fixtures/assets/images/script_with_assets/two.png vendor/sprockets/test/fixtures/assets/stylesheets/script_with_assets.css vendor/sprockets/test/fixtures/constants.yml vendor/sprockets/test/fixtures/dependency_ordered_source_files.js vendor/sprockets/test/fixtures/double_slash_comments_that_are_not_requires_should_be_ignored_when_strip_comments_is_false.js vendor/sprockets/test/fixtures/double_slash_comments_that_are_not_requires_should_be_removed_by_default.js vendor/sprockets/test/fixtures/multiline_comments_should_be_removed_by_default.js vendor/sprockets/test/fixtures/requiring_a_file_after_it_has_already_been_required_should_do_nothing.js vendor/sprockets/test/fixtures/requiring_a_file_that_does_not_exist_should_raise_an_error.js vendor/sprockets/test/fixtures/requiring_a_single_file_should_replace_the_require_comment_with_the_file_contents.js vendor/sprockets/test/fixtures/requiring_the_current_file_should_do_nothing.js vendor/sprockets/test/fixtures/src/constants.yml vendor/sprockets/test/fixtures/src/foo.js vendor/sprockets/test/fixtures/src/foo/bar.js vendor/sprockets/test/fixtures/src/foo/foo.js vendor/sprockets/test/fixtures/src/interdependent_sources/1.js vendor/sprockets/test/fixtures/src/interdependent_sources/2.js vendor/sprockets/test/fixtures/src/interdependent_sources/3.js vendor/sprockets/test/fixtures/src/interdependent_sources/4.js vendor/sprockets/test/fixtures/src/interdependent_sources/5.js vendor/sprockets/test/fixtures/src/script_with_assets.js vendor/sprockets/test/fixtures/src/script_with_comments.js vendor/sprockets/test/test_concatenation.rb vendor/sprockets/test/test_environment.rb vendor/sprockets/test/test_helper.rb vendor/sprockets/test/test_pathname.rb vendor/sprockets/test/test_preprocessor.rb vendor/sprockets/test/test_secretary.rb vendor/sprockets/test/test_source_file.rb vendor/sprockets/test/test_source_line.rb 4965458c520c66be302b65666c7a6dc56341a568 Grockit grockit@grok-a.local http://github.com/nathansobo/screw-unit/commit/efbf242a6ad31d1f59f5ec52883778157048cc7c efbf242a6ad31d1f59f5ec52883778157048cc7c

2009-09-03T16:32:40-07:00

Fixed the example. 213b303c82a08fffc086b3b898209cb644dc4522 Grockit grockit@grok-a.local